Load a bunch of triangle strip-based Havok records

components/nif/niffile.cpp

@@ -144,6 +144,9 @@ static std::map<std::string,RecordFactoryEntry> makeFactory()
     factory["BSDismemberSkinInstance"]      = {&construct <BSDismemberSkinInstance>     , RC_BSDismemberSkinInstance    };
     factory["NiControllerManager"]          = {&construct <NiControllerManager>         , RC_NiControllerManager        };
     factory["bhkMoppBvTreeShape"]           = {&construct <bhkMoppBvTreeShape>          , RC_bhkMoppBvTreeShape         };
+    factory["bhkNiTriStripsShape"]          = {&construct <bhkNiTriStripsShape>         , RC_bhkNiTriStripsShape        };
+    factory["bhkPackedNiTriStripsShape"]    = {&construct <bhkPackedNiTriStripsShape>   , RC_bhkPackedNiTriStripsShape  };
+    factory["hkPackedNiTriStripsData"]      = {&construct <hkPackedNiTriStripsData>     , RC_hkPackedNiTriStripsData    };
     return factory;
 }
 

components/nif/physics.cpp

@@ -60,6 +60,15 @@ namespace Nif
         mProcessContactDelay = nif->getUShort();
     }
 
+    void TriangleData::read(NIFStream *nif)
+    {
+        for (int i = 0; i < 3; i++)
+            mTriangle[i] = nif->getUShort();
+        mWeldingInfo = nif->getUShort();
+        if (nif->getVersion() <= NIFFile::NIFVersion::VER_OB)
+            mNormal = nif->getVector3();
+    }
+
     /// Record types
 
     void bhkCollisionObject::read(NIFStream *nif)
@@ -107,4 +116,67 @@ namespace Nif
         mMopp.read(nif);
     }
 
+    void bhkNiTriStripsShape::read(NIFStream *nif)
+    {
+        mHavokMaterial.read(nif);
+        mRadius = nif->getFloat();
+        nif->skip(20); // Unused
+        mGrowBy = nif->getUInt();
+        if (nif->getVersion() >= NIFStream::generateVersion(10,1,0,0))
+            mScale = nif->getVector4();
+        mData.read(nif);
+        unsigned int numFilters = nif->getUInt();
+        nif->getUInts(mFilters, numFilters);
+    }
+
+    void bhkNiTriStripsShape::post(NIFFile *nif)
+    {
+        mData.post(nif);
+    }
+
+    void bhkPackedNiTriStripsShape::read(NIFStream *nif)
+    {
+        if (nif->getVersion() <= NIFFile::NIFVersion::VER_OB)
+        {
+            mSubshapes.resize(nif->getUShort());
+            for (hkSubPartData& subshape : mSubshapes)
+                subshape.read(nif);
+        }
+        mUserData = nif->getUInt();
+        nif->skip(4); // Unused
+        mRadius = nif->getFloat();
+        nif->skip(4); // Unused
+        mScale = nif->getVector4();
+        nif->skip(20); // Duplicates of the two previous fields
+        mData.read(nif);
+    }
+
+    void bhkPackedNiTriStripsShape::post(NIFFile *nif)
+    {
+        mData.post(nif);
+    }
+
+    void hkPackedNiTriStripsData::read(NIFStream *nif)
+    {
+        unsigned int numTriangles = nif->getUInt();
+        mTriangles.resize(numTriangles);
+        for (unsigned int i = 0; i < numTriangles; i++)
+            mTriangles[i].read(nif);
+
+        unsigned int numVertices = nif->getUInt();
+        bool compressed = false;
+        if (nif->getVersion() >= NIFFile::NIFVersion::VER_BGS)
+            compressed = nif->getBoolean();
+        if (!compressed)
+            nif->getVector3s(mVertices, numVertices);
+        else
+            nif->skip(6 * numVertices); // Half-precision vectors are not currently supported
+        if (nif->getVersion() >= NIFFile::NIFVersion::VER_BGS)
+        {
+            mSubshapes.resize(nif->getUShort());
+            for (hkSubPartData& subshape : mSubshapes)
+                subshape.read(nif);
+        }
+    }
+
 } // Namespace

components/nif/physics.hpp

@@ -77,6 +77,14 @@ struct hkpMoppCode
     void read(NIFStream *nif);
 };
 
+struct TriangleData
+{
+    unsigned short mTriangle[3];
+    unsigned short mWeldingInfo;
+    osg::Vec3f mNormal;
+    void read(NIFStream *nif);
+};
+
 /// Record types
 
 // Abstract Bethesda Havok object
@@ -155,5 +163,40 @@ struct bhkMoppBvTreeShape : public bhkBvTreeShape
     void read(NIFStream *nif) override;
 };
 
+// Bethesda triangle strip-based Havok shape collection
+struct bhkNiTriStripsShape : public bhkShape
+{
+    HavokMaterial mHavokMaterial;
+    float mRadius;
+    unsigned int mGrowBy;
+    osg::Vec4f mScale{1.f, 1.f, 1.f, 0.f};
+    NiTriStripsDataList mData;
+    std::vector<unsigned int> mFilters;
+    void read(NIFStream *nif) override;
+    void post(NIFFile *nif) override;
+};
+
+// Bethesda packed triangle strip-based Havok shape collection
+struct bhkPackedNiTriStripsShape : public bhkShapeCollection
+{
+    std::vector<hkSubPartData> mSubshapes;
+    unsigned int mUserData;
+    float mRadius;
+    osg::Vec4f mScale;
+    hkPackedNiTriStripsDataPtr mData;
+
+    void read(NIFStream *nif) override;
+    void post(NIFFile *nif) override;
+};
+
+// bhkPackedNiTriStripsShape data block
+struct hkPackedNiTriStripsData : public bhkShapeCollection
+{
+    std::vector<TriangleData> mTriangles;
+    std::vector<osg::Vec3f> mVertices;
+    std::vector<hkSubPartData> mSubshapes;
+    void read(NIFStream *nif) override;
+};
+
 } // Namespace
 #endif

components/nif/record.hpp

@@ -131,7 +131,10 @@ enum RecordType
   RC_bhkCollisionObject,
   RC_BSDismemberSkinInstance,
   RC_NiControllerManager,
-  RC_bhkMoppBvTreeShape
+  RC_bhkMoppBvTreeShape,
+  RC_bhkNiTriStripsShape,
+  RC_bhkPackedNiTriStripsShape,
+  RC_hkPackedNiTriStripsData
 };
 
 /// Base class for all records

components/nif/recordptr.hpp

@@ -152,6 +152,7 @@ struct NiCollisionObject;
 struct bhkWorldObject;
 struct bhkShape;
 struct bhkSerializable;
+struct hkPackedNiTriStripsData;
 
 using NodePtr = RecordPtrT<Node>;
 using ExtraPtr = RecordPtrT<Extra>;
@@ -182,6 +183,7 @@ using NiAlphaPropertyPtr = RecordPtrT<NiAlphaProperty>;
 using NiCollisionObjectPtr = RecordPtrT<NiCollisionObject>;
 using bhkWorldObjectPtr = RecordPtrT<bhkWorldObject>;
 using bhkShapePtr = RecordPtrT<bhkShape>;
+using hkPackedNiTriStripsDataPtr = RecordPtrT<hkPackedNiTriStripsData>;
 
 using NodeList = RecordListT<Node>;
 using PropertyList = RecordListT<Property>;