Merge pull request #198 from Azukimochi/develop

Develop
Azukimochi · Jul 18, 2024 · bea3786 · bea3786
2 parents 617979d + cd51eef
commit bea3786
Show file tree

Hide file tree

Showing 7 changed files with 62 additions and 21 deletions.
diff --git a/Editor/ControlAnimationParameters.cs b/Editor/ControlAnimationParameters.cs
@@ -9,13 +9,17 @@ public readonly struct ControlAnimationParameters
 
         public readonly float MinLightValue;
         public readonly float MaxLightValue;
+        public readonly float DefaultMinLightValue;
+        public readonly float DefaultMaxLightValue;
 
-        public ControlAnimationParameters(string targetPath, Type targetType, float minLightValue, float maxLightValue)
+        public ControlAnimationParameters(string targetPath, Type targetType, float minLightValue, float maxLightValue, float defaultMinLightValue, float defaultMaxLightValue)
         {
             TargetPath = targetPath;
             TargetType = targetType;
             MinLightValue = minLightValue;
             MaxLightValue = maxLightValue;
+            DefaultMinLightValue = defaultMinLightValue;
+            DefaultMaxLightValue = defaultMaxLightValue;
         }
     }
 }
diff --git a/Editor/NDMF/Passes.GenerateAnimationsPass.cs b/Editor/NDMF/Passes.GenerateAnimationsPass.cs
@@ -35,19 +35,34 @@ internal static void Run(Session session, LightLimitChangerObjectCache cache)
                         if (!parameters.TargetShaders.Contains(x.Name))
                             continue;
 
-                        foreach (ref readonly var container in animationContainers)
+                        var min = parameters.MinLightValue;
+                        var max = parameters.MaxLightValue;
+
+                        float defaultMinLight, defaultMaxLight;
+                        if (parameters.OverwriteDefaultLightMinMax && 
+                            renderer.sharedMaterial is Material mat &&
+                            x.IsTargetShader(mat?.shader) && 
+                            x.TryGetLightMinMaxValue(mat, out defaultMinLight, out defaultMaxLight))
                         {
-                            if (!(!parameters.OverwriteDefaultLightMinMax &&
-                                  (renderer.sharedMaterials?.Length ?? 0) > 0 &&
-                                  renderer.sharedMaterials[0] is Material mat &&
-                                  x.IsTargetShader(mat?.shader) &&
-                                  x.TryGetLightMinMaxValue(mat, out var min, out var max)))
+                            // OK!
+                        }
+                        else
+                        {
+                            if (parameters.IsSeparateLightControl)
                             {
-                                min = parameters.MinLightValue;
-                                max = parameters.MaxLightValue;
+                                defaultMinLight = parameters.DefaultMinLightValue;
+                                defaultMaxLight = parameters.DefaultMaxLightValue;
                             }
+                            else
+                            {
+                                defaultMinLight = defaultMaxLight = parameters.DefaultLightValue;
+                            }
+                        }
 
-                            x.SetControlAnimation(container, new ControlAnimationParameters(relativePath, type, min, max));
+                        var param = new ControlAnimationParameters(relativePath, type, min, max, defaultMinLight, defaultMaxLight);
+                        foreach (ref readonly var container in animationContainers)
+                        {
+                            x.SetControlAnimation(container, param);
                         }
                     }
                 }

