Merge branch 'russianroulette' into 'master'

BulletNifLoader: Handle NiSkinPartition, reduce false-positive collision generation for NiSwitchNode children

See merge request OpenMW/openmw!3634

apps/openmw_test_suite/nif/node.hpp

@@ -53,6 +53,7 @@ namespace Nif::Testing
     {
         value.mData = NiSkinDataPtr(nullptr);
         value.mRoot = NiAVObjectPtr(nullptr);
+        value.mPartitions = NiSkinPartitionPtr(nullptr);
     }
 
     inline void init(NiTimeController& value)

components/nif/data.cpp

@@ -290,6 +290,17 @@ namespace Nif
         }
     }
 
+    const Nif::NiSkinPartition* NiSkinInstance::getPartitions() const
+    {
+        const Nif::NiSkinPartition* partitions = nullptr;
+        if (!mPartitions.empty())
+            partitions = mPartitions.getPtr();
+        else if (!mData.empty() && !mData->mPartitions.empty())
+            partitions = mData->mPartitions.getPtr();
+
+        return partitions;
+    }
+
     void BSDismemberSkinInstance::read(NIFStream* nif)
     {
         NiSkinInstance::read(nif);

components/nif/data.hpp

@@ -208,6 +208,8 @@ namespace Nif
 
         void read(NIFStream* nif) override;
         void post(Reader& nif) override;
+
+        const Nif::NiSkinPartition* getPartitions() const;
     };
 
     struct BSDismemberSkinInstance : public NiSkinInstance

components/nif/node.cpp

@@ -27,6 +27,37 @@ namespace
         mesh.preallocateIndices(static_cast<int>(data.mNumTriangles) * 3);
     }
 
+    void trianglesToBtTriangleMesh(btTriangleMesh& mesh, const std::vector<unsigned short>& triangles)
+    {
+        for (std::size_t i = 0; i < triangles.size(); i += 3)
+            mesh.addTriangleIndices(triangles[i + 0], triangles[i + 1], triangles[i + 2]);
+    }
+
+    void stripsToBtTriangleMesh(btTriangleMesh& mesh, const std::vector<std::vector<unsigned short>>& strips)
+    {
+        for (const auto& strip : strips)
+        {
+            if (strip.size() < 3)
+                continue;
+
+            unsigned short a;
+            unsigned short b = strip[0];
+            unsigned short c = strip[1];
+            for (size_t i = 2; i < strip.size(); i++)
+            {
+                a = b;
+                b = c;
+                c = strip[i];
+                if (a == b || b == c || a == c)
+                    continue;
+                if (i % 2 == 0)
+                    mesh.addTriangleIndices(a, b, c);
+                else
+                    mesh.addTriangleIndices(a, c, b);
+            }
+        }
+    }
+
 }
 
 namespace Nif
@@ -243,15 +274,33 @@ namespace Nif
         if (mData.empty() || mData->mVertices.empty())
             return nullptr;
 
+        std::vector<const std::vector<unsigned short>*> triangleLists;
+        std::vector<const std::vector<std::vector<unsigned short>>*> stripsLists;
         auto data = static_cast<const NiTriShapeData*>(mData.getPtr());
-        if (data->mNumTriangles == 0 || data->mTriangles.empty())
+        const Nif::NiSkinPartition* partitions = nullptr;
-            return nullptr;
+        if (!mSkin.empty())
+            partitions = mSkin->getPartitions();
 
+        if (partitions)
+        {
+            triangleLists.reserve(partitions->mPartitions.size());
+            stripsLists.reserve(partitions->mPartitions.size());
+            for (auto& partition : partitions->mPartitions)
+            {
+                triangleLists.push_back(&partition.mTrueTriangles);
+                stripsLists.push_back(&partition.mTrueStrips);
+            }
+        }
+        else if (data->mNumTriangles != 0)
+            triangleLists.push_back(&data->mTriangles);
+
+        // This makes a perhaps dangerous assumption that NiSkinPartition will never have more than 65536 triangles.
         auto mesh = std::make_unique<btTriangleMesh>();
         triBasedGeomToBtTriangleMesh(*mesh, *data);
-        const std::vector<unsigned short>& triangles = data->mTriangles;
+        for (const auto triangles : triangleLists)
-        for (std::size_t i = 0; i < triangles.size(); i += 3)
+            trianglesToBtTriangleMesh(*mesh, *triangles);
-            mesh->addTriangleIndices(triangles[i + 0], triangles[i + 1], triangles[i + 2]);
+        for (const auto strips : stripsLists)
+            stripsToBtTriangleMesh(*mesh, *strips);
 
         if (mesh->getNumTriangles() == 0)
             return nullptr;
