Read ColorTable from gpu, + color table related updates

PassiveModding · Jul 9, 2024 · 3f4ecef · 3f4ecef
1 parent 59b5256
commit 3f4ecef
Show file tree

Hide file tree

Showing 12 changed files with 486 additions and 359 deletions.
diff --git a/FFXIVClientStructs b/FFXIVClientStructs
diff --git a/Meddle/Meddle.Plugin/Meddle.Plugin.csproj b/Meddle/Meddle.Plugin/Meddle.Plugin.csproj
@@ -24,6 +24,7 @@
     <ItemGroup>
         <PackageReference Include="DalamudPackager" Version="2.1.13" />
         <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
+        <PackageReference Include="Vortice.Direct3D11" Version="3.5.0" />
         <Reference Include="Dalamud">
             <HintPath>$(DalamudLibPath)Dalamud.dll</HintPath>
             <Private>false</Private>

diff --git a/Meddle/Meddle.Plugin/Plugin.cs b/Meddle/Meddle.Plugin/Plugin.cs
@@ -34,7 +34,8 @@ public Plugin(IDalamudPluginInterface pluginInterface)
                             .AddSingleton<InteropService>()
                             .AddSingleton<ExportUtil>();
 
-            var config = pluginInterface.GetPluginConfig() as Configuration ?? new Configuration(pluginInterface);
+            Configuration.PluginInterface = pluginInterface;
+            var config = pluginInterface.GetPluginConfig() as Configuration ?? new Configuration();
             serviceCollection.AddSingleton(config);
 
             var gameDir = Environment.CurrentDirectory;
@@ -114,19 +115,13 @@ public void Dispose()
 
 public class Configuration : IPluginConfiguration
 {
-    private readonly IDalamudPluginInterface pi;
-
-    public Configuration(IDalamudPluginInterface pi)
-    {
-        this.pi = pi;
-    }
-
+    public static IDalamudPluginInterface PluginInterface = null!;
     public int Version { get; set; } = 1;
     public bool ShowAdvanced { get; set; }
     public bool OpenOnLoad { get; set; }
     public void Save()
     {
-        pi.SavePluginConfig(this);
+        PluginInterface.SavePluginConfig(this);
     }
 
 }
+6 −4		FFXIVClientStructs/FFXIV/Client/Graphics/Scene/CharacterBase.cs
+69 −34		FFXIVClientStructs/FFXIV/Client/System/Resource/Handle/MaterialResourceHandle.cs