xzw 2 rokov pred
rodič
commit
30e0288374

BIN
resources/textures/pic_point32.png


BIN
resources/textures/pic_point_s32.png


+ 3 - 3
src/custom/modules/panos/Images360.js

@@ -1199,7 +1199,7 @@ export class Images360 extends THREE.EventDispatcher{
             
         let camera = viewer.scene.getActiveCamera();
         if(target && !dir){
-            dir = new Vector3().subVectors(target,point).normalize();
+            dir = new THREE.Vector3().subVectors(target,point).normalize();
         }
         let atFloor = sameFloor && viewer.modules.SiteModel.pointInWhichEntity(point, 'floor');
         
@@ -1251,7 +1251,7 @@ export class Images360 extends THREE.EventDispatcher{
                     return -dis1 
                 }else {
                     let dis2 = disSquareMap.get(pano);
-                    let vec2 = new Vector3().subVectors(target,pano.position).normalize();
+                    let vec2 = new THREE.Vector3().subVectors(target,pano.position).normalize();
                     let cos = dir.dot(vec2);  
                     //let result = (- dis1  - Math.pow(dis2 , 1.5)) / (cos + 2)  // cos+2是为了调整到1-3, 
                     
@@ -1281,7 +1281,7 @@ export class Images360 extends THREE.EventDispatcher{
         ); 
         
          
-        var g = Common$1.sortByScore(panos,  require, rank);
+        var g = Common.sortByScore(panos,  require, rank);
         //console.log(g)
         
         /* let result1 = g && g.slice(0, 10)

+ 2 - 2
src/custom/settings.js

@@ -160,11 +160,11 @@ const config = {//配置参数   不可修改
     measure:{
         color:'#00C8AF',
         default:{
-            color:"#64C8BB",//"#00c7b2",
+            color:"#2F8FFF",//"#00c7b2",
             opacity:0.7
         },
         highlight:{
-            color:'#00C8AF',//"#00c7b2",
+            color:"#2F8FFF",//"#00c7b2",
             opacity:1
         },
         guide:{

+ 11 - 2
src/custom/viewer/ViewerNew.js

@@ -3283,7 +3283,11 @@ export class Viewer extends ViewerBase{
                 }
                 this.images360.panos.forEach(pano=>{
                     Potree.Utils.updateVisible(pano, 'screenshot', true)
-                })    
+                }) 
+                viewer.scene.measurements.forEach((e)=>{
+                    Potree.Utils.updateVisible(e, 'screenshot', true)  
+                })
+                
                 Potree.Utils.updateVisible(this.reticule, 'screenshot', true)
                  
             
@@ -3358,7 +3362,12 @@ export class Viewer extends ViewerBase{
             this.images360.panos.forEach(pano=>{//令漫游点不可见
                 Potree.Utils.updateVisible(pano, 'screenshot', false)
             }) 
-        }                    
+        } 
+        if(info.hideMeasures){
+            viewer.scene.measurements.forEach((e)=>{
+                Potree.Utils.updateVisible(e, 'screenshot', false)  
+            })
+        }            
         Potree.Utils.updateVisible(this.reticule, 'screenshot', false)//令reticule不可见 
                                 
         

+ 1 - 0
src/viewer/ExtendScene.js

@@ -17,6 +17,7 @@ class ExtendScene extends Scene{
 		this.cameraO = new THREE.OrthographicCamera(-1, 1, 1, -1, Potree.config.view.near, Potree.settings.cameraFar);
         this.cameraP.limitFar = true//add
 		this.cameraBasic = new THREE.PerspectiveCamera();//add 不自动计算的渐变相机
+        this.cameraBasic.name = 'tranCamera'
         //this.cameraBasic.matrixAutoUpdate = false 
 		this.initializeExtend();
         

+ 9 - 0
src/viewer/ExtendView.js

@@ -205,6 +205,7 @@ class ExtendView extends View {
             let f = ()=>{
                 info.callback && info.callback()     
                 this.dispatchEvent('flyingDone')  
+                viewer.dispatchEvent('content_changed')
             }
             if(info.duration){
                 setTimeout(f,1)//延迟是为了使isFlying先为false
@@ -438,10 +439,18 @@ class ExtendView extends View {
         let callback = info.callback
         info.callback = ()=>{ 
             viewport.camera = info.endCamera 
+            viewer.scene.measurements.forEach((e)=>{
+                Potree.Utils.updateVisible(e, 'tranCamera', true)  
+            })
             callback && callback()
         } 
         
         
+        viewer.scene.measurements.forEach((e)=>{
+            Potree.Utils.updateVisible(e, 'tranCamera', false) //含sprite且实时更新size的都要隐藏
+        })
+        
+        
         info.camera = info.endCamera
         
         if(info.camera.type == "OrthographicCamera"){