ToxicMushroom/Penumbra
1
0
Fork 0
mirror of https://github.com/xivdev/Penumbra.git synced 2025-12-31 21:03:48 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

No EST files anymore.

Browse source
This commit is contained in:
Ottermandias 2024-06-15 16:17:44 +02:00
parent 943207cae8
commit ebef4ff650
8 changed files with 68 additions and 183 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Penumbra/Collections/Cache/EqpCache.cs
View file

@ -34,17 +34,6 @@ public sealed class EqpCache(MetaFileManager manager, ModCollection collection)
protected override void RevertModInternal(EqpIdentifier identifier)
{ }
public static bool Apply(ExpandedEqpFile file, EqpIdentifier identifier, EqpEntry entry)
{
var origEntry = file[identifier.SetId];
var mask = Eqp.Mask(identifier.Slot);
if ((origEntry & mask) == entry)
return false;
file[identifier.SetId] = (origEntry & ~mask) | entry;
return true;
}
protected override void Dispose(bool _)
=> Clear();
}

136
Penumbra/Collections/Cache/EstCache.cs
View file

@ -1,5 +1,3 @@
using Penumbra.Interop.Services;
using Penumbra.Interop.Structs;
using Penumbra.Meta;
using Penumbra.Meta.Files;
using Penumbra.Meta.Manipulations;
@ -8,144 +6,26 @@ namespace Penumbra.Collections.Cache;
public sealed class EstCache(MetaFileManager manager, ModCollection collection) : MetaCacheBase<EstIdentifier, EstEntry>(manager, collection)
{
private EstFile? _estFaceFile;
private EstFile? _estHairFile;
private EstFile? _estBodyFile;
private EstFile? _estHeadFile;
public override void SetFiles()
{
Manager.SetFile(_estFaceFile, MetaIndex.FaceEst);
Manager.SetFile(_estHairFile, MetaIndex.HairEst);
Manager.SetFile(_estBodyFile, MetaIndex.BodyEst);
Manager.SetFile(_estHeadFile, MetaIndex.HeadEst);
}
public void SetFile(MetaIndex index)
{
switch (index)
{
case MetaIndex.FaceEst:
Manager.SetFile(_estFaceFile, MetaIndex.FaceEst);
break;
case MetaIndex.HairEst:
Manager.SetFile(_estHairFile, MetaIndex.HairEst);
break;
case MetaIndex.BodyEst:
Manager.SetFile(_estBodyFile, MetaIndex.BodyEst);
break;
case MetaIndex.HeadEst:
Manager.SetFile(_estHeadFile, MetaIndex.HeadEst);
break;
}
}
public MetaList.MetaReverter TemporarilySetFiles(EstType type)
{
var (file, idx) = type switch
{
EstType.Face => (_estFaceFile, MetaIndex.FaceEst),
EstType.Hair => (_estHairFile, MetaIndex.HairEst),
EstType.Body => (_estBodyFile, MetaIndex.BodyEst),
EstType.Head => (_estHeadFile, MetaIndex.HeadEst),
_ => (null, 0),
};
return Manager.TemporarilySetFile(file, idx);
}
public void ResetFiles()
{
Manager.SetFile(null, MetaIndex.FaceEst);
Manager.SetFile(null, MetaIndex.HairEst);
Manager.SetFile(null, MetaIndex.BodyEst);
Manager.SetFile(null, MetaIndex.HeadEst);
}
{ }
protected override void IncorporateChangesInternal()
{
if (!Manager.CharacterUtility.Ready)
return;
foreach (var (identifier, (_, entry)) in this)
Apply(GetFile(identifier)!, identifier, entry);
Penumbra.Log.Verbose($"{Collection.AnonymizedName}: Loaded {Count} delayed EST manipulations.");
}
{ }
public EstEntry GetEstEntry(EstIdentifier identifier)
{
var file = GetCurrentFile(identifier);
return file != null
? file[identifier.GenderRace, identifier.SetId]
=> TryGetValue(identifier, out var entry)
? entry.Entry
: EstFile.GetDefault(Manager, identifier);
}
public void Reset()
{
_estFaceFile?.Reset();
_estHairFile?.Reset();
_estBodyFile?.Reset();
_estHeadFile?.Reset();
Clear();
}
=> Clear();
protected override void ApplyModInternal(EstIdentifier identifier, EstEntry entry)
{
if (GetFile(identifier) is { } file)
Apply(file, identifier, entry);
}
{ }
protected override void RevertModInternal(EstIdentifier identifier)
{
if (GetFile(identifier) is { } file)
Apply(file, identifier, EstFile.GetDefault(Manager, identifier.Slot, identifier.GenderRace, identifier.SetId));
}
public static bool Apply(EstFile file, EstIdentifier identifier, EstEntry entry)
=> file.SetEntry(identifier.GenderRace, identifier.SetId, entry) switch
{
EstFile.EstEntryChange.Unchanged => false,
EstFile.EstEntryChange.Changed => true,
EstFile.EstEntryChange.Added => true,
EstFile.EstEntryChange.Removed => true,
_ => false,
};
{ }
protected override void Dispose(bool _)
{
_estFaceFile?.Dispose();
_estHairFile?.Dispose();
_estBodyFile?.Dispose();
_estHeadFile?.Dispose();
_estFaceFile = null;
_estHairFile = null;
_estBodyFile = null;
_estHeadFile = null;
Clear();
}
private EstFile? GetCurrentFile(EstIdentifier identifier)
=> identifier.Slot switch
{
EstType.Hair => _estHairFile,
EstType.Face => _estFaceFile,
EstType.Body => _estBodyFile,
EstType.Head => _estHeadFile,
_ => null,
};
private EstFile? GetFile(EstIdentifier identifier)
{
if (!Manager.CharacterUtility.Ready)
return null;
return identifier.Slot switch
{
EstType.Hair => _estHairFile ??= new EstFile(Manager, EstType.Hair),
EstType.Face => _estFaceFile ??= new EstFile(Manager, EstType.Face),
EstType.Body => _estBodyFile ??= new EstFile(Manager, EstType.Body),
EstType.Head => _estHeadFile ??= new EstFile(Manager, EstType.Head),
_ => null,
};
}
=> Clear();
}

