merge master

3 files changed, 9 insertions, 6 deletions

diff --git a/src/crepe/manager/LoopTimerManager.cpp b/src/crepe/manager/LoopTimerManager.cpp
index a98a29d..e78f92f 100644
--- a/src/crepe/manager/LoopTimerManager.cpp
+++ b/src/crepe/manager/LoopTimerManager.cpp
@@ -31,7 +31,7 @@ void LoopTimerManager::update() {
 		this->delta_time = this->maximum_delta_time;
 	}
 	if (this->delta_time > 0s) {
-		this->actual_fps = 1.0 / duration_cast<seconds>(this->delta_time).count();
+		this->actual_fps = static_cast<unsigned>(1.0 / this->delta_time.count());
 	} else {
 		this->actual_fps = 0;
 	}
diff --git a/src/crepe/manager/LoopTimerManager.h b/src/crepe/manager/LoopTimerManager.h
index 139294d..2f1e6b6 100644
--- a/src/crepe/manager/LoopTimerManager.h
+++ b/src/crepe/manager/LoopTimerManager.h
@@ -8,7 +8,7 @@ namespace crepe {
 
 class Engine;
 
-typedef std::chrono::duration<double> duration_t;
+typedef std::chrono::duration<float> duration_t;
 typedef std::chrono::duration<unsigned long long, std::micro> elapsed_time_t;
 
 /**
@@ -57,7 +57,7 @@ public:
 	 *
 	 * \return Current FPS.
 	 */
-	unsigned get_fps() const;
+	unsigned int get_fps() const;
 
 	/**
 	 * \brief Get the current time scale.
@@ -151,9 +151,9 @@ private:
 
 private:
 	//! Target frames per second.
-	unsigned target_fps = 60;
+	unsigned int target_fps = 60;
 	//! Actual frames per second.
-	unsigned actual_fps = 0;
+	unsigned int actual_fps = 0;
 	//! Time scale for speeding up or slowing down the game (0 = pause, < 1 = slow down, 1 = normal speed, > 1 = speed up).
 	float time_scale = 1;
 	//! Maximum delta time in seconds to avoid large jumps.
diff --git a/src/crepe/system/AnimatorSystem.cpp b/src/crepe/system/AnimatorSystem.cpp
index ad4eaa8..e5ab2fa 100644
--- a/src/crepe/system/AnimatorSystem.cpp
+++ b/src/crepe/system/AnimatorSystem.cpp
@@ -1,20 +1,23 @@
 #include "../api/Animator.h"
 #include "../manager/ComponentManager.h"
 #include "../manager/LoopTimerManager.h"
+#include <chrono>
 
 #include "AnimatorSystem.h"
 
 using namespace crepe;
+using namespace std::chrono;
 
 void AnimatorSystem::frame_update() {
 	ComponentManager & mgr = this->mediator.component_manager;
 	LoopTimerManager & timer = this->mediator.loop_timer;
 	RefVector<Animator> animations = mgr.get_components_by_type<Animator>();
 
-	unsigned long long elapsed_time = timer.get_elapsed_time().count();
+	float elapsed_time = duration_cast<duration<float>>(timer.get_elapsed_time()).count();
 
 	for (Animator & a : animations) {
 		if (!a.active) continue;
+		if (a.data.fps == 0) continue;
 
 		Animator::Data & ctx = a.data;
 		float frame_duration = 1.0f / ctx.fps;