diff --git a/Editor/ShaderInfo/ShaderInfo.LilToon.cs b/Editor/ShaderInfo/ShaderInfo.LilToon.cs
@@ -178,13 +178,13 @@ public override void SetControlAnimation(in ControlAnimationContainer container,
             {
                 if (container.ControlType.HasFlag(LightLimitControlType.LightMin))
                 {
-                    container.Default.SetParameterAnimation(parameters, _LightMinLimit, parameters.MinLightValue);
+                    container.Default.SetParameterAnimation(parameters, _LightMinLimit, parameters.DefaultMinLightValue);
                     container.Control.SetParameterAnimation(parameters, _LightMinLimit, parameters.MinLightValue, parameters.MaxLightValue);
                 }
 
                 if (container.ControlType.HasFlag(LightLimitControlType.LightMax))
                 {
-                    container.Default.SetParameterAnimation(parameters, _LightMaxLimit, parameters.MaxLightValue);
+                    container.Default.SetParameterAnimation(parameters, _LightMaxLimit, parameters.DefaultMaxLightValue);
                     container.Control.SetParameterAnimation(parameters, _LightMaxLimit, parameters.MinLightValue, parameters.MaxLightValue);
                 }
 

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);
@@ -147,13 +161,13 @@ public override void SetControlAnimation(in ControlAnimationContainer container,
             {
                 if (container.ControlType.HasFlag(LightLimitControlType.LightMin))
                 {
-                    container.Default.SetParameterAnimation(parameters, _LightingMinLightBrightness, parameters.MinLightValue);
+                    container.Default.SetParameterAnimation(parameters, _LightingMinLightBrightness, parameters.DefaultMinLightValue);
                     container.Control.SetParameterAnimation(parameters, _LightingMinLightBrightness, parameters.MinLightValue, parameters.MaxLightValue);
                 }
 
                 if (container.ControlType.HasFlag(LightLimitControlType.LightMax))
                 {
-                    container.Default.SetParameterAnimation(parameters, _LightingCap, parameters.MaxLightValue);
+                    container.Default.SetParameterAnimation(parameters, _LightingCap, parameters.DefaultMaxLightValue);
                     container.Control.SetParameterAnimation(parameters, _LightingCap, parameters.MinLightValue, parameters.MaxLightValue);
                 }
 

diff --git a/Editor/ShaderInfo/ShaderInfo.Sunao.cs b/Editor/ShaderInfo/ShaderInfo.Sunao.cs
@@ -82,16 +82,16 @@ public override void SetControlAnimation(in ControlAnimationContainer container,
             {
                 if (container.ControlType.HasFlag(LightLimitControlType.LightMin))
                 {
-                    container.Default.SetParameterAnimation(parameters, _MinimumLight, parameters.MinLightValue);
+                    container.Default.SetParameterAnimation(parameters, _MinimumLight, parameters.DefaultMinLightValue);
 
                     container.Control.SetParameterAnimation(parameters, _MinimumLight, parameters.MinLightValue, parameters.MaxLightValue);
                 }
 
                 if (container.ControlType.HasFlag(LightLimitControlType.LightMax))
                 {
-                    container.Default.SetParameterAnimation(parameters, _DirectionalLight, parameters.MaxLightValue);
-                    container.Default.SetParameterAnimation(parameters, _PointLight, parameters.MaxLightValue);
-                    container.Default.SetParameterAnimation(parameters, _SHLight, parameters.MaxLightValue);
+                    container.Default.SetParameterAnimation(parameters, _DirectionalLight, parameters.DefaultMaxLightValue);
+                    container.Default.SetParameterAnimation(parameters, _PointLight, parameters.DefaultMaxLightValue);
+                    container.Default.SetParameterAnimation(parameters, _SHLight, parameters.DefaultMaxLightValue);
 
                     var curve = Utils.Animation.Linear(parameters.MinLightValue, parameters.MaxLightValue);
                     container.Control.SetParameterAnimation(parameters, _DirectionalLight, curve);

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
 }
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "io.github.azukimochi.light-limit-changer",
-  "version": "1.13.0",
+  "version": "1.13.1-rc.0",
   "unity": "2019.4",
   "displayName": "LightLimitChanger",
   "description": "Light Limit ChangerはModular-Avatar前提のVRChatアバター向けの明るさ変更ジェネレーターです。―――――――――――――――――― Light Limit Changer is a brightness change generator for VRChat avatars based on Modular-Avatar. ―――――――――――――――――― by Azukimochi25",