|
@@ -126219,7 +126219,7 @@ ENDSEC
|
|
|
var finish = ()=>{
|
|
|
|
|
|
oldStates.viewports.forEach(old=>{//恢复相机
|
|
|
- var viewport = [mapViewport, mainViewport].find(v=>v.name == old.name);
|
|
|
+ var viewport = viewports.find(v=>v.name == old.name);
|
|
|
viewport.left = old.left;
|
|
|
viewport.width = old.width;
|
|
|
viewport.view.copy(old.view);
|
|
@@ -126256,15 +126256,24 @@ ENDSEC
|
|
|
viewer.updateVisible(pano, 'screenshot', true);
|
|
|
});
|
|
|
viewer.updateVisible(this.reticule, 'screenshot', true);
|
|
|
- useMap && viewer.updateVisible(this.mapViewer.cursor, 'screenshot', true);
|
|
|
+
|
|
|
|
|
|
- if(oldStates.attachedToViewer != this.mapViewer.attachedToViewer){
|
|
|
- if(info.type == 'measure'){
|
|
|
- this.mapViewer.attachToMainViewer(false );
|
|
|
- }
|
|
|
- }
|
|
|
- mapViewport.camera.zoom = oldStates.mapZoom;
|
|
|
- mapViewport.camera.updateProjectionMatrix();
|
|
|
+
|
|
|
+ if(useMap){
|
|
|
+ viewer.updateVisible(this.mapViewer.cursor, 'screenshot', true);
|
|
|
+
|
|
|
+
|
|
|
+ if(oldStates.attachedToViewer != this.mapViewer.attachedToViewer){
|
|
|
+ if(info.type == 'measure'){
|
|
|
+ this.mapViewer.attachToMainViewer(false );
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+ mapViewport.camera.zoom = oldStates.mapZoom;
|
|
|
+ mapViewport.camera.updateProjectionMatrix();
|
|
|
+ }
|
|
|
+
|
|
|
|
|
|
if(Potree.settings.displayMode == 'showPanos') {
|
|
|
viewer.images360.flyToPano({pano:oldStates.pano, duration:0, callback:()=>{
|
|
@@ -126281,16 +126290,24 @@ ENDSEC
|
|
|
|
|
|
|
|
|
|
|
|
- let mapViewport = this.mapViewer.viewports[0];
|
|
|
+
|
|
|
let mainViewport = this.mainViewport;
|
|
|
- let oldStates = {
|
|
|
- attachedToViewer : this.mapViewer.attachedToViewer,
|
|
|
- viewports : [mapViewport, mainViewport].map(e=>{
|
|
|
- return e.clone()
|
|
|
- }),
|
|
|
- mapZoom: mapViewport.camera.zoom,
|
|
|
+ let viewports = [mainViewport];
|
|
|
+ let oldStates = {
|
|
|
+ viewports : [mainViewport.clone()],
|
|
|
pano: Potree.settings.displayMode == 'showPanos' ? viewer.images360.currentPano : null,
|
|
|
};
|
|
|
+ if(useMap){
|
|
|
+ let mapViewport = this.mapViewer.viewports[0];
|
|
|
+ viewports.push(mapViewport);
|
|
|
+ oldStates.viewports.push(mapViewport.clone());
|
|
|
+ oldStates.attachedToViewer = this.mapViewer.attachedToViewer;
|
|
|
+ oldStates.mapZoom = mapViewport.camera.zoom;
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+ viewer.updateVisible(this.mapViewer.cursor, 'screenshot', false);//令mapCursor不可见
|
|
|
+ }
|
|
|
|
|
|
|
|
|
|
|
@@ -126300,8 +126317,8 @@ ENDSEC
|
|
|
});
|
|
|
}
|
|
|
viewer.updateVisible(this.reticule, 'screenshot', false);//令reticule不可见
|
|
|
-
|
|
|
- viewer.updateVisible(this.mapViewer.cursor, 'screenshot', false);//令mapCursor不可见
|
|
|
+
|
|
|
+
|
|
|
|
|
|
|
|
|
|