|
|
@@ -54220,7 +54220,7 @@
|
|
|
let camera = info.camera || viewport.camera;
|
|
|
|
|
|
let startZoom = camera.zoom;
|
|
|
- let endPosition = info.endPosition;
|
|
|
+ let endPosition = info.endPosition || info.position;
|
|
|
let boundSize = info.boundSize;
|
|
|
let endZoom = info.endZoom;
|
|
|
let margin = info.margin || {x:0,y:0};/* 200 */ //像素
|
|
|
@@ -91922,8 +91922,8 @@ void main()
|
|
|
startCamera = viewer.scene.cameraO;
|
|
|
endCamera = viewer.scene.cameraP;
|
|
|
}else {
|
|
|
-
|
|
|
- view.setView(viewer.mainViewport, { position:view.position,
|
|
|
+ console.log('switchView2', 'not ortho');
|
|
|
+ view.setView({ position:viewInfo.position,
|
|
|
endPitch: viewInfo.pitch, endYaw: viewInfo.yaw ,
|
|
|
startCamera, endCamera,
|
|
|
callback:()=>{
|
xzw