|
|
@@ -81303,7 +81303,7 @@ void main()
|
|
|
});
|
|
|
return
|
|
|
}
|
|
|
- if(e.drag.pointerDelta.length() == 0){ //部分设备在touchstart后立即执行了touchmove，导致marker立即移动，需要屏蔽
|
|
|
+ if(e.drag.pointerDelta.length() == 0){ //部分设备（华为matePad11）在touchstart后立即执行了touchmove，导致marker立即移动，需要屏蔽
|
|
|
return
|
|
|
}
|
|
|
viewer.dispatchEvent({
|
|
|
@@ -82281,10 +82281,15 @@ void main()
|
|
|
|
|
|
let mouseover = (e) => {this.setSelected(true, 'edge');};
|
|
|
let mouseleave = (e) => {this.setSelected(false, 'edge');};
|
|
|
-
|
|
|
+
|
|
|
edge.addEventListener('mouseover', mouseover);
|
|
|
edge.addEventListener('mouseleave', mouseleave);
|
|
|
edge.removeEventListener('addHoverEvent', addHoverEvent);
|
|
|
+
|
|
|
+ //2023.10.25add:
|
|
|
+ edge.addEventListener('click',()=>{
|
|
|
+ if(!this.isNew) this.focus();
|
|
|
+ });
|
|
|
};
|
|
|
edge.addEventListener('addHoverEvent', addHoverEvent);
|
|
|
}
|
|
|
@@ -98470,7 +98475,7 @@ ENDSEC
|
|
|
if(pano1){//过渡
|
|
|
let dontAddSides;
|
|
|
let dis = pano0.position.distanceTo(pano1.position);
|
|
|
-
|
|
|
+ if(dis == 0)return
|
|
|
let sinAlpha = Math.abs(pano0.position.z - pano1.position.z) / dis; //俯仰角的sin，随角度增大而增大 0-1
|
|
|
let score = (1+sinAlpha*20) * dis; //score越大创建的mesh越不适合
|
|
|
let isNeighbour = this.isNeighbour(pano0, pano1);
|
xzw