xzw 2 vuotta sitten
vanhempi
commit
0fa1607536
1 muutettua tiedostoa jossa 20 lisäystä ja 12 poistoa
  1. 20 12
      src/utils/sync.js

+ 20 - 12
src/utils/sync.js

@@ -43,20 +43,27 @@ export function loadSourceScene(sourceFrame,type) {
         // }
 
         window.viewer1 = sourceApp.viewer
-
+        window.app1 = sourceApp
         viewer1.mainViewport.view.minPitch += 0.01 //防止bim垂直视角上的闪烁(似乎是因 up 要乘以某矩阵导致微小偏差所致)
         viewer1.mainViewport.view.minPitch -= 0.01
-
+        if(type == 'laser'){
+            sourceApp.Potree.settings.rotAroundPoint = false
+            viewer1.images360.panos.forEach(pano=>{
+                viewer1.updateVisible(pano.label2, 'notDisplay', true)
+                pano.dispatchEvent({type:'changeMarkerTex',name:'ring'})
+            }) 
+            sourceApp.canChangePos = () => {
+                return sourceApp.Potree.settings.displayMode != 'showPanos'
+            }
+        }
         initConvertView()
-
+        console.log('\n loadSourceScene', type)
         sourceApp.viewer.addEventListener('camera_changed', e => {
             targetApp && views.receive(getView())
         })
     })
 
-    sourceApp.canChangePos = () => {
-        return sourceApp.Potree.settings.displayMode != 'showPanos'
-    }
+    
 }
 
 /**
@@ -64,12 +71,13 @@ export function loadSourceScene(sourceFrame,type) {
  * @param {String} type kankan|laser|bim
  */
 export function loadTargetScene(targetFrame,type) {
-
-    // targetApp = targetFrame.value.contentWindow
-    // targetApp.loaded.then(viewer => {
-    //     window.viewer2 = targetApp.viewer
-    //     initConvertView()
-    // })
+    
+    targetApp = targetFrame.value.contentWindow
+    targetApp.loaded.then(viewer => {
+        console.log('loadTargetScene')
+        window.viewer2 = targetApp.viewer
+        initConvertView()
+    })
 
 }