|
@@ -82414,7 +82414,7 @@ void main()
|
|
focus(){
|
|
focus(){
|
|
|
|
|
|
|
|
|
|
- let dontChangeCamDir = viewer.mainViewport.camera.type == 'OrthographicCamera' && math.closeTo( viewer.mainViewport.view.pitch , -1.57079632); //俯视图不改角度
|
|
|
|
|
|
+ let dontChangeCamDir = viewer.mainViewport.camera.type == 'OrthographicCamera'; /* && math.closeTo( viewer.mainViewport.view.pitch , -1.57079632) */ // 不改角度
|
|
|
|
|
|
viewer.focusOnObject(this, 'measure', null, {dontChangeCamDir});
|
|
viewer.focusOnObject(this, 'measure', null, {dontChangeCamDir});
|
|
|
|
|
|
@@ -139328,7 +139328,7 @@ ENDSEC
|
|
boundSize.y = Math.max(min, boundSize.y);
|
|
boundSize.y = Math.max(min, boundSize.y);
|
|
}
|
|
}
|
|
if(camera.type == 'OrthographicCamera'){
|
|
if(camera.type == 'OrthographicCamera'){
|
|
- dis = boundSize.length() / 2;
|
|
|
|
|
|
+ dis = boundSize.length();
|
|
}else {
|
|
}else {
|
|
let aspect = boundSize.x / boundSize.y;
|
|
let aspect = boundSize.x / boundSize.y;
|
|
if(camera.aspect > aspect){//视野更宽则用bound的纵向来决定
|
|
if(camera.aspect > aspect){//视野更宽则用bound的纵向来决定
|