Skip to content

Commit

Permalink
Remove ver/userver/userver2 for niftools#76
Browse files Browse the repository at this point in the history 
The `ver` attribute was never actually formalized and just meant as a shorcut for using both ver1/ver2 on the same version.  `userver` was almost never used and `userver2` was becoming increasingly uncommon as most comparisons were switched to inequalities.

To make things easier, these should just be part of the expression.
  • Loading branch information
@hexabits
hexabits committed Jun 4, 2018
1 parent d6da9e6 commit 513d223
Showing 1 changed file with 31 additions and 31 deletions.
62 changes: 31 additions & 31 deletions nif.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1709,8 +1709,8 @@
<add name="Has Bone Indices" type="bool">Do we have bone indices?</add>
<add name="Bone Indices" type="byte" arr1="Num Vertices" arr2="Num Weights Per Vertex" cond="Has Bone Indices">Bone indices, they index into 'Bones'.</add>
<add name="Unknown Short" type="ushort" vercond="User Version 2 &gt; 34" />
<add name="Vertex Desc" type="BSVertexDesc" ver="20.2.0.7" userver2="100" />
<add name="Triangles Copy" type="Triangle" arr1="Num Triangles" ver="20.2.0.7" userver2="100" />
<add name="Vertex Desc" type="BSVertexDesc" ver1="20.2.0.7" ver2="20.2.0.7" vercond="User Version 2 == 100" />
<add name="Triangles Copy" type="Triangle" arr1="Num Triangles" ver1="20.2.0.7" ver2="20.2.0.7" vercond="User Version 2 == 100" />
</compound>

<compound name="NiPlane">
Expand Down Expand Up @@ -3142,7 +3142,7 @@
<add name="Material Extra Data" type="int" arr1="Num Materials" ver1="20.2.0.5">Extra data associated with the material. A value of -1 means the material is the default implementation.</add>
<add name="Active Material" type="int" default="-1" ver1="20.2.0.5">The index of the currently active material.</add>
<!-- Custom Versions -->
<add name="Cyanide Unknown" type="byte" default="255" ver1="10.2.0.0" ver2="10.2.0.0" userver="1">Cyanide extension (Blood Bowl).</add>
<add name="Cyanide Unknown" type="byte" default="255" ver1="10.2.0.0" ver2="10.2.0.0" vercond="(User Version == 1)">Cyanide extension (Blood Bowl).</add>
<add name="WorldShift Unknown" type="int" ver1="10.3.0.1" ver2="10.4.0.1" />
<!-- / Custom -->
<add name="Material Needs Update" type="bool" ver1="20.2.0.7">Whether the materials for this object always needs to be updated before rendering with them.</add>
Expand All @@ -3165,8 +3165,8 @@
<add name="Material Data" type="MaterialData" ver1="10.0.1.0" vercond="(User Version 2 &lt; 100)" />
<add name="Material Data" type="MaterialData" ver1="10.0.1.0" vercond="(User Version 2 &gt;= 100)" cond="!NiParticleSystem" />
<!-- Bethesda -->
<add name="Shader Property" type="Ref" template="BSShaderProperty" ver1="20.2.0.7" userver="12" />
<add name="Alpha Property" type="Ref" template="NiAlphaProperty" ver1="20.2.0.7" userver="12" />
<add name="Shader Property" type="Ref" template="BSShaderProperty" ver1="20.2.0.7" vercond="(User Version 2 &gt; 34)" />
<add name="Alpha Property" type="Ref" template="NiAlphaProperty" ver1="20.2.0.7" vercond="(User Version 2 &gt; 34)" />
</niobject>

<niobject name="NiTriBasedGeom" abstract="1" inherit="NiGeometry">
Expand Down Expand Up @@ -3227,7 +3227,7 @@
<add name="Vertices" type="Vector3" arr1="Num Vertices" cond="Has Vertices">The mesh vertices.</add>
<add name="Vector Flags" type="VectorFlags" ver1="10.0.1.0" vercond="!((Version == 20.2.0.7) &amp;&amp; (User Version 2 &gt; 0))" />
<add name="BS Vector Flags" type="BSVectorFlags" vercond="((Version == 20.2.0.7) &amp;&amp; (User Version 2 &gt; 0))" />
<add name="Material CRC" type="uint" ver1="20.2.0.7" ver2="20.2.0.7" userver="12" />
<add name="Material CRC" type="uint" ver1="20.2.0.7" ver2="20.2.0.7" vercond="User Version 2 &gt; 34" />
<add name="Has Normals" type="bool">Do we have lighting normals? These are essential for proper lighting: if not present, the model will only be influenced by ambient light.</add>
<add name="Normals" type="Vector3" arr1="Num Vertices" cond="Has Normals">The lighting normals.</add>
<add name="Tangents" type="Vector3" arr1="Num Vertices" cond="(Has Normals) &amp;&amp; ((Vector Flags | BS Vector Flags) &amp; 4096)" ver1="10.1.0.0">Tangent vectors.</add>
Expand Down Expand Up @@ -4472,11 +4472,11 @@
Skinning data, optimized for hardware skinning. The mesh is partitioned in submeshes such that each vertex of a submesh is influenced only by a limited and fixed number of bones.
<add name="Num Skin Partition Blocks" type="uint" />
<add name="Skin Partition Blocks" type="SkinPartition" arr1="Num Skin Partition Blocks" vercond="!((Version == 20.2.0.7) &amp;&amp; (User Version 2 == 100))">Skin partition objects.</add>
<add name="Data Size" type="uint" ver="20.2.0.7" userver2="100" />
<add name="Vertex Size" type="uint" ver="20.2.0.7" userver2="100" />
<add name="Vertex Desc" type="BSVertexDesc" ver="20.2.0.7" userver2="100" />
<add name="Vertex Data" type="BSVertexDataSSE" arg="Vertex Desc\Vertex Attributes" 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="Data Size" type="uint" ver1="20.2.0.7" ver2="20.2.0.7" vercond="User Version 2 == 100" />
<add name="Vertex Size" type="uint" ver1="20.2.0.7" ver2="20.2.0.7" vercond="User Version 2 == 100" />
<add name="Vertex Desc" type="BSVertexDesc" ver1="20.2.0.7" ver2="20.2.0.7" vercond="User Version 2 == 100" />
<add name="Vertex Data" type="BSVertexDataSSE" arg="Vertex Desc\Vertex Attributes" arr1="Data Size / Vertex Size" cond="Data Size &gt; 0" ver1="20.2.0.7" ver2="20.2.0.7" vercond="User Version 2 == 100" />
<add name="Partition" type="SkinPartition" arr1="Num Skin Partition Blocks" ver1="20.2.0.7" ver2="20.2.0.7" vercond="User Version 2 == 100" />
</niobject>

<niobject name="NiTexture" abstract="1" inherit="NiObjectNET">
Expand Down Expand Up @@ -6107,11 +6107,11 @@
<add name="Flags" type="byte" vercond="(User Version 2 &lt; 130)" />
<add name="Index" type="uint" vercond="(User Version 2 &lt; 130)">Index = previous Index + previous Num Tris in Segment * 3</add>
<add name="Num Tris in Segment" type="uint" vercond="(User Version 2 &lt; 130)">The number of triangles belonging to this segment</add>
<add name="Start Index" type="uint" userver2="130" />
<add name="Num Primitives" type="uint" userver2="130" />
<add name="Parent Array Index" type="uint" userver2="130" />
<add name="Num Sub Segments" type="uint" userver2="130" />
<add name="Sub Segment" type="BSGeometrySubSegment" arr1="Num Sub Segments" userver2="130" />
<add name="Start Index" type="uint" vercond="User Version 2 == 130" />
<add name="Num Primitives" type="uint" vercond="User Version 2 == 130" />
<add name="Parent Array Index" type="uint" vercond="User Version 2 == 130" />
<add name="Num Sub Segments" type="uint" vercond="User Version 2 == 130" />
<add name="Sub Segment" type="BSGeometrySubSegment" arr1="Num Sub Segments" vercond="User Version 2 == 130" />
</compound>

