Fix charactertattoo not exporting correctly in raw mode

PassiveModding · Jan 13, 2025 · c6bc174 · c6bc174
1 parent 2cf03a0
commit c6bc174
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 15 deletions.
diff --git a/Meddle/Meddle.Plugin/Models/Composer/MaterialSet.cs b/Meddle/Meddle.Plugin/Models/Composer/MaterialSet.cs
@@ -332,12 +332,12 @@ public Vector4 GetConstantOrDefault(MaterialConstant id, Vector4 @default)
                    : @default;
     }
 
-    public uint GetShaderKeyOrDefault(uint category)
+    public uint GetShaderKeyOrThrow(uint category)
     {
-        return GetShaderKeyOrDefault((ShaderCategory)category);
+        return GetShaderKeyOrThrow((ShaderCategory)category);
     }
 
-    public uint GetShaderKeyOrDefault(ShaderCategory category)
+    public uint GetShaderKeyOrThrow(ShaderCategory category)
     {
         if (ShaderKeyDict.TryGetValue(category, out var value))
         {
@@ -347,7 +347,7 @@ public uint GetShaderKeyOrDefault(ShaderCategory category)
         throw new InvalidOperationException($"Shader key {category} not found");
     }
 
-    public TValue GetShaderKeyOrDefault<TValue>(ShaderCategory category) where TValue : Enum
+    public TValue GetShaderKeyOrThrow<TValue>(ShaderCategory category) where TValue : Enum
     {
         if (ShaderKeyDict.TryGetValue(category, out var value))
         {
@@ -518,7 +518,7 @@ void AddCustomizeParameters()
             extrasDict["FacePaintUVOffset"] = customizeParameters.FacePaintUVOffset;
             extrasDict["FacePaintUVMultiplier"] = customizeParameters.FacePaintUVMultiplier;
             extrasDict["MuscleTone"] = customizeParameters.MuscleTone;
-            extrasDict["OptionColor"] = customizeParameters.OptionColor;
+            extrasDict["OptionColor"] = customizeParameters.OptionColor.AsFloatArray();
             extrasDict["CustomizeParameters"] = JsonNode.Parse(JsonSerializer.Serialize(customizeParameters, JsonOptions))!;
         }
 

diff --git a/Meddle/Meddle.Plugin/Models/Composer/Materials/CharacterMaterialBuilder.cs b/Meddle/Meddle.Plugin/Models/Composer/Materials/CharacterMaterialBuilder.cs
@@ -27,7 +27,7 @@ public CharacterMaterialBuilder(string name, MaterialSet set, DataProvider dataP
 
     private void ApplyComputed()
     {
-        var textureMode = set.GetShaderKeyOrDefault<Meddle.Utils.Constants.TextureMode>(ShaderCategory.GetValuesTextureType);
+        var textureMode = set.GetShaderKeyOrThrow<Meddle.Utils.Constants.TextureMode>(ShaderCategory.GetValuesTextureType);
 
         if (!set.TryGetTextureStrict(dataProvider, TextureUsage.g_SamplerNormal, out var normalRes))
             throw new InvalidOperationException("Missing normal texture");
@@ -108,7 +108,6 @@ public override MeddleMaterialBuilder Apply()
 
         WithDoubleSide(set.RenderBackfaces);
 
-
         Extras = set.ComposeExtrasNode();
         return this;
     }

diff --git a/Meddle/Meddle.Plugin/Models/Composer/Materials/CharacterTattooMaterialBuilder.cs b/Meddle/Meddle.Plugin/Models/Composer/Materials/CharacterTattooMaterialBuilder.cs
@@ -14,6 +14,7 @@ public class CharacterTattooMaterialBuilder : MeddleMaterialBuilder
     private readonly MaterialSet set;
     private readonly DataProvider dataProvider;
     private readonly CustomizeParameter customizeParameter;
+    private readonly TextureMode textureMode;
 
     public CharacterTattooMaterialBuilder(
         string name, MaterialSet set, DataProvider dataProvider, CustomizeParameter customizeParameter,
@@ -22,9 +23,10 @@ public CharacterTattooMaterialBuilder(
         this.set = set;
         this.dataProvider = dataProvider;
         this.customizeParameter = customizeParameter;
+        this.textureMode = textureMode;
     }
 
-    public override MeddleMaterialBuilder Apply()
+    private void ApplyComputed()
     {
         var influenceColor = customizeParameter.OptionColor;
         if (!set.TryGetTextureStrict(dataProvider, TextureUsage.g_SamplerNormal, out var normalRes))
@@ -51,14 +53,25 @@ public override MeddleMaterialBuilder Apply()
 
         WithBaseColor(dataProvider.CacheTexture(diffuseTexture, $"Computed/{set.ComputedTextureName("diffuse")}"));
         WithNormal(dataProvider.CacheTexture(normalTexture, $"Computed/{set.ComputedTextureName("normal")}"));
+    }
+
+    public override MeddleMaterialBuilder Apply()
+    {
+        if (textureMode == TextureMode.Bake)
+        {
+            ApplyComputed();
+        }
+        else
+        {
+            ApplyRaw(set, dataProvider);
+        }
 
         WithDoubleSide(set.RenderBackfaces);
-
+        WithAlpha(AlphaMode.BLEND, set.GetConstantOrThrow<float>(MaterialConstant.g_AlphaThreshold));
         IndexOfRefraction = set.GetConstantOrThrow<float>(MaterialConstant.g_GlassIOR);
-        var alphaThreshold = set.GetConstantOrThrow<float>(MaterialConstant.g_AlphaThreshold);
-        WithAlpha(AlphaMode.BLEND, alphaThreshold);
-
+        WithDoubleSide(set.RenderBackfaces);
         Extras = set.ComposeExtrasNode();
+
         return this;
     }
 }
diff --git a/Meddle/Meddle.Plugin/Models/Composer/Materials/HairMaterialBuilder.cs b/Meddle/Meddle.Plugin/Models/Composer/Materials/HairMaterialBuilder.cs
@@ -28,7 +28,7 @@ public HairMaterialBuilder(
 
     private void ApplyComputed()
     {
-        var hairType = set.GetShaderKeyOrDefault<HairType>(ShaderCategory.CategoryHairType);
+        var hairType = set.GetShaderKeyOrThrow<HairType>(ShaderCategory.CategoryHairType);
 
         if (!set.TryGetTextureStrict(dataProvider, TextureUsage.g_SamplerNormal, out var normalRes))
             throw new InvalidOperationException("Missing normal texture");

diff --git a/Meddle/Meddle.Plugin/Models/Composer/Materials/SkinMaterialBuilder.cs b/Meddle/Meddle.Plugin/Models/Composer/Materials/SkinMaterialBuilder.cs
@@ -30,7 +30,7 @@ public SkinMaterialBuilder(
 
     private void ApplyComputed()
     {
-         var skinType = set.GetShaderKeyOrDefault<SkinType>(ShaderCategory.CategorySkinType);
+         var skinType = set.GetShaderKeyOrThrow<SkinType>(ShaderCategory.CategorySkinType);
 
         // var normalTexture = set.GetTexture(dataProvider, TextureUsage.g_SamplerNormal).ToResource().ToTexture();
         // var maskTexture = set.GetTexture(dataProvider, TextureUsage.g_SamplerMask).ToResource().ToTexture(normalTexture.Size);
@@ -136,7 +136,6 @@ public override MeddleMaterialBuilder Apply()
        IndexOfRefraction = set.GetConstantOrDefault(MaterialConstant.g_GlassIOR, 1.0f);
        var alphaThreshold = set.GetConstantOrDefault(MaterialConstant.g_AlphaThreshold, 0.0f);
        WithAlpha(AlphaMode.MASK, alphaThreshold);
-       WithMetallicRoughnessShader();
        WithDoubleSide(set.RenderBackfaces);
        Extras = set.ComposeExtrasNode();