#5584: MD5 model animation is working again, a renderable surface upd…

…ate is queued per each change
codereader · Jan 16, 2022 · 5034bb1 · 5034bb1
1 parent 4336484
commit 5034bb1
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 1 deletion.
diff --git a/radiantcore/model/md5/MD5Model.cpp b/radiantcore/model/md5/MD5Model.cpp
@@ -384,6 +384,13 @@ void MD5Model::updateAnim(std::size_t time)
 	{
 		i->surface->updateToSkeleton(_skeleton);
 	}
+
+    signal_ModelAnimationUpdated().emit();
+}
+
+sigc::signal<void>& MD5Model::signal_ModelAnimationUpdated()
+{
+    return _sigModelAnimationUpdated;
 }
 
 } // namespace
diff --git a/radiantcore/model/md5/MD5Model.h b/radiantcore/model/md5/MD5Model.h
@@ -71,6 +71,8 @@ class MD5Model :
 	// We need to keep a reference for skin swapping
 	RenderSystemWeakPtr _renderSystem;
 
+    sigc::signal<void> _sigModelAnimationUpdated;
+
 public:
 	MD5Model();
 
@@ -147,6 +149,8 @@ class MD5Model :
 	 */
 	static Vector3 parseVector3(parser::DefTokeniser& tok);
 
+    sigc::signal<void>& signal_ModelAnimationUpdated();
+
 private:
 
 	// Creates a new MD5Surface, adds it to the local list and returns the reference

diff --git a/radiantcore/model/md5/MD5ModelNode.cpp b/radiantcore/model/md5/MD5ModelNode.cpp
@@ -12,7 +12,16 @@ namespace md5
 MD5ModelNode::MD5ModelNode(const MD5ModelPtr& model) :
     _model(new MD5Model(*model)), // create a copy of the incoming model, we need our own instance
     _attachedToShaders(false)
-{}
+{
+    _animationUpdateConnection = _model->signal_ModelAnimationUpdated().connect(
+        sigc::mem_fun(this, &MD5ModelNode::onModelAnimationUpdated)
+    );
+}
+
+MD5ModelNode::~MD5ModelNode()
+{
+    _animationUpdateConnection.disconnect();
+}
 
 const model::IModel& MD5ModelNode::getIModel() const
 {
@@ -240,4 +249,12 @@ void MD5ModelNode::onVisibilityChanged(bool isVisibleNow)
     }
 }
 
+void MD5ModelNode::onModelAnimationUpdated()
+{
+    for (auto& surface : _renderableSurfaces)
+    {
+        surface->queueUpdate();
+    }
+}
+
 } // namespace md5
diff --git a/radiantcore/model/md5/MD5ModelNode.h b/radiantcore/model/md5/MD5ModelNode.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <sigc++/connection.h>
 #include "MD5Model.h"
 #include "modelskin.h"
 #include "itraceable.h"
@@ -26,8 +27,11 @@ class MD5ModelNode :
 
     bool _attachedToShaders;
 
+    sigc::connection _animationUpdateConnection;
+
 public:
 	MD5ModelNode(const MD5ModelPtr& model);
+    virtual ~MD5ModelNode();
 
     void onInsertIntoScene(scene::IMapRootNode& root) override;
     void onRemoveFromScene(scene::IMapRootNode& root) override;
@@ -74,6 +78,7 @@ class MD5ModelNode :
     void onVisibilityChanged(bool isVisibleNow) override;
 
 private:
+    void onModelAnimationUpdated();
     void attachToShaders();
     void detachFromShaders();
 #if 0