|
@@ -277,6 +277,10 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes, laserRoot, laserOS
|
|
|
sceneBus.emit('webglError', { msg: e.msg + memory })
|
|
|
})
|
|
|
viewer.compass.setAutoDisplay(true)
|
|
|
+
|
|
|
+ viewer.addEventListener('watchMonitor',()=>{
|
|
|
+ sceneBus.emit('watchMonitor')
|
|
|
+ })
|
|
|
|
|
|
/* mapBus.on('visible', v => {
|
|
|
//console.log('mapBus visible', v)
|
|
@@ -1384,8 +1388,9 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes, laserRoot, laserOS
|
|
|
AnimationEditor.pause()
|
|
|
},
|
|
|
setCurrentTime(s){// 设置当前时间, 单位为秒
|
|
|
- //console.log('setCurrentTime',s, AnimationEditor.playing)
|
|
|
+
|
|
|
(!AnimationEditor.playing || s == 0) && AnimationEditor.at(s) //除非s==0否则一定要先pause后才能设置时间
|
|
|
+ console.log('setCurrentTime',s, AnimationEditor.playing, AnimationEditor.cursorTime)
|
|
|
},
|
|
|
addAnimationModel(data){// 添加动画模型
|
|
|
/* title: string; 模型名称
|
|
@@ -2122,6 +2127,9 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes, laserRoot, laserOS
|
|
|
Potree.Utils.updateVisible(viewer.modules.MergeEditor.ground, 'hideGrid', false)
|
|
|
},
|
|
|
|
|
|
+ exitWatchMonitor(){
|
|
|
+ viewer.scene.monitors.find(e=>e.isWatching).leave()
|
|
|
+ }
|
|
|
|
|
|
}
|
|
|
|