11
Penumbra/Collections/Cache/GmpCache.cs
View file

@ -1,6 +1,5 @@
using Penumbra.GameData.Structs;
using Penumbra.Meta;
using Penumbra.Meta.Files;
using Penumbra.Meta.Manipulations;
namespace Penumbra.Collections.Cache;
@ -22,16 +21,6 @@ public sealed class GmpCache(MetaFileManager manager, ModCollection collection)
protected override void RevertModInternal(GmpIdentifier identifier)
{ }
public static bool Apply(ExpandedGmpFile file, GmpIdentifier identifier, GmpEntry entry)
{
var origEntry = file[identifier.SetId];
if (entry == origEntry)
return false;
file[identifier.SetId] = entry;
return true;
}
protected override void Dispose(bool _)
=> Clear();
}

6
Penumbra/Collections/Cache/MetaCache.cs
View file

@ -121,10 +121,8 @@ public class MetaCache(MetaFileManager manager, ModCollection collection)
switch (metaIndex)
{
case MetaIndex.Eqp:
Eqp.SetFiles();
break;
case MetaIndex.Gmp:
Gmp.SetFiles();
break;
case MetaIndex.HumanCmp:
Rsp.SetFiles();
@ -133,7 +131,6 @@ public class MetaCache(MetaFileManager manager, ModCollection collection)
case MetaIndex.HairEst:
case MetaIndex.HeadEst:
case MetaIndex.BodyEst:
Est.SetFile(metaIndex);
break;
default:
Eqdp.SetFile(metaIndex);
@ -151,9 +148,6 @@ public class MetaCache(MetaFileManager manager, ModCollection collection)
public MetaList.MetaReverter TemporarilySetCmpFile()
=> Rsp.TemporarilySetFile();
public MetaList.MetaReverter TemporarilySetEstFile(EstType type)
=> Est.TemporarilySetFiles(type);
/// <summary> Try to obtain a manipulated IMC file. </summary>
public bool GetImcFile(Utf8GamePath path, [NotNullWhen(true)] out Meta.Files.ImcFile? file)
=> Imc.GetFile(path, out file);

4
Penumbra/Collections/ModCollection.Cache.Access.cs
View file

@ -103,8 +103,4 @@ public partial class ModCollection
public MetaList.MetaReverter TemporarilySetCmpFile(CharacterUtility utility)
=> _cache?.Meta.TemporarilySetCmpFile()
?? utility.TemporarilyResetResource(MetaIndex.HumanCmp);
public MetaList.MetaReverter TemporarilySetEstFile(CharacterUtility utility, EstType type)
=> _cache?.Meta.TemporarilySetEstFile(type)
?? utility.TemporarilyResetResource((MetaIndex)type);
}