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

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


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


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


+ 12 - 17
dist/preview release/babylon.max.js

@@ -24349,6 +24349,17 @@ var BABYLON;
             if (this.renderList && this.renderList.length === 0) {
                 return;
             }
+            // Set custom projection.
+            // Needs to be before binding to prevent changing the aspect ratio.
+            if (this.activeCamera) {
+                engine.setViewport(this.activeCamera.viewport);
+                if (this.activeCamera !== scene.activeCamera) {
+                    scene.setTransformMatrix(this.activeCamera.getViewMatrix(), this.activeCamera.getProjectionMatrix(true));
+                }
+            }
+            else {
+                engine.setViewport(scene.activeCamera.viewport);
+            }
             // Prepare renderingManager
             this._renderingManager.reset();
             var currentRenderList = this.renderList ? this.renderList : scene.getActiveMeshes().data;
@@ -24402,21 +24413,6 @@ var BABYLON;
                     engine.bindFramebuffer(this._texture);
                 }
             }
-            // Set states for projection (this does not change accross faces)
-            if (!this.isCube || faceIndex === 0) {
-                if (this.activeCamera && this.activeCamera !== scene.activeCamera) {
-                    scene.setTransformMatrix(this.activeCamera.getViewMatrix(), this.activeCamera.getProjectionMatrix(true));
-                }
-                else {
-                    scene.setTransformMatrix(scene.activeCamera.getViewMatrix(), scene.activeCamera.getProjectionMatrix(true));
-                }
-                if (this.activeCamera) {
-                    engine.setViewport(this.activeCamera.viewport);
-                }
-                else {
-                    engine.setViewport(scene.activeCamera.viewport);
-                }
-            }
             this.onBeforeRenderObservable.notifyObservers(faceIndex);
             // Clear
             if (this.onClearObservable.hasObservers()) {
@@ -54746,8 +54742,7 @@ var BABYLON;
                 this._overloadedIntensity.z = this.overloadedReflectivityIntensity;
                 this._overloadedIntensity.w = this.overloadedEmissiveIntensity;
                 this._effect.setVector4("vOverloadedIntensity", this._overloadedIntensity);
-                this.convertColorToLinearSpaceToRef(this.overloadedAmbient, this._tempColor);
-                this._effect.setColor3("vOverloadedAmbient", this._tempColor);
+                this._effect.setColor3("vOverloadedAmbient", this.overloadedAmbient);
                 this.convertColorToLinearSpaceToRef(this.overloadedAlbedo, this._tempColor);
                 this._effect.setColor3("vOverloadedAlbedo", this._tempColor);
                 this.convertColorToLinearSpaceToRef(this.overloadedReflectivity, this._tempColor);

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