David Catuhe 8 years ago
parent
commit
17a52a7fa7

File diff suppressed because it is too large
+ 918 - 918
dist/preview release/babylon.d.ts


File diff suppressed because it is too large
+ 15 - 15
dist/preview release/babylon.js


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

@@ -42986,13 +42986,16 @@ var BABYLON;
             }
             // Set custom projection.
             // Needs to be before binding to prevent changing the aspect ratio.
+            var camera;
             if (this.activeCamera) {
+                camera = this.activeCamera;
                 engine.setViewport(this.activeCamera.viewport);
                 if (this.activeCamera !== scene.activeCamera) {
                     scene.setTransformMatrix(this.activeCamera.getViewMatrix(), this.activeCamera.getProjectionMatrix(true));
                 }
             }
             else {
+                camera = scene.activeCamera;
                 engine.setViewport(scene.activeCamera.viewport);
             }
             // Prepare renderingManager
@@ -43009,7 +43012,14 @@ var BABYLON;
                         continue;
                     }
                     mesh._preActivateForIntermediateRendering(sceneRenderId);
-                    if (mesh.isEnabled() && mesh.isVisible && mesh.subMeshes && ((mesh.layerMask & scene.activeCamera.layerMask) !== 0)) {
+                    var isMasked = void 0;
+                    if (!this.renderList) {
+                        isMasked = ((mesh.layerMask & camera.layerMask) !== 0);
+                    }
+                    else {
+                        isMasked = false;
+                    }
+                    if (mesh.isEnabled() && mesh.isVisible && mesh.subMeshes && !isMasked) {
                         mesh._activate(sceneRenderId);
                         for (var subIndex = 0; subIndex < mesh.subMeshes.length; subIndex++) {
                             var subMesh = mesh.subMeshes[subIndex];
@@ -50726,8 +50736,6 @@ var BABYLON;
         };
         return DefaultRenderingPipeline;
     }(BABYLON.PostProcessRenderPipeline));
-    // Luminance steps
-    DefaultRenderingPipeline.LuminanceSteps = 6;
     __decorate([
         BABYLON.serialize()
     ], DefaultRenderingPipeline.prototype, "_hdr", void 0);

File diff suppressed because it is too large
+ 918 - 918
dist/preview release/babylon.module.d.ts


File diff suppressed because it is too large
+ 15 - 15
dist/preview release/babylon.worker.js


File diff suppressed because it is too large
+ 2394 - 2368
dist/preview release/customConfigurations/minimalViewer/babylon.d.ts


File diff suppressed because it is too large
+ 18 - 17
dist/preview release/customConfigurations/minimalViewer/babylon.js


File diff suppressed because it is too large
+ 515 - 1
dist/preview release/customConfigurations/minimalViewer/babylon.max.js


File diff suppressed because it is too large
+ 2394 - 2368
dist/preview release/customConfigurations/minimalViewer/babylon.module.d.ts


+ 11 - 1
src/Materials/Textures/babylon.renderTargetTexture.ts

@@ -269,7 +269,9 @@
 
             // Set custom projection.
             // Needs to be before binding to prevent changing the aspect ratio.
+            let camera: Camera;
             if (this.activeCamera) {
+                camera = this.activeCamera;
                 engine.setViewport(this.activeCamera.viewport);
 
                 if (this.activeCamera !== scene.activeCamera)
@@ -278,6 +280,7 @@
                 }
             }
             else {
+                camera = scene.activeCamera;
                 engine.setViewport(scene.activeCamera.viewport);
             }
 
@@ -298,8 +301,15 @@
                     }
 
                     mesh._preActivateForIntermediateRendering(sceneRenderId);
+                    
+                    let isMasked;
+                    if (!this.renderList) {
+                        isMasked = ((mesh.layerMask & camera.layerMask) !== 0);
+                    } else {
+                        isMasked = false;
+                    }
 
-                    if (mesh.isEnabled() && mesh.isVisible && mesh.subMeshes && ((mesh.layerMask & scene.activeCamera.layerMask) !== 0)) {
+                    if (mesh.isEnabled() && mesh.isVisible && mesh.subMeshes && !isMasked) {
                         mesh._activate(sceneRenderId);
 
                         for (var subIndex = 0; subIndex < mesh.subMeshes.length; subIndex++) {