Fix problem with mare colors not resetting, reduce redraws again, use…

… material texture instead of GPU.

Glamourer/Api/GlamourerIpc.Apply.cs

@@ -163,7 +163,7 @@ private void ApplyDesign(DesignBase? design, IEnumerable<ActorIdentifier> actors
             if ((hasModelId || state.ModelData.ModelId == 0) && state.CanUnlock(lockCode))
             {
                 _stateManager.ApplyDesign(state, design,
-                    new ApplySettings(Source: once ? StateSource.IpcManual : StateSource.IpcFixed, Key: lockCode, MergeLinks: true));
+                    new ApplySettings(Source: once ? StateSource.IpcManual : StateSource.IpcFixed, Key: lockCode, MergeLinks: true, ResetMaterials: !once && lockCode != 0));
                 state.Lock(lockCode);
             }
         }

Glamourer/Automation/AutoDesignApplier.cs

@@ -254,7 +254,7 @@ public bool Reduce(Actor actor, ActorIdentifier identifier, [NotNullWhen(true)]
 
     private unsafe void Reduce(Actor actor, ActorState state, AutoDesignSet set, bool respectManual, bool fromJobChange)
     {
-        if (set.BaseState == AutoDesignSet.Base.Game)
+        if (set.BaseState is AutoDesignSet.Base.Game)
             _state.ResetStateFixed(state, respectManual);
         else if (!respectManual)
             state.Sources.RemoveFixedDesignSources();
@@ -265,7 +265,7 @@ private unsafe void Reduce(Actor actor, ActorState state, AutoDesignSet set, boo
         var mergedDesign = _designMerger.Merge(
             set.Designs.Where(d => d.IsActive(actor)).SelectMany(d => d.Design?.AllLinks.Select(l => (l.Design, l.Flags & d.Type)) ?? [(d.Design, d.Type)]),
             state.ModelData.Customize, state.BaseData, true, _config.AlwaysApplyAssociatedMods);
-        _state.ApplyDesign(state, mergedDesign, new ApplySettings(0, StateSource.Fixed, respectManual, fromJobChange, false));
+        _state.ApplyDesign(state, mergedDesign, new ApplySettings(0, StateSource.Fixed, respectManual, fromJobChange, false, false, set.BaseState is AutoDesignSet.Base.Game));
     }
 
     /// <summary> Get world-specific first and all-world afterward. </summary>

Glamourer/Designs/IDesignEditor.cs

@@ -12,7 +12,8 @@ public readonly record struct ApplySettings(
     bool RespectManual = false,
     bool FromJobChange = false,
     bool UseSingleSource = false,
-    bool MergeLinks = false)
+    bool MergeLinks = false,
+    bool ResetMaterials = false)
 {
     public static readonly ApplySettings Manual = new()
     {
@@ -22,6 +23,7 @@ public readonly record struct ApplySettings(
         RespectManual   = false,
         UseSingleSource = false,
         MergeLinks      = false,
+        ResetMaterials  = false,
     };
 
     public static readonly ApplySettings ManualWithLinks = new()
@@ -32,6 +34,7 @@ public readonly record struct ApplySettings(
         RespectManual   = false,
         UseSingleSource = false,
         MergeLinks      = true,
+        ResetMaterials  = false,
     };
 
     public static readonly ApplySettings Game = new()
@@ -42,6 +45,7 @@ public readonly record struct ApplySettings(
         RespectManual   = false,
         UseSingleSource = false,
         MergeLinks      = false,
+        ResetMaterials  = true,
     };
 }
 

Glamourer/Interop/Material/DirectXService.cs

@@ -15,7 +15,6 @@ namespace Glamourer.Interop.Material;
 public unsafe class DirectXService(IFramework framework) : IService
 {
     private readonly object _lock = new();
-
     private readonly ConcurrentDictionary<nint, (DateTime Update, ColorTable Table)> _textures = [];
 
     /// <summary> Generate a color table the way the game does inside the original texture, and release the original. </summary>

Glamourer/Interop/Material/LiveColorTablePreviewer.cs

@@ -110,11 +110,11 @@ public void OnHover(MaterialValueIndex index, ObjectIndex objectIndex, MtrlFile.
 
     private static Vector3 CalculateDiffuse()
     {
-        const int frameLength = 1;
-        const int steps       = 64;
-        var       frame       = ImGui.GetFrameCount();
-        var       hueByte     = frame % (steps * frameLength) / frameLength;
-        var       hue         = (float)hueByte / steps;
+        const long frameLength = TimeSpan.TicksPerMillisecond * 5;
+        const long steps       = 2000;
+        var        frame       = DateTimeOffset.UtcNow.UtcTicks;
+        var        hueByte     = frame % (steps * frameLength) / frameLength;
+        var        hue         = (float)hueByte / steps;
         ImGui.ColorConvertHSVtoRGB(hue, 1, 1, out var r, out var g, out var b);
         return new Vector3(r, g, b);
     }

Glamourer/State/StateApplier.cs

@@ -301,11 +301,11 @@ public unsafe void ChangeMaterialValue(ActorData data, MaterialValueIndex index,
         }
     }
 
-    public ActorData ChangeMaterialValues(ActorState state, bool apply)
+    public ActorData ChangeMaterialValue(ActorState state, MaterialValueIndex index, bool apply)
     {
         var data = GetData(state);
         if (apply)
-            ChangeMaterialValues(data, state.Materials, state.IsLocked);
+            ChangeMaterialValue(data, index, state.Materials.TryGetValue(index, out var v) ? v.Model : null, state.IsLocked);
         return data;
     }
 
@@ -326,7 +326,7 @@ public unsafe void ChangeMaterialValues(ActorData data, in StateMaterialManager
                 if (!mainKey.TryGetTexture(actor, out var texture))
                     continue;
 
-                if (!_directX.TryGetColorTable(*texture, out var table))
+                if (!PrepareColorSet.TryGetColorTable(actor, mainKey, out var table))
                     continue;
 
                 foreach (var (key, value) in values)
@@ -337,14 +337,6 @@ public unsafe void ChangeMaterialValues(ActorData data, in StateMaterialManager
         }
     }
 
-    public ActorData ChangeMaterialValue(ActorState state, MaterialValueIndex index, bool apply)
-    {
-        var data = GetData(state);
-        if (apply)
-            ChangeMaterialValue(data, index, state.Materials.TryGetValue(index, out var v) ? v.Model : null, state.IsLocked);
-        return data;
-    }
-
     /// <summary> Apply the entire state of an actor to all relevant actors, either via immediate redraw or piecewise. </summary>
     /// <param name="state"> The state to apply. </param>
     /// <param name="redraw"> Whether a redraw should be forced. </param>
@@ -377,7 +369,6 @@ public ActorData ApplyAll(ActorState state, bool redraw, bool withLock)
                 ChangeMetaState(actors, MetaIndex.VisorState,  state.ModelData.IsVisorToggled());
                 ChangeCrests(actors, state.ModelData.CrestVisibility);
                 ChangeParameters(actors, state.OnlyChangedParameters(), state.ModelData.Parameters, state.IsLocked);
-                // This should never be applied when caused through IPC, then redraw should be true.
                 ChangeMaterialValues(actors, state.Materials, state.IsLocked);
             }
         }

Glamourer/State/StateEditor.cs

@@ -296,6 +296,9 @@ public void ApplyDesign(object data, MergedDesign mergedDesign, ApplySettings se
                     Editor.ChangeMetaState(state, meta, mergedDesign.Design.DesignData.GetMeta(meta), Source(meta), out _, settings.Key);
             }
 
+            if (settings.ResetMaterials)
+                state.Materials.Clear();
+
             foreach (var (key, value) in mergedDesign.Design.Materials)
             {
                 if (!value.Enabled)
@@ -321,8 +324,6 @@ public void ApplyDesign(object data, MergedDesign mergedDesign, ApplySettings se
                         settings.Source, out _, settings.Key);
                 }
             }
