Skip to content
Snippets Groups Projects
Commit 9eb4c2ac authored by jonwd7's avatar jonwd7
Browse files

Re-unify BSVertexData for niflib 

Also updated definitions for Eye Data (missed during decoding from #58)
parent 6bdc3d87
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 26 additions and 38 deletions
nif.xml
+ 26
− 38
View file @ 9eb4c2ac
...@@ -1472,46 +1472,35 @@ ...@@ -1472,46 +1472,35 @@
<option value="9" name="VF_Vertex_Colors" /> <!-- & 512 --> <option value="9" name="VF_Vertex_Colors" /> <!-- & 512 -->
<option value="10" name="VF_Skinned" /> <!-- & 1024 --> <option value="10" name="VF_Skinned" /> <!-- & 1024 -->
<option value="11" name="VF_Unknown_6" /> <!-- & 2048 --> <option value="11" name="VF_Unknown_6" /> <!-- & 2048 -->
<option value="12" name="VF_Male_Eyes" /> <!-- & 4096 --> <option value="12" name="VF_Eye_Data" /> <!-- & 4096 -->
<option value="13" name="VF_Unknown_7" /> <!-- & 8192 --> <option value="13" name="VF_Unknown_7" /> <!-- & 8192 -->
<option value="14" name="VF_Full_Precision" /> <!-- & 16384 --> <option value="14" name="VF_Full_Precision" /> <!-- & 16384 -->
<option value="15" name="VF_Unknown_8" /> <!-- & 32768 --> <option value="15" name="VF_Unknown_8" /> <!-- & 32768 -->
</bitflags> </bitflags>
<compound name="BSVertexData"> <compound name="BSVertexData">
<add name="Vertex" type="HalfVector3" cond="((ARG &amp; 16) != 0) &amp;&amp; ((ARG &amp; 16384) == 0)" /> <add name="Vertex" type="Vector3" userver2="100" cond="((ARG &amp; 16) != 0)" />
<add name="Bitangent X" type="hfloat" cond="((ARG &amp; 16) != 0) &amp;&amp; ((ARG &amp; 256) != 0) &amp;&amp; ((ARG &amp; 16384) == 0)" /> <add name="Bitangent X" type="float" userver2="100" cond="((ARG &amp; 256) != 0)" />
<add name="Unknown Short" type="ushort" cond="((ARG &amp; 16) != 0) &amp;&amp; ((ARG &amp; 256) == 0) &amp;&amp; ((ARG &amp; 16384) == 0)" /> <add name="Unknown Int" type="uint" userver2="100" cond="(ARG &amp; 256) == 0" />
<add name="Vertex" type="Vector3" cond="((ARG &amp; 16) != 0) &amp;&amp; ((ARG &amp; 16384) != 0)" /> <add name="Vertex" type="HalfVector3" userver2="130" cond="((ARG &amp; 16) != 0) &amp;&amp; ((ARG &amp; 16384) == 0)" />
<add name="Bitangent X" type="float" cond="((ARG &amp; 16) != 0) &amp;&amp; ((ARG &amp; 256) != 0) &amp;&amp; ((ARG &amp; 16384) != 0)" /> <add name="Bitangent X" type="hfloat" userver2="130" cond="((ARG &amp; 256) != 0) &amp;&amp; ((ARG &amp; 16384) == 0)" />
<add name="Unknown Int" type="uint" cond="((ARG &amp; 16) != 0) &amp;&amp; ((ARG &amp; 256) == 0) &amp;&amp; ((ARG &amp; 16384) != 0)" /> <add name="Unknown Short" type="ushort" userver2="130" cond="((ARG &amp; 256) == 0) &amp;&amp; ((ARG &amp; 16384) == 0)" />
<add name="UV" type="HalfTexCoord" cond="((ARG &amp; 32) != 0)" /> <add name="Vertex" type="Vector3" userver2="130" cond="((ARG &amp; 16) != 0) &amp;&amp; ((ARG &amp; 16384) != 0)" />
<add name="Normal" type="ByteVector3" cond="(ARG &amp; 128) != 0" /> <add name="Bitangent X" type="float" userver2="130" cond="((ARG &amp; 256) != 0) &amp;&amp; ((ARG &amp; 16384) != 0)" />
<add name="Bitangent Y" type="byte" cond="(ARG &amp; 128) != 0" /> <add name="Unknown Int" type="uint" userver2="130" cond="((ARG &amp; 256) == 0) &amp;&amp; ((ARG &amp; 16384) != 0)" />
<add name="Tangent" type="ByteVector3" cond="((ARG &amp; 128) != 0) &amp;&amp; ((ARG &amp; 256) != 0)" />
<add name="Bitangent Z" type="byte" cond="((ARG &amp; 128) != 0) &amp;&amp; ((ARG &amp; 256) != 0)" /> <add name="UV" type="HalfTexCoord" cond="(((ARG &amp; 16) != 0) &amp;&amp; ((ARG &amp; 32) != 0))" />
<add name="Vertex Colors" type="ByteColor4" cond="(ARG &amp; 512) != 0" /> <add name="Normal" type="ByteVector3" cond="(ARG &amp; 128) != 0" />
<add name="Bone Weights" type="hfloat" arr1="4" cond="(ARG &amp; 1024) != 0" /> <add name="Bitangent Y" type="byte" cond="(ARG &amp; 128) != 0" />
<add name="Bone Indices" type="byte" arr1="4" cond="(ARG &amp; 1024) != 0" /> <add name="Tangent" type="ByteVector3" cond="((ARG &amp; 128) != 0) &amp;&amp; ((ARG &amp; 256) != 0)" />
<add name="Unknown Int 2" type="uint" cond="(ARG &amp; 4096) != 0" /> <add name="Bitangent Z" type="byte" cond="((ARG &amp; 128) != 0) &amp;&amp; ((ARG &amp; 256) != 0)" />
</compound> <add name="Vertex Colors" type="ByteColor4" cond="(ARG &amp; 512) != 0" />
<add name="Bone Weights" type="hfloat" arr1="4" cond="(ARG &amp; 1024) != 0" />
<compound name="BSVertexDataSSE"> <add name="Bone Indices" type="byte" arr1="4" cond="(ARG &amp; 1024) != 0" />
<add name="Vertex" type="Vector3" cond="((ARG &amp; 16) != 0)" /> <add name="Eye Data" type="float" cond="(ARG &amp; 4096) != 0" />
<add name="Bitangent X" type="float" cond="((ARG &amp; 16) != 0) &amp;&amp; ((ARG &amp; 256) != 0)" /> </compound>
<add name="Unknown Int" type="int" cond="((ARG &amp; 16) != 0) &amp;&amp; (ARG &amp; 256) == 0" />
<add name="UV" type="HalfTexCoord" cond="((ARG &amp; 32) != 0)" />
<add name="Normal" type="ByteVector3" cond="(ARG &amp; 128) != 0" />
<add name="Bitangent Y" type="byte" cond="(ARG &amp; 128) != 0" />
<add name="Tangent" type="ByteVector3" cond="((ARG &amp; 128) != 0) &amp;&amp; ((ARG &amp; 256) != 0)" />
<add name="Bitangent Z" type="byte" cond="((ARG &amp; 128) != 0) &amp;&amp; ((ARG &amp; 256) != 0)" />
<add name="Vertex Colors" type="ByteColor4" cond="(ARG &amp; 512) != 0" />
<add name="Bone Weights" type="hfloat" arr1="4" cond="(ARG &amp; 1024) != 0" />
<add name="Bone Indices" type="byte" arr1="4" cond="(ARG &amp; 1024) != 0" />
<add name="Unknown Int 2" type="uint" cond="(ARG &amp; 4096) != 0" />
</compound>
<compound name="SkinPartition" ver1="4.2.1.0"> <compound name="SkinPartition" ver1="4.2.1.0">
Skinning data for a submesh, optimized for hardware skinning. Part of NiSkinPartition. Skinning data for a submesh, optimized for hardware skinning. Part of NiSkinPartition.
...@@ -4284,7 +4273,7 @@ ...@@ -4284,7 +4273,7 @@
<add name="VF5" type="byte" ver="20.2.0.7" userver2="100" /> <add name="VF5" type="byte" ver="20.2.0.7" userver2="100" />
<add name="VF" type="VertexFlags" ver="20.2.0.7" userver2="100" /> <add name="VF" type="VertexFlags" ver="20.2.0.7" userver2="100" />
<add name="VF8" type="byte" ver="20.2.0.7" userver2="100" /> <add name="VF8" type="byte" ver="20.2.0.7" userver2="100" />
<add name="Vertex Data" type="BSVertexDataSSE" arg="VF" arr1="Data Size / Vertex Size" cond="Data Size &gt; 0" ver="20.2.0.7" userver2="100" /> <add name="Vertex Data" type="BSVertexData" arg="VF" arr1="Data Size / Vertex Size" cond="Data Size &gt; 0" ver="20.2.0.7" userver2="100" />
<add name="Partition" type="SkinPartition" arr1="Num Skin Partition Blocks" ver="20.2.0.7" userver2="100" /> <add name="Partition" type="SkinPartition" arr1="Num Skin Partition Blocks" ver="20.2.0.7" userver2="100" />
</niobject> </niobject>
...@@ -6627,8 +6616,7 @@ ...@@ -6627,8 +6616,7 @@
<add name="Num Triangles" type="ushort" vercond="User Version 2 &lt; 130" /> <add name="Num Triangles" type="ushort" vercond="User Version 2 &lt; 130" />
<add name="Num Vertices" type="ushort" /> <add name="Num Vertices" type="ushort" />
<add name="Data Size" type="uint" /> <add name="Data Size" type="uint" />
<add name="Vertex Data" type="BSVertexData" arr1="Num Vertices" arg="VF" cond="Data Size &gt; 0" userver2="130" /> <add name="Vertex Data" type="BSVertexData" arr1="Num Vertices" arg="VF" cond="Data Size &gt; 0" />
<add name="Vertex Data" type="BSVertexDataSSE" arr1="Num Vertices" arg="VF" cond="Data Size &gt; 0" userver2="100" />
<add name="Triangles" type="Triangle" arr1="Num Triangles" cond="Data Size &gt; 0" /> <add name="Triangles" type="Triangle" arr1="Num Triangles" cond="Data Size &gt; 0" />
<add name="Particle Data Size" type="uint" userver2="100" /> <add name="Particle Data Size" type="uint" userver2="100" />
<add name="Vertices" type="Vector3" arr1="Num Vertices" cond="Particle Data Size &gt; 0" userver2="100" /> <add name="Vertices" type="Vector3" arr1="Num Vertices" cond="Particle Data Size &gt; 0" userver2="100" />
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment