xzw před 5 měsíci
rodič
revize
9d6b8437a2

+ 9 - 9
src/custom/modules/datasetAlignment/Alignment.js

@@ -164,12 +164,12 @@ var Alignment = {
                 return this.bus.dispatchEvent('forbitMoveOriginDataset') 
             }
             
-            console.log('panoid',e.pointclouds[0].panos[0].id)           
+                   
             this.history.beforeChange(e.pointclouds)    
             //this.writeToHistory( e.pointclouds ) 
               
-            if(!transfromInfo){  
-                transfromInfo = {pointclouds:e.pointclouds}
+            if(!transfromInfo){   
+                transfromInfo = {pointclouds:e.pointclouds} 
             }
             
             
@@ -250,13 +250,13 @@ var Alignment = {
             } 
         })
         
-        
-        viewer.fpControls.addEventListener("end",(e)=>{   
+        let drop = ()=>{   
             transfromInfo && this.history.afterChange(transfromInfo.pointclouds )
-            transfromInfo = null 
-        })
-        
-        
+            transfromInfo = null  
+        } 
+        viewer.fpControls.addEventListener("end",drop) 
+        this.selectPanoCallBack = drop   //不得已加一个函数,在选择好漫游点后清空。click时可能滑动drag,导致触发transfromInfo重新赋值,过后却不触发drop
+         
 		 
         
         // cursor:

+ 5 - 3
src/custom/modules/panoEdit/panoEditor.js

@@ -461,7 +461,7 @@ class PanoEditor extends THREE.EventDispatcher{
     
     
     setTranMode(mode){//rotate or translate 
-        console.log('panoeditor setTranMode',mode)
+        //console.log('panoeditor setTranMode',mode)
         this.tranMode = mode
         
         if(this.activeViewName != 'top'){
@@ -1268,7 +1268,7 @@ class PanoEditor extends THREE.EventDispatcher{
     
     selectPano(pano, informinformBy2d, force){
         if(this.selectedPano == pano && !force)return
-        
+    
         let lastSeletedPano = this.selectedPano
         let opaProp = this.activeViewName == 'top' ? opacitys.topView : opacitys.sideView 
         
@@ -1327,7 +1327,9 @@ class PanoEditor extends THREE.EventDispatcher{
                 
                 this.gotoFloor(atFloor, false, 600   ) 
             }
-                 
+            
+            
+            Alignment.selectPanoCallBack() //add   
         }else{
             //viewer.controls.setTarget(null)  
         }

+ 1 - 1
src/custom/modules/siteModel/SiteModel.js

@@ -93,7 +93,7 @@ var SiteModel = {
         }
         
         
-        if(Potree.settings.isTest && ifDrawDatasetBound){
+        if(Potree.settings.isTest && ifDrawDatasetBound && Potree.settings.editType != 'pano'){
             viewer.addEventListener('allLoaded',()=>{
             
                 viewer.scene.pointclouds.forEach(pointcloud=>{

+ 2 - 2
src/custom/objects/Monitor.js

@@ -11,8 +11,8 @@ import SecurityControls from '../core/controls/SecurityControls' */
  
 import {transitions, easing, lerp} from '../utils/transitions.js'
 import CursorDeal from '../utils/CursorDeal.js'
-import FlvVideoPlayerBase from '../utils/media/FlvVideoPlayerBase'
-import H5VideoPlayerBase from '../utils/media/H5VideoPlayerBase'
+import FlvVideoPlayerBase from '../utils/media/FlvVideoPlayerBase.js'
+import H5VideoPlayerBase from '../utils/media/H5VideoPlayerBase.js'
 
  
 const planeGeometry = new THREE.PlaneGeometry(1,1)  

src/utils/media/FlvVideoPlayerBase.js → src/custom/utils/media/FlvVideoPlayerBase.js


src/utils/media/H5VideoPlayerBase.js → src/custom/utils/media/H5VideoPlayerBase.js