ToxicMushroom/Glamourer
1
0
Fork 0
mirror of https://github.com/Ottermandias/Glamourer.git synced 2025-12-12 18:27:24 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use Legacy Color Tables because our materials do not have DT ones yet.

Browse source
This commit is contained in:
Ottermandias 2024-05-27 17:42:49 +02:00
parent 93dcd317c1
commit 1341c4316c
12 changed files with 55 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Glamourer/Interop/Material/DirectXService.cs
View file

@ -2,11 +2,11 @@
using FFXIVClientStructs.FFXIV.Client.Graphics.Kernel;
using Lumina.Data.Files;
using OtterGui.Services;
using Penumbra.GameData.Files.MaterialStructs;
using Penumbra.String.Functions;
using SharpGen.Runtime;
using Vortice.Direct3D11;
using Vortice.DXGI;
using static Penumbra.GameData.Files.MtrlFile;
using MapFlags = Vortice.Direct3D11.MapFlags;
using Texture = FFXIVClientStructs.FFXIV.Client.Graphics.Kernel.Texture;
@ -14,14 +14,14 @@ 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 = [];
private readonly object _lock = new();
private readonly ConcurrentDictionary<nint, (DateTime Update, LegacyColorTable Table)> _textures = [];
/// <summary> Generate a color table the way the game does inside the original texture, and release the original. </summary>
/// <param name="original"> The original texture that will be replaced with a new one. </param>
/// <param name="colorTable"> The input color table. </param>
/// <returns> Success or failure. </returns>
public bool ReplaceColorTable(Texture** original, in ColorTable colorTable)
public bool ReplaceColorTable(Texture** original, in LegacyColorTable colorTable)
{
if (original == null)
return false;
@ -38,7 +38,7 @@ public unsafe class DirectXService(IFramework framework) : IService
if (texture.IsInvalid)
return false;
fixed (ColorTable* ptr = &colorTable)
fixed (LegacyColorTable* ptr = &colorTable)
{
if (!texture.Texture->InitializeContents(ptr))
return false;
@ -51,7 +51,7 @@ public unsafe class DirectXService(IFramework framework) : IService
return true;
}
public bool TryGetColorTable(Texture* texture, out ColorTable table)
public bool TryGetColorTable(Texture* texture, out LegacyColorTable table)
{
if (_textures.TryGetValue((nint)texture, out var p) && framework.LastUpdateUTC == p.Update)
{
@ -73,7 +73,7 @@ public unsafe class DirectXService(IFramework framework) : IService
/// <param name="texture"> A pointer to the internal texture struct containing the GPU handle. </param>
/// <param name="table"> The returned color table. </param>
/// <returns> Whether the table could be fetched. </returns>
private static bool TextureColorTable(Texture* texture, out ColorTable table)
private static bool TextureColorTable(Texture* texture, out LegacyColorTable table)
{
if (texture == null)
{
@ -114,7 +114,7 @@ public unsafe class DirectXService(IFramework framework) : IService
}
/// <summary> Turn a mapped texture into a color table. </summary>
private static ColorTable GetTextureData(ID3D11Texture2D1 resource, MappedSubresource map)
private static LegacyColorTable GetTextureData(ID3D11Texture2D1 resource, MappedSubresource map)
{
var desc = resource.Description1;
@ -133,14 +133,14 @@ public unsafe class DirectXService(IFramework framework) : IService
/// <param name="height"> The height of the texture. (Needs to be 16).</param>
/// <param name="pitch"> The stride in the texture data. </param>
/// <returns></returns>
private static ColorTable ReadTexture(nint data, int length, int height, int pitch)
private static LegacyColorTable ReadTexture(nint data, int length, int height, int pitch)
{
// Check that the data has sufficient dimension and size.
var expectedSize = sizeof(Half) * MaterialService.TextureWidth * height * 4;
if (length < expectedSize || sizeof(ColorTable) != expectedSize || height != MaterialService.TextureHeight)
if (length < expectedSize || sizeof(LegacyColorTable) != expectedSize || height != MaterialService.TextureHeight)
return default;
var ret = new ColorTable();
var ret = new LegacyColorTable();
var target = (byte*)&ret;
// If the stride is the same as in the table, just copy.
if (pitch == MaterialService.TextureWidth)