refactor(mask): opt code

galacean · Oct 18, 2024 · e2efa9d · e2efa9d
1 parent bc21358
commit e2efa9d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/packages/core/src/BasicResources.ts b/packages/core/src/BasicResources.ts
@@ -86,6 +86,8 @@ export class BasicResources {
     renderStates[RenderStateElementKey.StencilStateEnabled] = true;
     renderStates[RenderStateElementKey.StencilStatePassOperationFront] = passOperation;
     renderStates[RenderStateElementKey.StencilStatePassOperationBack] = passOperation;
+    renderStates[RenderStateElementKey.StencilStateCompareFunctionFront] = CompareFunction.Always;
+    renderStates[RenderStateElementKey.StencilStateCompareFunctionBack] = CompareFunction.Always;
     const failStencilOperation = StencilOperation.Keep;
     renderStates[RenderStateElementKey.StencilStateFailOperationFront] = failStencilOperation;
     renderStates[RenderStateElementKey.StencilStateFailOperationBack] = failStencilOperation;
@@ -94,8 +96,6 @@ export class BasicResources {
     renderStates[RenderStateElementKey.BlendStateColorWriteMask0] = ColorWriteMask.None;
     renderStates[RenderStateElementKey.DepthStateEnabled] = false;
     renderStates[RenderStateElementKey.RasterStateCullMode] = CullMode.Off;
-    renderStates[RenderStateElementKey.StencilStateCompareFunctionFront] = CompareFunction.Always;
-    renderStates[RenderStateElementKey.StencilStateCompareFunctionBack] = CompareFunction.Always;
 
     return renderStates;
   }

diff --git a/packages/core/src/RenderPipeline/RenderQueue.ts b/packages/core/src/RenderPipeline/RenderQueue.ts
@@ -77,18 +77,18 @@ export class RenderQueue {
       const maskInteraction = renderer._maskInteraction;
       const needMaskInteraction = maskInteraction !== SpriteMaskInteraction.None;
       const needMaskType = maskType !== RenderQueueMaskType.No;
-      if (needMaskInteraction) {
-        maskManager.drawMask(context, pipelineStageTagValue, subElement.component._maskLayer);
-      } else {
-        maskManager.isReadStencil(material) && maskManager.clearMask(context, pipelineStageTagValue);
-      }
-      needMaskType || (maskManager.isStencilWritten(material) && (maskManager.hasStencilWritten = true));
-
       let customStates: RenderStateElementMap = null;
-      if (needMaskInteraction) {
-        customStates = BasicResources.getMaskInteractionRenderStates(maskInteraction);
-      } else if (needMaskType) {
+
+      if (needMaskType) {
         customStates = BasicResources.getMaskTypeRenderStates(maskType);
+      } else {
+        if (needMaskInteraction) {
+          maskManager.drawMask(context, pipelineStageTagValue, subElement.component._maskLayer);
+          customStates = BasicResources.getMaskInteractionRenderStates(maskInteraction);
+        } else {
+          maskManager.isReadStencil(material) && maskManager.clearMask(context, pipelineStageTagValue);
+        }
+        maskManager.isStencilWritten(material) && (maskManager.hasStencilWritten = true);
       }
 
       const compileMacros = Shader._compileMacros;