1

src/custom/modules/panos/Images360.js

@@ -224,6 +224,7 @@ export class Images360 extends THREE.EventDispatcher{
                 set:  (mode)=> {
                     this.latestRequestMode = mode
                     console.warn('Request setMode: ' + mode)  
+                    this.dispatchEvent({type:'requestMode',mode})
                     let config2 
 
                     let config = Potree.config.displayMode[mode]

src/custom/objects/tool/Measure.js

@@ -797,12 +797,12 @@ export class Measure extends ctrlPolygon{
     
     
     createGuideLines(){//add 固定点垂线的辅助线  可以多段
-        var guideLine = LineDraw.createFatLine(this.guideLinePoints ,{material:this.getLineMat('guide')} )
+        var guideLine = LineDraw.createFatLine(this.guideLinePoints ,{material:this.getLineMat('guide2'), renderOrderShift:-1} )
         this.guideLine = guideLine  //暂时也叫这个名字
         this.add(guideLine);
     }
     updateGuideLines(){
-        this.guideLine.updateLine(this.guideLine, this.guideLinePoints)
+        LineDraw.updateLine(this.guideLine, this.guideLinePoints)
     }
     
     
@@ -943,7 +943,17 @@ export class Measure extends ctrlPolygon{
                 gapSize: 0.02,
                 dashed: true,
                 lineWidth: 2 
-            })      
+            }),
+            guide2:   LineDraw.createFatLineMat(Object.assign({}, lineDepthInfo,{
+                color:config.measure.guide.color, 
+                dashSize: 0.1, 
+                gapSize: 0.02,
+                dashed: true,
+                lineWidth: 2,
+                useDepth :true,                
+            })) 
+
+            
         }
     
     
@@ -974,7 +984,7 @@ export class Measure extends ctrlPolygon{
         }
     
     
-        if(type != 'guide'){
+        if(!type.includes('guide')){
             return Measure.lineMats[type+color] 
         }else return Measure.lineMats[type]
         

src/custom/objects/tool/MeasuringTool.js

@@ -203,7 +203,7 @@ export class MeasuringTool extends THREE.EventDispatcher{
         }
         viewer.scene.addMeasurement(measure);
         
-        if(measure.guideLine)measure.guideLine.visible = false
+        //if(measure.guideLine)measure.guideLine.visible = false
         return  measure       
     }
     

src/custom/objects/tool/ctrlPolygon.js

@@ -110,9 +110,11 @@ export class ctrlPolygon extends THREE.Object3D {
             this.add(o.marker)
             this.markers = [...this.markers.slice(0,index), o.marker, ...this.markers.slice(index,this.markers.length)]
             this.updateMarker(o.marker, o.point)
-            o.marker.addEventListener('drag', this.dragMarker.bind(this));
-            o.marker.addEventListener('drop', this.dropMarker.bind(this));
             
+            if(!this.unableDrag){  
+                o.marker.addEventListener('drag', this.dragMarker.bind(this));
+                o.marker.addEventListener('drop', this.dropMarker.bind(this));
+            }
             
             let addHoverEvent = (e)=>{
                 o.marker.removeEventListener('addHoverEvent',addHoverEvent) 

src/custom/utils/DrawUtil.js

@@ -117,8 +117,10 @@ var LineDraw = {
         
         
 		line.scale.set( 1, 1, 1 );
-		line.renderOrder = 2;
-        
+		line.renderOrder = 5;
+        if(o.renderOrderShift){
+            line.renderOrder += o.renderOrderShift
+        }
         this.moveFatLine(line, posArr)
         
 		return line;