xzw 8 miesięcy temu
rodzic
commit
640e12a5bb

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

@@ -42923,7 +42923,7 @@
 	      e.lineInfo.path.arrows.instanceMatrix.needsUpdate = true;
 	    });
 	    lastArrowCount = waitAdd.length;
-	    console.log('updateArrows spaceDis', spaceDis, 'count', waitAdd.length, 'cost', performance.now() - startTime);
+	    //console.log('updateArrows spaceDis', spaceDis, 'count', waitAdd.length, 'cost', performance.now() - startTime)
 	  }
 	}
 	Path$1.prototype.cloneMarker = Measure$1.prototype.cloneMarker;
@@ -56525,11 +56525,12 @@
 	      map: texLoader$8.load(o.spotUrl || Potree.resourcePath + '/textures/spot_default.png')
 	    })));
 	    this.spot.scale.set(defaultSpotScale, defaultSpotScale, defaultSpotScale);
-	    this.spot.renderOrder = renderOrders$1.spot;
+	    this.spot.renderOrder = this.spot.pickOrder = renderOrders$1.spot;
 	    this.line = LineDraw.createFatLine([], {
 	      mat: lineMat
 	    });
 	    this.line.name = 'tagLine';
+	    this.line.renderOrder = this.line.pickOrder = renderOrders$1.line;
 	    this.titleLabel = new TextSprite$2(Object.assign({}, depthMatProp, {
 	      root: group,
 	      text: '',
@@ -56603,6 +56604,9 @@
 	          //都没hover才取消    
 	          setCursor('hoverGrab', 'remove');
 	        }
+	        /* if(!hoverState.line && !hoverState.spot && !hoverState.label){
+	            this.dispatchEvent('mouseleave')
+	        } */
 	      }));
 	      [this.line, this.spot].forEach(e => e.addEventListener('drag', e => {
 	        if (this.dragEnable && cursor.grabbing) {
@@ -56623,7 +56627,9 @@
 	        this.dispatchEvent('mouseover');
 	      };
 	      var mouseleave = e => {
+	        //if(!hoverState.line && !hoverState.spot && !hoverState.label){
 	        this.dispatchEvent('mouseleave');
+	        //} 
 	      };
 	      var click = e => {
 	        this.dispatchEvent('click');

Plik diff jest za duży
+ 1 - 1
public/lib/potree/potree.js.map


+ 4 - 2
src/sdk/cover/index.js

@@ -324,7 +324,7 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes, laserRoot, laserOS
         let update = (e)=>{ //拖拽结束后发送changeCallBack
             if (measure.parent) {
                 //未被删除  
-                console.warn('changePoints', measure.dataset_points.length )   
+                //console.warn('changePoints', measure.dataset_points.length )   
                 if(measure.type == 'Path'){
                  
                     bus.emit('changePoints', measure.dataset_points.map((p,i)=>{return {position:p.clone(), modelId:measure.points_datasets[i]}}))
@@ -1362,7 +1362,7 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes, laserRoot, laserOS
                     path.setAddOrRemPoint(state) 
                 }, 
                 visibility(v){ 
-                    console.log('visibility', path.title, v)
+                    //console.log('visibility', path.title, v)
                     Potree.Utils.updateVisible(path,'user', v)
                 },
                 visibilityName(v){ 
@@ -1511,9 +1511,11 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes, laserRoot, laserOS
             
             tag.addEventListener('mouseover',()=>{
                 bus.emit('enter')
+                console.log('enter')
             }) 
             tag.addEventListener('mouseleave',()=>{
                 bus.emit('leave')
+                console.log('leave')
             }) 
             tag.addEventListener('click',()=>{
                 bus.emit('click')