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

More restructuring.

Browse source
This commit is contained in:
Ottermandias 2023-02-24 18:45:04 +01:00
parent c4a4aec221
commit 397362caa5
7 changed files with 912 additions and 860 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Penumbra.GameData/Files/MtrlFile.cs
View file

@ -23,8 +23,6 @@ public partial class MtrlFile : IWritable
public ShaderPackageData ShaderPackage;
public byte[] AdditionalData;
public ShpkFile? AssociatedShpk;
public bool ApplyDyeTemplate(StmFile stm, int colorSetIdx, int rowIdx, StainId stainId)
{
if (colorSetIdx < 0 || colorSetIdx >= ColorDyeSets.Length || rowIdx is < 0 or >= ColorSet.RowArray.NumRows)
@ -79,7 +77,7 @@ public partial class MtrlFile : IWritable
}
public List<(Sampler?, ShpkFile.Resource?)> GetSamplersByTexture()
public List<(Sampler?, ShpkFile.Resource?)> GetSamplersByTexture(ShpkFile? shpk)
{
var samplers = new List<(Sampler?, ShpkFile.Resource?)>();
for (var i = 0; i < Textures.Length; ++i)
@ -88,7 +86,7 @@ public partial class MtrlFile : IWritable
}
foreach (var sampler in ShaderPackage.Samplers)
{
samplers[sampler.TextureIndex] = (sampler, AssociatedShpk?.GetSamplerById(sampler.SamplerId));
samplers[sampler.TextureIndex] = (sampler, shpk?.GetSamplerById(sampler.SamplerId));
}
return samplers;