|
@@ -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;
|