瀏覽代碼

Remove Redundant Config

sebastien 6 年之前
父節點
當前提交
c5ec6c889e
共有 2 個文件被更改,包括 9 次插入13 次删除
  1. 5 9
      src/Layer/babylon.layer.ts
  2. 4 4
      src/Layer/babylon.layerSceneComponent.ts

+ 5 - 9
src/Layer/babylon.layer.ts

@@ -49,19 +49,15 @@ module BABYLON {
         public layerMask: number = 0x0FFFFFFF;
 
         /**
-         * Define if the layer is only used in renderTarget
-         */
-        public renderInRenderTargets = false;
-
-        /**
-         * Define if the layer is only used in renderTarget
+         * Define the list of render target the layer is visible into.
          */
-        public renderInScene = true;
+        public renderTargetTextures: RenderTargetTexture[] = [];
 
         /**
-         * Define the list of render target the layer is visible into.
+         * Define if the layer is only used in renderTarget or if it also 
+         * renders in the main frame buffer of the canvas.
          */
-        public renderTargetTextures: RenderTargetTexture[] = [];
+        public renderOnlyInRenderTargetTextures = false;
 
         private _scene: Scene;
         private _vertexBuffers: { [key: string]: Nullable<VertexBuffer> } = {};

+ 4 - 4
src/Layer/babylon.layerSceneComponent.ts

@@ -82,7 +82,7 @@ module BABYLON {
         }
 
         private _drawCameraPredicate(layer: Layer, isBackground: boolean, cameraLayerMask: number): boolean {
-            return layer.renderInScene &&
+            return !layer.renderOnlyInRenderTargetTextures &&
                 layer.isBackground === isBackground &&
                 ((layer.layerMask & cameraLayerMask) !== 0);
         }
@@ -100,10 +100,10 @@ module BABYLON {
         }
 
         private _drawRenderTargetPredicate(layer: Layer, isBackground: boolean, cameraLayerMask: number, renderTargetTexture: RenderTargetTexture): boolean {
-            return layer.renderInRenderTargets &&
+            return (layer.renderTargetTextures.length > 0) &&
                 layer.isBackground === isBackground &&
-                ((layer.layerMask & cameraLayerMask) !== 0) &&
-                (layer.renderTargetTextures.indexOf(renderTargetTexture) > -1);
+                (layer.renderTargetTextures.indexOf(renderTargetTexture) > -1) &&
+                ((layer.layerMask & cameraLayerMask) !== 0);
         }
 
         private _drawRenderTargetBackground(renderTarget: RenderTargetTexture): void {