|
@@ -82592,7 +82592,10 @@ void main()
|
|
|
if(absoluteState){
|
|
|
this.markers.forEach(e=>this.setMarkerSelected(e, 'hover', 'selectAll' ) );
|
|
|
|
|
|
- this.edges.forEach(e=>e.material = this.getLineMat('edgeSelect') );
|
|
|
+ this.edges.forEach(e=>{
|
|
|
+ e.renderOrder = Potree.config.renderOrders.lines + 1;
|
|
|
+ e.material = this.getLineMat('edgeSelect');
|
|
|
+ });
|
|
|
|
|
|
this.areaPlane && (this.areaPlane.material = planeMats.selected);
|
|
|
|
|
@@ -82606,7 +82609,10 @@ void main()
|
|
|
|
|
|
}else {
|
|
|
this.markers.forEach(e=>this.setMarkerSelected(e, 'unhover', 'selectAll' ));
|
|
|
- this.edges.forEach(e=>e.material = this.getLineMat('edgeDefault') );
|
|
|
+ this.edges.forEach(e=>{
|
|
|
+ e.renderOrder = Potree.config.renderOrders.lines;
|
|
|
+ e.material = this.getLineMat('edgeDefault');
|
|
|
+ });
|
|
|
this.areaPlane && (this.areaPlane.material = planeMats.default);
|
|
|
this.setEdgesDisplay(false, hoverObject=="screenshot");
|
|
|
//this.areaLabel && this.areaLabel.elem.removeClass('highLight')
|
|
@@ -82839,15 +82845,12 @@ void main()
|
|
|
if(this.measureType == 'MulDistance_shape'){
|
|
|
this.markers.forEach(e=>e.visible = false);
|
|
|
}
|
|
|
- this.removeEventListener('cancelSelect', cancelSelect);
|
|
|
- viewer.removeEventListener('global_click', cancelSelect);
|
|
|
+ this.removeEventListener('cancelSelect', cancelSelect);
|
|
|
this.setSelected(false, 'focus');
|
|
|
- this.dispatchEvent({type:'selected', state:false});
|
|
|
- return {stopContinue:true}//不要flytopano
|
|
|
+ this.dispatchEvent({type:'selected', state:false});
|
|
|
};
|
|
|
setTimeout(()=>{
|
|
|
- this.addEventListener('cancelSelect', cancelSelect);
|
|
|
- viewer.addEventListener('global_click', cancelSelect,{importance:10});
|
|
|
+ this.addEventListener('cancelSelect', cancelSelect);
|
|
|
},10);
|
|
|
}
|
|
|
|
|
@@ -83728,7 +83731,13 @@ void main()
|
|
|
|
|
|
viewer.addEventListener('resize',this.setSize.bind(this));
|
|
|
|
|
|
-
|
|
|
+ viewer.addEventListener('global_click', ()=>{
|
|
|
+ viewer.scene.measurements.forEach(e=>{
|
|
|
+ e.dispatchEvent('cancelSelect');
|
|
|
+ });
|
|
|
+ return {stopContinue:true}//不要flytopano
|
|
|
+ },{importance:10});
|
|
|
+
|
|
|
|
|
|
|
|
|
if( Potree.settings.adsorption ){
|