ToxicMushroom/Penumbra
1
0
Fork 0
mirror of https://github.com/xivdev/Penumbra.git synced 2026-02-22 15:57:46 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Move a lot of things over to Luna.
Some checks failed
.NET Build / build (push) Has been cancelled
Details

Browse source
This commit is contained in:
Ottermandias 2025-10-24 22:47:14 +02:00
parent d79e687162
commit 6b475ee229
66 changed files with 666 additions and 705 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Penumbra/Import/Models/ModelManager.cs
View file

@ -1,7 +1,6 @@
using Dalamud.Plugin.Services;
using Lumina.Data.Parsing;
using Luna;
using OtterGui.Tasks;
using Penumbra.Collections.Manager;
using Penumbra.GameData;
using Penumbra.GameData.Data;

67
Penumbra/Import/TexToolsImporter.Gui.cs
View file

@ -1,7 +1,4 @@
using Dalamud.Bindings.ImGui;
using ImSharp;
using OtterGui;
using OtterGui.Raii;
using Penumbra.Import.Structs;
using Penumbra.UI.Classes;
@ -23,9 +20,9 @@ public partial class TexToolsImporter
public bool DrawProgressInfo(Vector2 size)
{
if (_modPackCount == 0)
if (_modPackCount is 0)
{
ImGuiUtil.Center("Nothing to extract.");
ImEx.TextCentered("Nothing to extract."u8);
return true;
}
@ -35,40 +32,40 @@ public partial class TexToolsImporter
return true;
}
ImGui.NewLine();
Im.Line.New();
var percentage = (float)_currentModPackIdx / _modPackCount;
ImGui.ProgressBar(percentage, size, $"Mod {_currentModPackIdx + 1} / {_modPackCount}");
ImGui.NewLine();
ImGui.TextUnformatted(State == ImporterState.DeduplicatingFiles
Im.ProgressBar(percentage, size, $"Mod {_currentModPackIdx + 1} / {_modPackCount}");
Im.Line.New();
Im.Text(State is ImporterState.DeduplicatingFiles
? $"Deduplicating {_currentModName}..."
: $"Extracting {_currentModName}...");
if (_currentNumOptions > 1)
{
ImGui.NewLine();
ImGui.NewLine();
Im.Line.New();
Im.Line.New();
if (_currentOptionIdx >= _currentNumOptions)
ImGui.ProgressBar(1f, size, $"Extracted {_currentNumOptions} Options");
Im.ProgressBar(1f, size, $"Extracted {_currentNumOptions} Options");
else
ImGui.ProgressBar(_currentOptionIdx / (float)_currentNumOptions, size,
Im.ProgressBar(_currentOptionIdx / (float)_currentNumOptions, size,
$"Extracting Option {_currentOptionIdx + 1} / {_currentNumOptions}...");
ImGui.NewLine();
if (State != ImporterState.DeduplicatingFiles)
ImGui.TextUnformatted(
Im.Line.New();
if (State is not ImporterState.DeduplicatingFiles)
Im.Text(
$"Extracting Option {(_currentGroupName.Length == 0 ? string.Empty : $"{_currentGroupName} - ")}{_currentOptionName}...");
}
ImGui.NewLine();
ImGui.NewLine();
Im.Line.New();
Im.Line.New();
if (_currentFileIdx >= _currentNumFiles)
ImGui.ProgressBar(1f, size, $"Extracted {_currentNumFiles} Files");
Im.ProgressBar(1f, size, $"Extracted {_currentNumFiles} Files");
else
ImGui.ProgressBar(_currentFileIdx / (float)_currentNumFiles, size, $"Extracting File {_currentFileIdx + 1} / {_currentNumFiles}...");
Im.ProgressBar(_currentFileIdx / (float)_currentNumFiles, size, $"Extracting File {_currentFileIdx + 1} / {_currentNumFiles}...");
ImGui.NewLine();
if (State != ImporterState.DeduplicatingFiles)
ImGui.TextUnformatted($"Extracting File {_currentFileName}...");
Im.Line.New();
if (State is not ImporterState.DeduplicatingFiles)
Im.Text($"Extracting File {_currentFileName}...");
return false;
}
@ -77,31 +74,33 @@ public partial class TexToolsImporter
{
var success = ExtractedMods.Count(t => t.Error == null);
ImGui.TextUnformatted($"Successfully extracted {success} / {ExtractedMods.Count} files.");
ImGui.NewLine();
using var table = ImRaii.Table("##files", 2);
Im.Text($"Successfully extracted {success} / {ExtractedMods.Count} files.");
Im.Line.New();
using var table = Im.Table.Begin("##files"u8, 2);
if (!table)
return;
foreach (var (file, dir, ex) in ExtractedMods)
{
ImGui.TableNextColumn();
ImGui.TextUnformatted(file.Name);
ImGui.TableNextColumn();
if (ex == null)
table.DrawColumn(file.Name);
table.NextColumn();
if (ex is null)
{
using var color = ImGuiColor.Text.Push(ColorId.FolderExpanded.Value());
ImGui.TextUnformatted(dir?.FullName[(_baseDirectory.FullName.Length + 1)..] ?? "Unknown Directory");
if (dir is null)
Im.Text("Unknown Directory"u8);
else
Im.Text(dir.FullName.AsSpan(_baseDirectory.FullName.Length + 1));
}
else
{
using var color = ImGuiColor.Text.Push(ColorId.ConflictingMod.Value());
ImGui.TextUnformatted(ex.Message);
ImGuiUtil.HoverTooltip(ex.ToString());
Im.Text(ex.Message);
Im.Tooltip.OnHover($"{ex}");
}
}
}
public bool DrawCancelButton(Vector2 size)
=> ImGuiUtil.DrawDisabledButton("Cancel", size, string.Empty, _token.IsCancellationRequested);
=> ImEx.Button("Cancel"u8, size, StringU8.Empty, _token.IsCancellationRequested);
}

1
Penumbra/Import/Textures/CombinedTexture.Manipulation.cs
View file

@ -1,5 +1,4 @@
using ImSharp;
using OtterGui.Text;
using Rgba32 = SixLabors.ImageSharp.PixelFormats.Rgba32;
namespace Penumbra.Import.Textures;

5
Penumbra/Import/Textures/TextureManager.cs
View file

@ -3,8 +3,7 @@ using Dalamud.Interface.Textures;
using Dalamud.Interface.Textures.TextureWraps;
using Dalamud.Plugin.Services;
using Lumina.Data.Files;
using OtterGui.Log;
using OtterGui.Tasks;
using Luna;
using OtterTex;
using SharpDX.Direct3D11;
using SixLabors.ImageSharp;
@ -17,7 +16,7 @@ using Image = SixLabors.ImageSharp.Image;
namespace Penumbra.Import.Textures;
public sealed class TextureManager(IDataManager gameData, Logger logger, ITextureProvider textureProvider, IUiBuilder uiBuilder)
: SingleTaskQueue, IDisposable, Luna.IService
: SingleTaskQueue, IDisposable, IService
{
private readonly Logger _logger = logger;