Merge pull request #197 from Azukimochi/feature/poiyomi-unlock-materials

Feature/poiyomi unlock materials
Azukimochi · Jul 18, 2024 · 96eaadc · 96eaadc
2 parents 305c3f5 + 28c3108
commit 96eaadc
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 2 deletions.
diff --git a/Editor/ShaderInfo/ShaderInfo.Poiyomi.cs b/Editor/ShaderInfo/ShaderInfo.Poiyomi.cs
@@ -48,12 +48,26 @@ private static class DefaultParameters
 
             private const string Animated_Suffix = "Animated";
             private const string Flag_IsAnimated = "1";
+            private static readonly Material[] singleMaterialArray = new Material[1];
 
             public override bool TryNormalizeMaterial(Material material, LightLimitChangerObjectCache cache)
             {
                 var textureBaker = TextureBaker.GetInstance<PoiyomiTextureBaker>(cache);
                 bool result = false;
 
+#if POIYOMI
+
+                // ロックされてるかどうか確認
+                if (Thry.ShaderOptimizer.IsMaterialLocked(material))
+                {
+                    // されてるなら解除してしまう（どのみちアップロード時には自動でロックされるはずなので）
+                    singleMaterialArray[0] = material;
+                    if (!Thry.ShaderOptimizer.SetLockedForAllMaterials(singleMaterialArray, 0))
+                        return false;
+                }
+
+#endif
+
                 {
                     bool bakeFlag = false;
                     var tex = material.GetOrDefault<Texture>(PropertyIDs.MainTex);

diff --git a/Editor/io.github.azukimochi.light-limit-changer.editor.asmdef b/Editor/io.github.azukimochi.light-limit-changer.editor.asmdef
@@ -1,12 +1,14 @@
 {
     "name": "io.github.azukimochi.light-limit-changer.editor",
+    "rootNamespace": "",
     "references": [
         "nadena.dev.modular-avatar.core",
         "io.github.azukimochi.light-limit-changer",
         "nadena.dev.modular-avatar.core.editor",
         "nadena.dev.ndmf",
         "nadena.dev.ndmf.runtime",
-        "nadena.dev.ndmf.vrchat"
+        "nadena.dev.ndmf.vrchat",
+        "ThryAssemblyDefinition"
     ],
     "includePlatforms": [
         "Editor"
@@ -25,6 +27,12 @@
     ],
     "autoReferenced": false,
     "defineConstraints": [],
-    "versionDefines": [],
+    "versionDefines": [
+        {
+            "name": "com.poiyomi.toon",
+            "expression": "",
+            "define": "POIYOMI"
+        }
+    ],
     "noEngineReferences": false
 }