Ver código fonte

Merge pull request #135 from michael-korbas/dev

Fixed bug on postProcessManager
deltakosh 11 anos atrás
pai
commit
58f6a51ccd

+ 1 - 1
Babylon/Cameras/babylon.camera.js

@@ -165,7 +165,7 @@ var BABYLON = BABYLON || {};
             return;
         }
 
-        if (!insertAt || insertAt < 0) {
+        if (insertAt == null || insertAt < 0) {
             this._postProcesses.push(postProcess);
             this._postProcessesTakenIndices.push(this._postProcesses.length - 1);
 

+ 5 - 4
Babylon/PostProcess/babylon.postProcessManager.js

@@ -32,8 +32,9 @@ var BABYLON = BABYLON || {};
     // Methods
     BABYLON.PostProcessManager.prototype._prepareFrame = function () {
         var postProcesses = this._scene.activeCamera._postProcesses;
-        
-        if (postProcesses.length === 0 || !this._scene.postProcessesEnabled) {
+        var postProcessesTakenIndices = this._scene.activeCamera._postProcessesTakenIndices;
+		
+        if (postProcessesTakenIndices.length === 0 || !this._scene.postProcessesEnabled) {
             return;
         }
         
@@ -43,14 +44,14 @@ var BABYLON = BABYLON || {};
     BABYLON.PostProcessManager.prototype._finalizeFrame = function () {
         var postProcesses = this._scene.activeCamera._postProcesses;
         var postProcessesTakenIndices = this._scene.activeCamera._postProcessesTakenIndices;
-        if (postProcesses.length === 0 || !this._scene.postProcessesEnabled) {
+        if (postProcessesTakenIndices.length === 0 || !this._scene.postProcessesEnabled) {
             return;
         }
 
         var engine = this._scene.getEngine();
         
         for (var index = 0; index < postProcessesTakenIndices.length; index++) {
-            if (postProcessesTakenIndices[index] < postProcessesTakenIndices.length - 1) {
+            if (index < postProcessesTakenIndices.length - 1) {
                 postProcesses[postProcessesTakenIndices[index + 1]].activate(this._scene.activeCamera);
             } else {
                 engine.restoreDefaultFramebuffer();