|
@@ -42576,32 +42576,16 @@
|
|
|
this.setTitleVisi(this.titleLabel.parent, false, 'noPoint');
|
|
|
this.setTitle(Potree.settings.isOfficial ? '' : 'title');
|
|
|
line.addEventListener('mouseover', e => {
|
|
|
- this.editEnable && viewer.dispatchEvent({
|
|
|
- type: "CursorChange",
|
|
|
- action: 'add',
|
|
|
- name: 'hoverGrab'
|
|
|
- });
|
|
|
+ this.editEnable && CursorDeal.add('hoverGrab');
|
|
|
});
|
|
|
line.addEventListener('startDragging', e => {
|
|
|
- this.editEnable && viewer.dispatchEvent({
|
|
|
- type: "CursorChange",
|
|
|
- action: 'add',
|
|
|
- name: 'grabbing'
|
|
|
- });
|
|
|
+ this.editEnable && CursorDeal.add('grabbing');
|
|
|
});
|
|
|
line.addEventListener('drop', e => {
|
|
|
- this.editEnable && viewer.dispatchEvent({
|
|
|
- type: "CursorChange",
|
|
|
- action: 'remove',
|
|
|
- name: 'grabbing'
|
|
|
- });
|
|
|
+ this.editEnable && CursorDeal.remove('grabbing');
|
|
|
});
|
|
|
line.addEventListener('mouseleave', e => {
|
|
|
- this.editEnable && viewer.dispatchEvent({
|
|
|
- type: "CursorChange",
|
|
|
- action: 'remove',
|
|
|
- name: 'hoverGrab'
|
|
|
- });
|
|
|
+ this.editEnable && CursorDeal.remove('hoverGrab');
|
|
|
});
|
|
|
line.addEventListener('drag', e => {
|
|
|
if (this.editEnable) {
|
|
@@ -42646,21 +42630,13 @@
|
|
|
this.setSelected('hover');
|
|
|
this.hoverStates.edge = true;
|
|
|
if (this.addOrRemovePoint && !this.isNew) {
|
|
|
- viewer.dispatchEvent({
|
|
|
- type: "CursorChange",
|
|
|
- action: 'add',
|
|
|
- name: 'pen_addPoint'
|
|
|
- });
|
|
|
+ CursorDeal.add('pen_addPoint');
|
|
|
}
|
|
|
};
|
|
|
var mouseleave = e => {
|
|
|
this.setSelected('unhover');
|
|
|
this.hoverStates.edge = false;
|
|
|
- viewer.dispatchEvent({
|
|
|
- type: "CursorChange",
|
|
|
- action: 'remove',
|
|
|
- name: 'pen_addPoint'
|
|
|
- });
|
|
|
+ CursorDeal.remove('pen_addPoint');
|
|
|
hideFakeMarker();
|
|
|
};
|
|
|
this.edge.addEventListener('mouseover', mouseover);
|
|
@@ -42916,21 +42892,13 @@
|
|
|
marker.renderOrder = Potree.config.renderOrders.path.marker;
|
|
|
marker.addEventListener('mouseover', e => {
|
|
|
if (this.addOrRemovePoint && !this.isNew) {
|
|
|
- viewer.dispatchEvent({
|
|
|
- type: "CursorChange",
|
|
|
- action: 'add',
|
|
|
- name: 'pen_delPoint'
|
|
|
- });
|
|
|
+ CursorDeal.add('pen_delPoint');
|
|
|
//hideFakeMarker()
|
|
|
}
|
|
|
this.hoverStates.marker = marker;
|
|
|
} /* ,{importance:1} */);
|
|
|
marker.addEventListener('mouseleave', e => {
|
|
|
- viewer.dispatchEvent({
|
|
|
- type: "CursorChange",
|
|
|
- action: 'remove',
|
|
|
- name: 'pen_delPoint'
|
|
|
- });
|
|
|
+ CursorDeal.remove('pen_delPoint');
|
|
|
marker == this.hoverStates.marker && (this.hoverStates.marker = null);
|
|
|
});
|
|
|
marker.addEventListener('click', e => {
|
|
@@ -43028,12 +42996,6 @@
|
|
|
}
|
|
|
if (!state) {
|
|
|
this.updateEndCaps();
|
|
|
- /* viewer.dispatchEvent({
|
|
|
- type : "CursorChange", action:'remove', name:'grabbing'
|
|
|
- })
|
|
|
- viewer.dispatchEvent({
|
|
|
- type : "CursorChange", action:'remove', name:'hoverGrab'
|
|
|
- }) */
|
|
|
}
|
|
|
viewer.dispatchEvent('content_changed');
|
|
|
}
|
|
@@ -43044,33 +43006,14 @@
|
|
|
}
|
|
|
updateCursorState() {
|
|
|
//可能在hover时修改addOrRemovePoint,也可能从marker和edge之间切换, 主要是addOrRemovePoint开关时要记得之前的hover状态
|
|
|
- viewer.dispatchEvent({
|
|
|
- type: "CursorChange",
|
|
|
- action: this.addOrRemovePoint ? 'add' : 'remove',
|
|
|
- name: 'pen'
|
|
|
- });
|
|
|
+
|
|
|
+ CursorDeal[this.addOrRemovePoint ? 'add' : 'remove']('pen');
|
|
|
if (this.addOrRemovePoint && !this.isNew) {
|
|
|
- viewer.dispatchEvent({
|
|
|
- type: "CursorChange",
|
|
|
- action: this.hoverStates.edge ? 'add' : 'remove',
|
|
|
- name: 'pen_addPoint'
|
|
|
- });
|
|
|
- viewer.dispatchEvent({
|
|
|
- type: "CursorChange",
|
|
|
- action: this.hoverStates.marker ? 'add' : 'remove',
|
|
|
- name: 'pen_delPoint'
|
|
|
- });
|
|
|
+ CursorDeal[this.hoverStates.edge ? 'add' : 'remove']('pen_addPoint');
|
|
|
+ CursorDeal[this.hoverStates.marker ? 'add' : 'remove']('pen_delPoint');
|
|
|
} else {
|
|
|
- viewer.dispatchEvent({
|
|
|
- type: "CursorChange",
|
|
|
- action: 'remove',
|
|
|
- name: 'pen_addPoint'
|
|
|
- });
|
|
|
- viewer.dispatchEvent({
|
|
|
- type: "CursorChange",
|
|
|
- action: 'remove',
|
|
|
- name: 'pen_delPoint'
|
|
|
- });
|
|
|
+ CursorDeal.remove('pen_addPoint');
|
|
|
+ CursorDeal.remove('pen_delPoint');
|
|
|
}
|
|
|
}
|
|
|
setTitleVisi(label, v) {
|
|
@@ -43776,8 +43719,8 @@
|
|
|
});
|
|
|
});
|
|
|
this.showLabels = true;
|
|
|
- this.scene = new Scene();
|
|
|
- this.scene.name = 'scene_measurement';
|
|
|
+ //this.scene = new THREE.Scene();
|
|
|
+ //this.scene.name = 'scene_measurement';
|
|
|
//this.light = new THREE.PointLight(0xffffff, 1.0);
|
|
|
//this.scene.add(this.light);
|
|
|
|
|
@@ -43853,7 +43796,7 @@
|
|
|
}
|
|
|
|
|
|
//viewer.addEventListener("update", this.update.bind(this));
|
|
|
- viewer.addEventListener("render.pass.perspective_overlay", this.render.bind(this));
|
|
|
+ //viewer.addEventListener("render.pass.perspective_overlay", this.render.bind(this));
|
|
|
viewer.addEventListener("scene_changed", this.onSceneChange.bind(this));
|
|
|
viewer.scene.addEventListener('measurement_added', this.onAdd);
|
|
|
viewer.scene.addEventListener('measurement_removed', this.onRemove);
|