refactor: __blendEquationMode and __blendEquationModeAlpha

actnwit · Apr 2, 2023 · 7bcbf5c · 7bcbf5c
1 parent 67d43c4
commit 7bcbf5c
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/src/foundation/materials/contents/MToonMaterialContent.ts b/src/foundation/materials/contents/MToonMaterialContent.ts
@@ -24,6 +24,7 @@ import { RenderingArg } from '../../../webgl/types/CommonTypes';
 import { ShaderSemanticsInfo } from '../../definitions/ShaderSemanticsInfo';
 import { Vrm0xMaterialProperty } from '../../../types';
 import { Sampler } from '../../textures/Sampler';
+import { Blend } from '../../definitions/Blend';
 
 export class MToonMaterialContent extends AbstractMaterialContent {
   static readonly _Cutoff = new ShaderSemanticsClass({ str: 'cutoff' });
@@ -806,7 +807,10 @@ export class MToonMaterialContent extends AbstractMaterialContent {
         this.__floatProperties._DstBlend
       );
 
-      material.setBlendEquationMode(blendEquationMode, blendEquationModeAlpha);
+      material.setBlendEquationMode(
+        Blend.from(blendEquationMode),
+        blendEquationModeAlpha != null ? Blend.from(blendEquationModeAlpha) : undefined
+      );
       material.setBlendFuncFactor(blendFuncSrcFactor, blendFuncDstFactor);
     }
 

diff --git a/src/foundation/materials/core/Material.ts b/src/foundation/materials/core/Material.ts
@@ -38,6 +38,7 @@ import { GL_FUNC_ADD, GL_ONE, GL_ONE_MINUS_SRC_ALPHA, GL_SRC_ALPHA } from '../..
 import { ShaderSemanticsInfo, VertexAttributeEnum } from '../../definitions';
 import { MaterialTypeName, ShaderVariable } from './MaterialTypes';
 import { Sampler } from '../../textures/Sampler';
+import { Blend, BlendEnum } from '../../definitions/Blend';
 
 /**
  * The material class.
@@ -63,8 +64,8 @@ export class Material extends RnObject {
   public cullFace = true; // If true, enable gl.CULL_FACE
   public cullFrontFaceCCW = true;
   private __alphaToCoverage = false;
-  private __blendEquationMode = GL_FUNC_ADD; // gl.FUNC_ADD
-  private __blendEquationModeAlpha = GL_FUNC_ADD; // gl.FUNC_ADD
+  private __blendEquationMode = Blend.EquationFuncAdd; // gl.FUNC_ADD
+  private __blendEquationModeAlpha = Blend.EquationFuncAdd; // gl.FUNC_ADD
   private __blendFuncSrcFactor = GL_SRC_ALPHA; // gl.SRC_ALPHA
   private __blendFuncDstFactor = GL_ONE_MINUS_SRC_ALPHA; // gl.ONE_MINUS_SRC_ALPHA
   private __blendFuncAlphaSrcFactor = GL_ONE; // gl.ONE
@@ -650,7 +651,7 @@ export class Material extends RnObject {
    * @param blendEquationMode the argument of gl.blendEquation of the first argument of gl.blendEquationSeparate such as gl.FUNC_ADD
    * @param blendEquationModeAlpha the second argument of gl.blendEquationSeparate
    */
-  public setBlendEquationMode(blendEquationMode: number, blendEquationModeAlpha?: number) {
+  public setBlendEquationMode(blendEquationMode: BlendEnum, blendEquationModeAlpha?: BlendEnum) {
     this.__blendEquationMode = blendEquationMode;
     this.__blendEquationModeAlpha = blendEquationModeAlpha ?? blendEquationMode;
   }

diff --git a/src/webgl/WebGLStrategyCommonMethod.ts b/src/webgl/WebGLStrategyCommonMethod.ts
@@ -73,7 +73,11 @@ function setBlendSettings(material: Material, gl: WebGLRenderingContext) {
   }
 
   if (material.alphaMode === AlphaMode.Translucent) {
-    setBlendEquationMode(material.blendEquationMode, material.blendEquationModeAlpha, gl);
+    setBlendEquationMode(
+      material.blendEquationMode.index,
+      material.blendEquationModeAlpha.index,
+      gl
+    );
     setBlendFuncSrcFactor(
       material.blendFuncSrcFactor,
       material.blendFuncDstFactor,