xzw 2 년 전
부모
커밋
c9df358dcf
3개의 변경된 파일17개의 추가작업 그리고 12개의 파일을 삭제
  1. 2 2
      src/pages/Viewer.vue
  2. 3 1
      src/utils/ConvertViews.js
  3. 12 9
      src/utils/sync.js

+ 2 - 2
src/pages/Viewer.vue

@@ -400,7 +400,7 @@ const onP1Click = (type) =>{
     }
     }
     console.log(points.value.p1)
     console.log(points.value.p1)
     // todo 定位
     // todo 定位
-    alert(type)
+     
     flyToP1P2(points.value.p1)
     flyToP1P2(points.value.p1)
     
     
 }
 }
@@ -411,7 +411,7 @@ const onP2Click = (type) =>{
         return
         return
     }
     }
     // todo 定位
     // todo 定位
-    alert(type)
+    
     flyToP1P2(points.value.p2)
     flyToP1P2(points.value.p2)
 }
 }
 
 

+ 3 - 1
src/utils/ConvertViews.js

@@ -231,7 +231,6 @@ export default class ConvertViews extends THREE.EventDispatcher{
         bimViewer = this.bimViewer = targetApp.viewer 
         bimViewer = this.bimViewer = targetApp.viewer 
         bimViewer.setNavigationMode(targetApp.Glodon.Bimface.Viewer.NavigationMode3D.Walk)
         bimViewer.setNavigationMode(targetApp.Glodon.Bimface.Viewer.NavigationMode3D.Walk)
         //bimViewer.setFlySpeedRate(3)
         //bimViewer.setFlySpeedRate(3)
-        bimViewer.getViewer().setTransitionAnimationState(false) //setCameraStatus瞬间变化相机 ,or setCameraAnimation?
        
        
        
        
         let camera = bimViewer.getViewer().camera
         let camera = bimViewer.getViewer().camera
@@ -242,6 +241,9 @@ export default class ConvertViews extends THREE.EventDispatcher{
        
        
        
        
         if(targetPano){
         if(targetPano){
+            bimViewer.getViewer().setTransitionAnimationState(false) //setCameraStatus瞬间变化相机 ,or setCameraAnimation?
+            
+            
             this.needConvertAxis = sourceApp.sceneType == 'kankan' && targetApp.sceneType == 'bim'// Y朝上需要转换
             this.needConvertAxis = sourceApp.sceneType == 'kankan' && targetApp.sceneType == 'bim'// Y朝上需要转换
             
             
             this.lastCamStatus = bimViewer.getCameraStatus()
             this.lastCamStatus = bimViewer.getCameraStatus()

+ 12 - 9
src/utils/sync.js

@@ -27,16 +27,19 @@ export function flyToP1P2(data){
         let player = sourceApp.app.core.get('Player')
         let player = sourceApp.app.core.get('Player')
         player.flyToPano({pano:model.panos.index[data.id]})  
         player.flyToPano({pano:model.panos.index[data.id]})  
     }
     }
-    let info = bimViewer.getCameraStatus() 
-    let msg = {
-        position:data.position,
-        target:info.target,
-        up: new THREE.Vector3(0,0,1),
-        //前三个缺一不可  
-        
+    
+    {
+        let bimViewer = targetApp.viewer
+        let info = bimViewer.getCameraStatus() 
+        let msg = {
+            position:data.position,
+            target:info.target,
+            up: new THREE.Vector3(0,0,1),
+            //前三个缺一不可  
+            
+        } 
+        bimViewer.setCameraStatus(msg)
     }
     }
-     
-    targetApp.viewer.setCameraStatus(msg)
 }
 }