Texture fixes

- remove bitmapdata and map locking - fix charactermodel blend usage on certain textures
PassiveModding · Dec 17, 2023 · 316d4ad · 316d4ad
1 parent 7df9150
commit 316d4ad
Show file tree

Hide file tree

Showing 2 changed files with 172 additions and 277 deletions.
diff --git a/Meddle/Meddle.Xande/ModelConverter.cs b/Meddle/Meddle.Xande/ModelConverter.cs
@@ -797,26 +797,25 @@ private Task HandleMeshCreation(MaterialBuilder glTfMaterial,
                 {
                     // not sure if backface culling should be done here, depends on model ugh
                     backfaceCulling = false;
-                    TextureUtility.ParseCharacterTextures(xivTextureMap, xivMaterial, _log.PluginLog,
-                        copyNormalAlphaToDiffuse);
+                    TextureUtility.ParseCharacterTextures(xivTextureMap, xivMaterial, _log.PluginLog);
                     break;
                 }
                 case "skin.shpk":
                 {
                     alphaMode = AlphaMode.MASK;
-                    TextureUtility.ParseSkinTextures(xivTextureMap, xivMaterial, _log.PluginLog);
+                    TextureUtility.ParseSkinTextures(xivTextureMap, xivMaterial);
                     break;
                 }
                 case "hair.shpk":
                 {
                     alphaMode = AlphaMode.MASK;
                     backfaceCulling = false;
-                    TextureUtility.ParseHairTextures(xivTextureMap, xivMaterial, _log.PluginLog);
+                    TextureUtility.ParseHairTextures(xivTextureMap, xivMaterial);
                     break;
                 }
                 case "iris.shpk":
                 {
-                    TextureUtility.ParseIrisTextures(xivTextureMap!, xivMaterial, _log.PluginLog);
+                    TextureUtility.ParseIrisTextures(xivTextureMap!, xivMaterial);
                     break;
                 }
                 default: