big clean up in progress 1

This commit is contained in:
2025-11-27 00:29:56 +09:00
parent 1cdc0a90f9
commit 8cc83bce79
36 changed files with 389 additions and 522 deletions

View File

@@ -1,10 +1,5 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using Dalamud.Plugin.Services;
using Microsoft.Extensions.Logging;
using Penumbra.Api.Enums;
using Penumbra.GameData.Files;
namespace LightlessSync.Services.TextureCompression;
@@ -37,9 +32,9 @@ public sealed class TextureMetadataHelper
private static readonly (TextureUsageCategory Category, string Token)[] CategoryTokens =
{
(TextureUsageCategory.Ui, "/ui/"),
(TextureUsageCategory.Ui, "/uld/"),
(TextureUsageCategory.Ui, "/icon/"),
(TextureUsageCategory.UI, "/ui/"),
(TextureUsageCategory.UI, "/uld/"),
(TextureUsageCategory.UI, "/icon/"),
(TextureUsageCategory.VisualEffect, "/vfx/"),
@@ -104,9 +99,6 @@ public sealed class TextureMetadataHelper
(TextureMapKind.Specular, "_s"),
(TextureMapKind.Specular, "_spec"),
(TextureMapKind.Emissive, "_em"),
(TextureMapKind.Emissive, "_glow"),
(TextureMapKind.Index, "_id"),
(TextureMapKind.Index, "_idx"),
(TextureMapKind.Index, "_index"),
@@ -133,10 +125,10 @@ public sealed class TextureMetadataHelper
_dataManager = dataManager;
}
public bool TryGetRecommendationInfo(TextureCompressionTarget target, out (string Title, string Description) info)
public static bool TryGetRecommendationInfo(TextureCompressionTarget target, out (string Title, string Description) info)
=> RecommendationCatalog.TryGetValue(target, out info);
public TextureUsageCategory DetermineCategory(string? gamePath)
public static TextureUsageCategory DetermineCategory(string? gamePath)
{
var normalized = Normalize(gamePath);
if (string.IsNullOrEmpty(normalized))
@@ -193,7 +185,7 @@ public sealed class TextureMetadataHelper
return TextureUsageCategory.Unknown;
}
public string DetermineSlot(TextureUsageCategory category, string? gamePath)
public static string DetermineSlot(TextureUsageCategory category, string? gamePath)
{
if (category == TextureUsageCategory.Customization)
return GuessCustomizationSlot(gamePath);
@@ -218,7 +210,7 @@ public sealed class TextureMetadataHelper
TextureUsageCategory.Companion => "Companion",
TextureUsageCategory.VisualEffect => "VFX",
TextureUsageCategory.Housing => "Housing",
TextureUsageCategory.Ui => "UI",
TextureUsageCategory.UI => "UI",
_ => "General"
};
}
@@ -260,7 +252,7 @@ public sealed class TextureMetadataHelper
return false;
}
private void AddGameMaterialCandidates(string? gamePath, IList<MaterialCandidate> candidates)
private static void AddGameMaterialCandidates(string? gamePath, IList<MaterialCandidate> candidates)
{
var normalized = Normalize(gamePath);
if (string.IsNullOrEmpty(normalized))
@@ -286,7 +278,7 @@ public sealed class TextureMetadataHelper
}
}
private void AddLocalMaterialCandidates(string? localTexturePath, IList<MaterialCandidate> candidates)
private static void AddLocalMaterialCandidates(string? localTexturePath, IList<MaterialCandidate> candidates)
{
if (string.IsNullOrEmpty(localTexturePath))
return;
@@ -397,7 +389,7 @@ public sealed class TextureMetadataHelper
return TextureMapKind.Unknown;
}
public bool TryMapFormatToTarget(string? format, out TextureCompressionTarget target)
public static bool TryMapFormatToTarget(string? format, out TextureCompressionTarget target)
{
var normalized = (format ?? string.Empty).ToUpperInvariant();
if (normalized.Contains("BC1", StringComparison.Ordinal))
@@ -434,7 +426,7 @@ public sealed class TextureMetadataHelper
return false;
}
public (TextureCompressionTarget Target, string Reason)? GetSuggestedTarget(string? format, TextureMapKind mapKind)
public static (TextureCompressionTarget Target, string Reason)? GetSuggestedTarget(string? format, TextureMapKind mapKind)
{
TextureCompressionTarget? current = null;
if (TryMapFormatToTarget(format, out var mapped))
@@ -446,7 +438,6 @@ public sealed class TextureMetadataHelper
TextureMapKind.Mask => TextureCompressionTarget.BC4,
TextureMapKind.Index => TextureCompressionTarget.BC3,
TextureMapKind.Specular => TextureCompressionTarget.BC4,
TextureMapKind.Emissive => TextureCompressionTarget.BC3,
TextureMapKind.Diffuse => TextureCompressionTarget.BC7,
_ => TextureCompressionTarget.BC7
};