|
@@ -82113,6 +82113,7 @@ void main()
|
|
|
}
|
|
|
}
|
|
|
this.isEditing = state;
|
|
|
+ viewer.dispatchEvent({type:'MeasureDragChange',state});
|
|
|
}
|
|
|
|
|
|
|
|
@@ -89740,7 +89741,7 @@ void main()
|
|
|
//点云费时:2-15ms
|
|
|
//深度图费时: 0.1-0.2ms
|
|
|
|
|
|
-
|
|
|
+ this.viewer.dispatchEvent({type:'getIntersect', intersect});
|
|
|
|
|
|
if(onlyGetIntersect){
|
|
|
return intersect
|
|
@@ -106054,17 +106055,19 @@ ENDSEC
|
|
|
});
|
|
|
|
|
|
var updateVisi = (e)=>{
|
|
|
- if(e.hoverViewport == viewer.mainViewport){
|
|
|
+ //if(e.hoverViewport == viewer.mainViewport){
|
|
|
Potree.Utils.updateVisible(this,"atViewport", true);
|
|
|
this.update(e.intersect && e.intersect.location);
|
|
|
- }else {
|
|
|
- Potree.Utils.updateVisible(this,"atViewport", false); //小地图不显示
|
|
|
- }
|
|
|
+ /* }else{
|
|
|
+ Potree.Utils.updateVisible(this,"atViewport", false) //小地图不显示
|
|
|
+ } */
|
|
|
|
|
|
};
|
|
|
|
|
|
- viewer.addEventListener('global_mousemove', updateVisi);
|
|
|
- viewer.addEventListener('global_touchstart', updateVisi);
|
|
|
+ //viewer.addEventListener('global_mousemove', updateVisi)
|
|
|
+ viewer.addEventListener('global_touchstart', updateVisi);
|
|
|
+ viewer.addEventListener('getIntersect', updateVisi);
|
|
|
+
|
|
|
|
|
|
|
|
|
/* viewer.addEventListener("beginSplitView",()=>{
|
|
@@ -106076,7 +106079,7 @@ ENDSEC
|
|
|
|
|
|
|
|
|
this.addEventListener("setEnable",(e)=>{
|
|
|
- Potree.Utils.updateVisible(this, "enable", e.value); //界面开关
|
|
|
+ Potree.Utils.updateVisible(this, "enable", e.value, 1, e.value?'add':'cancel' ); //界面开关
|
|
|
/* if(Potree.settings.displayMode == 'showPanos') && e.value){
|
|
|
Potree.settings.pointDensity = 'magnifier'
|
|
|
}else if() */
|
|
@@ -106084,17 +106087,29 @@ ENDSEC
|
|
|
});
|
|
|
|
|
|
|
|
|
- if(Potree.settings.isOfficial){
|
|
|
- Potree.Utils.updateVisible(this, "enable", false);
|
|
|
- }else {
|
|
|
- Potree.Utils.updateVisible(this, "measure", false);
|
|
|
- viewer.addEventListener("measureMovePoint",()=>{//测量开始
|
|
|
- Potree.Utils.updateVisible(this, "measure", true);
|
|
|
+ /* if(Potree.settings.isOfficial){
|
|
|
+ Potree.Utils.updateVisible(this, "enable", false)
|
|
|
+ }else{ */
|
|
|
+
|
|
|
+
|
|
|
+ //默认隐藏, 显示的条件:测量拖拽 或 外部消息setEnable
|
|
|
+
|
|
|
+ Potree.Utils.updateVisible(this, "default", false, 0); //默认隐藏
|
|
|
+
|
|
|
+ viewer.addEventListener("MeasureDragChange",(e)=>{//测量drag
|
|
|
+ Potree.Utils.updateVisible(this, "measure", e.state, 1, e.state?'add':'cancel');
|
|
|
});
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+ /* viewer.addEventListener("measureMovePoint",()=>{//测量开始
|
|
|
+ Potree.Utils.updateVisible(this, "measure", true, 1, 'add')
|
|
|
+ })
|
|
|
viewer.addEventListener("endMeasureMove",()=>{
|
|
|
- Potree.Utils.updateVisible(this, "measure", false);
|
|
|
- });
|
|
|
- }
|
|
|
+ Potree.Utils.updateVisible(this, "measure", false, 1, 'cancel')
|
|
|
+ }) */
|
|
|
+ //}
|
|
|
|
|
|
|
|
|
viewer.scene.view.addEventListener('flyingDone',()=>{
|
|
@@ -106110,11 +106125,12 @@ ENDSEC
|
|
|
|
|
|
//注意:在鼠标没有移动的时候,无法获取到最新的intersect, 放大镜内的内容可能是错误的。全景模式下更奇怪,原因未知
|
|
|
update(aimPos){//相机靠近 navvis的做法
|
|
|
+
|
|
|
var dontRender = this.dontRender || !(aimPos instanceof Vector3) || Potree.settings.displayMode == 'showPanos' && viewer.images360.flying;
|
|
|
aimPos = aimPos instanceof Vector3 ? aimPos : this.aimPos;
|
|
|
if(!aimPos || !this.visible)return
|
|
|
|
|
|
-
|
|
|
+ //console.log('aimPos', aimPos)
|
|
|
|
|
|
var playerCamera = viewer.scene.getActiveCamera();
|
|
|
|