-
-            requiresRedraw |= mergedDesign.Design.Materials.Count > 0 && settings.Source.IsIpc();
         }
 
         var actors = settings.Source.RequiresChange()

Glamourer/State/StateManager.cs

@@ -224,7 +224,6 @@ public void ResetState(ActorState state, StateSource source, uint key = 0)
          || !state.ModelData.IsHuman
          || CustomizeArray.Compare(state.ModelData.Customize, state.BaseData.Customize).RequiresRedraw();
 
-        redraw          |= state.Materials.Values.Count > 0 && source.IsIpc();
         state.ModelData =  state.BaseData;
         state.ModelData.SetIsWet(false);
         foreach (var index in Enum.GetValues<CustomizeIndex>())
@@ -346,7 +345,7 @@ public void ReapplyState(Actor actor, StateSource source)
     public void ReapplyState(Actor actor, ActorState state, StateSource source)
     {
         var data = Applier.ApplyAll(state,
-            !actor.Model.IsHuman || CustomizeArray.Compare(actor.Model.GetCustomize(), state.ModelData.Customize).RequiresRedraw() || state.Materials.Values.Count > 0 && source.IsIpc(), false);
+            !actor.Model.IsHuman || CustomizeArray.Compare(actor.Model.GetCustomize(), state.ModelData.Customize).RequiresRedraw(), false);
         StateChanged.Invoke(StateChanged.Type.Reapply, source, state, data, null);
     }