GRAPHICS: Add an Ogre frame listener to advance animations

xoreos · Mar 21, 2014 · 26b6e98 · 26b6e98
1 parent 7e2e716
commit 26b6e98
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 1 deletion.
diff --git a/src/graphics/renderer.cpp b/src/graphics/renderer.cpp
@@ -67,10 +67,25 @@ class OgreLogger : public Ogre::LogListener {
 	}
 };
 
+class OgreAnimator : public Ogre::FrameListener {
+public:
+	bool frameStarted(const Ogre::FrameEvent &event) {
+		Ogre::SceneManager *scene = Ogre::Root::getSingleton().getSceneManagerIterator().begin()->second;
+		if (!scene)
+			return false;
+
+		OGRE_LOCK_MUTEX(scene->sceneGraphMutex);
+
+		for (Ogre::AnimationStateIterator anims = scene->getAnimationStateIterator(); anims.hasMoreElements(); anims.moveNext())
+			anims.current()->second->addTime(event.timeSinceLastFrame);
+
+		return true;
+	}
+};
 
 Renderer::Renderer(SDL_Window &screen, bool vsync, int fsaa) :
 	_logManager(0), _logger(0), _root(0), _overlaySystem(0), _dummyWindow(0),
-	_renderWindow(0), _sceneManager(0), _camera(0), _viewPort(0) {
+	_renderWindow(0), _sceneManager(0), _camera(0), _viewPort(0), _animator(0) {
 
 	try {
 		createLog();
@@ -107,9 +122,13 @@ Renderer::~Renderer() {
 void Renderer::destroy() {
 	CursorMan.deinit();
 
+	if (_root && _animator)
+		_root->removeFrameListener(_animator);
+
 	if (_sceneManager && _overlaySystem)
 		_sceneManager->removeRenderQueueListener(_overlaySystem);
 
+	delete _animator;
 	delete _overlaySystem;
 	delete _root;
 
@@ -129,6 +148,7 @@ void Renderer::destroy() {
 	_sceneManager  = 0;
 	_camera        = 0;
 	_viewPort      = 0;
+	_animator      = 0;
 }
 
 void Renderer::createLog() {
@@ -270,6 +290,9 @@ void Renderer::createScene() {
 	_camera->setFarClipDistance(1000.0);
 	_camera->setFOVy(Ogre::Degree(60.0));
 
+	_animator = new OgreAnimator;
+	_root->addFrameListener(_animator);
+
 	CursorMan.init();
 }
 

diff --git a/src/graphics/renderer.h b/src/graphics/renderer.h
@@ -47,6 +47,7 @@ namespace Ogre {
 namespace Graphics {
 
 class OgreLogger;
+class OgreAnimator;
 
 enum RenderCapability {
 	kCapabilityS3TC,         ///< Supports S3TC DXTn.
@@ -83,6 +84,7 @@ class Renderer {
 	Ogre::SceneManager  *_sceneManager;  ///< The OGRE scene manager.
 	Ogre::Camera        *_camera;        ///< The OGRE camera.
 	Ogre::Viewport      *_viewPort;      ///< The OGRE view port.
+	OgreAnimator        *_animator;      ///< The OGRE frame listener advancing animations.
 
 
 	void createLog();