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

Slight cleanup.

Browse source
This commit is contained in:
Ottermandias 2025-02-20 18:36:46 +01:00
parent f8d0616acd
commit d40c59eee9
1 changed files with 16 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

56
Penumbra/Import/Models/Export/VertexFragment.cs
View file

@ -1,4 +1,3 @@
using System;
using SharpGLTF.Geometry.VertexTypes;
using SharpGLTF.Memory;
using SharpGLTF.Schema2;
@ -11,7 +10,7 @@ Realistically, it will need to stick around until transforms/mutations are built
and there's reason to overhaul the export pipeline.
*/
public struct VertexColorFfxiv : IVertexCustom
public struct VertexColorFfxiv(Vector4 ffxivColor) : IVertexCustom
{
public IEnumerable<KeyValuePair<string, AttributeFormat>> GetEncodingAttributes()
{
@ -20,7 +19,7 @@ public struct VertexColorFfxiv : IVertexCustom
new AttributeFormat(DimensionType.VEC4, EncodingType.UNSIGNED_SHORT, true));
}
public Vector4 FfxivColor;
public Vector4 FfxivColor = ffxivColor;
public int MaxColors
=> 0;
@ -33,9 +32,6 @@ public struct VertexColorFfxiv : IVertexCustom
public IEnumerable<string> CustomAttributes
=> CustomNames;
public VertexColorFfxiv(Vector4 ffxivColor)
=> FfxivColor = ffxivColor;
public void Add(in VertexMaterialDelta delta)
{ }
@ -88,7 +84,7 @@ public struct VertexColorFfxiv : IVertexCustom
}
}
public struct VertexTexture1ColorFfxiv : IVertexCustom
public struct VertexTexture1ColorFfxiv(Vector2 texCoord0, Vector4 ffxivColor) : IVertexCustom
{
public IEnumerable<KeyValuePair<string, AttributeFormat>> GetEncodingAttributes()
{
@ -98,9 +94,9 @@ public struct VertexTexture1ColorFfxiv : IVertexCustom
new AttributeFormat(DimensionType.VEC4, EncodingType.UNSIGNED_SHORT, true));
}
public Vector2 TexCoord0;
public Vector2 TexCoord0 = texCoord0;
public Vector4 FfxivColor;
public Vector4 FfxivColor = ffxivColor;
public int MaxColors
=> 0;
@ -113,12 +109,6 @@ public struct VertexTexture1ColorFfxiv : IVertexCustom
public IEnumerable<string> CustomAttributes
=> CustomNames;
public VertexTexture1ColorFfxiv(Vector2 texCoord0, Vector4 ffxivColor)
{
TexCoord0 = texCoord0;
FfxivColor = ffxivColor;
}
public void Add(in VertexMaterialDelta delta)
{
TexCoord0 += delta.TexCoord0Delta;
@ -182,7 +172,7 @@ public struct VertexTexture1ColorFfxiv : IVertexCustom
}
}
public struct VertexTexture2ColorFfxiv : IVertexCustom
public struct VertexTexture2ColorFfxiv(Vector2 texCoord0, Vector2 texCoord1, Vector4 ffxivColor) : IVertexCustom
{
public IEnumerable<KeyValuePair<string, AttributeFormat>> GetEncodingAttributes()
{
@ -194,9 +184,9 @@ public struct VertexTexture2ColorFfxiv : IVertexCustom
new AttributeFormat(DimensionType.VEC4, EncodingType.UNSIGNED_SHORT, true));
}
public Vector2 TexCoord0;
public Vector2 TexCoord1;
public Vector4 FfxivColor;
public Vector2 TexCoord0 = texCoord0;
public Vector2 TexCoord1 = texCoord1;
public Vector4 FfxivColor = ffxivColor;
public int MaxColors
=> 0;
@ -209,13 +199,6 @@ public struct VertexTexture2ColorFfxiv : IVertexCustom
public IEnumerable<string> CustomAttributes
=> CustomNames;
public VertexTexture2ColorFfxiv(Vector2 texCoord0, Vector2 texCoord1, Vector4 ffxivColor)
{
TexCoord0 = texCoord0;
TexCoord1 = texCoord1;
FfxivColor = ffxivColor;
}
public void Add(in VertexMaterialDelta delta)
{
TexCoord0 += delta.TexCoord0Delta;
@ -283,7 +266,8 @@ public struct VertexTexture2ColorFfxiv : IVertexCustom
}
}
public struct VertexTexture3ColorFfxiv : IVertexCustom
public struct VertexTexture3ColorFfxiv(Vector2 texCoord0, Vector2 texCoord1, Vector2 texCoord2, Vector4 ffxivColor)
: IVertexCustom
{
public IEnumerable<KeyValuePair<string, AttributeFormat>> GetEncodingAttributes()
{
@ -297,10 +281,10 @@ public struct VertexTexture3ColorFfxiv : IVertexCustom
new AttributeFormat(DimensionType.VEC4, EncodingType.UNSIGNED_SHORT, true));
}
public Vector2 TexCoord0;
public Vector2 TexCoord1;
public Vector2 TexCoord2;
public Vector4 FfxivColor;
public Vector2 TexCoord0 = texCoord0;
public Vector2 TexCoord1 = texCoord1;
public Vector2 TexCoord2 = texCoord2;
public Vector4 FfxivColor = ffxivColor;
public int MaxColors
=> 0;
@ -313,14 +297,6 @@ public struct VertexTexture3ColorFfxiv : IVertexCustom
public IEnumerable<string> CustomAttributes
=> CustomNames;
public VertexTexture3ColorFfxiv(Vector2 texCoord0, Vector2 texCoord1, Vector2 texCoord2, Vector4 ffxivColor)
{
TexCoord0 = texCoord0;
TexCoord1 = texCoord1;
TexCoord2 = texCoord2;
FfxivColor = ffxivColor;
}
public void Add(in VertexMaterialDelta delta)
{
TexCoord0 += delta.TexCoord0Delta;
@ -387,7 +363,7 @@ public struct VertexTexture3ColorFfxiv : IVertexCustom
FfxivColor.Z,
FfxivColor.W,
};
if (components.Any(component => component < 0 || component > 1))
if (components.Any(component => component is < 0f or > 1f))
throw new ArgumentOutOfRangeException(nameof(FfxivColor));
}
}