xzw hai 1 ano
pai
achega
8ab50aed0e

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

@@ -82257,14 +82257,15 @@ void main()
 
 	          
 	            if(this.showDistances || this.labelText){ // edge labels
-	                let edgeLabel = this.edgeLabels[index];
-	                let distance = this.labelText || point.distanceTo(nextPoint);
-	                edgeLabel.shouldVisi = (this.labelText || distance>0) && (index < lastIndex || this.isRect || this.closed && !this.isNew ); 
+	                let edgeLabel = this.edgeLabels[index]; 
+	                let distance = point.distanceTo(nextPoint);
+	                let text = this.labelText || distance;
+	                edgeLabel.shouldVisi = distance>0 && (index < lastIndex || this.isRect || this.closed && !this.isNew ); 
 	                /* this.closed || */edgeLabel.setVisible(edgeLabel.shouldVisi);  
 	                if(edgeLabel.shouldVisi){
 	                    this.lineDir = new Vector3().subVectors(point,nextPoint).normalize(); //[point,nextPoint]
 	                    
-	                    setEdgeLabel(edgeLabel,point,nextPoint,distance);
+	                    setEdgeLabel(edgeLabel,point,nextPoint,text);
 	                    
 	                }
 	                
@@ -104293,7 +104294,7 @@ ENDSEC
 	        viewer.scene.view.addEventListener('flyingDone',()=>{
 	            if(!this.visible)return
 	            let pickWindowSize = 100;
-	            let intersect = viewer.inputHandler.getIntersect(viewer.mainViewport, viewer.mainViewport.camera, true, pickWindowSize );
+	            let intersect = viewer.inputHandler.getIntersect({viewport:viewer.mainViewport,  usePointcloud:true, pickWindowSize} );
 	            this.update(intersect && intersect.location);
 	        });
 	    }

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 1 - 1
public/static/lib/potree/potree.js.map


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

@@ -420,11 +420,10 @@ var enter = ({
         info.disMeasure2 = {
             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])} 
+            {line: info.disMeasure2.points, dis: info.disMeasure2.points[0].distanceTo(info.disMeasure2.points[1])} 
         ])