Fix exporting models with UInt16 positions

Norbyte · Norbyte · commit e9694b7f39bb · 2023-08-07T19:12:04.000+02:00
diff --git a/LSLib/Granny/Model/Vertex.cs b/LSLib/Granny/Model/Vertex.cs
@@ -426,7 +426,8 @@ public VertexDescriptor ConstructDescriptor(MemberDefinition memberDefn, StructD
                         {
                             desc.PositionType = PositionType.Float3;
                         }
-                        else if (member.Type == MemberType.BinormalInt16 && member.ArraySize == 4)
+                        // Game incorrectly uses UInt16 instead of BinormalInt16 sometimes
+                        else if ((member.Type == MemberType.BinormalInt16 || member.Type == MemberType.UInt16) && member.ArraySize == 4)
                         {
                             desc.PositionType = PositionType.Word4;
                         }
@@ -478,7 +479,8 @@ public VertexDescriptor ConstructDescriptor(MemberDefinition memberDefn, StructD
                         break;
 
                     case "QTangent":
-                        if (member.Type == MemberType.BinormalInt16 && member.ArraySize == 4)
+                        // Game incorrectly uses UInt16 instead of BinormalInt16 sometimes
+                        if ((member.Type == MemberType.BinormalInt16 || member.Type == MemberType.UInt16) && member.ArraySize == 4)
                         {
                             desc.NormalType = NormalType.QTangent;
                             desc.TangentType = NormalType.QTangent;

Original file line number	Diff line number	Diff line change
`@@ -426,7 +426,8 @@ public VertexDescriptor ConstructDescriptor(MemberDefinition memberDefn, StructD`
`426`	`426`	`{`
`427`	`427`	`desc.PositionType = PositionType.Float3;`
`428`	`428`	`}`
`429`		`- else if (member.Type == MemberType.BinormalInt16 && member.ArraySize == 4)`
	`429`	`+ // Game incorrectly uses UInt16 instead of BinormalInt16 sometimes`
	`430`	`+ else if ((member.Type == MemberType.BinormalInt16 \|\| member.Type == MemberType.UInt16) && member.ArraySize == 4)`
`430`	`431`	`{`
`431`	`432`	`desc.PositionType = PositionType.Word4;`
`432`	`433`	`}`
`@@ -478,7 +479,8 @@ public VertexDescriptor ConstructDescriptor(MemberDefinition memberDefn, StructD`
`478`	`479`	`break;`
`479`	`480`
`480`	`481`	`case "QTangent":`
`481`		`- if (member.Type == MemberType.BinormalInt16 && member.ArraySize == 4)`
	`482`	`+ // Game incorrectly uses UInt16 instead of BinormalInt16 sometimes`
	`483`	`+ if ((member.Type == MemberType.BinormalInt16 \|\| member.Type == MemberType.UInt16) && member.ArraySize == 4)`
`482`	`484`	`{`
`483`	`485`	`desc.NormalType = NormalType.QTangent;`
`484`	`486`	`desc.TangentType = NormalType.QTangent;`