xzw 8 months ago
parent
commit
f40232f2fe
3 changed files with 26 additions and 7 deletions
  1. 21 2
      public/lib/potree/potree.js
  2. 1 1
      public/lib/potree/potree.js.map
  3. 4 4
      src/sdk/cover/index.js

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

@@ -40527,7 +40527,7 @@
 	  dispose() {
 	    //add 
 	    this.parent.remove(this);
-	    this.markers.forEach(e => e.dispose());
+	    this.markers.forEach(e => e.dispose && e.dispose());
 	    this.edges.forEach(e => e.geometry.dispose());
 	  }
 	  reDraw() {
@@ -42344,6 +42344,7 @@
 	  width2d: 200
 	};
 	var halfPathWidth = 0.4;
+	var titleLineHeight = 2;
 	//const edgeExtrudePoints = [new THREE.Vector2(0,-0.4), new THREE.Vector2(0,0.4)]
 
 	var planeGeo$2 = new PlaneBufferGeometry(1, 1);
@@ -42409,7 +42410,7 @@
 	        //useDepth : true ,//暂时不遮挡
 	      }));
 	      this.titleLabel.sprite.material.depthTest = false;
-	      var line = LineDraw.createLine([new Vector3(0, 0, 0), new Vector3(0, 0, 2)], {
+	      var line = LineDraw.createLine([new Vector3(0, 0, 0), new Vector3(0, 0, titleLineHeight)], {
 	        color: '#ffffff'
 	      });
 	      group.add(line);
@@ -42560,6 +42561,7 @@
 	    marker.markerSelectStates = {};
 	    Potree.Utils.setObjectLayers(marker, 'measure');
 	    marker.renderOrder = Potree.config.renderOrders.measureMarker;
+	    marker.addEventListener('startDragging', e => {});
 	    marker.addEventListener('drop', e => {
 	      if (e.button != MOUSE.LEFT) return;
 	      viewer.inputHandler.dispatchEvent({
@@ -42584,6 +42586,10 @@
 	    this.enableEdit = !!state;
 	    this.markers.forEach(e => Potree.Utils.updateVisible(e, 'editEnable', this.enableEdit));
 	  }
+	  setTitleVisi(v) {
+	    var reason = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
+	    Potree.Utils.updateVisible(this.titleLabel.parent, 'hideTitle-' + reason, v);
+	  }
 	  editStateChange(state) {
 	    //拖动时被调用
 	    super.editStateChange(state);
@@ -42731,6 +42737,14 @@
 	  }
 	   */
 
+	  setFontSize(fontsize) {
+	    this.fontSize = fontsize;
+	    this.markerLabels.concat(this.titleLabel).forEach(e => {
+	      e.fontsize = fontsize;
+	      e.updateTexture();
+	    });
+	    viewer.dispatchEvent('content_changed');
+	  }
 	  reDraw() {
 	    var restMarkerCount = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 0;
 	    //重新开始画 
@@ -42756,6 +42770,11 @@
 	      situation: 'dragging'
 	    });
 	  }
+	  dispose() {
+	    super.dispose();
+	    this.titleLabel.dispose();
+	    this.markerLabels.forEach(e => e.dispose());
+	  }
 	}
 	Path$1.prototype.cloneMarker = Measure$1.prototype.cloneMarker;
 	Path$1.prototype.updateDatasetBelong = Measure$1.prototype.updateDatasetBelong;

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


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

@@ -1262,7 +1262,7 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes }) => {
 
                 path = viewer.measuringTool.startInsertion( info, () => { 
                     bus.emit("end", ret); //完成  
-                }   
+                }) 
             }else{
                 info.dataset_points = props.points.map(e=>e.modelId)
                 info.points_datasets = props.points.map(e=>e.position)
@@ -1270,9 +1270,9 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes }) => {
                 
             }
             let funs = getMeasureFunction(path, bus) 
-            path.dispatchEvent('',()=>{
-                changePoints
-            })
+            /* path.dispatchEvent('',()=>{
+                
+            }) */