|
@@ -3465,10 +3465,16 @@ export class Viewer extends ViewerBase{
|
|
|
var inv = camera.matrixWorldInverse;
|
|
|
}else{
|
|
|
var cameraTemp = camera.clone()
|
|
|
- cameraTemp.position.copy(cameraPos)
|
|
|
- cameraTemp.lookAt(target);
|
|
|
- cameraTemp.updateMatrix();
|
|
|
- cameraTemp.updateMatrixWorld();
|
|
|
+
|
|
|
+ let view = viewer.mainViewport.view.clone();
|
|
|
+ view.position.copy(cameraPos);
|
|
|
+ view.lookAt(target);
|
|
|
+ if(o.endPitch != void 0){
|
|
|
+ view.pitch = o.endPitch
|
|
|
+ view.yaw = o.endYaw
|
|
|
+ }
|
|
|
+ view.applyToCamera(cameraTemp)
|
|
|
+
|
|
|
//对镜头的bound
|
|
|
var inv = cameraTemp.matrixWorldInverse;
|
|
|
}
|
|
@@ -3481,7 +3487,7 @@ export class Viewer extends ViewerBase{
|
|
|
scale = 1.3;
|
|
|
}else{
|
|
|
bound = boundingBox.applyMatrix4(inv);
|
|
|
- scale = 0.9;
|
|
|
+ scale = 1.0//0.9;
|
|
|
}
|
|
|
|
|
|
boundSize = bound.getSize(new THREE.Vector3)
|