fix multiply mode sphere texture with alpha

noname0310 · May 11, 2024 · 77a9b0c · 77a9b0c
1 parent a6bc88b
commit 77a9b0c
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.42.3
+
+- fix multiply mode sphere texture with alpha not rendered correctly
+
 ## 0.42.2
 
 - fix `MmdAmmoPhysics` rigidbody initialization

diff --git a/src/Loader/mmdPluginMaterial.ts b/src/Loader/mmdPluginMaterial.ts
@@ -421,7 +421,7 @@ export class MmdPluginMaterial extends MaterialPluginBase {
                     #ifdef SPHERE_TEXTURE_BLEND_MODE_MULTIPLY
                         color *= sphereReflectionColor;
                     #elif defined(SPHERE_TEXTURE_BLEND_MODE_ADD)
-                        color = vec4(color.rgb + sphereReflectionColor.rgb, color.a * sphereReflectionColor.a);
+                        color = vec4(color.rgb + sphereReflectionColor.rgb, color.a);// * sphereReflectionColor.a);
                     #endif
                 #endif
             `;

diff --git a/src/Loader/mmdStandardMaterial.ts b/src/Loader/mmdStandardMaterial.ts
@@ -5,7 +5,7 @@ import { Color3 } from "@babylonjs/core/Maths/math.color";
 import type { Scene } from "@babylonjs/core/scene";
 import type { Nullable } from "@babylonjs/core/types";
 
-import type { MmdPluginMaterialSphereTextureBlendMode } from "./mmdPluginMaterial";
+import { MmdPluginMaterialSphereTextureBlendMode } from "./mmdPluginMaterial";
 import { MmdPluginMaterial } from "./mmdPluginMaterial";
 
 /**
@@ -242,4 +242,18 @@ export class MmdStandardMaterial extends StandardMaterial {
         }
         this._renderOutline = value;
     }
+
+    /**
+     * Specifies if the material will require alpha blending
+     * @returns a boolean specifying if alpha blending is needed
+     */
+    public override needAlphaBlending(): boolean {
+        if (this._disableAlphaBlending) {
+            return false;
+        }
+
+        return super.needAlphaBlending() ||
+            (this._pluginMaterial.sphereTexture !== null &&
+            this._pluginMaterial.sphereTextureBlendMode === MmdPluginMaterialSphereTextureBlendMode.Multiply);
+    }
 }
diff --git a/src/Loader/mmdStandardMaterialBuilder.ts b/src/Loader/mmdStandardMaterialBuilder.ts
@@ -686,6 +686,10 @@ export class MmdStandardMaterialBuilder implements IMmdMaterialBuilder {
             if (materialInfo.sphereTextureMode !== PmxObject.Material.SphereTextureMode.Off) {
                 const sphereTexturePath = imagePathTable[textureInfo?.imagePathIndex ?? -1];
                 if (sphereTexturePath !== undefined) {
+                    const format = scene.getEngine().isWebGPU || materialInfo.sphereTextureMode === PmxObject.Material.SphereTextureMode.Multiply
+                        ? Constants.TEXTUREFORMAT_RGBA
+                        : Constants.TEXTUREFORMAT_RGB;
+
                     const sphereTextureFileFullPath = referenceFileResolver.createFullPath(sphereTexturePath);
 
                     let sphereTexture: Nullable<Texture>;
@@ -700,7 +704,7 @@ export class MmdStandardMaterialBuilder implements IMmdMaterialBuilder {
                             {
                                 ...textureInfo,
                                 deleteBuffer: this.deleteTextureBufferAfterLoad,
-                                format: scene.getEngine().isWebGPU ? Constants.TEXTUREFORMAT_RGBA : Constants.TEXTUREFORMAT_RGB,
+                                format: format,
                                 mimeType: file instanceof File ? file.type : file.mimeType
                             }
                         ));
@@ -714,7 +718,7 @@ export class MmdStandardMaterialBuilder implements IMmdMaterialBuilder {
                             {
                                 ...textureInfo,
                                 deleteBuffer: this.deleteTextureBufferAfterLoad,
-                                format: scene.getEngine().isWebGPU ? Constants.TEXTUREFORMAT_RGBA : Constants.TEXTUREFORMAT_RGB
+                                format: format
                             }
                         ));
                     }

diff --git a/src/Test/Scene/alphaForceDepthWriteTestScene.ts b/src/Test/Scene/alphaForceDepthWriteTestScene.ts
@@ -37,8 +37,8 @@ export class SceneBuilder implements ISceneBuilder {
         materialBuilder.afterBuildSingleMaterial = (material): void => {
             if (material.diffuseTexture) {
                 material.diffuseTexture.hasAlpha = true;
+                material.useAlphaFromDiffuseTexture = true;
             }
-            material.useAlphaFromDiffuseTexture = true;
             material.transparencyMode = Material.MATERIAL_ALPHABLEND;
             material.forceDepthWrite = true;
 
@@ -59,8 +59,8 @@ export class SceneBuilder implements ISceneBuilder {
         pmxLoader.buildMorph = true;
         const mmdMesh = await SceneLoader.ImportMeshAsync(
             undefined,
-            "res/private_test/model/YYB Hatsune Miku_10th/",
-            "YYB Hatsune Miku_10th_v1.02 - faceforward.pmx",
+            "res/private_test/model/YYB Hatsune Miku_NT/",
+            "YYB Hatsune Miku_NT_1.0ver.pmx",
             scene
         ).then(result => result.meshes[0] as MmdMesh);
         for (const mesh of mmdMesh.metadata.meshes) mesh.receiveShadows = true;

diff --git a/src/Test/index.ts b/src/Test/index.ts
@@ -6,7 +6,7 @@ import { Engine } from "@babylonjs/core/Engines/engine";
 // import "@babylonjs/core/Engines/WebGPU/Extensions/engine.readTexture";
 // import { WebGPUEngine } from "@babylonjs/core/Engines/webgpuEngine";
 import { BaseRuntime } from "./baseRuntime";
-import { SceneBuilder } from "./Scene/wasmRuntimeTestScene";
+import { SceneBuilder } from "./Scene/alphaForceDepthWriteTestScene";
 
 await new Promise(resolve => window.onload = resolve);