Ver código fonte

Fixing renderTarget activeCamera test

David Catuhe 9 anos atrás
pai
commit
5854b3bfee

Diferenças do arquivo suprimidas por serem muito extensas
+ 9 - 9
dist/preview release/babylon.core.js


Diferenças do arquivo suprimidas por serem muito extensas
+ 2363 - 2363
dist/preview release/babylon.d.ts


Diferenças do arquivo suprimidas por serem muito extensas
+ 19 - 19
dist/preview release/babylon.js


+ 6 - 0
dist/preview release/babylon.max.js

@@ -17461,6 +17461,9 @@ var BABYLON;
         };
         RenderTargetTexture.prototype.render = function (useCameraPostProcess, dumpForDebug) {
             var scene = this.getScene();
+            if (this.activeCamera && this.activeCamera !== scene.activeCamera) {
+                scene.setTransformMatrix(this.activeCamera.getViewMatrix(), this.activeCamera.getProjectionMatrix(true));
+            }
             if (this._waitingRenderList) {
                 this.renderList = [];
                 for (var index = 0; index < this._waitingRenderList.length; index++) {
@@ -17504,6 +17507,9 @@ var BABYLON;
             if (this.onAfterUnbind) {
                 this.onAfterUnbind();
             }
+            if (this.activeCamera && this.activeCamera !== scene.activeCamera) {
+                scene.setTransformMatrix(scene.activeCamera.getViewMatrix(), scene.activeCamera.getProjectionMatrix(true));
+            }
             scene.resetCachedMaterial();
         };
         RenderTargetTexture.prototype.renderToTarget = function (faceIndex, currentRenderList, useCameraPostProcess, dumpForDebug) {

Diferenças do arquivo suprimidas por serem muito extensas
+ 22 - 22
dist/preview release/babylon.noworker.js


+ 6 - 0
src/Materials/Textures/babylon.renderTargetTexture.js

@@ -120,6 +120,9 @@ var BABYLON;
         };
         RenderTargetTexture.prototype.render = function (useCameraPostProcess, dumpForDebug) {
             var scene = this.getScene();
+            if (this.activeCamera && this.activeCamera !== scene.activeCamera) {
+                scene.setTransformMatrix(this.activeCamera.getViewMatrix(), this.activeCamera.getProjectionMatrix(true));
+            }
             if (this._waitingRenderList) {
                 this.renderList = [];
                 for (var index = 0; index < this._waitingRenderList.length; index++) {
@@ -163,6 +166,9 @@ var BABYLON;
             if (this.onAfterUnbind) {
                 this.onAfterUnbind();
             }
+            if (this.activeCamera && this.activeCamera !== scene.activeCamera) {
+                scene.setTransformMatrix(scene.activeCamera.getViewMatrix(), scene.activeCamera.getProjectionMatrix(true));
+            }
             scene.resetCachedMaterial();
         };
         RenderTargetTexture.prototype.renderToTarget = function (faceIndex, currentRenderList, useCameraPostProcess, dumpForDebug) {

+ 10 - 10
src/Materials/Textures/babylon.renderTargetTexture.ts

@@ -126,10 +126,10 @@
 
         public render(useCameraPostProcess?: boolean, dumpForDebug?: boolean) {
             var scene = this.getScene();
-            
-            if (this.activeCamera !== scene.activeCamera) {
-        		scene.setTransformMatrix(this.activeCamera.getViewMatrix(), this.activeCamera.getProjectionMatrix(true));
-        	}
+
+            if (this.activeCamera && this.activeCamera !== scene.activeCamera) {
+                scene.setTransformMatrix(this.activeCamera.getViewMatrix(), this.activeCamera.getProjectionMatrix(true));
+            }
 
             if (this._waitingRenderList) {
                 this.renderList = [];
@@ -171,7 +171,7 @@
                     }
                 }
             }
-            
+
             if (this.isCube) {
                 for (var face = 0; face < 6; face++) {
                     this.renderToTarget(face, currentRenderList, useCameraPostProcess, dumpForDebug);
@@ -183,10 +183,10 @@
             if (this.onAfterUnbind) {
                 this.onAfterUnbind();
             }
-            
-            if (this.activeCamera !== scene.activeCamera) {
-        		scene.setTransformMatrix(scene.activeCamera.getViewMatrix(), scene.activeCamera.getProjectionMatrix(true));
-        	}
+
+            if (this.activeCamera && this.activeCamera !== scene.activeCamera) {
+                scene.setTransformMatrix(scene.activeCamera.getViewMatrix(), scene.activeCamera.getProjectionMatrix(true));
+            }
 
             scene.resetCachedMaterial();
         }
@@ -284,4 +284,4 @@
             return serializationObject;
         }
     }
-} 
+}

+ 1 - 1
src/Tools/babylon.sceneSerializer.ts

@@ -369,4 +369,4 @@
             return serializationObject;
         }
     }
-}
+}