Merge branch 'addMesh_lua' into 'master'

Draft: addMesh lua calls

See merge request OpenMW/openmw!4494

apps/openmw/mwlua/animationbindings.cpp

@@ -284,6 +284,35 @@ namespace MWLua
                 "removeVfxAction");
         };
 
+        api["addMesh"] = [context](const SelfObject& object, std::string_view model, std::string_view bonename,
+                             std::string_view meshId) {
+            context.mLuaManager->addAction(
+                [object = Object(object), model = std::string(model), bonename = std::string(bonename),
+                    meshId = std::string(meshId)] {
+                    MWRender::Animation* anim = getMutableAnimationOrThrow(object);
+                    anim->addCustomMesh(model, bonename, meshId);
+                },
+                "addMeshAction");
+        };
+
+        api["removeMesh"] = [context](const SelfObject& object, std::string_view meshId) {
+            context.mLuaManager->addAction(
+                [object = Object(object), meshId = std::string(meshId)] {
+                    MWRender::Animation* anim = getMutableAnimationOrThrow(object);
+                    anim->removeCustomMesh(meshId);
+                },
+                "removeMeshAction");
+        };
+
+        api["removeAllMeshes"] = [context](const SelfObject& object) {
+            context.mLuaManager->addAction(
+                [object = Object(object)] {
+                    MWRender::Animation* anim = getMutableAnimationOrThrow(object);
+                    anim->removeCustomMeshes();
+                },
+                "removeAllMeshesAction");
+        };
+
         return LuaUtil::makeReadOnly(api);
     }
 

apps/openmw/mwrender/animation.cpp

@@ -1710,6 +1710,31 @@ namespace MWRender
         mExtraLightSource->setActorFade(mAlpha);
     }
 
+    void Animation::removeCustomMesh(std::string_view meshId)
+    {
+        mCustomMeshesMap.erase(std::string(meshId));
+    }
+
+    void Animation::removeCustomMeshes()
+    {
+        mCustomMeshesMap.clear();
+    }
+
+    void Animation::addCustomMesh(std::string_view model, std::string_view bonename, std::string_view meshId)
+    {
+        SceneUtil::FindByNameVisitor findVisitor(bonename);
+        mObjectRoot->accept(findVisitor);
+        osg::Group* parent = findVisitor.mFoundNode;
+
+        if (!parent)
+            return;
+
+        VFS::Path::Normalized mesh(model);
+        osg::ref_ptr<osg::Node> instance = mResourceSystem->getSceneManager()->getInstance(mesh, parent);
+        PartHolderPtr holder = std::make_unique<PartHolder>(instance);
+        mCustomMeshesMap.insert(std::pair<std::string, PartHolderPtr>(meshId, std::move(holder)));
+    }
+
     void Animation::addEffect(std::string_view model, std::string_view effectId, bool loop, std::string_view bonename,
         std::string_view texture, bool useAmbientLight)
     {

apps/openmw/mwrender/animation.hpp

@@ -210,6 +210,8 @@ namespace MWRender
 
         mutable NodeMap mNodeMap;
         mutable bool mNodeMapCreated;
+        mutable std::unordered_map<std::string, PartHolderPtr, Misc::StringUtils::CiHash, Misc::StringUtils::CiEqual>
+            mCustomMeshesMap;
 
         MWWorld::Ptr mPtr;
 
@@ -350,6 +352,10 @@ namespace MWRender
         void addEffect(std::string_view model, std::string_view effectId, bool loop = false,
             std::string_view bonename = {}, std::string_view texture = {}, bool useAmbientLight = true);
 
+        void addCustomMesh(std::string_view model, std::string_view bonename, std::string_view meshId);
+        void removeCustomMesh(std::string_view meshId);
+        void removeCustomMeshes();
+
         void removeEffect(std::string_view effectId);
         void removeEffects();
         std::vector<std::string_view> getLoopingEffects() const;