|
@@ -159,7 +159,8 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes }) => {
|
|
|
|
|
|
viewer.addEventListener('webglError', e => {
|
|
viewer.addEventListener('webglError', e => {
|
|
console.error('viewer webglError: ' + e)
|
|
console.error('viewer webglError: ' + e)
|
|
- sceneBus.emit('webglError', { msg: e.msg })
|
|
|
|
|
|
+ let memory = '. \n jsHeapSizeLimit:'+ performance.memory.jsHeapSizeLimit/ 1e6 + ', usedJSHeapSize: '+performance.memory.usedJSHeapSize/ 1e6 + '(M)'
|
|
|
|
+ sceneBus.emit('webglError', { msg: e.msg + memory })
|
|
})
|
|
})
|
|
viewer.compass.setAutoDisplay(true)
|
|
viewer.compass.setAutoDisplay(true)
|
|
|
|
|
|
@@ -795,7 +796,7 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes }) => {
|
|
MergeEditor.transformControls.visible && e.selected && MergeEditor.transformControls.attach(model, e.clickPos) //: MergeEditor.transformControls.detach()
|
|
MergeEditor.transformControls.visible && e.selected && MergeEditor.transformControls.attach(model, e.clickPos) //: MergeEditor.transformControls.detach()
|
|
})
|
|
})
|
|
|
|
|
|
-
|
|
|
|
|
|
+ MergeEditor.modelAdded(model)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@@ -1497,7 +1498,7 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes }) => {
|
|
|
|
|
|
let aspect = cesAspect || viewer.scene.getActiveCamera().aspect;
|
|
let aspect = cesAspect || viewer.scene.getActiveCamera().aspect;
|
|
|
|
|
|
- console.log('updateMap', aspect)
|
|
|
|
|
|
+ //console.log('updateMap', aspect)
|
|
|
|
|
|
if (aspect < 1) {
|
|
if (aspect < 1) {
|
|
let fovy = Math.PI * (viewer.scene.getActiveCamera().fov / 180);
|
|
let fovy = Math.PI * (viewer.scene.getActiveCamera().fov / 180);
|