Просмотр исходного кода

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

bill 1 год назад
Родитель
Сommit
1fd4b7094a

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

@@ -55957,7 +55957,7 @@
 	        lineWidth: 3,
 	       
 	        textColor: "#000000", //"#FFFFFF"
-	        adsorptMinDis:40,
+	        adsorptMinDis:60,
 	    },
 	    material:{//初始化
 	        pointSize: 0.1,  

Разница между файлами не показана из-за своего большого размера
+ 1 - 1
public/static/lib/potree/potree.js.map


+ 3 - 0
src/sdk/laser/core/enter.js

@@ -752,6 +752,8 @@ var enter = ({
                 let shape,  measureFun, mainPoint = new THREE.Vector3(), bus = mitt();  
                 basePoint && (mainPoint.basePoint = new THREE.Vector3().copy(basePoint))
                 mainPoint.bus = bus
+                mainPoint.index11 = Math.random()
+                
                 
                 const baseLineChanged = ()=>{
                     updateMeasureForPoint(mainPoint)
@@ -860,6 +862,7 @@ var enter = ({
                         setDisplay(false)
                     },
                     selected(state){
+                        console.error(mainPoint.index11, 'selected', state)
                         if(graph){
                             measureFun.selected(state)  
                         }