chore: remove Optimize Material

Tliks · Feb 6, 2025 · 3453d1d · 3453d1d
1 parent 46ae0a0
commit 3453d1d
Show file tree

Hide file tree

Showing 11 changed files with 7 additions and 268 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,8 @@
 ### Deprecated
 
 ### Removed
+- Optimize Material
+    - may fix an issue where the preview renderertexture was not displayed correctly in VirtualLens2.
 
 ### Fixed
 

diff --git a/Editor/AutoConfigureTextureEditor.cs b/Editor/AutoConfigureTextureEditor.cs
@@ -10,7 +10,6 @@ public class AutoConfigureTextureEditor : Editor
         private SerializedProperty FormatMode;
         private SerializedProperty MaintainCrunch;
         private SerializedProperty OptimizeMipMap;
-        private SerializedProperty OptimizeMaterial;
         private SerializedProperty ResolutionReduction;
         private SerializedProperty IsPCOnly;
         private SerializedProperty Exclude;
@@ -21,7 +20,6 @@ private void OnEnable()
             FormatMode = serializedObject.FindProperty(nameof(AutoConfigureTexture.FormatMode));
             MaintainCrunch = serializedObject.FindProperty(nameof(AutoConfigureTexture.MaintainCrunch));
             OptimizeMipMap = serializedObject.FindProperty(nameof(AutoConfigureTexture.OptimizeMipMap));
-            OptimizeMaterial = serializedObject.FindProperty(nameof(AutoConfigureTexture.OptimizeMaterial));
             ResolutionReduction = serializedObject.FindProperty(nameof(AutoConfigureTexture.ResolutionReduction));
             IsPCOnly = serializedObject.FindProperty(nameof(AutoConfigureTexture.IsPCOnly));
             Exclude = serializedObject.FindProperty(nameof(AutoConfigureTexture.Exclude));
@@ -41,7 +39,6 @@ public override void OnInspectorGUI()
                 }
             }
             PropertyField(OptimizeMipMap);
-            PropertyField(OptimizeMaterial);
             PropertyField(ResolutionReduction);
             PropertyField(IsPCOnly);
             PropertyField(Exclude);

diff --git a/Editor/OptimizeMaterial.meta b/Editor/OptimizeMaterial.meta
diff --git a/Editor/OptimizeMaterial/General.cs b/Editor/OptimizeMaterial/General.cs
diff --git a/Editor/OptimizeMaterial/General.cs.meta b/Editor/OptimizeMaterial/General.cs.meta
diff --git a/Editor/OptimizeMaterial/OptimizeMaterial.cs b/Editor/OptimizeMaterial/OptimizeMaterial.cs
diff --git a/Editor/OptimizeMaterial/OptimizeMaterial.cs.meta b/Editor/OptimizeMaterial/OptimizeMaterial.cs.meta
diff --git a/Editor/OptimizeMaterial/lilToon.cs b/Editor/OptimizeMaterial/lilToon.cs
diff --git a/Editor/OptimizeMaterial/lilToon.cs.meta b/Editor/OptimizeMaterial/lilToon.cs.meta
diff --git a/Editor/PluginDefinition.cs b/Editor/PluginDefinition.cs
@@ -14,20 +14,6 @@ public class PluginDefinition : Plugin<PluginDefinition>
 
         protected override void Configure()
         {
-
-            InPhase(BuildPhase.Resolving).          
-            Run("Invoke Shader Optimization", ctx =>
-            {
-                var root = ctx.AvatarRootObject;
-
-                var components = root.GetComponentsInChildren<AutoConfigureTexture>();
-
-                foreach (var component in components)
-                {
-                    OptimizeMaterial.Apply(ctx, component);
-                }
-            });
-
             InPhase(BuildPhase.Generating).
             Run("Attach TextureConfigurator", ctx =>
             {

diff --git a/Runtime/AutoConfigureTexture.cs b/Runtime/AutoConfigureTexture.cs
@@ -1,4 +1,6 @@
+using System;
 using System.Collections.Generic;
+using System.Reflection;
 using UnityEngine;
 using VRC.SDKBase;
 
@@ -28,9 +30,11 @@ public class AutoConfigureTexture: MonoBehaviour, IEditorOnly
         public FormatMode FormatMode = FormatMode.Balanced;
         public bool MaintainCrunch = true;
         public bool OptimizeMipMap = true;
-        public bool OptimizeMaterial = true;
         public Reduction ResolutionReduction = Reduction.Normal;
         public bool IsPCOnly = true;
         public List<Texture2D> Exclude = new();
+
+        // 削除された機能。バージョンを下げたときの互換性用にフィールドは残すが、次のマイナーあたりで削除する。
+        [Obsolete] public bool OptimizeMaterial = false; 
     }
 }