xzw 2 年之前
父节点
当前提交
1a75c322d1
共有 2 个文件被更改,包括 23 次插入6 次删除
  1. 22 5
      public/static/lib/potree/potree.js
  2. 1 1
      public/static/lib/potree/potree.js.map

+ 22 - 5
public/static/lib/potree/potree.js

@@ -83727,10 +83727,10 @@ void main()
 	        let click = (e)=>{//一旦点击就立刻增加两marker  
 	         
 	            if(ifAtWrongPlace(e))return  
-	            if(e.clickElement)return  //如点击label时focusOnObject
+	            if(e.clickElement || e.drag.object)return  //如点击label时focusOnObject, 或拖拽marker
 	             
 	            
-	            if(e.button === MOUSE.RIGHT)return 
+	            if(e.button === MOUSE.RIGHT )return  
 	            
 	            if(isMobile){
 	                viewer.controls.setEnable(false);
@@ -139233,9 +139233,18 @@ ENDSEC
 	                this.images360.panos.forEach(pano=>{
 	                    Potree.Utils.updateVisible(pano, 'screenshot', true);
 	                }); 
-	                viewer.scene.measurements.forEach((e)=>{
-	                    Potree.Utils.updateVisible(e, 'screenshot', true);  
-	                });
+	                if(info.hideMeasures){
+	                    viewer.scene.measurements.forEach((e)=>{
+	                        Potree.Utils.updateVisible(e, 'screenshot', true);  
+	                    }); 
+	                }else {
+	                    viewer.scene.measurements.forEach((e)=>{
+	                        e.edgeLabels.forEach(label=>{
+	                            label.backgroundColor.a = label._oldA  ;//透明的抗锯齿渲染会变黑,所以去除透明
+	                            label.updateTexture();  
+	                        });
+	                    });
+	                } 
 	                
 	                Potree.Utils.updateVisible(this.reticule, 'screenshot', true);
 	                 
@@ -139316,6 +139325,14 @@ ENDSEC
 	            viewer.scene.measurements.forEach((e)=>{
 	                Potree.Utils.updateVisible(e, 'screenshot', false);  
 	            });
+	        }else {
+	            viewer.scene.measurements.forEach((e)=>{
+	                e.edgeLabels.forEach(label=>{
+	                    label._oldA = label.backgroundColor.a;
+	                    label.backgroundColor.a = 1 ;//透明的抗锯齿渲染会变黑,所以去除透明
+	                    label.updateTexture();  
+	                });
+	            });
 	        }            
 	        Potree.Utils.updateVisible(this.reticule, 'screenshot', false);//令reticule不可见 
 	                                

文件差异内容过多而无法显示
+ 1 - 1
public/static/lib/potree/potree.js.map