Layer.cullingMask and Camera.cullingMask has been removed as not need…

…ed (#5506)

Co-authored-by: Martin Valigursky <mvaligursky@snapchat.com>

src/scene/camera.js

@@ -40,7 +40,6 @@ class Camera {
         this._clearDepthBuffer = true;
         this._clearStencil = 0;
         this._clearStencilBuffer = true;
-        this._cullingMask = 0xFFFFFFFF;
         this._cullFaces = true;
         this._farClip = 1000;
         this._flipFaces = false;
@@ -177,14 +176,6 @@ class Camera {
         return this._clearStencilBuffer;
     }
 
-    set cullingMask(newValue) {
-        this._cullingMask = newValue;
-    }
-
-    get cullingMask() {
-        return this._cullingMask;
-    }
-
     set cullFaces(newValue) {
         this._cullFaces = newValue;
     }
@@ -411,7 +402,6 @@ class Camera {
         this.clearStencil = other.clearStencil;
         this.clearStencilBuffer = other.clearStencilBuffer;
         this.cullFaces = other.cullFaces;
-        this.cullingMask = other.cullingMask;
         this.flipFaces = other.flipFaces;
         this.frustumCulling = other.frustumCulling;
         this.layers = other.layers;

src/scene/layer.js

@@ -341,15 +341,6 @@ class Layer {
          */
         this.instances = options.layerReference ? options.layerReference.instances : new InstanceList();
 
-        /**
-         * Visibility bit mask that interacts with {@link MeshInstance#mask}. Especially useful
-         * when combined with layerReference, allowing for the filtering of some objects, while
-         * sharing their list and culling.
-         *
-         * @type {number}
-         */
-        this.cullingMask = options.cullingMask ? options.cullingMask : 0xFFFFFFFF;
-
         /**
          * @type {import('./mesh-instance.js').MeshInstance[]}
          * @ignore

src/scene/renderer/forward-renderer.js

@@ -461,7 +461,7 @@ class ForwardRenderer extends Renderer {
     }
 
     // execute first pass over draw calls, in order to update materials / shaders
-    renderForwardPrepareMaterials(camera, drawCalls, drawCallsCount, sortedLights, cullingMask, layer, pass) {
+    renderForwardPrepareMaterials(camera, drawCalls, drawCallsCount, sortedLights, layer, pass) {
 
         const addCall = (drawCall, isNewMaterial, lightMaskChanged) => {
             _drawCallList.drawCalls.push(drawCall);
@@ -482,10 +482,6 @@ class ForwardRenderer extends Renderer {
             /** @type {import('../mesh-instance.js').MeshInstance} */
             const drawCall = drawCalls[i];
 
-            // apply visibility override
-            if (cullingMask && drawCall.mask && !(cullingMask & drawCall.mask))
-                continue;
-
             if (drawCall.command) {
 
                 addCall(drawCall, false, false);
@@ -697,14 +693,14 @@ class ForwardRenderer extends Renderer {
         }
     }
 
-    renderForward(camera, allDrawCalls, allDrawCallsCount, sortedLights, pass, cullingMask, drawCallback, layer, flipFaces) {
+    renderForward(camera, allDrawCalls, allDrawCallsCount, sortedLights, pass, drawCallback, layer, flipFaces) {
 
         // #if _PROFILER
         const forwardStartTime = now();
         // #endif
 
         // run first pass over draw calls and handle material / shader updates
-        const preparedCalls = this.renderForwardPrepareMaterials(camera, allDrawCalls, allDrawCallsCount, sortedLights, cullingMask, layer, pass);
+        const preparedCalls = this.renderForwardPrepareMaterials(camera, allDrawCalls, allDrawCallsCount, sortedLights, layer, pass);
 
         // render mesh instances
         this.renderForwardInternal(camera, preparedCalls, sortedLights, pass, drawCallback, flipFaces);
@@ -1143,7 +1139,6 @@ class ForwardRenderer extends Renderer {
                                visible.length,
                                layer._splitLights,
                                shaderPass,
-                               layer.cullingMask,
                                layer.onDrawCall,
                                layer,
                                flipFaces);

src/scene/renderer/renderer.js

@@ -786,16 +786,12 @@ class Renderer {
         let visibleLength = 0;
         const drawCallsCount = drawCalls.length;
 
-        const cullingMask = camera.cullingMask || 0xFFFFFFFF; // if missing assume camera's default value
-
         if (!camera.frustumCulling) {
             for (let i = 0; i < drawCallsCount; i++) {
                 // need to copy array anyway because sorting will happen and it'll break original draw call order assumption
                 const drawCall = drawCalls[i];
-                if (!drawCall.visible && !drawCall.command) continue;
-
-                // if the object's mask AND the camera's cullingMask is zero then the game object will be invisible from the camera
-                if (drawCall.mask && (drawCall.mask & cullingMask) === 0) continue;
+                if (!drawCall.visible && !drawCall.command)
+                    continue;
 
                 visibleList[visibleLength] = drawCall;
                 visibleLength++;
@@ -810,9 +806,6 @@ class Renderer {
                 if (!drawCall.visible) continue; // use visible property to quickly hide/show meshInstances
                 let visible = true;
 
-                // if the object's mask AND the camera's cullingMask is zero then the game object will be invisible from the camera
-                if (drawCall.mask && (drawCall.mask & cullingMask) === 0) continue;
-
                 if (drawCall.cull) {
                     visible = drawCall._isVisible(camera);
                     // #if _PROFILER
@@ -924,7 +917,7 @@ class Renderer {
 
     /**
      * visibility culling of lights, meshInstances, shadows casters
-     * Also applies meshInstance.visible and camera.cullingMask
+     * Also applies meshInstance.visible
      *
      * @param {import('../composition/layer-composition.js').LayerComposition} comp - The layer
      * composition.