|
|
@@ -21823,9 +21823,10 @@
|
|
|
}
|
|
|
}
|
|
|
renderOverlay() {
|
|
|
+ var _o$viewport;
|
|
|
var o = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
|
|
|
// measure tag
|
|
|
- if (this.overlayScene.children.filter(e => e.visible).length == 0) return;
|
|
|
+ if (this.overlayScene.children.filter(e => e.visible).length == 0 || (_o$viewport = o.viewport) !== null && _o$viewport !== void 0 && (_o$viewport = _o$viewport.cameraLayers) !== null && _o$viewport !== void 0 && _o$viewport.length && !o.viewport.cameraLayers.includes('sceneObjects')) return;
|
|
|
var renderer = o.renderer || this.viewer.renderer;
|
|
|
Potree.Utils.setCameraLayers(o.camera, ['sceneObjects']);
|
|
|
viewer.dispatchEvent({
|
|
|
@@ -62361,8 +62362,8 @@
|
|
|
this.showVideo(true);
|
|
|
this.video.pause(); //先显示出画面
|
|
|
setTimeout(() => {
|
|
|
- viewer.mainViewport.cameraLayers = ['monitor']; //hide others
|
|
|
- }, 1000);
|
|
|
+ viewer.mainViewport.cameraLayers = ['monitor']; //hide others
|
|
|
+ }, 800);
|
|
|
viewer.mainViewport.view.setRotMode('free');
|
|
|
viewer.mainViewport.view.setView({
|
|
|
position: this.getWorldPosition(new Vector3()),
|
xzw