浏览代码

FramingBehavior will not force minZ if not required

David Catuhe 8 年之前
父节点
当前提交
fefbbcb430

文件差异内容过多而无法显示
+ 736 - 736
dist/preview release/babylon.d.ts


文件差异内容过多而无法显示
+ 1 - 1
dist/preview release/babylon.js


+ 3 - 1
dist/preview release/babylon.max.js

@@ -70163,7 +70163,9 @@ var BABYLON;
             }
             else if (this._mode === FramingBehavior.IgnoreBoundsSizeMode) {
                 radius = this._calculateLowerRadiusFromModelBoundingSphere(minimumWorld, maximumWorld);
-                this._attachedCamera.lowerRadiusLimit = this._attachedCamera.minZ;
+                if (this._attachedCamera.lowerRadiusLimit === null) {
+                    this._attachedCamera.lowerRadiusLimit = this._attachedCamera.minZ;
+                }
             }
             // transition to new radius
             if (!this._radiusTransition) {

文件差异内容过多而无法显示
+ 736 - 736
dist/preview release/babylon.module.d.ts


文件差异内容过多而无法显示
+ 38 - 38
dist/preview release/babylon.worker.js


文件差异内容过多而无法显示
+ 2375 - 2375
dist/preview release/customConfigurations/minimalGLTFViewer/babylon.d.ts


文件差异内容过多而无法显示
+ 1 - 1
dist/preview release/customConfigurations/minimalGLTFViewer/babylon.js


+ 3 - 1
dist/preview release/customConfigurations/minimalGLTFViewer/babylon.max.js

@@ -50136,7 +50136,9 @@ var BABYLON;
             }
             else if (this._mode === FramingBehavior.IgnoreBoundsSizeMode) {
                 radius = this._calculateLowerRadiusFromModelBoundingSphere(minimumWorld, maximumWorld);
-                this._attachedCamera.lowerRadiusLimit = this._attachedCamera.minZ;
+                if (this._attachedCamera.lowerRadiusLimit === null) {
+                    this._attachedCamera.lowerRadiusLimit = this._attachedCamera.minZ;
+                }
             }
             // transition to new radius
             if (!this._radiusTransition) {

文件差异内容过多而无法显示
+ 2375 - 2375
dist/preview release/customConfigurations/minimalGLTFViewer/babylon.module.d.ts


+ 3 - 1
src/Behaviors/Cameras/babylon.framingBehavior.ts

@@ -252,7 +252,9 @@ module BABYLON {
 				radius = position;
 			} else if (this._mode === FramingBehavior.IgnoreBoundsSizeMode) {
 				radius = this._calculateLowerRadiusFromModelBoundingSphere(minimumWorld, maximumWorld);
-				this._attachedCamera.lowerRadiusLimit = this._attachedCamera.minZ;
+				if (this._attachedCamera.lowerRadiusLimit === null) {
+					this._attachedCamera.lowerRadiusLimit = this._attachedCamera.minZ;
+				}
 			}
 
 			// transition to new radius