瀏覽代碼

fix: mm->cm bgColor:black

xzw 1 年之前
父節點
當前提交
52314508f4
共有 3 個文件被更改,包括 28 次插入30 次删除
  1. 2 2
      public/static/lib/potree/potree.js
  2. 1 1
      public/static/lib/potree/potree.js.map
  3. 25 27
      src/sdk/laser/core/enter.js

+ 2 - 2
public/static/lib/potree/potree.js

@@ -56080,7 +56080,7 @@
 	    doubleClickTime:200,//双击间隔时间
 	    testNodeCount1: browser.isMobile() ? 5 : 3,  //testMaxNode次数达到这个数字时,changePointSize才使用nodeMaxLevel。 (调试时比较卡,在线上实际只需要3)
 	     
-	    background: '#232323',
+	    background: '#000000', //为户外增强对比度改为纯黑
 	    mapBG:/* '#232323',   */  '#F5F5F5',   //地图的clearColor
 
 	    colors: {  //from navvis
@@ -82263,7 +82263,7 @@ void main()
 	            this.setEdgeLabelPos(label,p1,p2);
 	 
 	            distance = distance == void 0 ? p1.distanceTo(p2) : distance; 
-	            var text = this.labelText || viewer.unitConvert.convert(distance, 'distance',  Potree.settings.precision , this.unitSystem, 0.001 , true, true);//distance要传0.1 这个factor
+	            var text = this.labelText || viewer.unitConvert.convert(distance, 'distance',  Potree.settings.precision , this.unitSystem, 0.01 , true, true);//distance要传0.1 这个factor
 	            label.setText(text);
 	          
 	        };

File diff suppressed because it is too large
+ 1 - 1
public/static/lib/potree/potree.js.map


+ 25 - 27
src/sdk/laser/core/enter.js

@@ -331,10 +331,10 @@ var enter = ({
                     string: viewer.unitConvert.convert(
                         value,
                         "distance",
-                        void 0,
+                        Potree.settings.precision,
                         measure.unitSystem,
-                        0.1,
-                        true),
+                        0.01,
+                        true,true),
                 };
             },
             changeUnit: (unit) => {
@@ -486,10 +486,7 @@ var enter = ({
         }
         
          
-        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.disMeasure2.points[1])} 
-        ])
+        //fixPoint.emitLines()
          
         
         return info
@@ -553,7 +550,8 @@ var enter = ({
             if(!I)return //向上了
             let dragVec = new THREE.Vector3().subVectors(I, dragInfo.dragPoint);
             dragVec.projectOnVector(dragInfo.normal) 
-            dragDisMeasure2(fixPoint, dragVec, dragInfo.startMeasurePoints) 
+            dragDisMeasure2(fixPoint, dragVec, dragInfo.startMeasurePoints)
+            fixPoint.emitLines()            
         })
         
         fixPoint.disMeasure1 = disMeasure1;
@@ -570,6 +568,8 @@ var enter = ({
                 }                
             })    
         })
+        
+        fixPoint.emitLines()
     }
     
     
@@ -589,13 +589,7 @@ var enter = ({
         disMeasure2.updateGuideLines()
         disMeasure2.update({ifUpdateMarkers:true})  
         viewer.dispatchEvent('content_changed') 
-        
-        
-        fixPoint.bus.emit('measureChange',[
-            {line: disMeasure1.points.map(e=>e.clone()), dis: disMeasure1.points[0].distanceTo(disMeasure1.points[1])},
-            {line: disMeasure2.points.map(e=>e.clone()), dis: disMeasure2.points[0].distanceTo(disMeasure2.points[1])} 
-        ])
-    
+         
     }
     
     
@@ -631,9 +625,9 @@ var enter = ({
                 dragVec = newVec
             }
             dragDisMeasure2(fixPoint, dragVec)//恢复之前拖拽的距离
-        }
-        
+        } 
         
+        fixPoint.emitLines() 
         
         
     }
@@ -921,7 +915,12 @@ var enter = ({
                     } 
                     viewer.dispatchEvent('content_changed')  
                 } 
-                
+                mainPoint.emitLines = ()=>{
+                    mainPoint.bus.emit('measureChange',[
+                        {line: mainPoint.disMeasure1.points.map(e=>e.clone()), dis: mainPoint.disMeasure1.points[0].distanceTo(mainPoint.disMeasure1.points[1])},
+                        {line: mainPoint.disMeasure2.points.map(e=>e.clone()), dis: mainPoint.disMeasure2.points[0].distanceTo(mainPoint.disMeasure2.points[1])} 
+                    ])
+                }
                 
                 if(graph){ //多线段形状
                     let info = {
@@ -963,16 +962,15 @@ var enter = ({
                     mainPoint.copy(pos)
                     mainPoint.isFixPoint = true  
                     mainPoint.pos2d = Potree.Utils.getPos2d(mainPoint, viewer.mainViewport, viewer.renderArea )
-                    ifDrawVerMeasure && createMeasureForPoint(mainPoint, disMeasure2points) 
-                    viewer.fixPoints.push(mainPoint) 
                     
-                    ifDrawVerMeasure && setTimeout(()=>{
-                        mainPoint.bus.emit('measureChange',[
-                            {line: mainPoint.disMeasure1.points.map(e=>e.clone()), dis: mainPoint.disMeasure1.points[0].distanceTo(mainPoint.disMeasure1.points[1])},
-                            {line: mainPoint.disMeasure2.points.map(e=>e.clone()), dis: mainPoint.disMeasure2.points[0].distanceTo(mainPoint.disMeasure2.points[1])} 
-                        ])
-                    },10)
-                        
+                     
+                    if(ifDrawVerMeasure){
+                        createMeasureForPoint(mainPoint, disMeasure2points) 
+                        setTimeout(()=>{
+                            mainPoint.emitLines()
+                        },10)
+                    }
+                    viewer.fixPoints.push(mainPoint)    
                 }