anna/OrangeGuidanceTomestone
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor: remove texture caching

Browse Source
This commit is contained in:
Anna 2024-07-01 11:10:41 -04:00
parent 52ac341c93
commit cd549e76fb
Signed by: anna
GPG Key ID: D0943384CD9F87D1
2 changed files with 15 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/Plugin.cs
View File

@ -1,4 +1,4 @@
using Dalamud.IoC; using Dalamud.IoC;
using Dalamud.Plugin; using Dalamud.Plugin;
using Dalamud.Plugin.Services; using Dalamud.Plugin.Services;
using OrangeGuidanceTomestone.MiniPenumbra; using OrangeGuidanceTomestone.MiniPenumbra;

35
client/Ui/MainWindowTabs/Write.cs
View File

@ -1,7 +1,7 @@
using System.Numerics; using System.Numerics;
using System.Text; using System.Text;
using Dalamud.Game.ClientState.Conditions; using Dalamud.Game.ClientState.Conditions;
using Dalamud.Interface.Textures.TextureWraps; using Dalamud.Interface.Textures;
using ImGuiNET; using ImGuiNET;
using Newtonsoft.Json; using Newtonsoft.Json;
using OrangeGuidanceTomestone.Helpers; using OrangeGuidanceTomestone.Helpers;
@ -55,32 +55,21 @@ internal class Write : ITab {
return template.Words.Get(word.Item2); return template.Words.Get(word.Item2);
} }
private List<IDalamudTextureWrap> GlyphImages { get; } = [];
private void LoadSignImages() {
Task.Run(async () => {
for (var i = 0; i < Messages.VfxPaths.Length; i++) {
var stream = Resourcer.Resource.AsStreamUnChecked($"OrangeGuidanceTomestone.img.sign_{i}.jpg");
using var mem = new MemoryStream();
await stream.CopyToAsync(mem);
var wrap = await this.Plugin.TextureProvider.CreateFromImageAsync(mem.ToArray());
this.GlyphImages.Add(wrap);
}
});
}
internal Write(Plugin plugin) { internal Write(Plugin plugin) {
this.Plugin = plugin; this.Plugin = plugin;
this.LoadSignImages();
this._glyph = this.Plugin.Config.DefaultGlyph; this._glyph = this.Plugin.Config.DefaultGlyph;
Pack.UpdatePacks(); Pack.UpdatePacks();
} }
public void Dispose() { public void Dispose() {
foreach (var wrap in this.GlyphImages) {
wrap.Dispose();
} }
private ISharedImmediateTexture GetGlyphImage(int i) {
return this.Plugin.TextureProvider.GetFromManifestResource(
typeof(Plugin).Assembly,
$"OrangeGuidanceTomestone.img.sign_{i}.jpg"
);
} }
public void Draw() { public void Draw() {
@ -214,8 +203,9 @@ internal class Write : ITab {
ImGui.TableNextRow(); ImGui.TableNextRow();
if (ImGui.TableSetColumnIndex(0)) { if (ImGui.TableSetColumnIndex(0)) {
var glyphImage = this.GlyphImages[this._glyph]; var glyphImage = this.GetGlyphImage(this._glyph);
ImGui.Image(glyphImage.ImGuiHandle, new Vector2(imageHeight)); var wrap = glyphImage.GetWrapOrEmpty();
ImGui.Image(wrap.ImGuiHandle, new Vector2(imageHeight));
} }
if (ImGui.TableSetColumnIndex(1) && this._part1 != -1) { if (ImGui.TableSetColumnIndex(1) && this._part1 != -1) {
@ -295,8 +285,9 @@ internal class Write : ITab {
ImGui.BeginTooltip(); ImGui.BeginTooltip();
using var endTooltip = new OnDispose(ImGui.EndTooltip); using var endTooltip = new OnDispose(ImGui.EndTooltip);
var image = this.GlyphImages[i]; var glyphImage = this.GetGlyphImage(this._glyph);
ImGui.Image(image.ImGuiHandle, new Vector2(imageHeight)); var wrap = glyphImage.GetWrapOrEmpty();
ImGui.Image(wrap.ImGuiHandle, new Vector2(imageHeight));
tooltipShown = true; tooltipShown = true;
} }
} }