|
|
@@ -54299,7 +54299,7 @@
|
|
|
tranCamera(viewport, info, duration, easeName){
|
|
|
viewport.camera = info.midCamera;
|
|
|
//viewport.camera.matrixWorld = info.endCamera.matrixWorld
|
|
|
-
|
|
|
+ console.log('tranCamera');
|
|
|
|
|
|
//viewer.setCameraMode(CameraMode.ORTHOGRAPHIC)
|
|
|
info.midCamera.projectionMatrix.copy(info.startCamera.projectionMatrix);
|
|
|
@@ -54308,9 +54308,7 @@
|
|
|
info.onUpdate = (progress, delta)=>{
|
|
|
lerp.matrix4(info.midCamera.projectionMatrix, info.endCamera.projectionMatrix)(progress);
|
|
|
|
|
|
- /* console.log('matrixWorld', viewport.camera.position.toArray(), viewport.camera.matrixWorld.toArray())
|
|
|
- console.log('projectionMatrix', info.endCamera.zoom, viewport.camera.projectionMatrix.toArray())
|
|
|
- */
|
|
|
+
|
|
|
onUpdate && onUpdate(progress, delta);
|
|
|
};
|
|
|
|
|
|
@@ -54322,7 +54320,7 @@
|
|
|
});
|
|
|
viewer.dispatchEvent({type:'camera_changed', viewport:viewer.mainViewport, changeInfo:{}});//update sprite
|
|
|
|
|
|
-
|
|
|
+ console.log('tranCamera end');
|
|
|
callback && callback();
|
|
|
};
|
|
|
info.forbitCancel = true;
|
|
|
@@ -97271,7 +97269,7 @@ ENDSEC
|
|
|
|
|
|
|
|
|
cancelFlyToPano(toPano){//取消当前已有的飞行准备，前提是相机还未移动
|
|
|
- if(viewer.mainViewport.view.isFlying() || toPano && this.latestToPano != toPano)return
|
|
|
+ if(/* viewer.mainViewport.view.isFlying() || */toPano && this.latestToPano != toPano)return
|
|
|
//Potree.Log('cancelFlyToPano', this.latestToPano && this.latestToPano.pano.id)
|
|
|
this.nextPano = null;
|
|
|
this.latestToPano = null;
|
xzw