<niobject name="BSSegmentedTriShape" inherit="NiTriShape">
Expand Down Expand Up @@ -6463,7 +6463,7 @@
<add name="Unknown Data" type="Vector3" arr1="Unknown Data Size" arr2="Unknown Data Width" />
<add name="Unknown Indices" type="ushort" arr1="Unknown Data Size" />
<add name="Num Mapped Primitives" type="ushort" vercond="(User Version &lt; 17)">When non-zero, equal to the number of primitives.</add>
<add name="Num Mapped Primitives" type="uint" userver="17">When non-zero, equal to the number of primitives.</add>
<add name="Num Mapped Primitives" type="uint" vercond="(User Version == 17)">When non-zero, equal to the number of primitives.</add>
<add name="Mapped Primitives" type="byte" arr1="Num Mapped Primitives">Some integer associated with each primitive.</add>
<add name="Partition Size" type="uint" />
<add name="Partitions" type="PartitionDataEpicMickey" arr1="Partition Size" />
Expand Down Expand Up @@ -7376,17 +7376,17 @@
<add name="Shader Property" type="Ref" template="BSShaderProperty" />
<add name="Alpha Property" type="Ref" template="NiAlphaProperty" />
<add name="Vertex Desc" type="BSVertexDesc" />
<add name="Num Triangles" type="uint" userver2="130" />
<add name="Num Triangles" type="uint" vercond="User Version 2 == 130" />
<add name="Num Triangles" type="ushort" vercond="User Version 2 &lt; 130" />
<add name="Num Vertices" type="ushort" />
<add name="Data Size" type="uint" />
<add name="Vertex Data" type="BSVertexData" arr1="Num Vertices" arg="Vertex Desc\Vertex Attributes" cond="Data Size &gt; 0" userver2="130" />
<add name="Vertex Data" type="BSVertexDataSSE" arr1="Num Vertices" arg="Vertex Desc\Vertex Attributes" cond="Data Size &gt; 0" userver2="100" />
<add name="Vertex Data" type="BSVertexData" arr1="Num Vertices" arg="Vertex Desc\Vertex Attributes" cond="Data Size &gt; 0" vercond="User Version 2 == 130" />
<add name="Vertex Data" type="BSVertexDataSSE" arr1="Num Vertices" arg="Vertex Desc\Vertex Attributes" cond="Data Size &gt; 0" vercond="User Version 2 == 100" />
<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 Vertices" type="HalfVector3" arr1="Num Vertices" cond="Particle Data Size &gt; 0" userver2="100" />
<add name="Particle Normals" type="HalfVector3" arr1="Num Vertices" cond="Particle Data Size &gt; 0" userver2="100" />
<add name="Particle Triangles" type="Triangle" arr1="Num Triangles" cond="Particle Data Size &gt; 0" userver2="100" />
<add name="Particle Data Size" type="uint" vercond="User Version 2 == 100" />
<add name="Particle Vertices" type="HalfVector3" arr1="Num Vertices" cond="Particle Data Size &gt; 0" vercond="User Version 2 == 100" />
<add name="Particle Normals" type="HalfVector3" arr1="Num Vertices" cond="Particle Data Size &gt; 0" vercond="User Version 2 == 100" />
<add name="Particle Triangles" type="Triangle" arr1="Num Triangles" cond="Particle Data Size &gt; 0" vercond="User Version 2 == 100" />
</niobject>

<niobject name="BSMeshLODTriShape" inherit="BSTriShape" versions="V20_2_0_7_FO4">
Expand Down Expand Up @@ -7415,13 +7415,13 @@

<niobject name="BSSubIndexTriShape" inherit="BSTriShape" versions="V20_2_0_7_FO4 V20_2_0_7_SSE">
Fallout 4 Sub-Index Tri Shape
<add name="Num Primitives" type="uint" userver2="130" cond="Data Size &gt; 0" />
<add name="Num Segments" type="uint" userver2="130" cond="Data Size &gt; 0" />
<add name="Total Segments" type="uint" userver2="130" cond="Data Size &gt; 0" />
<add name="Segment" type="BSGeometrySegmentData" userver2="130" arr1="Num Segments" cond="Data Size &gt; 0" />
<add name="Segment Data" type="BSGeometrySegmentSharedData" userver2="130" cond="(Num Segments &lt; Total Segments) &amp;&amp; (Data Size &gt; 0)" />
<add name="Num Segments" type="uint" userver2="100" />
<add name="Segment" type="BSGeometrySegmentData" userver2="100" arr1="Num Segments" />
<add name="Num Primitives" type="uint" vercond="User Version 2 == 130" cond="Data Size &gt; 0" />
<add name="Num Segments" type="uint" vercond="User Version 2 == 130" cond="Data Size &gt; 0" />
<add name="Total Segments" type="uint" vercond="User Version 2 == 130" cond="Data Size &gt; 0" />
<add name="Segment" type="BSGeometrySegmentData" vercond="User Version 2 == 130" arr1="Num Segments" cond="Data Size &gt; 0" />
<add name="Segment Data" type="BSGeometrySegmentSharedData" vercond="User Version 2 == 130" cond="(Num Segments &lt; Total Segments) &amp;&amp; (Data Size &gt; 0)" />
<add name="Num Segments" type="uint" vercond="User Version 2 == 100" />
<add name="Segment" type="BSGeometrySegmentData" vercond="User Version 2 == 100" arr1="Num Segments" />
</niobject>

<!-- Fallout 4 Physics -->
Expand Down

0 comments on commit 513d223

Please sign in to comment.