xzw 1 месяц назад
Родитель
Сommit
d02f43dcbf
3 измененных файлов с 211 добавлено и 83 удалено
  1. 209 81
      src/custom/modules/panos/Images360.js
  2. 1 1
      src/custom/modules/panos/Panorama.js
  3. 1 1
      src/navigation/InputHandlerNew.js

Разница между файлами не показана из-за своего большого размера
+ 209 - 81
src/custom/modules/panos/Images360.js


+ 1 - 1
src/custom/modules/panos/Panorama.js

@@ -98,7 +98,7 @@ class Panorama extends THREE.EventDispatcher{
             0       pointcloudVisi(隐藏了数据集)       unvisible
             0       pointcloudVisi(隐藏了数据集)       unvisible
          */ 
          */ 
        
        
-        this.panosData = o
+        this.panoData = o
            
            
         this.originPosition = new THREE.Vector3().copy(o.pose.translation) 
         this.originPosition = new THREE.Vector3().copy(o.pose.translation) 
         this.originFloorPosition = new THREE.Vector3().copy(o.puck)
         this.originFloorPosition = new THREE.Vector3().copy(o.puck)

+ 1 - 1
src/navigation/InputHandlerNew.js

@@ -782,7 +782,7 @@ export class InputHandler extends THREE.EventDispatcher {
     }
     }
 
 
 
 
-    ifBlockedByIntersect({point, margin=0, cameraPos, pickWindowSize, pano, useDepthTex}={}){//某点是否被遮挡(不允许camera修改位置, 因为depthTex不好置换)
+    ifBlockedByIntersect({point, margin=0, cameraPos, pickWindowSize, pano, useDepthTex, viewport}={}){//某点是否被遮挡(不允许camera修改位置, 因为depthTex不好置换)
         viewport = viewport || this.hoverViewport || viewer.mainViewport
         viewport = viewport || this.hoverViewport || viewer.mainViewport
         let intersect = this.getIntersect({viewport, onlyGetIntersect:true, pickWindowSize,  useDepthTex,  point, cameraPos, pano })
         let intersect = this.getIntersect({viewport, onlyGetIntersect:true, pickWindowSize,  useDepthTex,  point, cameraPos, pano })
         let cameraPos_ = (!cameraPos && pano) ? pano.position : (cameraPos||viewport.view.position)
         let cameraPos_ = (!cameraPos && pano) ? pano.position : (cameraPos||viewport.view.position)