@@ -267,33 +316,32 @@ namespace Nif
         if (mData.empty() || mData->mVertices.empty())
             return nullptr;
 
+        std::vector<const std::vector<unsigned short>*> triangleLists;
+        std::vector<const std::vector<std::vector<unsigned short>>*> stripsLists;
         auto data = static_cast<const NiTriStripsData*>(mData.getPtr());
-        if (data->mNumTriangles == 0 || data->mStrips.empty())
+        const Nif::NiSkinPartition* partitions = nullptr;
-            return nullptr;
+        if (!mSkin.empty())
+            partitions = mSkin->getPartitions();
+
+        if (partitions)
+        {
+            triangleLists.reserve(partitions->mPartitions.size());
+            stripsLists.reserve(partitions->mPartitions.size());
+            for (auto& partition : partitions->mPartitions)
+            {
+                triangleLists.push_back(&partition.mTrueTriangles);
+                stripsLists.push_back(&partition.mTrueStrips);
+            }
+        }
+        else if (data->mNumTriangles != 0)
+            stripsLists.push_back(&data->mStrips);
 
         auto mesh = std::make_unique<btTriangleMesh>();
         triBasedGeomToBtTriangleMesh(*mesh, *data);
-        for (const std::vector<unsigned short>& strip : data->mStrips)
+        for (const auto triangles : triangleLists)
-        {
+            trianglesToBtTriangleMesh(*mesh, *triangles);
-            if (strip.size() < 3)
+        for (const auto strips : stripsLists)
-                continue;
+            stripsToBtTriangleMesh(*mesh, *strips);
-
-            unsigned short a;
-            unsigned short b = strip[0];
-            unsigned short c = strip[1];
-            for (size_t i = 2; i < strip.size(); i++)
-            {
-                a = b;
-                b = c;
-                c = strip[i];
-                if (a == b || b == c || a == c)
-                    continue;
-                if (i % 2 == 0)
-                    mesh->addTriangleIndices(a, b, c);
-                else
-                    mesh->addTriangleIndices(a, c, b);
-            }
-        }
 
         if (mesh->getNumTriangles() == 0)
             return nullptr;

components/nifbullet/bulletnifloader.cpp

@@ -250,11 +250,16 @@ namespace NifBullet
             const Nif::Parent currentParent{ *ninode, parent };
             for (const auto& child : ninode->mChildren)
             {
-                if (child.empty())
+                if (!child.empty())
-                    continue;
+                {
-
+                    assert(std::find(child->mParents.begin(), child->mParents.end(), ninode) != child->mParents.end());
-                assert(std::find(child->mParents.begin(), child->mParents.end(), ninode) != child->mParents.end());
+                    handleNode(child.get(), &currentParent, args);
-                handleNode(child.get(), &currentParent, args);
+                }
+                // For NiSwitchNodes and NiFltAnimationNodes, only use the first child
+                // TODO: must synchronize with the rendering scene graph somehow
+                // Doing this for NiLODNodes is unsafe (the first level might not be the closest)
+                if (node.recType == Nif::RC_NiSwitchNode || node.recType == Nif::RC_NiFltAnimationNode)
+                    break;
             }
         }
     }
@@ -272,7 +277,6 @@ namespace NifBullet
 
         if (!niGeometry.mSkin.empty())
             args.mAnimated = false;
-        // TODO: handle NiSkinPartition
 
         std::unique_ptr<btCollisionShape> childShape = niGeometry.getCollisionShape();
         if (childShape == nullptr)

components/nifosg/nifloader.cpp

@@ -1382,17 +1382,7 @@ namespace NifOsg
             if (!niGeometry->mSkin.empty())
             {
                 const Nif::NiSkinInstance* skin = niGeometry->mSkin.getPtr();
-                const Nif::NiSkinData* data = nullptr;
+                const Nif::NiSkinPartition* partitions = skin->getPartitions();
-                const Nif::NiSkinPartition* partitions = nullptr;
-                if (!skin->mData.empty())
-                {
-                    data = skin->mData.getPtr();
-                    if (!data->mPartitions.empty())
-                        partitions = data->mPartitions.getPtr();
-                }
-                if (!partitions && !skin->mPartitions.empty())
-                    partitions = skin->mPartitions.getPtr();
-
                 hasPartitions = partitions != nullptr;
                 if (hasPartitions)
                 {