|
@@ -82407,9 +82407,12 @@ void main()
|
|
|
|
|
|
marker.markerSelectStates = {};
|
|
|
marker.addEventListener('startDragging',(e)=>{
|
|
|
+ console.log('marker startdragging');
|
|
|
viewer.inputHandler.dispatchEvent( {type: 'measuring',v:true, cause:'startDragging', situation:'dragging', object:this});
|
|
|
});
|
|
|
marker.addEventListener('drop',(e)=>{
|
|
|
+ console.log('marker drop');
|
|
|
+ this.lastDropTime = Date.now();
|
|
|
viewer.inputHandler.dispatchEvent({type: 'measuring', v:false, cause:'stopDragging', situation:'dragging', object:this} );
|
|
|
|
|
|
if(Potree.settings.adsorption){
|
|
@@ -82438,6 +82441,9 @@ void main()
|
|
|
|
|
|
//2023.10.25add:
|
|
|
edge.addEventListener('click',()=>{
|
|
|
+ console.log('edgeclick');
|
|
|
+ let now = Date.now();
|
|
|
+ if(now-this.lastDropTime < 50)return ;//点击到marker了
|
|
|
if(!this.isNew) this.focus();
|
|
|
});
|
|
|
};
|
|
@@ -82547,6 +82553,14 @@ void main()
|
|
|
marker.material = this.getMarkerMaterial('default');
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
+
|
|
|
+ if(absoluteState){
|
|
|
+ marker.renderOrder = marker.pickOrder = Potree.config.renderOrders.measureMarker+1;
|
|
|
+ }else {
|
|
|
+ marker.renderOrder = marker.pickOrder = Potree.config.renderOrders.measureMarker;
|
|
|
+ }
|
|
|
+
|
|
|
|
|
|
marker.selected = absoluteState;
|
|
|
|
|
@@ -82858,7 +82872,7 @@ void main()
|
|
|
edgeLabel.addEventListener('mouseleave',()=>{
|
|
|
this.setSelected(false, 'edgeLabel');
|
|
|
});
|
|
|
- edgeLabel.addEventListener('click',()=>{
|
|
|
+ edgeLabel.addEventListener('click',()=>{
|
|
|
if(!this.isNew) this.focus();
|
|
|
});
|
|
|
//edgeLabel.sprite.material.opacity = config.measure.default.opacity
|