xzw 1 år sedan
förälder
incheckning
1c0bc6b1c7
3 ändrade filer med 35 tillägg och 22 borttagningar
  1. 11 8
      public/lib/potree/potree.js
  2. 1 1
      public/lib/potree/potree.js.map
  3. 23 13
      src/sdk/cover/index.js

+ 11 - 8
public/lib/potree/potree.js

@@ -54212,7 +54212,7 @@
 	            
 	            let f = ()=>{ 
 	                this.position.copy(endPosition);  //因为延时1后control的update会导致位置改变
-	                info.callback && info.callback();  
+	                info.callback && info.callback();   
 	                this.dispatchEvent('flyingDone');  
 	            };
 	            if(info.duration){
@@ -54225,15 +54225,17 @@
 	        
 	        let endPosition = new Vector3().copy(info.position);
 	        let startPosition = this.position.clone();
-			let startQuaternion, endQuaternion, endTarget = null,  
+			let startQuaternion, endQuaternion, endTarget = info.target && new Vector3().copy(info.target)  ,  
 	            endYaw, startYaw, endPitch, startPitch ;
 	        
 	        
 	        this.restrictPos(endPosition);
 	         
+	         
+	         
+	         
 	        if(info.endYaw == void 0){
-	            if(info.target ){
-	                endTarget = new Vector3().copy(info.target);  
+	            if(info.target ){ 
 	                endQuaternion = math.getQuaFromPosAim(endPosition,endTarget); //若为垂直,会自动偏向x负的方向
 	           
 	            }else if(info.quaternion){
@@ -73684,7 +73686,7 @@ void main()
 	//注意,这时候Potree.js中export的内容还不在Potree变量中
 
 	var texLoader$1 = new TextureLoader();
-
+	    texLoader$1.crossOrigin = "anonymous"; 
 	{//defines:
 	    Potree.defines = {};
 	    Potree.defines.Buttons = {// MouseEvent.buttons
@@ -91030,7 +91032,7 @@ void main()
 	             console.log('updateNodeMaxLevel ' + this.dataset_id + " : "+ this.nodeMaxLevel);                
 	              
 	            setTimeout(()=>{
-	               this.setPointLevel();//重新计算 
+	               this.setPointLevel();//重新计算    延迟是因为testNodeMax会变回旧的
 	            },1);
 	             
 	            if(!Potree.settings.sizeFitToLevel){
@@ -120772,7 +120774,7 @@ ENDSEC
 	        
 	        model.lastMatrixWorld = model.matrixWorld.clone();
 	        viewer.dispatchEvent('content_changed');
-	        viewer.mapViewer && viewer.mapViewer.dispatchEvent('content_changed');
+	        viewer.mapViewer && Potree.settings.showObjectsOnMap && viewer.mapViewer.dispatchEvent('content_changed');
 	    },
 	    
 	    
@@ -120887,12 +120889,13 @@ ENDSEC
 	    
 	    
 	    setGroundPlaneImg(src){//设置地面图
-	        const s = 0.1;
+	        const s = 0.08;
 	        this.curGroundImgSrc = src;
 	        if(src){
 	            let map = texLoader$a.load(src,(tex)=>{
 	                if(this.curGroundImgSrc == src){
 	                    this.groundPlane.scale.set(tex.image.width*s, tex.image.height*s);  
+	                    viewer.dispatchEvent('content_changed');
 	                }
 	            }); 
 	            if(!this.groundPlane){

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 1 - 1
public/lib/potree/potree.js.map


+ 23 - 13
src/sdk/cover/index.js

@@ -358,8 +358,8 @@ export const enter = (dom, mapDom, isLocal, lonlat) => {
         },
          
  
-        setBackdrop(sky){//天空盒背景
-            console.log('天空盒背景',  sky)
+        setBackdrop(sky, type){//天空盒背景
+            console.log('天空盒背景',  sky,type)
             
             let setGroundAndText = (color)=>{
                 MergeEditor.secondCompass.dom.find(".dirText").css({'color':color})
@@ -368,22 +368,32 @@ export const enter = (dom, mapDom, isLocal, lonlat) => {
                 //MergeEditor.ground.children[0].material.color.set(color)
             }
             
-            if(sky == 'none'){
+            
+            if(type == 'bimg' ){//地面图 
+                MergeEditor.setGroundPlaneImg(sky) 
+                setGroundAndText('#e0e0e0')
                 viewer.setBackground(mainBackground) 
-                setGroundAndText('#eee')
-            }else if(sky[0] == '#'){
-                viewer.setBackground(new THREE.Color(sky)) 
-                let color = sky == '#fff' ? '#666' : sky == '#333' ? '#eee' : '#bbb'  //反相
-                setGroundAndText(color)
-            }else if(sky == 'image-map' || sky == 'vector-map' ){//影像|矢量 地图
+            }else{ 
+                MergeEditor.setGroundPlaneImg(null) 
                 
+                if(sky == 'none'){
+                    viewer.setBackground(mainBackground) 
+                    setGroundAndText('#eee')
+                }else if(sky[0] == '#'){
+                    viewer.setBackground(new THREE.Color(sky)) 
+                 
+                    let color = sky == '#fff' ? '#666' : sky == '#333' ? '#eee' : '#bbb'  //反相
+                    setGroundAndText(color)
+                }else if(type == 'image-map' || type == 'vector-map' ){//影像|矢量 地图
+                     
+                }else{//环境
+                    viewer.setBackground('skybox', sky)  
+                    setGroundAndText('#e0e0e0')
+                } 
                 
-            
-            }else{
-                viewer.setBackground('skybox', sky) 
-                setGroundAndText('#e0e0e0')
             }
             
+            
             viewer.dispatchEvent('content_changed')
         },
         switchMapType(type){