Hide Nif nodes with name "EditorMarker".

components/nifbullet/bulletnifloader.cpp

@@ -182,8 +182,8 @@ namespace NifBullet
             if (hasCollisionNode && !hasCollisionShape)
                 mShape->mVisualCollisionType = Resource::VisualCollisionType::Camera;
             bool generateCollisionShape = !hasCollisionShape;
-            handleNode(filename, *node, nullptr, 0, generateCollisionShape, isAnimated, generateCollisionShape, false,
+            handleNode(filename, nif.getVersion(), *node, nullptr, 0, generateCollisionShape, isAnimated,
-                mShape->mVisualCollisionType);
+                generateCollisionShape, false, mShape->mVisualCollisionType);
         }
 
         if (mCompoundShape)
@@ -268,8 +268,8 @@ namespace NifBullet
         return true;
     }
 
-    void BulletNifLoader::handleNode(const std::string& fileName, const Nif::Node& node, const Nif::Parent* parent,
+    void BulletNifLoader::handleNode(const std::string& fileName, unsigned int nifVersion, const Nif::Node& node,
-        int flags, bool isCollisionNode, bool isAnimated, bool autogenerated, bool avoid,
+        const Nif::Parent* parent, int flags, bool isCollisionNode, bool isAnimated, bool autogenerated, bool avoid,
         Resource::VisualCollisionType& visualCollisionType)
     {
         // TODO: allow on-the fly collision switching via toggling this flag
@@ -328,6 +328,9 @@ namespace NifBullet
             }
         }
 
+        if (nifVersion > Nif::NIFFile::NIFVersion::VER_MW && Misc::StringUtils::ciEqual(node.name, "EditorMarker"))
+            return;
+
         if (isCollisionNode)
         {
             // NOTE: a trishape with hasBounds=true, but no BBoxCollision flag should NOT go through handleNiTriShape!
@@ -352,8 +355,8 @@ namespace NifBullet
                     continue;
 
                 assert(std::find(child->parents.begin(), child->parents.end(), ninode) != child->parents.end());
-                handleNode(fileName, child.get(), &currentParent, flags, isCollisionNode, isAnimated, autogenerated,
+                handleNode(fileName, nifVersion, child.get(), &currentParent, flags, isCollisionNode, isAnimated,
-                    avoid, visualCollisionType);
+                    autogenerated, avoid, visualCollisionType);
             }
         }
     }

components/nifbullet/bulletnifloader.hpp

@@ -52,8 +52,8 @@ namespace NifBullet
     private:
         bool findBoundingBox(const Nif::Node& node, const std::string& filename);
 
-        void handleNode(const std::string& fileName, const Nif::Node& node, const Nif::Parent* parent, int flags,
+        void handleNode(const std::string& fileName, unsigned int nifVersion, const Nif::Node& node,
-            bool isCollisionNode, bool isAnimated, bool autogenerated, bool avoid,
+            const Nif::Parent* parent, int flags, bool isCollisionNode, bool isAnimated, bool autogenerated, bool avoid,
             Resource::VisualCollisionType& visualCollisionType);
 
         bool hasRootCollisionNode(const Nif::Node& rootNode) const;

components/nifosg/nifloader.cpp

@@ -45,6 +45,7 @@
 #include <components/nif/effect.hpp>
 #include <components/nif/exception.hpp>
 #include <components/nif/extra.hpp>
+#include <components/nif/niffile.hpp>
 #include <components/nif/node.hpp>
 #include <components/nif/property.hpp>
 #include <components/sceneutil/morphgeometry.hpp>
@@ -340,8 +341,8 @@ namespace NifOsg
             created->setDataVariance(osg::Object::STATIC);
             for (const Nif::Node* root : roots)
             {
-                auto node = handleNode(root, nullptr, nullptr, imageManager, std::vector<unsigned int>(), 0, false,
+                auto node = handleNode(nif.getVersion(), root, nullptr, nullptr, imageManager,
-                    false, false, &textkeys->mTextKeys);
+                    std::vector<unsigned int>(), 0, false, false, false, &textkeys->mTextKeys);
                 created->addChild(node);
             }
             if (mHasNightDayLabel)
@@ -597,13 +598,19 @@ namespace NifOsg
             return node;
         }
 
-        osg::ref_ptr<osg::Node> handleNode(const Nif::Node* nifNode, const Nif::Parent* parent, osg::Group* parentNode,
+        osg::ref_ptr<osg::Node> handleNode(unsigned int nifVersion, const Nif::Node* nifNode, const Nif::Parent* parent,
-            Resource::ImageManager* imageManager, std::vector<unsigned int> boundTextures, int animflags,
+            osg::Group* parentNode, Resource::ImageManager* imageManager, std::vector<unsigned int> boundTextures,
-            bool skipMeshes, bool hasMarkers, bool hasAnimatedParents, SceneUtil::TextKeyMap* textKeys,
+            int animflags, bool skipMeshes, bool hasMarkers, bool hasAnimatedParents, SceneUtil::TextKeyMap* textKeys,
             osg::Node* rootNode = nullptr)
         {
-            if (rootNode != nullptr && Misc::StringUtils::ciEqual(nifNode->name, "Bounding Box"))
+            if (rootNode)
-                return nullptr;
+            {
+                if (Misc::StringUtils::ciEqual(nifNode->name, "Bounding Box"))
+                    return nullptr;
+                if (nifVersion > Nif::NIFFile::NIFVersion::VER_MW && !Loader::getShowMarkers()
+                    && Misc::StringUtils::ciEqual(nifNode->name, "EditorMarker"))
+                    return nullptr;
+            }
 
             osg::ref_ptr<osg::Group> node = createNode(nifNode);
 
@@ -802,8 +809,8 @@ namespace NifOsg
                 const Nif::Parent currentParent{ *ninode, parent };
                 for (const auto& child : children)
                     if (!child.empty())
-                        handleNode(child.getPtr(), &currentParent, currentNode, imageManager, boundTextures, animflags,
+                        handleNode(nifVersion, child.getPtr(), &currentParent, currentNode, imageManager, boundTextures,
-                            skipMeshes, hasMarkers, hasAnimatedParents, textKeys, rootNode);
+                            animflags, skipMeshes, hasMarkers, hasAnimatedParents, textKeys, rootNode);
 
                 // Propagate effects to the the direct subgraph instead of the node itself
                 // This simulates their "affected node list" which Morrowind appears to replace with the subgraph (?)