Merge branch 'dev' of http://192.168.0.115:3000/bill/traffic-laser into dev

public/static/lib/potree/potree.js

@@ -81303,7 +81303,9 @@ void main()
 	            });
 	            return
 	        }
-	        
+	        if(e.drag.pointerDelta.length() == 0){ //部分设备在touchstart后立即执行了touchmove，导致marker立即移动，需要屏蔽
+	            return
+	        }
 	        viewer.dispatchEvent({
 	            type : "CursorChange", action : "remove",  name:"polygon_AtWrongPlace"
 	        });
@@ -81336,7 +81338,7 @@ void main()
 	                }
 	            }
 	            this.editStateChange(true);
-	            
+	            //console.log('pointerDelta',e.drag.pointerDelta)
 	            viewer.dispatchEvent({type:'dragMarker', object:this});
 	            return true
 	        }
@@ -82622,7 +82624,7 @@ void main()
 	    }
 	    
 	    focus({dontMoveCamera=false}={}){  
-	    
+	        if(Potree.settings.displayMode == 'showPanos')dontMoveCamera = true;  //2023.10.24 新需求：点击后不移动,否则经常跳到别的点。且在app上会反应一秒才选中。
 	        if(!dontMoveCamera){
 	            let dontChangeCamDir = viewer.mainViewport.camera.type == 'OrthographicCamera'; /* && math.closeTo( viewer.mainViewport.view.pitch , -1.57079632)  */ // 不改角度
 	            viewer.focusOnObject(this, 'measure', null, {dontChangeCamDir});
@@ -82638,7 +82640,7 @@ void main()
 	            viewer.removeEventListener('global_click', cancelSelect); 
 	            this.setSelected(false, 'focus'); 
 	            this.dispatchEvent({type:'selected', state:false});
-	            return {stopContinue:true}
+	            return {stopContinue:true}//不要flytopano
 	        };
 	        setTimeout(()=>{
 	            this.addEventListener('cancelSelect', cancelSelect);
@@ -83978,19 +83980,12 @@ void main()
 	        
 	        Potree.Utils.setCameraLayers(o.camera, ['measure']);
 			
-	        if(o.screenshot && this.viewer.ssaaRenderPass.enabled){ //抗锯齿
-	            this.viewer.ssaaRenderPass.sampleLevel = 4;
-	            this.viewer.composer.render(this.scene, o.camera );  
-	            /* viewer.scene.measurements.forEach(e=>{ //隐藏除了label以外的
-	                e.children.forEach((c)=>{
-	                    if(!(c instanceof TextSprite)){
-	                        c.visible = false
-	                    } 
-	                }) 
-	            })  */
-	        }else {
+	        /* if(o.screenshot && this.viewer.ssaaRenderPass.enabled){ //抗锯齿
+	            this.viewer.ssaaRenderPass.sampleLevel = 4
+	            this.viewer.composer.render(this.scene, o.camera );   
+	        }else{ */
 	            this.viewer.renderer.render(this.scene, o.camera );
-	        }
+	        //}
 		}
 	};
 
@@ -89342,7 +89337,7 @@ void main()
 	    }
 	    
 		onTouchStart (e) {
-			if (this.logMessages) console.log(this.constructor.name + ': onTouchStart');
+			if (this.logMessages) console.log(this.constructor.name + ': onTouchStart',this.getTouchInfo(e));
 
 			e.preventDefault(); 
 	       
@@ -89374,11 +89369,14 @@ void main()
 	        //console.log('')
 		}
 	    
-	    
+	    /* getTouchInfo(e){
+	        let t = e.targetTouches[0]
+	        return {clientX: t.clientX, clientY:t.clientY, pageX:t.pageX, pageY:t.pageY }
+	    } */
 	    
 	    
 		onTouchMove (e) {
-			if (this.logMessages) console.log(this.constructor.name + ': onTouchMove');
+			if (this.logMessages) console.log(this.constructor.name + ': onTouchMove', this.getTouchInfo(e));
 
 			e.preventDefault();
 	        
@@ -136917,12 +136915,12 @@ ENDSEC
 	                        Potree.Utils.updateVisible(e, 'screenshot', true);  
 	                    }); 
 	                }else {
-	                    viewer.scene.measurements.forEach((e)=>{
+	                    /* viewer.scene.measurements.forEach((e)=>{
 	                        e.edgeLabels.forEach(label=>{ 
 	                            label.backgroundColor.a = label._oldA  ;//透明的抗锯齿渲染会变黑，所以去除透明
-	                            label.updateTexture();  
-	                        });
-	                    });
+	                            label.updateTexture()  
+	                        })
+	                    }) */
 	                } 
 	                
 	                Potree.Utils.updateVisible(this.reticule, 'screenshot', true);
@@ -137005,13 +137003,13 @@ ENDSEC
 	                Potree.Utils.updateVisible(e, 'screenshot', false);  
 	            });
 	        }else {
-	            viewer.scene.measurements.forEach((e)=>{
+	            /* viewer.scene.measurements.forEach((e)=>{
 	                e.edgeLabels.forEach(label=>{
-	                    label._oldA = label.backgroundColor.a;
+	                    label._oldA = label.backgroundColor.a
 	                    label.backgroundColor.a = 1 ;//透明的抗锯齿渲染会变黑，所以去除透明
-	                    label.updateTexture();  
-	                });
-	            });
+	                    label.updateTexture()  
+	                })
+	            }) */
 	        }            
 	        Potree.Utils.updateVisible(this.reticule, 'screenshot', false);//令reticule不可见