Merge branch 'jaro/physics-system-improvement' of github.com:lonkaars/crepe into jaro/particle-system-improvement

4 files changed, 5 insertions, 5 deletions

diff --git a/src/crepe/manager/LoopTimerManager.cpp b/src/crepe/manager/LoopTimerManager.cpp
index 4a3df0a..9819632 100644
--- a/src/crepe/manager/LoopTimerManager.cpp
+++ b/src/crepe/manager/LoopTimerManager.cpp
@@ -80,8 +80,8 @@ duration_t LoopTimerManager::get_lag() const {
 	return this->elapsed_time - this->elapsed_fixed_time;
 }
 
-float LoopTimerManager::get_scaled_fixed_delta_time() const {
-	return (this->fixed_delta_time * this->time_scale).count();
+duration_t LoopTimerManager::get_scaled_fixed_delta_time() const {
+	return this->fixed_delta_time * this->time_scale;
 }
 
 void LoopTimerManager::set_fixed_delta_time(float seconds) {
diff --git a/src/crepe/manager/LoopTimerManager.h b/src/crepe/manager/LoopTimerManager.h
index dcbe21c..91403e4 100644
--- a/src/crepe/manager/LoopTimerManager.h
+++ b/src/crepe/manager/LoopTimerManager.h
@@ -103,7 +103,7 @@ public:
 	 *
 	 * \return The fixed delta time, scaled by the current time scale, in seconds.
 	 */
-	float get_scaled_fixed_delta_time() const;
+	duration_t get_scaled_fixed_delta_time() const;
 
 private:
 	//! Friend relation to use start,enforce_frame_rate,get_lag,update,advance_fixed_update.
diff --git a/src/crepe/system/AISystem.cpp b/src/crepe/system/AISystem.cpp
index e9d8fa7..680dbb8 100644
--- a/src/crepe/system/AISystem.cpp
+++ b/src/crepe/system/AISystem.cpp
@@ -16,7 +16,7 @@ void AISystem::update() {
 	LoopTimerManager & loop_timer = mediator.loop_timer;
 	RefVector<AI> ai_components = mgr.get_components_by_type<AI>();
 
-	float dt = loop_timer.get_scaled_fixed_delta_time();
+	float dt = loop_timer.get_scaled_fixed_delta_time().count();
 
 	// Loop through all AI components
 	for (AI & ai : ai_components) {
diff --git a/src/crepe/system/PhysicsSystem.cpp b/src/crepe/system/PhysicsSystem.cpp
index ca10b25..3b3b8ab 100644
--- a/src/crepe/system/PhysicsSystem.cpp
+++ b/src/crepe/system/PhysicsSystem.cpp
@@ -18,7 +18,7 @@ void PhysicsSystem::update() {
 	ComponentManager & mgr = mediator.component_manager;
 	LoopTimerManager & loop_timer = mediator.loop_timer;
 	RefVector<Rigidbody> rigidbodies = mgr.get_components_by_type<Rigidbody>();
-	float dt = loop_timer.get_scaled_fixed_delta_time();
+	float dt = loop_timer.get_scaled_fixed_delta_time().count();
 
 	float gravity = Config::get_instance().physics.gravity;
 	for (Rigidbody & rigidbody : rigidbodies) {