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

public/static/lib/potree/potree.js

@@ -75333,7 +75333,7 @@ void main()
 	            opacity:0.8
 	        },
 	        highlight:{
-	            color:"#2F8FFF",//"#00c7b2",
+	            color:"#ff8f28",//"#00c7b2",  (255, 143, 40, 1
 	            opacity:1
 	        },
 	        guide:{
@@ -82327,15 +82327,16 @@ void main()
 	    
 	    setLabelHightState(label, state){ 
 	        if(state){  
-	            label.backgroundColor = {r:255, g:255, b:255, a:config$1.measure.highlight.opacity},
+	            let color = new Color(Potree.config.measure.highlight.color);
+	            label.backgroundColor = {r:255*color.r, g:255*color.g, b:255*color.b, a:config$1.measure.highlight.opacity},
 	            //label.backgroundColor.a = config.measure.highlight.opacity
 	            label.sprite.material.useDepth = false;
-	            label.textColor = {r: this.color.r*255, g:  this.color.g*255, b:  this.color.b*255, a: 1}; 
+	            //label.textColor = {r: this.color.r*255, g:  this.color.g*255, b:  this.color.b*255, a: 1} 
 	        }else {
 	            label.backgroundColor = {r: this.color.r*255, g:  this.color.g*255, b:  this.color.b*255, a:config$1.measure.default.opacity};
 	            //label.backgroundColor.a = config.measure.default.opacity
 	            label.sprite.material.useDepth = true;
-	            label.textColor = {r: 255, g: 255, b: 255, a: 1}; 
+	            //label.textColor = {r: 255, g: 255, b: 255, a: 1} 
 	            
 	        }  
 	        label.updateTexture();  
@@ -82602,7 +82603,7 @@ void main()
 	                opacity: 1,
 	                map: texLoader$2.load(Potree.resourcePath+'/textures/pic_point32.png' ), 
 	                //useDepth:true ,
-	                replaceColor:this.color,
+	                replaceColor:  new Color(Potree.config.measure.highlight.color) ,
 	                beReplacedRed: 0.184,   //0.18431372
 	                mapColorReplace:true
 	            }));   
@@ -82644,7 +82645,7 @@ void main()
 	                depthTestWhenPick:true,
 	            }); 
 	            lineMats['edgeSelect'+color] = LineDraw.createFatLineMat({
-	                color: this.color,//'#f0ff00',
+	                color:  Potree.config.measure.highlight.color ,
 	                dashSize: 0.5, 
 	                gapSize: 0.2, 
 	                lineWidth: config$1.measure.lineWidth  ,

src/sdk/laser/core/enter.js

@@ -113,7 +113,7 @@ var enter = ({
         
         if (e.viewport.name == "MainView") { 
             let meterPerPixel = viewer.mainViewport.camera.type == 'OrthographicCamera' ? 1 / viewer.mainViewport.camera.zoom : null//原本我设定的每像素代表1米， 然后再除以zoom
-            console.log('meterPerPixel', meterPerPixel)  
+            //console.log('meterPerPixel', meterPerPixel)  
             sceneBus.emit("posChange", {
                 x: pos.x,
                 y: pos.y,