fix: 1

public/static/lib/potree/potree.js

@@ -81992,7 +81992,7 @@ void main()
 	    textBorderThick:3,
 	    fontsize: 15 * textSizeRatio,  
 	    borderRadius : 12, margin:{x:20,y:4},
-	    renderOrder : 5, pickOrder:5, 
+	    renderOrder : 8, pickOrder:8, 
 	    disToLine:-0.15,
 	    
 	    useDepth : true , 
@@ -82010,7 +82010,7 @@ void main()
 	    backgroundColor: {r: 255, g: 255, b: 255, a:config$1.measure.default.opacity},
 	    textColor: {r: 0.3, g: 0.3, b:0.3, a: 1.0},
 	    fontsize:15 * textSizeRatio,   borderRadius : 12,  margin:{x:20,y:4},
-	    renderOrder : 4, pickOrder:4, 
+	    renderOrder : 7, pickOrder:7, 
 	};
 
 
@@ -82365,7 +82365,7 @@ void main()
 	         
 	        let marker = new Sprite$2({mat:this.getMarkerMaterial('default'), sizeInfo: markerSizeInfo, name:"measure_point"} );
 	        Potree.Utils.setObjectLayers(marker, 'measure' );
-	        marker.pickOrder = marker.renderOrder = 3; 
+	        marker.pickOrder = marker.renderOrder = 6; 
 	        marker.markerSelectStates = {}; 
 	        marker.addEventListener('startDragging',(e)=>{
 	            if(e.drag.dragViewport.name == 'MainView')viewer.inputHandler.dispatchEvent( {type: 'isMeasuring',v:true, cause:'startDragging'});
@@ -82847,19 +82847,43 @@ void main()
 	    
 	    getMarkerMaterial(type){ 
 	        let color = this.color.getHexString(); 
-	        if(!markerMats[type + color]){
-	           
-	            markerMats['default' + color] = new DepthBasicMaterial($.extend({},lineDepthInfo,{ 
+	        let name;   
+	        if(this.measureType == 'MulDistance'){
+	             name = type + '_circle_' + color;
+	        }else {
+	             name = type + '_arrow_' + color;
+	        }
+	        
+	        if(!markerMats[name]){
+	            
+	            markerMats['default_circle_' + color] = new DepthBasicMaterial($.extend({},lineDepthInfo,{ 
 	                transparent: !0,
 	                opacity: 1,
-	                //map: texLoader.load(Potree.resourcePath+'/textures/pic_point_s32.png' ), 
+	                map: texLoader$2.load(Potree.resourcePath+'/textures/pic_point_s32.png' ),  
+	                useDepth:true,
+	                replaceColor:this.color,
+	                beReplacedRed: 0.184,  //0.18431372
+	                mapColorReplace:true,
+	            })),
+	            markerMats['select_circle_' + color] = new DepthBasicMaterial($.extend({},lineDepthInfo,{ 
+	                transparent: !0,
+	                opacity: 1,
+	                map: texLoader$2.load(Potree.resourcePath+'/textures/pic_point32.png' ), 
+	                //useDepth:true ,
+	                replaceColor:  new Color(Potree.config.measure.highlight.color) ,
+	                beReplacedRed: 0.184,   //0.18431372
+	                mapColorReplace:true
+	            })); 
+	            markerMats['default_arrow_' + color] = new DepthBasicMaterial($.extend({},lineDepthInfo,{ 
+	                transparent: !0,
+	                opacity: 1, 
 	                map: texLoader$2.load(Potree.resourcePath+'/textures/arrows_l_32.png' ),
 	                useDepth:true,
 	                replaceColor:this.color,
 	                beReplacedRed: 0.184,  //0.18431372
 	                mapColorReplace:true,
 	            })),
-	            markerMats['select' + color] = new DepthBasicMaterial($.extend({},lineDepthInfo,{ 
+	            markerMats['select_arrow_' + color] = new DepthBasicMaterial($.extend({},lineDepthInfo,{ 
 	                transparent: !0,
 	                opacity: 1,
 	                map: texLoader$2.load(Potree.resourcePath+'/textures/arrows_l_32.png' ), 
@@ -82867,9 +82891,15 @@ void main()
 	                replaceColor:  new Color(Potree.config.measure.highlight.color) ,
 	                beReplacedRed: 0.184,   //0.18431372
 	                mapColorReplace:true
-	            }));   
+	            })); 
+	          
+	            
 	        }  
-	        return markerMats[type + color] 
+	        
+	       
+	        return markerMats[name]
+	        
+	         
 	        
 	    }
 	    

src/sdk/laser/core/enter.js

@@ -241,7 +241,7 @@ var enter = ({
             //拖拽结束后发送changeCallBack
             if (measure.parent) {
                 //未被删除
-                isShape ? bus.emit("graphChange") : bus.emit("update");
+                isShape ? bus.emit("graphChange", {path:measure.points, center:measure.getCenter()}) : bus.emit("update");
                 
             }
         });
@@ -406,6 +406,11 @@ var enter = ({
             points : [new THREE.Vector3().copy(fixPoint.basePoint),  foot2_P1],
             guideLinePoints : [foot2_P1, foot2_P2/* , foot1_P2 */],
         }
+        
+        fixPoint.bus.emit('measureChange',[
+            {line: info.disMeasure1.points, dis: info.disMeasure1.points[0].distanceTo(info.disMeasure1.points[1])},
+            {line: info.disMeasure2.points, dis: info.disMeasure2.points[0].distanceTo(info.disMeasure1.points[1])} 
+        ])
          
         
         return info
@@ -437,8 +442,15 @@ var enter = ({
         let disMeasure2 = viewer.measuringTool.createMeasureFromData(info2);
     
         
-        fixPoint.disMeasure1 = disMeasure1
-        fixPoint.disMeasure2 = disMeasure2
+        fixPoint.disMeasure1 = disMeasure1;
+        fixPoint.disMeasure2 = disMeasure2;
+        
+        
+        
+            
+          
+        
+        
     }
     
     let removeMeasureForPoint = (fixPoint)=>{
@@ -701,6 +713,7 @@ var enter = ({
 
 
             createFixPoint({measure, graph, pos, basePoint}){//创建固定点或多线段
+             
                 console.log('createFixPoint',measure, graph, pos, basePoint)
                 const bus = mitt();
                 let info = {
@@ -709,7 +722,7 @@ var enter = ({
                 let measureFun, fixPoint 
   
 
-                if(graph){ 
+                if(graph){ //多线段
                     if(graph.length == 0){
                         measure = viewer.measuringTool.startInsertion( info,
                             () => { 
@@ -739,9 +752,7 @@ var enter = ({
                 }
                  
                 
-                const ret = {
-                    // 退出测量模式，清除之前操作
-                    
+                const ret = {  
                     bus,
                     destroy : measureFun ? measureFun.clear : ()=>{
                         console.log('destroy'  )