xzw 4 tháng trước cách đây
mục cha
commit
d2ed242a5f
3 tập tin đã thay đổi với 20 bổ sung4 xóa
  1. 10 2
      public/lib/potree/potree.js
  2. 1 1
      public/lib/potree/potree.js.map
  3. 9 1
      src/sdk/cover/index.js

+ 10 - 2
public/lib/potree/potree.js

@@ -62182,6 +62182,7 @@
 	      this.highlight(false);
 	    });
 	    this.cameraModel.addEventListener('click', () => {
+	      if (viewer.scene.monitors.some(e => e.isWatching)) return;
 	      this.watch();
 	    });
 	  }
@@ -62238,6 +62239,10 @@
 	      },
 	      duration: 1000
 	    });
+	    viewer.dispatchEvent({
+	      type: 'exitWatchMonitor',
+	      monitor: this
+	    });
 	  }
 
 	  // 显示监控视频或显示投射体
@@ -62261,6 +62266,10 @@
 	      this.cylinder.bottom.material = this.normalMat;
 	      //this.cylinder.bottom.renderOrder = RenderOrder.visibleFloor
 	    }
+	    viewer.dispatchEvent({
+	      type: 'watchMonitor',
+	      monitor: this
+	    });
 	  }
 	  play() {
 	    //console.log('play monitor', this.sid, this.videoSrc)
@@ -91549,8 +91558,7 @@
 
 	          boundingBox_.min.set(-radius, -radius, -radius);
 	          boundingBox_.max.set(radius, radius, radius);
-
-	          //boundingBox_.translate(center)
+	          boundingBox_.translate(_center);
 
 	          //2025:很少有模型用这个,之前是哪个模型有的?目前看到cesium的模型有 'http://192.168.0.25/oss/manage/media-library/result/test/tileset.json',
 	        } else {

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 1 - 1
public/lib/potree/potree.js.map


+ 9 - 1
src/sdk/cover/index.js

@@ -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()
+        }
         
     }