|
@@ -83523,6 +83523,7 @@ void main()
|
|
|
this.viewer.removeEventListener('cancel_insertions', Exit);
|
|
|
//pressExit && this.viewer.inputHandler.removeEventListener('keydown', pressExit);
|
|
|
this.viewer.removeEventListener('global_click', click);
|
|
|
+ this.viewer.removeEventListener('global_touchstart', click );
|
|
|
this.viewer.removeEventListener('global_mousemove', ifAtWrongPlace);
|
|
|
viewer.dispatchEvent({
|
|
|
type : "CursorChange", action : "remove", name:"polygon_AtWrongPlace"
|
|
@@ -91597,7 +91598,7 @@ void main()
|
|
|
|
|
|
let dir = directions[name];
|
|
|
if(name == 'top'){
|
|
|
- let baseLine = viewer.scene.measurements.find(e=>e.isBaseLine); //使基准线在俯视图中水平
|
|
|
+ let baseLine = viewer.scene.measurements.find(e=>e.isBaseLine && e.points.length == 2); //使基准线在俯视图中水平
|
|
|
let yaw = baseLine ? new Vector2().subVectors(baseLine.points[0], baseLine.points[1]).angle() : 0;
|
|
|
dir = baseLine ? {dir: new Vector3(0,0,-1),yaw,pitch: -1.5707963267948966} : directions[name];
|
|
|
}
|
|
@@ -91735,7 +91736,7 @@ void main()
|
|
|
|
|
|
//外部传消息,使进入俯视
|
|
|
this.addEventListener('enterTopView',()=>{
|
|
|
- let baseLine = viewer.scene.measurements.find(e=>e.isBaseLine); //使基准线在俯视图中水平
|
|
|
+ let baseLine = viewer.scene.measurements.find(e=>e.isBaseLine && e.points.length == 2); //使基准线在俯视图中水平
|
|
|
let yaw = baseLine ? new Vector2().subVectors(baseLine.points[0], baseLine.points[1]).angle() : 0;
|
|
|
this.switchView('ortho', {dir: new Vector3(0,0,-1),yaw,pitch: -1.5707963267948966});
|
|
|
});
|