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

Add morph handling for normal/tangent

Browse source
This commit is contained in:
ackwell 2024-01-05 20:13:39 +11:00
parent acaa49fec5
commit 6641f5425b
2 changed files with 36 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

38
Penumbra/Import/Models/Import/VertexAttribute.cs
View file

@ -150,7 +150,7 @@ public class VertexAttribute
); );
} }
public static VertexAttribute? Normal(Accessors accessors) public static VertexAttribute? Normal(Accessors accessors, IEnumerable<Accessors> morphAccessors)
{ {
if (!accessors.TryGetValue("NORMAL", out var accessor)) if (!accessors.TryGetValue("NORMAL", out var accessor))
return null; return null;
@ -164,9 +164,24 @@ public class VertexAttribute
var values = accessor.AsVector3Array(); var values = accessor.AsVector3Array();
var foo = morphAccessors
.Select(ma => ma.GetValueOrDefault("NORMAL")?.AsVector3Array())
.ToArray();
return new VertexAttribute( return new VertexAttribute(
element, element,
index => BuildHalf4(new Vector4(values[index], 0)) index => BuildHalf4(new Vector4(values[index], 0)),
null,
(morphIndex, vertexIndex) =>
{
var value = values[vertexIndex];
var delta = foo[morphIndex]?[vertexIndex];
if (delta != null)
value += delta.Value;
return BuildHalf4(new Vector4(value, 0));
}
); );
} }
@ -203,7 +218,7 @@ public class VertexAttribute
); );
} }
public static VertexAttribute? Tangent1(Accessors accessors) public static VertexAttribute? Tangent1(Accessors accessors, IEnumerable<Accessors> morphAccessors)
{ {
if (!accessors.TryGetValue("TANGENT", out var accessor)) if (!accessors.TryGetValue("TANGENT", out var accessor))
return null; return null;
@ -217,9 +232,24 @@ public class VertexAttribute
var values = accessor.AsVector4Array(); var values = accessor.AsVector4Array();
var foo = morphAccessors
.Select(ma => ma.GetValueOrDefault("TANGENT")?.AsVector3Array())
.ToArray();
return new VertexAttribute( return new VertexAttribute(
element, element,
index => BuildByteFloat4(values[index]) index => BuildByteFloat4(values[index]),
null,
(morphIndex, vertexIndex) =>
{
var value = values[vertexIndex];
var delta = foo[morphIndex]?[vertexIndex];
if (delta != null)
value += new Vector4(delta.Value, 0);
return BuildByteFloat4(value);
}
); );
} }

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

@ -523,8 +523,8 @@ public sealed partial class ModelManager : SingleTaskQueue, IDisposable
VertexAttribute.Position(accessors, morphAccessors), VertexAttribute.Position(accessors, morphAccessors),
VertexAttribute.BlendWeight(accessors), VertexAttribute.BlendWeight(accessors),
VertexAttribute.BlendIndex(accessors), VertexAttribute.BlendIndex(accessors),
VertexAttribute.Normal(accessors), VertexAttribute.Normal(accessors, morphAccessors),
VertexAttribute.Tangent1(accessors), VertexAttribute.Tangent1(accessors, morphAccessors),
VertexAttribute.Color(accessors), VertexAttribute.Color(accessors),
VertexAttribute.Uv(accessors), VertexAttribute.Uv(accessors),
}; };