From fe8f985d2c7ea672a5f886d7d0df064f26bd2cb4 Mon Sep 17 00:00:00 2001
From: JAROWMR <jarorutjes07@gmail.com>
Date: Sat, 7 Dec 2024 15:43:00 +0100
Subject: improved physics for AI
---
src/crepe/api/Config.h | 2 +-
src/crepe/system/AISystem.cpp | 2 +-
src/crepe/system/CollisionSystem.cpp | 14 ---------
src/crepe/system/PhysicsSystem.cpp | 57 +++++++++++++++++-------------------
src/test/PhysicsTest.cpp | 2 +-
5 files changed, 30 insertions(+), 47 deletions(-)
diff --git a/src/crepe/api/Config.h b/src/crepe/api/Config.h
index a9745c3..c31cf4a 100644
--- a/src/crepe/api/Config.h
+++ b/src/crepe/api/Config.h
@@ -63,7 +63,7 @@ public:
*
* Gravity value of game.
*/
- double gravity = 1;
+ float gravity = 1;
} physics;
//! default window settings
diff --git a/src/crepe/system/AISystem.cpp b/src/crepe/system/AISystem.cpp
index 55dc14c..324ee5f 100644
--- a/src/crepe/system/AISystem.cpp
+++ b/src/crepe/system/AISystem.cpp
@@ -130,7 +130,7 @@ vec2 AISystem::arrive(const AI & ai) {
float distance = to_target.length();
if (distance > 0.0f) {
float speed = distance / ai.arrive_deceleration;
- speed = std::min(speed, rigidbody.data.max_linear_velocity.length());
+ speed = std::min(speed, rigidbody.data.max_linear_velocity);
vec2 desired_velocity = to_target * (speed / distance);
return desired_velocity - rigidbody.data.linear_velocity;
diff --git a/src/crepe/system/CollisionSystem.cpp b/src/crepe/system/CollisionSystem.cpp
index 6b1954e..0483693 100644
--- a/src/crepe/system/CollisionSystem.cpp
+++ b/src/crepe/system/CollisionSystem.cpp
@@ -182,11 +182,7 @@ CollisionSystem::collision_handler(CollisionInternal & data1, CollisionInternal
vec2 collider_pos2 = this->get_current_position(collider2.offset, data2.transform,
data2.rigidbody);
resolution = this->get_circle_box_resolution(collider1, collider2, collider_pos1,
-<<<<<<< HEAD
collider_pos2);
-=======
- collider_pos2, false);
->>>>>>> 33a072db28d71ba65e59f9491abd42dbf9695fc4
break;
}
}
@@ -272,12 +268,7 @@ vec2 CollisionSystem::get_circle_circle_resolution(const CircleCollider & circle
vec2 CollisionSystem::get_circle_box_resolution(const CircleCollider & circle_collider,
const BoxCollider & box_collider,
const vec2 & circle_position,
-<<<<<<< HEAD
const vec2 & box_position) const {
-=======
- const vec2 & box_position,
- bool inverse) const {
->>>>>>> 33a072db28d71ba65e59f9491abd42dbf9695fc4
vec2 delta = circle_position - box_position;
// Compute half-dimensions of the box
@@ -299,11 +290,6 @@ vec2 CollisionSystem::get_circle_box_resolution(const CircleCollider & circle_co
// Compute penetration depth
float penetration_depth = circle_collider.radius - distance;
-<<<<<<< HEAD
-
-=======
- if (inverse) collision_normal = -collision_normal;
->>>>>>> 33a072db28d71ba65e59f9491abd42dbf9695fc4
// Compute the resolution vector
vec2 resolution = collision_normal * penetration_depth;
diff --git a/src/crepe/system/PhysicsSystem.cpp b/src/crepe/system/PhysicsSystem.cpp
index ebf4439..ab77b35 100644
--- a/src/crepe/system/PhysicsSystem.cpp
+++ b/src/crepe/system/PhysicsSystem.cpp
@@ -11,11 +11,12 @@
using namespace crepe;
void PhysicsSystem::update() {
+ double dt = LoopTimer::get_instance().get_delta_time();
ComponentManager & mgr = this->mediator.component_manager;
RefVector<Rigidbody> rigidbodies = mgr.get_components_by_type<Rigidbody>();
RefVector<Transform> transforms = mgr.get_components_by_type<Transform>();
- double gravity = Config::get_instance().physics.gravity;
+ float gravity = Config::get_instance().physics.gravity;
for (Rigidbody & rigidbody : rigidbodies) {
if (!rigidbody.active) continue;
@@ -28,17 +29,27 @@ void PhysicsSystem::update() {
if (rigidbody.data.gravity_scale > 0) {
rigidbody.data.linear_velocity.y
+= (rigidbody.data.mass * rigidbody.data.gravity_scale
- * gravity);
+ * gravity * dt);
}
- // Add damping
+ // Add coefficient rotation
if (rigidbody.data.angular_velocity_coefficient > 0) {
rigidbody.data.angular_velocity
- *= rigidbody.data.angular_velocity_coefficient;
+ *= std::pow(rigidbody.data.angular_velocity_coefficient, dt);
+
}
- if (rigidbody.data.linear_velocity_coefficient.x > 0
- && rigidbody.data.linear_velocity_coefficient.y > 0) {
- rigidbody.data.linear_velocity
- *= rigidbody.data.linear_velocity_coefficient;
+
+ // Add coefficient movement horizontal
+ if (rigidbody.data.linear_velocity_coefficient.x > 0)
+ {
+ rigidbody.data.linear_velocity.x
+ *= std::pow(rigidbody.data.linear_velocity_coefficient.x, dt);
+ }
+
+ // Add coefficient movement horizontal
+ if (rigidbody.data.linear_velocity_coefficient.y > 0)
+ {
+ rigidbody.data.linear_velocity.y
+ *= std::pow(rigidbody.data.linear_velocity_coefficient.y, dt);
}
// Max velocity check
@@ -51,40 +62,26 @@ void PhysicsSystem::update() {
rigidbody.data.angular_velocity
= -rigidbody.data.max_angular_velocity;
}
-
- if (rigidbody.data.linear_velocity.x
- > rigidbody.data.max_linear_velocity.x) {
- rigidbody.data.linear_velocity.x
- = rigidbody.data.max_linear_velocity.x;
- } else if (rigidbody.data.linear_velocity.x
- < -rigidbody.data.max_linear_velocity.x) {
- rigidbody.data.linear_velocity.x
- = -rigidbody.data.max_linear_velocity.x;
- }
-
- if (rigidbody.data.linear_velocity.y
- > rigidbody.data.max_linear_velocity.y) {
- rigidbody.data.linear_velocity.y
- = rigidbody.data.max_linear_velocity.y;
- } else if (rigidbody.data.linear_velocity.y
- < -rigidbody.data.max_linear_velocity.y) {
- rigidbody.data.linear_velocity.y
- = -rigidbody.data.max_linear_velocity.y;
+
+ // Set max velocity to maximum length
+ if(rigidbody.data.linear_velocity.length() > rigidbody.data.max_linear_velocity) {
+ rigidbody.data.linear_velocity.normalize();
+ rigidbody.data.linear_velocity *= rigidbody.data.max_linear_velocity;
}
// Move object
if (!rigidbody.data.constraints.rotation) {
- transform.rotation += rigidbody.data.angular_velocity;
+ transform.rotation += rigidbody.data.angular_velocity * dt;
transform.rotation = std::fmod(transform.rotation, 360.0);
if (transform.rotation < 0) {
transform.rotation += 360.0;
}
}
if (!rigidbody.data.constraints.x) {
- transform.position.x += rigidbody.data.linear_velocity.x;
+ transform.position.x += rigidbody.data.linear_velocity.x * dt;
}
if (!rigidbody.data.constraints.y) {
- transform.position.y += rigidbody.data.linear_velocity.y;
+ transform.position.y += rigidbody.data.linear_velocity.y * dt;
}
}
}
diff --git a/src/test/PhysicsTest.cpp b/src/test/PhysicsTest.cpp
index 43d2931..4af34f5 100644
--- a/src/test/PhysicsTest.cpp
+++ b/src/test/PhysicsTest.cpp
@@ -27,7 +27,7 @@ public:
.mass = 1,
.gravity_scale = 1,
.body_type = Rigidbody::BodyType::DYNAMIC,
- .max_linear_velocity = vec2{10, 10},
+ .max_linear_velocity = 10,
.max_angular_velocity = 10,
.constraints = {0, 0},
});
--
cgit v1.2.3
From 2b3f4ae6abcd88d89b0f6d0db8023b26ac3e9150 Mon Sep 17 00:00:00 2001
From: JAROWMR <jarorutjes07@gmail.com>
Date: Sat, 7 Dec 2024 15:45:31 +0100
Subject: restore file
---
src/crepe/system/CollisionSystem.cpp | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/crepe/system/CollisionSystem.cpp b/src/crepe/system/CollisionSystem.cpp
index 0483693..952ed0a 100644
--- a/src/crepe/system/CollisionSystem.cpp
+++ b/src/crepe/system/CollisionSystem.cpp
@@ -290,6 +290,7 @@ vec2 CollisionSystem::get_circle_box_resolution(const CircleCollider & circle_co
// Compute penetration depth
float penetration_depth = circle_collider.radius - distance;
+
// Compute the resolution vector
vec2 resolution = collision_normal * penetration_depth;
--
cgit v1.2.3
From 3f4be8dd73792b8937cdba4934b8938be163ac7a Mon Sep 17 00:00:00 2001
From: JAROWMR <jarorutjes07@gmail.com>
Date: Sat, 7 Dec 2024 15:46:29 +0100
Subject: restored file
---
src/crepe/system/CollisionSystem.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/crepe/system/CollisionSystem.cpp b/src/crepe/system/CollisionSystem.cpp
index 952ed0a..44a0431 100644
--- a/src/crepe/system/CollisionSystem.cpp
+++ b/src/crepe/system/CollisionSystem.cpp
@@ -290,7 +290,7 @@ vec2 CollisionSystem::get_circle_box_resolution(const CircleCollider & circle_co
// Compute penetration depth
float penetration_depth = circle_collider.radius - distance;
-
+
// Compute the resolution vector
vec2 resolution = collision_normal * penetration_depth;
--
cgit v1.2.3
From 529e55a28a7e51bf3dd0f08fa9d6f0192445a7b4 Mon Sep 17 00:00:00 2001
From: JAROWMR <jarorutjes07@gmail.com>
Date: Sat, 7 Dec 2024 19:26:12 +0100
Subject: fixed transform
---
src/crepe/api/LoopManager.cpp | 8 +--
src/crepe/system/PhysicsSystem.cpp | 112 ++++++++++++++++++-------------------
2 files changed, 59 insertions(+), 61 deletions(-)
diff --git a/src/crepe/api/LoopManager.cpp b/src/crepe/api/LoopManager.cpp
index fec9f51..0c1caaa 100644
--- a/src/crepe/api/LoopManager.cpp
+++ b/src/crepe/api/LoopManager.cpp
@@ -37,10 +37,10 @@ void LoopManager::fixed_update() {
// TODO: retrieve EventManager from direct member after singleton refactor
EventManager & ev = this->mediator.event_manager;
ev.dispatch_events();
- this->get_system<ScriptSystem>().update();
- this->get_system<AISystem>().update();
- this->get_system<PhysicsSystem>().update();
- this->get_system<CollisionSystem>().update();
+ this->get_system<ScriptSystem>().update(); // past velocity en locatie aan.
+ this->get_system<AISystem>().update(); // past velocity aan (2x) maxforce
+ this->get_system<PhysicsSystem>().update(); // past velocity aan en locatie
+ this->get_system<CollisionSystem>().update(); // past velocity aan en locate
}
void LoopManager::loop() {
diff --git a/src/crepe/system/PhysicsSystem.cpp b/src/crepe/system/PhysicsSystem.cpp
index ab77b35..7e66567 100644
--- a/src/crepe/system/PhysicsSystem.cpp
+++ b/src/crepe/system/PhysicsSystem.cpp
@@ -14,76 +14,74 @@ void PhysicsSystem::update() {
double dt = LoopTimer::get_instance().get_delta_time();
ComponentManager & mgr = this->mediator.component_manager;
RefVector<Rigidbody> rigidbodies = mgr.get_components_by_type<Rigidbody>();
- RefVector<Transform> transforms = mgr.get_components_by_type<Transform>();
+
float gravity = Config::get_instance().physics.gravity;
for (Rigidbody & rigidbody : rigidbodies) {
if (!rigidbody.active) continue;
+ Transform & transform = mgr.get_components_by_id<Transform>(rigidbody.game_object_id).front().get();
switch (rigidbody.data.body_type) {
case Rigidbody::BodyType::DYNAMIC:
- for (Transform & transform : transforms) {
- if (transform.game_object_id == rigidbody.game_object_id) {
-
- // Add gravity
- if (rigidbody.data.gravity_scale > 0) {
- rigidbody.data.linear_velocity.y
- += (rigidbody.data.mass * rigidbody.data.gravity_scale
- * gravity * dt);
- }
- // Add coefficient rotation
- if (rigidbody.data.angular_velocity_coefficient > 0) {
- rigidbody.data.angular_velocity
- *= std::pow(rigidbody.data.angular_velocity_coefficient, dt);
-
- }
+ if (transform.game_object_id == rigidbody.game_object_id) {
+ // Add gravity
+ if (rigidbody.data.gravity_scale > 0) {
+ rigidbody.data.linear_velocity.y
+ += (rigidbody.data.mass * rigidbody.data.gravity_scale
+ * gravity * dt);
+ }
+ // Add coefficient rotation
+ if (rigidbody.data.angular_velocity_coefficient > 0) {
+ rigidbody.data.angular_velocity
+ *= std::pow(rigidbody.data.angular_velocity_coefficient, dt);
+
+ }
- // Add coefficient movement horizontal
- if (rigidbody.data.linear_velocity_coefficient.x > 0)
- {
- rigidbody.data.linear_velocity.x
- *= std::pow(rigidbody.data.linear_velocity_coefficient.x, dt);
- }
+ // Add coefficient movement horizontal
+ if (rigidbody.data.linear_velocity_coefficient.x > 0)
+ {
+ rigidbody.data.linear_velocity.x
+ *= std::pow(rigidbody.data.linear_velocity_coefficient.x, dt);
+ }
- // Add coefficient movement horizontal
- if (rigidbody.data.linear_velocity_coefficient.y > 0)
- {
- rigidbody.data.linear_velocity.y
- *= std::pow(rigidbody.data.linear_velocity_coefficient.y, dt);
- }
+ // Add coefficient movement horizontal
+ if (rigidbody.data.linear_velocity_coefficient.y > 0)
+ {
+ rigidbody.data.linear_velocity.y
+ *= std::pow(rigidbody.data.linear_velocity_coefficient.y, dt);
+ }
- // Max velocity check
- if (rigidbody.data.angular_velocity
- > rigidbody.data.max_angular_velocity) {
- rigidbody.data.angular_velocity
- = rigidbody.data.max_angular_velocity;
- } else if (rigidbody.data.angular_velocity
- < -rigidbody.data.max_angular_velocity) {
- rigidbody.data.angular_velocity
- = -rigidbody.data.max_angular_velocity;
- }
-
- // Set max velocity to maximum length
- if(rigidbody.data.linear_velocity.length() > rigidbody.data.max_linear_velocity) {
- rigidbody.data.linear_velocity.normalize();
- rigidbody.data.linear_velocity *= rigidbody.data.max_linear_velocity;
- }
+ // Max velocity check
+ if (rigidbody.data.angular_velocity
+ > rigidbody.data.max_angular_velocity) {
+ rigidbody.data.angular_velocity
+ = rigidbody.data.max_angular_velocity;
+ } else if (rigidbody.data.angular_velocity
+ < -rigidbody.data.max_angular_velocity) {
+ rigidbody.data.angular_velocity
+ = -rigidbody.data.max_angular_velocity;
+ }
+
+ // Set max velocity to maximum length
+ if(rigidbody.data.linear_velocity.length() > rigidbody.data.max_linear_velocity) {
+ rigidbody.data.linear_velocity.normalize();
+ rigidbody.data.linear_velocity *= rigidbody.data.max_linear_velocity;
+ }
- // Move object
- if (!rigidbody.data.constraints.rotation) {
- transform.rotation += rigidbody.data.angular_velocity * dt;
- transform.rotation = std::fmod(transform.rotation, 360.0);
- if (transform.rotation < 0) {
- transform.rotation += 360.0;
- }
- }
- if (!rigidbody.data.constraints.x) {
- transform.position.x += rigidbody.data.linear_velocity.x * dt;
- }
- if (!rigidbody.data.constraints.y) {
- transform.position.y += rigidbody.data.linear_velocity.y * dt;
+ // Move object
+ if (!rigidbody.data.constraints.rotation) {
+ transform.rotation += rigidbody.data.angular_velocity * dt;
+ transform.rotation = std::fmod(transform.rotation, 360.0);
+ if (transform.rotation < 0) {
+ transform.rotation += 360.0;
}
}
+ if (!rigidbody.data.constraints.x) {
+ transform.position.x += rigidbody.data.linear_velocity.x * dt;
+ }
+ if (!rigidbody.data.constraints.y) {
+ transform.position.y += rigidbody.data.linear_velocity.y * dt;
+ }
}
break;
case Rigidbody::BodyType::KINEMATIC:
--
cgit v1.2.3
From 9b4f6f24f29e8873a14989ba8c9fccfbc460af7f Mon Sep 17 00:00:00 2001
From: JAROWMR <jarorutjes07@gmail.com>
Date: Sat, 7 Dec 2024 20:42:38 +0100
Subject: use fixed delta time
---
src/crepe/api/LoopTimer.h | 19 ++++++++++---------
src/crepe/system/AISystem.cpp | 2 +-
src/crepe/system/PhysicsSystem.cpp | 2 +-
3 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/src/crepe/api/LoopTimer.h b/src/crepe/api/LoopTimer.h
index 9393439..8d0b2f9 100644
--- a/src/crepe/api/LoopTimer.h
+++ b/src/crepe/api/LoopTimer.h
@@ -58,6 +58,16 @@ public:
* \param game_scale The desired game scale (0 = pause, 1 = normal speed, > 1 = speed up).
*/
void set_game_scale(double game_scale);
+
+ /**
+ * \brief Get the fixed delta time for consistent updates.
+ *
+ * Fixed delta time is used for operations that require uniform time steps, such as physics
+ * calculations.
+ *
+ * \return Fixed delta time in seconds.
+ */
+ double get_fixed_delta_time() const;
private:
friend class LoopManager;
@@ -77,15 +87,6 @@ private:
*/
void enforce_frame_rate();
- /**
- * \brief Get the fixed delta time for consistent updates.
- *
- * Fixed delta time is used for operations that require uniform time steps, such as physics
- * calculations.
- *
- * \return Fixed delta time in seconds.
- */
- double get_fixed_delta_time() const;
/**
* \brief Get the accumulated lag in the game loop.
diff --git a/src/crepe/system/AISystem.cpp b/src/crepe/system/AISystem.cpp
index 324ee5f..64e93fc 100644
--- a/src/crepe/system/AISystem.cpp
+++ b/src/crepe/system/AISystem.cpp
@@ -17,7 +17,7 @@ void AISystem::update() {
ComponentManager & mgr = mediator.component_manager;
RefVector<AI> ai_components = mgr.get_components_by_type<AI>();
- double dt = LoopTimer::get_instance().get_delta_time();
+ double dt = LoopTimer::get_instance().get_fixed_delta_time();
for (AI & ai : ai_components) {
RefVector<Rigidbody> rigidbodies
diff --git a/src/crepe/system/PhysicsSystem.cpp b/src/crepe/system/PhysicsSystem.cpp
index 7e66567..be768f9 100644
--- a/src/crepe/system/PhysicsSystem.cpp
+++ b/src/crepe/system/PhysicsSystem.cpp
@@ -11,7 +11,7 @@
using namespace crepe;
void PhysicsSystem::update() {
- double dt = LoopTimer::get_instance().get_delta_time();
+ double dt = LoopTimer::get_instance().get_fixed_delta_time();
ComponentManager & mgr = this->mediator.component_manager;
RefVector<Rigidbody> rigidbodies = mgr.get_components_by_type<Rigidbody>();
--
cgit v1.2.3
From 436b0db58c7533b286ecd3ec3d3c71311e71cf9c Mon Sep 17 00:00:00 2001
From: JAROWMR <jarorutjes07@gmail.com>
Date: Wed, 11 Dec 2024 20:21:55 +0100
Subject: added fixed update
---
src/crepe/api/Rigidbody.h | 2 +-
src/crepe/system/AISystem.cpp | 6 ++----
src/crepe/system/PhysicsSystem.cpp | 22 +++++++++++++++++++---
3 files changed, 22 insertions(+), 8 deletions(-)
diff --git a/src/crepe/api/Rigidbody.h b/src/crepe/api/Rigidbody.h
index f641fff..b08c8db 100644
--- a/src/crepe/api/Rigidbody.h
+++ b/src/crepe/api/Rigidbody.h
@@ -53,7 +53,7 @@ public:
*/
struct Data {
//! objects mass
- float mass = 0.0;
+ float mass = 1;
/**
* \brief Gravity scale factor.
*
diff --git a/src/crepe/system/AISystem.cpp b/src/crepe/system/AISystem.cpp
index 1d8ffb9..1bbac69 100644
--- a/src/crepe/system/AISystem.cpp
+++ b/src/crepe/system/AISystem.cpp
@@ -13,12 +13,10 @@ using namespace std::chrono;
void AISystem::update() {
const Mediator & mediator = this->mediator;
ComponentManager & mgr = mediator.component_manager;
- LoopTimerManager & timer = mediator.loop_timer;
- RefVector<AI> ai_components = mgr.get_components_by_type<AI>();
LoopTimerManager & loop_timer = mediator.loop_timer;
+ RefVector<AI> ai_components = mgr.get_components_by_type<AI>();
- //TODO: Use fixed loop dt (this is not available at master at the moment)
- duration_t dt = loop_timer.get_delta_time();
+ duration_t dt = loop_timer.get_scaled_fixed_delta_time();
// 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 be768f9..77c3be7 100644
--- a/src/crepe/system/PhysicsSystem.cpp
+++ b/src/crepe/system/PhysicsSystem.cpp
@@ -5,17 +5,24 @@
#include "../api/Transform.h"
#include "../api/Vector2.h"
#include "../manager/ComponentManager.h"
+#include "../manager/LoopTimerManager.h"
+#include "../manager/Mediator.h"
#include "PhysicsSystem.h"
using namespace crepe;
+using namespace std::chrono;
void PhysicsSystem::update() {
- double dt = LoopTimer::get_instance().get_fixed_delta_time();
- ComponentManager & mgr = this->mediator.component_manager;
+
+ const Mediator & mediator = this->mediator;
+ ComponentManager & mgr = mediator.component_manager;
+ LoopTimerManager & loop_timer = mediator.loop_timer;
RefVector<Rigidbody> rigidbodies = mgr.get_components_by_type<Rigidbody>();
-
+ duration_t delta_time = loop_timer.get_scaled_fixed_delta_time();
+ float dt = duration_cast<seconds>(delta_time).count();
+
float gravity = Config::get_instance().physics.gravity;
for (Rigidbody & rigidbody : rigidbodies) {
if (!rigidbody.active) continue;
@@ -25,6 +32,15 @@ void PhysicsSystem::update() {
case Rigidbody::BodyType::DYNAMIC:
if (transform.game_object_id == rigidbody.game_object_id) {
// Add gravity
+
+ if (rigidbody.data.mass <= 0) {
+ throw std::runtime_error("Mass must be greater than 0");
+ }
+
+ if (gravity <= 0) {
+ throw std::runtime_error("Config Gravity must be greater than 0");
+ }
+
if (rigidbody.data.gravity_scale > 0) {
rigidbody.data.linear_velocity.y
+= (rigidbody.data.mass * rigidbody.data.gravity_scale
--
cgit v1.2.3
From a4c65ca6a69987349f703e51beed47a219d3d92d Mon Sep 17 00:00:00 2001
From: JAROWMR <jarorutjes07@gmail.com>
Date: Wed, 11 Dec 2024 21:32:05 +0100
Subject: timing fix
---
src/crepe/system/AISystem.cpp | 3 ++-
src/crepe/system/PhysicsSystem.cpp | 2 +-
src/example/AITest.cpp | 24 +++++++++++---------
src/test/CMakeLists.txt | 46 +++++++++++++++++++-------------------
src/test/PhysicsTest.cpp | 8 +++++--
5 files changed, 46 insertions(+), 37 deletions(-)
diff --git a/src/crepe/system/AISystem.cpp b/src/crepe/system/AISystem.cpp
index 1bbac69..a20e28c 100644
--- a/src/crepe/system/AISystem.cpp
+++ b/src/crepe/system/AISystem.cpp
@@ -43,7 +43,8 @@ void AISystem::update() {
// Calculate the acceleration (using the above calculated force)
vec2 acceleration = force / rigidbody.data.mass;
// Finally, update Rigidbody's velocity
- rigidbody.data.linear_velocity += acceleration * duration_cast<seconds>(dt).count();
+ rigidbody.data.linear_velocity += acceleration * duration<float>(dt).count();
+
}
}
diff --git a/src/crepe/system/PhysicsSystem.cpp b/src/crepe/system/PhysicsSystem.cpp
index 77c3be7..78370d1 100644
--- a/src/crepe/system/PhysicsSystem.cpp
+++ b/src/crepe/system/PhysicsSystem.cpp
@@ -21,7 +21,7 @@ void PhysicsSystem::update() {
RefVector<Rigidbody> rigidbodies = mgr.get_components_by_type<Rigidbody>();
duration_t delta_time = loop_timer.get_scaled_fixed_delta_time();
- float dt = duration_cast<seconds>(delta_time).count();
+ float dt = duration<float>(delta_time).count();
float gravity = Config::get_instance().physics.gravity;
for (Rigidbody & rigidbody : rigidbodies) {
diff --git a/src/example/AITest.cpp b/src/example/AITest.cpp
index f4efc9f..93ba500 100644
--- a/src/example/AITest.cpp
+++ b/src/example/AITest.cpp
@@ -8,7 +8,6 @@
#include <crepe/api/Scene.h>
#include <crepe/api/Script.h>
#include <crepe/api/Sprite.h>
-#include <crepe/api/Texture.h>
#include <crepe/manager/Mediator.h>
#include <crepe/types.h>
@@ -47,14 +46,19 @@ public:
GameObject game_object1 = mgr.new_object("", "", vec2{0, 0}, 0, 1);
GameObject game_object2 = mgr.new_object("", "", vec2{0, 0}, 0, 1);
- Texture img = Texture("asset/texture/test_ap43.png");
- game_object1.add_component<Sprite>(img, Sprite::Data{
- .color = Color::MAGENTA,
- .flip = Sprite::FlipSettings{false, false},
- .sorting_in_layer = 1,
- .order_in_layer = 1,
- .size = {0, 195},
- });
+ Asset img{"asset/texture/test_ap43.png"};
+
+ Sprite & test_sprite = game_object1.add_component<Sprite>(
+ img, Sprite::Data{
+ .color = Color::MAGENTA,
+ .flip = Sprite::FlipSettings{false, false},
+ .sorting_in_layer = 2,
+ .order_in_layer = 2,
+ .size = {0, 100},
+ .angle_offset = 0,
+ .position_offset = {0, 0},
+ });
+
AI & ai = game_object1.add_component<AI>(3000);
// ai.arrive_on();
// ai.flee_on();
@@ -63,7 +67,7 @@ public:
ai.make_oval_path(1000, 500, {0, 500}, 4.7124, false);
game_object1.add_component<Rigidbody>(Rigidbody::Data{
.mass = 0.1f,
- .max_linear_velocity = {40, 40},
+ .max_linear_velocity = 40,
});
game_object1.add_component<BehaviorScript>().set_script<Script1>();
diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
index 11b4ca9..f9063fc 100644
--- a/src/test/CMakeLists.txt
+++ b/src/test/CMakeLists.txt
@@ -1,27 +1,27 @@
target_sources(test_main PUBLIC
main.cpp
- CollisionTest.cpp
+ # CollisionTest.cpp
PhysicsTest.cpp
- ScriptTest.cpp
- ParticleTest.cpp
- AudioTest.cpp
- AssetTest.cpp
- ResourceManagerTest.cpp
- OptionalRefTest.cpp
- RenderSystemTest.cpp
- EventTest.cpp
- ECSTest.cpp
- SceneManagerTest.cpp
- ValueBrokerTest.cpp
- DBTest.cpp
- Vector2Test.cpp
- LoopManagerTest.cpp
- LoopTimerTest.cpp
- InputTest.cpp
- ScriptEventTest.cpp
- ScriptSceneTest.cpp
- Profiling.cpp
- SaveManagerTest.cpp
- ScriptSaveManagerTest.cpp
- ScriptECSTest.cpp
+ # ScriptTest.cpp
+ # ParticleTest.cpp
+ # AudioTest.cpp
+ # AssetTest.cpp
+ # ResourceManagerTest.cpp
+ # OptionalRefTest.cpp
+ # RenderSystemTest.cpp
+ # EventTest.cpp
+ # ECSTest.cpp
+ # SceneManagerTest.cpp
+ # ValueBrokerTest.cpp
+ # DBTest.cpp
+ # Vector2Test.cpp
+ # LoopManagerTest.cpp
+ # LoopTimerTest.cpp
+ # InputTest.cpp
+ # ScriptEventTest.cpp
+ # ScriptSceneTest.cpp
+ # Profiling.cpp
+ # SaveManagerTest.cpp
+ # ScriptSaveManagerTest.cpp
+ # ScriptECSTest.cpp
)
diff --git a/src/test/PhysicsTest.cpp b/src/test/PhysicsTest.cpp
index 4af34f5..316a567 100644
--- a/src/test/PhysicsTest.cpp
+++ b/src/test/PhysicsTest.cpp
@@ -5,6 +5,8 @@
#include <crepe/manager/ComponentManager.h>
#include <crepe/system/PhysicsSystem.h>
#include <gtest/gtest.h>
+#include <crepe/manager/LoopTimerManager.h>
+#include <crepe/manager/Mediator.h>
using namespace std;
using namespace std::chrono_literals;
@@ -16,6 +18,8 @@ class PhysicsTest : public ::testing::Test {
public:
ComponentManager component_manager{m};
PhysicsSystem system{m};
+ LoopTimerManager loop_timer{m};
+
void SetUp() override {
ComponentManager & mgr = this->component_manager;
@@ -55,10 +59,10 @@ TEST_F(PhysicsTest, gravity) {
EXPECT_EQ(transform.position.y, 0);
system.update();
- EXPECT_EQ(transform.position.y, 1);
+ EXPECT_NEAR(transform.position.y, 0.0004,0.0001);
system.update();
- EXPECT_EQ(transform.position.y, 3);
+ EXPECT_NEAR(transform.position.y, 0.002,0.001);
}
TEST_F(PhysicsTest, max_velocity) {
--
cgit v1.2.3
From 2de3ed22a78b1978e5e3c9350f67d82554130c39 Mon Sep 17 00:00:00 2001
From: heavydemon21 <nielsstunnebrink1@gmail.com>
Date: Wed, 11 Dec 2024 22:00:41 +0100
Subject: hotfix inputtest.cpp
---
src/test/InputTest.cpp | 46 +++++++++++-----------------------------------
1 file changed, 11 insertions(+), 35 deletions(-)
diff --git a/src/test/InputTest.cpp b/src/test/InputTest.cpp
index 29ef941..7d9f47d 100644
--- a/src/test/InputTest.cpp
+++ b/src/test/InputTest.cpp
@@ -1,4 +1,7 @@
+#include "system/RenderSystem.h"
+#include <algorithm>
#include <gtest/gtest.h>
+#include <iostream>
#define protected public
#define private public
#include "api/KeyCodes.h"
@@ -27,14 +30,19 @@ public:
SDLContext sdl_context{mediator};
InputSystem input_system{mediator};
+ RenderSystem render{mediator};
EventManager event_manager{mediator};
//GameObject camera;
protected:
void SetUp() override {
- mediator.event_manager = event_manager;
- mediator.component_manager = mgr;
- event_manager.clear();
+ GameObject obj = mgr.new_object("camera", "camera", vec2{0, 0}, 0, 1);
+ auto & camera = obj.add_component<Camera>(
+ ivec2{500, 500}, vec2{500, 500}, Camera::Data{.bg_color = Color::WHITE, .zoom = 1.0f});
+ render.update();
+ //mediator.event_manager = event_manager;
+ //mediator.component_manager = mgr;
+ //event_manager.clear();
}
void simulate_mouse_click(int mouse_x, int mouse_y, Uint8 mouse_button) {
@@ -59,10 +67,6 @@ protected:
};
TEST_F(InputTest, MouseDown) {
- GameObject obj = mgr.new_object("camera", "camera", vec2{0, 0}, 0, 1);
- auto & camera = obj.add_component<Camera>(
- ivec2{0, 0}, vec2{500, 500}, Camera::Data{.bg_color = Color::WHITE, .zoom = 1.0f});
- camera.active = true;
bool mouse_triggered = false;
EventHandler<MousePressEvent> on_mouse_down = [&](const MousePressEvent & event) {
mouse_triggered = true;
@@ -89,10 +93,6 @@ TEST_F(InputTest, MouseDown) {
}
TEST_F(InputTest, MouseUp) {
- GameObject obj = mgr.new_object("camera", "camera", vec2{0, 0}, 0, 1);
- auto & camera = obj.add_component<Camera>(
- ivec2{0, 0}, vec2{500, 500}, Camera::Data{.bg_color = Color::WHITE, .zoom = 1.0f});
- camera.active = true;
bool function_triggered = false;
EventHandler<MouseReleaseEvent> on_mouse_release = [&](const MouseReleaseEvent & e) {
function_triggered = true;
@@ -117,10 +117,6 @@ TEST_F(InputTest, MouseUp) {
}
TEST_F(InputTest, MouseMove) {
- GameObject obj = mgr.new_object("camera", "camera", vec2{0, 0}, 0, 1);
- auto & camera = obj.add_component<Camera>(
- ivec2{0, 0}, vec2{500, 500}, Camera::Data{.bg_color = Color::WHITE, .zoom = 1.0f});
- camera.active = true;
bool function_triggered = false;
EventHandler<MouseMoveEvent> on_mouse_move = [&](const MouseMoveEvent & e) {
function_triggered = true;
@@ -147,10 +143,6 @@ TEST_F(InputTest, MouseMove) {
}
TEST_F(InputTest, KeyDown) {
- GameObject obj = mgr.new_object("camera", "camera", vec2{0, 0}, 0, 1);
- auto & camera = obj.add_component<Camera>(
- ivec2{0, 0}, vec2{500, 500}, Camera::Data{.bg_color = Color::WHITE, .zoom = 1.0f});
- camera.active = true;
bool function_triggered = false;
// Define event handler for KeyPressEvent
@@ -178,10 +170,6 @@ TEST_F(InputTest, KeyDown) {
}
TEST_F(InputTest, KeyUp) {
- GameObject obj = mgr.new_object("camera", "camera", vec2{0, 0}, 0, 1);
- auto & camera = obj.add_component<Camera>(
- ivec2{0, 0}, vec2{500, 500}, Camera::Data{.bg_color = Color::WHITE, .zoom = 1.0f});
- camera.active = true;
bool function_triggered = false;
EventHandler<KeyReleaseEvent> on_key_release = [&](const KeyReleaseEvent & event) {
function_triggered = true;
@@ -202,10 +190,6 @@ TEST_F(InputTest, KeyUp) {
}
TEST_F(InputTest, MouseClick) {
- GameObject obj = mgr.new_object("camera", "camera", vec2{0, 0}, 0, 1);
- auto & camera = obj.add_component<Camera>(
- ivec2{0, 0}, vec2{500, 500}, Camera::Data{.bg_color = Color::WHITE, .zoom = 1.0f});
- camera.active = true;
bool on_click_triggered = false;
EventHandler<MouseClickEvent> on_mouse_click = [&](const MouseClickEvent & event) {
on_click_triggered = true;
@@ -223,10 +207,6 @@ TEST_F(InputTest, MouseClick) {
}
TEST_F(InputTest, testButtonClick) {
- GameObject obj = mgr.new_object("camera", "camera", vec2{0, 0}, 0, 1);
- auto & camera = obj.add_component<Camera>(
- ivec2{0, 0}, vec2{500, 500}, Camera::Data{.bg_color = Color::WHITE, .zoom = 1.0f});
- camera.active = true;
GameObject button_obj = mgr.new_object("body", "person", vec2{0, 0}, 0, 1);
bool button_clicked = false;
std::function<void()> on_click = [&]() { button_clicked = true; };
@@ -250,10 +230,6 @@ TEST_F(InputTest, testButtonClick) {
}
TEST_F(InputTest, testButtonHover) {
- GameObject obj = mgr.new_object("camera", "camera", vec2{0, 0}, 0, 1);
- auto & camera = obj.add_component<Camera>(
- ivec2{0, 0}, vec2{500, 500}, Camera::Data{.bg_color = Color::WHITE, .zoom = 1.0f});
- camera.active = true;
GameObject button_obj = mgr.new_object("body", "person", vec2{0, 0}, 0, 1);
bool button_clicked = false;
std::function<void()> on_click = [&]() { button_clicked = true; };
--
cgit v1.2.3
From f261bee32778790068d0e37ae84885dd844b3402 Mon Sep 17 00:00:00 2001
From: Loek Le Blansch <loek@pipeframe.xyz>
Date: Thu, 12 Dec 2024 10:51:48 +0100
Subject: fix tests
---
src/test/InputTest.cpp | 2 --
src/test/LoopManagerTest.cpp | 11 +++++++----
src/test/LoopTimerTest.cpp | 5 ++++-
3 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/src/test/InputTest.cpp b/src/test/InputTest.cpp
index 7d9f47d..7e22d37 100644
--- a/src/test/InputTest.cpp
+++ b/src/test/InputTest.cpp
@@ -1,7 +1,5 @@
#include "system/RenderSystem.h"
-#include <algorithm>
#include <gtest/gtest.h>
-#include <iostream>
#define protected public
#define private public
#include "api/KeyCodes.h"
diff --git a/src/test/LoopManagerTest.cpp b/src/test/LoopManagerTest.cpp
index af89d64..1584fd5 100644
--- a/src/test/LoopManagerTest.cpp
+++ b/src/test/LoopManagerTest.cpp
@@ -10,7 +10,7 @@
using namespace std::chrono;
using namespace crepe;
-class LoopManagerTest : public ::testing::Test {
+class DISABLED_LoopManagerTest : public ::testing::Test {
protected:
class TestGameLoop : public crepe::LoopManager {
public:
@@ -22,7 +22,7 @@ protected:
void SetUp() override {}
};
-TEST_F(LoopManagerTest, FixedUpdate) {
+TEST_F(DISABLED_LoopManagerTest, FixedUpdate) {
// Arrange
test_loop.loop_timer.set_target_framerate(60);
@@ -43,7 +43,8 @@ TEST_F(LoopManagerTest, FixedUpdate) {
// Test finished
}
-TEST_F(LoopManagerTest, ScaledFixedUpdate) {
+
+TEST_F(DISABLED_LoopManagerTest, ScaledFixedUpdate) {
// Arrange
test_loop.loop_timer.set_target_framerate(60);
@@ -64,7 +65,8 @@ TEST_F(LoopManagerTest, ScaledFixedUpdate) {
// Test finished
}
-TEST_F(LoopManagerTest, ShutDown) {
+
+TEST_F(DISABLED_LoopManagerTest, ShutDown) {
// Arrange
test_loop.loop_timer.set_target_framerate(60);
// Start the loop in a separate thread
@@ -74,3 +76,4 @@ TEST_F(LoopManagerTest, ShutDown) {
// Wait for the loop thread to finish
loop_thread.join();
}
+
diff --git a/src/test/LoopTimerTest.cpp b/src/test/LoopTimerTest.cpp
index 5e1eccf..d76bf45 100644
--- a/src/test/LoopTimerTest.cpp
+++ b/src/test/LoopTimerTest.cpp
@@ -1,10 +1,13 @@
#include <chrono>
#include <gtest/gtest.h>
#include <thread>
+
#define private public
#define protected public
+
#include <crepe/manager/LoopTimerManager.h>
#include <crepe/manager/Mediator.h>
+
using namespace std::chrono;
using namespace crepe;
@@ -57,7 +60,7 @@ TEST_F(LoopTimerTest, DeltaTimeCalculation) {
ASSERT_NEAR(delta_time.count(), elapsed_time, 1);
}
-TEST_F(LoopTimerTest, getCurrentTime) {
+TEST_F(LoopTimerTest, DISABLED_getCurrentTime) {
// Set the target FPS to 60 (16.67 ms per frame)
loop_timer.set_target_framerate(60);
--
cgit v1.2.3
From 05a33d4793520fa84a93bc79882ef29d39cd08e5 Mon Sep 17 00:00:00 2001
From: Loek Le Blansch <loek@pipeframe.xyz>
Date: Thu, 12 Dec 2024 10:52:02 +0100
Subject: `make format`
---
src/crepe/api/LoopManager.h | 1 -
src/test/InputTest.cpp | 5 +++--
src/test/LoopManagerTest.cpp | 1 -
3 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/crepe/api/LoopManager.h b/src/crepe/api/LoopManager.h
index 2915315..40e6b38 100644
--- a/src/crepe/api/LoopManager.h
+++ b/src/crepe/api/LoopManager.h
@@ -12,7 +12,6 @@
#include "../manager/SceneManager.h"
#include "../system/System.h"
-
namespace crepe {
/**
* \brief Main game loop manager
diff --git a/src/test/InputTest.cpp b/src/test/InputTest.cpp
index 7e22d37..8b40cea 100644
--- a/src/test/InputTest.cpp
+++ b/src/test/InputTest.cpp
@@ -35,8 +35,9 @@ public:
protected:
void SetUp() override {
GameObject obj = mgr.new_object("camera", "camera", vec2{0, 0}, 0, 1);
- auto & camera = obj.add_component<Camera>(
- ivec2{500, 500}, vec2{500, 500}, Camera::Data{.bg_color = Color::WHITE, .zoom = 1.0f});
+ auto & camera
+ = obj.add_component<Camera>(ivec2{500, 500}, vec2{500, 500},
+ Camera::Data{.bg_color = Color::WHITE, .zoom = 1.0f});
render.update();
//mediator.event_manager = event_manager;
//mediator.component_manager = mgr;
diff --git a/src/test/LoopManagerTest.cpp b/src/test/LoopManagerTest.cpp
index 1584fd5..df132ae 100644
--- a/src/test/LoopManagerTest.cpp
+++ b/src/test/LoopManagerTest.cpp
@@ -76,4 +76,3 @@ TEST_F(DISABLED_LoopManagerTest, ShutDown) {
// Wait for the loop thread to finish
loop_thread.join();
}
-
--
cgit v1.2.3
From 91aa03ded258c13cf3bc31640778df61e233906d Mon Sep 17 00:00:00 2001
From: JAROWMR <jarorutjes07@gmail.com>
Date: Thu, 12 Dec 2024 14:35:34 +0100
Subject: updated test
---
src/test/PhysicsTest.cpp | 33 +++++++++++++++++----------------
1 file changed, 17 insertions(+), 16 deletions(-)
diff --git a/src/test/PhysicsTest.cpp b/src/test/PhysicsTest.cpp
index 316a567..198a371 100644
--- a/src/test/PhysicsTest.cpp
+++ b/src/test/PhysicsTest.cpp
@@ -69,29 +69,30 @@ TEST_F(PhysicsTest, max_velocity) {
ComponentManager & mgr = this->component_manager;
vector<reference_wrapper<Rigidbody>> rigidbodies = mgr.get_components_by_id<Rigidbody>(0);
Rigidbody & rigidbody = rigidbodies.front().get();
+ rigidbody.data.gravity_scale = 0;
ASSERT_FALSE(rigidbodies.empty());
EXPECT_EQ(rigidbody.data.linear_velocity.y, 0);
rigidbody.add_force_linear({100, 100});
rigidbody.add_force_angular(100);
system.update();
- EXPECT_EQ(rigidbody.data.linear_velocity.y, 10);
- EXPECT_EQ(rigidbody.data.linear_velocity.x, 10);
+ EXPECT_NEAR(rigidbody.data.linear_velocity.y, 7.07,0.01);
+ EXPECT_NEAR(rigidbody.data.linear_velocity.x, 7.07,0.01);
EXPECT_EQ(rigidbody.data.angular_velocity, 10);
rigidbody.add_force_linear({-100, -100});
rigidbody.add_force_angular(-100);
system.update();
- EXPECT_EQ(rigidbody.data.linear_velocity.y, -10);
- EXPECT_EQ(rigidbody.data.linear_velocity.x, -10);
+ EXPECT_NEAR(rigidbody.data.linear_velocity.y, -7.07,0.01);
+ EXPECT_NEAR(rigidbody.data.linear_velocity.x, -7.07,0.01);
EXPECT_EQ(rigidbody.data.angular_velocity, -10);
}
TEST_F(PhysicsTest, movement) {
- Config::get_instance().physics.gravity = 0;
ComponentManager & mgr = this->component_manager;
vector<reference_wrapper<Rigidbody>> rigidbodies = mgr.get_components_by_id<Rigidbody>(0);
Rigidbody & rigidbody = rigidbodies.front().get();
+ rigidbody.data.gravity_scale = 0;
vector<reference_wrapper<Transform>> transforms = mgr.get_components_by_id<Transform>(0);
const Transform & transform = transforms.front().get();
ASSERT_FALSE(rigidbodies.empty());
@@ -100,31 +101,31 @@ TEST_F(PhysicsTest, movement) {
rigidbody.add_force_linear({1, 1});
rigidbody.add_force_angular(1);
system.update();
- EXPECT_EQ(transform.position.x, 1);
- EXPECT_EQ(transform.position.y, 1);
- EXPECT_EQ(transform.rotation, 1);
+ EXPECT_NEAR(transform.position.x, 0.02,0.001);
+ EXPECT_NEAR(transform.position.y, 0.02,0.001);
+ EXPECT_NEAR(transform.rotation, 0.02,0.001);
rigidbody.data.constraints = {1, 1, 1};
- EXPECT_EQ(transform.position.x, 1);
- EXPECT_EQ(transform.position.y, 1);
- EXPECT_EQ(transform.rotation, 1);
+ EXPECT_NEAR(transform.position.x, 0.02,0.001);
+ EXPECT_NEAR(transform.position.y, 0.02,0.001);
+ EXPECT_NEAR(transform.rotation, 0.02,0.001);
rigidbody.data.linear_velocity_coefficient.x = 0.5;
rigidbody.data.linear_velocity_coefficient.y = 0.5;
rigidbody.data.angular_velocity_coefficient = 0.5;
system.update();
- EXPECT_EQ(rigidbody.data.linear_velocity.x, 0.5);
- EXPECT_EQ(rigidbody.data.linear_velocity.y, 0.5);
- EXPECT_EQ(rigidbody.data.angular_velocity, 0.5);
+ EXPECT_NEAR(rigidbody.data.linear_velocity.x, 0.98,0.01);
+ EXPECT_NEAR(rigidbody.data.linear_velocity.y, 0.98,0.01);
+ EXPECT_NEAR(rigidbody.data.angular_velocity, 0.98,0.01);
rigidbody.data.constraints = {1, 1, 0};
rigidbody.data.angular_velocity_coefficient = 0;
rigidbody.data.max_angular_velocity = 1000;
rigidbody.data.angular_velocity = 360;
system.update();
- EXPECT_EQ(transform.rotation, 1);
+ EXPECT_NEAR(transform.rotation, 7.22,0.0001);
rigidbody.data.angular_velocity = -360;
system.update();
- EXPECT_EQ(transform.rotation, 1);
+ EXPECT_NEAR(transform.rotation, 0.02,0.001);
}
--
cgit v1.2.3
From 4c64dbc5c4ac44ef7dfe8a950ee67f96e6f99991 Mon Sep 17 00:00:00 2001
From: JAROWMR <jarorutjes07@gmail.com>
Date: Thu, 12 Dec 2024 14:49:58 +0100
Subject: fixed game
---
src/crepe/api/Config.h | 2 +-
src/example/game.cpp | 44 +++++++++++++++++++++++---------------------
2 files changed, 24 insertions(+), 22 deletions(-)
diff --git a/src/crepe/api/Config.h b/src/crepe/api/Config.h
index cd27343..ca2d3f1 100644
--- a/src/crepe/api/Config.h
+++ b/src/crepe/api/Config.h
@@ -53,7 +53,7 @@ struct Config final {
*
* Gravity value of game.
*/
- float gravity = 1;
+ float gravity = 10;
} physics;
//! default window settings
diff --git a/src/example/game.cpp b/src/example/game.cpp
index 4239c15..5c8d749 100644
--- a/src/example/game.cpp
+++ b/src/example/game.cpp
@@ -2,6 +2,7 @@
#include "api/Scene.h"
#include "manager/ComponentManager.h"
#include "manager/Mediator.h"
+#include "types.h"
#include <crepe/api/BoxCollider.h>
#include <crepe/api/Camera.h>
#include <crepe/api/Color.h>
@@ -11,7 +12,6 @@
#include <crepe/api/Rigidbody.h>
#include <crepe/api/Script.h>
#include <crepe/api/Sprite.h>
-#include <crepe/api/Texture.h>
#include <crepe/api/Transform.h>
#include <crepe/api/Vector2.h>
@@ -183,16 +183,16 @@ public:
vec2{world_collider, world_collider}); // Left
world.add_component<BoxCollider>(vec2{screen_size_width / 2 + world_collider / 2, 0},
vec2{world_collider, world_collider}); // right
- world.add_component<Camera>(
- Color::WHITE,
- ivec2{static_cast<int>(screen_size_width), static_cast<int>(screen_size_height)},
- vec2{screen_size_width, screen_size_height}, 1.0f);
+ world.add_component<Camera>(ivec2{static_cast<int>(screen_size_width),static_cast<int>(screen_size_height)},vec2{screen_size_width,screen_size_height},Camera::Data{
+ .bg_color = Color::WHITE,
+ .zoom = 1,
+ });
GameObject game_object1 = mgr.new_object(
"Name", "Tag", vec2{screen_size_width / 2, screen_size_height / 2}, 0, 1);
game_object1.add_component<Rigidbody>(Rigidbody::Data{
.mass = 1,
- .gravity_scale = 0,
+ .gravity_scale = 1,
.body_type = Rigidbody::BodyType::DYNAMIC,
.linear_velocity = {0, 0},
.constraints = {0, 0, 0},
@@ -203,17 +203,19 @@ public:
// add box with boxcollider
game_object1.add_component<BoxCollider>(vec2{0, 0}, vec2{20, 20});
game_object1.add_component<BehaviorScript>().set_script<MyScript1>();
- auto img1 = Texture("asset/texture/square.png");
- game_object1.add_component<Sprite>(img1, color, Sprite::FlipSettings{false, false}, 1,
- 1, 20);
+
+ Asset img1{"asset/texture/square.png"};
+ game_object1.add_component<Sprite>(img1,Sprite::Data{
+ .size = {20,20},
+ });
//add circle with cirlcecollider deactiveated
game_object1.add_component<CircleCollider>(vec2{0, 0}, 10).active = false;
- auto img2 = Texture("asset/texture/circle.png");
+ Asset img2{"asset/texture/circle.png"};
game_object1
- .add_component<Sprite>(img2, color, Sprite::FlipSettings{false, false}, 1, 1, 20)
- .active
- = false;
+ .add_component<Sprite>(img2,Sprite::Data{
+ .size = {20,20},
+ }).active = false;
GameObject game_object2 = mgr.new_object(
"Name", "Tag", vec2{screen_size_width / 2, screen_size_height / 2}, 0, 1);
@@ -230,17 +232,17 @@ public:
// add box with boxcollider
game_object2.add_component<BoxCollider>(vec2{0, 0}, vec2{20, 20});
game_object2.add_component<BehaviorScript>().set_script<MyScript2>();
- auto img3 = Texture("asset/texture/square.png");
- game_object2.add_component<Sprite>(img3, color, Sprite::FlipSettings{false, false}, 1,
- 1, 20);
+
+ game_object2.add_component<Sprite>(img1,Sprite::Data{
+ .size = {20,20},
+ });
//add circle with cirlcecollider deactiveated
game_object2.add_component<CircleCollider>(vec2{0, 0}, 10).active = false;
- auto img4 = Texture("asset/texture/circle.png");
- game_object2
- .add_component<Sprite>(img4, color, Sprite::FlipSettings{false, false}, 1, 1, 20)
- .active
- = false;
+
+ game_object2.add_component<Sprite>(img2,Sprite::Data{
+ .size = {20,20},
+ }).active = false;
}
string get_name() const { return "scene1"; }
--
cgit v1.2.3
From ef0235137fc931c09e7f6493c7df46d09c47008d Mon Sep 17 00:00:00 2001
From: JAROWMR <jarorutjes07@gmail.com>
Date: Thu, 12 Dec 2024 14:51:06 +0100
Subject: removed merge file
---
src/crepe/api/LoopTimer.h | 145 ----------------------------------------------
1 file changed, 145 deletions(-)
delete mode 100644 src/crepe/api/LoopTimer.h
diff --git a/src/crepe/api/LoopTimer.h b/src/crepe/api/LoopTimer.h
deleted file mode 100644
index 8d0b2f9..0000000
--- a/src/crepe/api/LoopTimer.h
+++ /dev/null
@@ -1,145 +0,0 @@
-#pragma once
-
-#include <chrono>
-
-namespace crepe {
-
-class LoopTimer {
-public:
- /**
- * \brief Get the singleton instance of LoopTimer.
- *
- * \return A reference to the LoopTimer instance.
- */
- static LoopTimer & get_instance();
-
- /**
- * \brief Get the current delta time for the current frame.
- *
- * \return Delta time in seconds since the last frame.
- */
- double get_delta_time() const;
-
- /**
- * \brief Get the current game time.
- *
- * \note The current game time may vary from real-world elapsed time. It is the cumulative
- * sum of each frame's delta time.
- *
- * \return Elapsed game time in seconds.
- */
- double get_current_time() const;
-
- /**
- * \brief Set the target frames per second (FPS).
- *
- * \param fps The desired frames rendered per second.
- */
- void set_fps(int fps);
-
- /**
- * \brief Get the current frames per second (FPS).
- *
- * \return Current FPS.
- */
- int get_fps() const;
-
- /**
- * \brief Get the current game scale.
- *
- * \return The current game scale, where 0 = paused, 1 = normal speed, and values > 1 speed
- * up the game.
- */
- double get_game_scale() const;
-
- /**
- * \brief Set the game scale.
- *
- * \param game_scale The desired game scale (0 = pause, 1 = normal speed, > 1 = speed up).
- */
- void set_game_scale(double game_scale);
-
- /**
- * \brief Get the fixed delta time for consistent updates.
- *
- * Fixed delta time is used for operations that require uniform time steps, such as physics
- * calculations.
- *
- * \return Fixed delta time in seconds.
- */
- double get_fixed_delta_time() const;
-
-private:
- friend class LoopManager;
-
- /**
- * \brief Start the loop timer.
- *
- * Initializes the timer to begin tracking frame times.
- */
- void start();
-
- /**
- * \brief Enforce the frame rate limit.
- *
- * Ensures that the game loop does not exceed the target FPS by delaying frame updates as
- * necessary.
- */
- void enforce_frame_rate();
-
-
- /**
- * \brief Get the accumulated lag in the game loop.
- *
- * Lag represents the difference between the target frame time and the actual frame time,
- * useful for managing fixed update intervals.
- *
- * \return Accumulated lag in seconds.
- */
- double get_lag() const;
-
- /**
- * \brief Construct a new LoopTimer object.
- *
- * Private constructor for singleton pattern to restrict instantiation outside the class.
- */
- LoopTimer();
-
- /**
- * \brief Update the timer to the current frame.
- *
- * Calculates and updates the delta time for the current frame and adds it to the cumulative
- * game time.
- */
- void update();
-
- /**
- * \brief Advance the game loop by a fixed update interval.
- *
- * This method progresses the game state by a consistent, fixed time step, allowing for
- * stable updates independent of frame rate fluctuations.
- */
- void advance_fixed_update();
-
-private:
- //! Current frames per second
- int fps = 50;
- //! Current game scale
- double game_scale = 1;
- //! Maximum delta time in seconds to avoid large jumps
- std::chrono::duration<double> maximum_delta_time{0.25};
- //! Delta time for the current frame in seconds
- std::chrono::duration<double> delta_time{0.0};
- //! Target time per frame in seconds
- std::chrono::duration<double> frame_target_time = std::chrono::duration<double>(1.0) / fps;
- //! Fixed delta time for fixed updates in seconds
- std::chrono::duration<double> fixed_delta_time = std::chrono::duration<double>(1.0) / 50.0;
- //! Total elapsed game time in seconds
- std::chrono::duration<double> elapsed_time{0.0};
- //! Total elapsed time for fixed updates in seconds
- std::chrono::duration<double> elapsed_fixed_time{0.0};
- //! Time of the last frame
- std::chrono::steady_clock::time_point last_frame_time;
-};
-
-} // namespace crepe
--
cgit v1.2.3
From 72ba9f9dd9553c8bbca83f4f73a59d28d1f89273 Mon Sep 17 00:00:00 2001
From: JAROWMR <jarorutjes07@gmail.com>
Date: Thu, 12 Dec 2024 14:54:23 +0100
Subject: added rotation for preview
---
src/example/game.cpp | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/src/example/game.cpp b/src/example/game.cpp
index 5c8d749..aab8d66 100644
--- a/src/example/game.cpp
+++ b/src/example/game.cpp
@@ -66,6 +66,11 @@ class MyScript1 : public Script {
//add collider switch
break;
}
+ case Keycode::Q: {
+ Rigidbody & rg = this->get_component<Rigidbody>();
+ rg.data.angular_velocity = 1;
+ break;
+ }
default:
break;
}
--
cgit v1.2.3
From 7a931b354f6ef6615049771bce32335bb049723b Mon Sep 17 00:00:00 2001
From: JAROWMR <jarorutjes07@gmail.com>
Date: Thu, 12 Dec 2024 14:55:12 +0100
Subject: reverted file
---
src/test/CMakeLists.txt | 46 +++++++++++++++++++++++-----------------------
1 file changed, 23 insertions(+), 23 deletions(-)
diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
index f9063fc..11b4ca9 100644
--- a/src/test/CMakeLists.txt
+++ b/src/test/CMakeLists.txt
@@ -1,27 +1,27 @@
target_sources(test_main PUBLIC
main.cpp
- # CollisionTest.cpp
+ CollisionTest.cpp
PhysicsTest.cpp
- # ScriptTest.cpp
- # ParticleTest.cpp
- # AudioTest.cpp
- # AssetTest.cpp
- # ResourceManagerTest.cpp
- # OptionalRefTest.cpp
- # RenderSystemTest.cpp
- # EventTest.cpp
- # ECSTest.cpp
- # SceneManagerTest.cpp
- # ValueBrokerTest.cpp
- # DBTest.cpp
- # Vector2Test.cpp
- # LoopManagerTest.cpp
- # LoopTimerTest.cpp
- # InputTest.cpp
- # ScriptEventTest.cpp
- # ScriptSceneTest.cpp
- # Profiling.cpp
- # SaveManagerTest.cpp
- # ScriptSaveManagerTest.cpp
- # ScriptECSTest.cpp
+ ScriptTest.cpp
+ ParticleTest.cpp
+ AudioTest.cpp
+ AssetTest.cpp
+ ResourceManagerTest.cpp
+ OptionalRefTest.cpp
+ RenderSystemTest.cpp
+ EventTest.cpp
+ ECSTest.cpp
+ SceneManagerTest.cpp
+ ValueBrokerTest.cpp
+ DBTest.cpp
+ Vector2Test.cpp
+ LoopManagerTest.cpp
+ LoopTimerTest.cpp
+ InputTest.cpp
+ ScriptEventTest.cpp
+ ScriptSceneTest.cpp
+ Profiling.cpp
+ SaveManagerTest.cpp
+ ScriptSaveManagerTest.cpp
+ ScriptECSTest.cpp
)
--
cgit v1.2.3
From f9ed8f05ec95e530041d54921cdd17023cdfde6f Mon Sep 17 00:00:00 2001
From: JAROWMR <jarorutjes07@gmail.com>
Date: Thu, 12 Dec 2024 14:59:59 +0100
Subject: make format
---
src/crepe/system/AISystem.cpp | 1 -
src/crepe/system/PhysicsSystem.cpp | 33 +++++++++++++--------------
src/example/game.cpp | 46 +++++++++++++++++++++++---------------
src/test/PhysicsTest.cpp | 39 ++++++++++++++++----------------
4 files changed, 62 insertions(+), 57 deletions(-)
diff --git a/src/crepe/system/AISystem.cpp b/src/crepe/system/AISystem.cpp
index a20e28c..6578ecb 100644
--- a/src/crepe/system/AISystem.cpp
+++ b/src/crepe/system/AISystem.cpp
@@ -44,7 +44,6 @@ void AISystem::update() {
vec2 acceleration = force / rigidbody.data.mass;
// Finally, update Rigidbody's velocity
rigidbody.data.linear_velocity += acceleration * duration<float>(dt).count();
-
}
}
diff --git a/src/crepe/system/PhysicsSystem.cpp b/src/crepe/system/PhysicsSystem.cpp
index 78370d1..a1d35bb 100644
--- a/src/crepe/system/PhysicsSystem.cpp
+++ b/src/crepe/system/PhysicsSystem.cpp
@@ -22,11 +22,12 @@ void PhysicsSystem::update() {
duration_t delta_time = loop_timer.get_scaled_fixed_delta_time();
float dt = duration<float>(delta_time).count();
-
+
float gravity = Config::get_instance().physics.gravity;
for (Rigidbody & rigidbody : rigidbodies) {
if (!rigidbody.active) continue;
- Transform & transform = mgr.get_components_by_id<Transform>(rigidbody.game_object_id).front().get();
+ Transform & transform
+ = mgr.get_components_by_id<Transform>(rigidbody.game_object_id).front().get();
switch (rigidbody.data.body_type) {
case Rigidbody::BodyType::DYNAMIC:
@@ -43,43 +44,39 @@ void PhysicsSystem::update() {
if (rigidbody.data.gravity_scale > 0) {
rigidbody.data.linear_velocity.y
- += (rigidbody.data.mass * rigidbody.data.gravity_scale
- * gravity * dt);
+ += (rigidbody.data.mass * rigidbody.data.gravity_scale * gravity
+ * dt);
}
// Add coefficient rotation
if (rigidbody.data.angular_velocity_coefficient > 0) {
rigidbody.data.angular_velocity
*= std::pow(rigidbody.data.angular_velocity_coefficient, dt);
-
}
// Add coefficient movement horizontal
- if (rigidbody.data.linear_velocity_coefficient.x > 0)
- {
+ if (rigidbody.data.linear_velocity_coefficient.x > 0) {
rigidbody.data.linear_velocity.x
- *= std::pow(rigidbody.data.linear_velocity_coefficient.x, dt);
+ *= std::pow(rigidbody.data.linear_velocity_coefficient.x, dt);
}
// Add coefficient movement horizontal
- if (rigidbody.data.linear_velocity_coefficient.y > 0)
- {
+ if (rigidbody.data.linear_velocity_coefficient.y > 0) {
rigidbody.data.linear_velocity.y
- *= std::pow(rigidbody.data.linear_velocity_coefficient.y, dt);
+ *= std::pow(rigidbody.data.linear_velocity_coefficient.y, dt);
}
// Max velocity check
if (rigidbody.data.angular_velocity
> rigidbody.data.max_angular_velocity) {
- rigidbody.data.angular_velocity
- = rigidbody.data.max_angular_velocity;
+ rigidbody.data.angular_velocity = rigidbody.data.max_angular_velocity;
} else if (rigidbody.data.angular_velocity
- < -rigidbody.data.max_angular_velocity) {
- rigidbody.data.angular_velocity
- = -rigidbody.data.max_angular_velocity;
+ < -rigidbody.data.max_angular_velocity) {
+ rigidbody.data.angular_velocity = -rigidbody.data.max_angular_velocity;
}
-
+
// Set max velocity to maximum length
- if(rigidbody.data.linear_velocity.length() > rigidbody.data.max_linear_velocity) {
+ if (rigidbody.data.linear_velocity.length()
+ > rigidbody.data.max_linear_velocity) {
rigidbody.data.linear_velocity.normalize();
rigidbody.data.linear_velocity *= rigidbody.data.max_linear_velocity;
}
diff --git a/src/example/game.cpp b/src/example/game.cpp
index aab8d66..5361f3a 100644
--- a/src/example/game.cpp
+++ b/src/example/game.cpp
@@ -188,10 +188,13 @@ public:
vec2{world_collider, world_collider}); // Left
world.add_component<BoxCollider>(vec2{screen_size_width / 2 + world_collider / 2, 0},
vec2{world_collider, world_collider}); // right
- world.add_component<Camera>(ivec2{static_cast<int>(screen_size_width),static_cast<int>(screen_size_height)},vec2{screen_size_width,screen_size_height},Camera::Data{
- .bg_color = Color::WHITE,
- .zoom = 1,
- });
+ world.add_component<Camera>(
+ ivec2{static_cast<int>(screen_size_width), static_cast<int>(screen_size_height)},
+ vec2{screen_size_width, screen_size_height},
+ Camera::Data{
+ .bg_color = Color::WHITE,
+ .zoom = 1,
+ });
GameObject game_object1 = mgr.new_object(
"Name", "Tag", vec2{screen_size_width / 2, screen_size_height / 2}, 0, 1);
@@ -210,17 +213,20 @@ public:
game_object1.add_component<BehaviorScript>().set_script<MyScript1>();
Asset img1{"asset/texture/square.png"};
- game_object1.add_component<Sprite>(img1,Sprite::Data{
- .size = {20,20},
- });
+ game_object1.add_component<Sprite>(img1, Sprite::Data{
+ .size = {20, 20},
+ });
//add circle with cirlcecollider deactiveated
game_object1.add_component<CircleCollider>(vec2{0, 0}, 10).active = false;
Asset img2{"asset/texture/circle.png"};
game_object1
- .add_component<Sprite>(img2,Sprite::Data{
- .size = {20,20},
- }).active = false;
+ .add_component<Sprite>(img2,
+ Sprite::Data{
+ .size = {20, 20},
+ })
+ .active
+ = false;
GameObject game_object2 = mgr.new_object(
"Name", "Tag", vec2{screen_size_width / 2, screen_size_height / 2}, 0, 1);
@@ -237,17 +243,21 @@ public:
// add box with boxcollider
game_object2.add_component<BoxCollider>(vec2{0, 0}, vec2{20, 20});
game_object2.add_component<BehaviorScript>().set_script<MyScript2>();
-
- game_object2.add_component<Sprite>(img1,Sprite::Data{
- .size = {20,20},
- });
+
+ game_object2.add_component<Sprite>(img1, Sprite::Data{
+ .size = {20, 20},
+ });
//add circle with cirlcecollider deactiveated
game_object2.add_component<CircleCollider>(vec2{0, 0}, 10).active = false;
-
- game_object2.add_component<Sprite>(img2,Sprite::Data{
- .size = {20,20},
- }).active = false;
+
+ game_object2
+ .add_component<Sprite>(img2,
+ Sprite::Data{
+ .size = {20, 20},
+ })
+ .active
+ = false;
}
string get_name() const { return "scene1"; }
diff --git a/src/test/PhysicsTest.cpp b/src/test/PhysicsTest.cpp
index 198a371..c04e3ff 100644
--- a/src/test/PhysicsTest.cpp
+++ b/src/test/PhysicsTest.cpp
@@ -3,10 +3,10 @@
#include <crepe/api/Rigidbody.h>
#include <crepe/api/Transform.h>
#include <crepe/manager/ComponentManager.h>
-#include <crepe/system/PhysicsSystem.h>
-#include <gtest/gtest.h>
#include <crepe/manager/LoopTimerManager.h>
#include <crepe/manager/Mediator.h>
+#include <crepe/system/PhysicsSystem.h>
+#include <gtest/gtest.h>
using namespace std;
using namespace std::chrono_literals;
@@ -20,7 +20,6 @@ public:
PhysicsSystem system{m};
LoopTimerManager loop_timer{m};
-
void SetUp() override {
ComponentManager & mgr = this->component_manager;
vector<reference_wrapper<Transform>> transforms
@@ -59,10 +58,10 @@ TEST_F(PhysicsTest, gravity) {
EXPECT_EQ(transform.position.y, 0);
system.update();
- EXPECT_NEAR(transform.position.y, 0.0004,0.0001);
+ EXPECT_NEAR(transform.position.y, 0.0004, 0.0001);
system.update();
- EXPECT_NEAR(transform.position.y, 0.002,0.001);
+ EXPECT_NEAR(transform.position.y, 0.002, 0.001);
}
TEST_F(PhysicsTest, max_velocity) {
@@ -76,15 +75,15 @@ TEST_F(PhysicsTest, max_velocity) {
rigidbody.add_force_linear({100, 100});
rigidbody.add_force_angular(100);
system.update();
- EXPECT_NEAR(rigidbody.data.linear_velocity.y, 7.07,0.01);
- EXPECT_NEAR(rigidbody.data.linear_velocity.x, 7.07,0.01);
+ EXPECT_NEAR(rigidbody.data.linear_velocity.y, 7.07, 0.01);
+ EXPECT_NEAR(rigidbody.data.linear_velocity.x, 7.07, 0.01);
EXPECT_EQ(rigidbody.data.angular_velocity, 10);
rigidbody.add_force_linear({-100, -100});
rigidbody.add_force_angular(-100);
system.update();
- EXPECT_NEAR(rigidbody.data.linear_velocity.y, -7.07,0.01);
- EXPECT_NEAR(rigidbody.data.linear_velocity.x, -7.07,0.01);
+ EXPECT_NEAR(rigidbody.data.linear_velocity.y, -7.07, 0.01);
+ EXPECT_NEAR(rigidbody.data.linear_velocity.x, -7.07, 0.01);
EXPECT_EQ(rigidbody.data.angular_velocity, -10);
}
@@ -101,31 +100,31 @@ TEST_F(PhysicsTest, movement) {
rigidbody.add_force_linear({1, 1});
rigidbody.add_force_angular(1);
system.update();
- EXPECT_NEAR(transform.position.x, 0.02,0.001);
- EXPECT_NEAR(transform.position.y, 0.02,0.001);
- EXPECT_NEAR(transform.rotation, 0.02,0.001);
+ EXPECT_NEAR(transform.position.x, 0.02, 0.001);
+ EXPECT_NEAR(transform.position.y, 0.02, 0.001);
+ EXPECT_NEAR(transform.rotation, 0.02, 0.001);
rigidbody.data.constraints = {1, 1, 1};
- EXPECT_NEAR(transform.position.x, 0.02,0.001);
- EXPECT_NEAR(transform.position.y, 0.02,0.001);
- EXPECT_NEAR(transform.rotation, 0.02,0.001);
+ EXPECT_NEAR(transform.position.x, 0.02, 0.001);
+ EXPECT_NEAR(transform.position.y, 0.02, 0.001);
+ EXPECT_NEAR(transform.rotation, 0.02, 0.001);
rigidbody.data.linear_velocity_coefficient.x = 0.5;
rigidbody.data.linear_velocity_coefficient.y = 0.5;
rigidbody.data.angular_velocity_coefficient = 0.5;
system.update();
- EXPECT_NEAR(rigidbody.data.linear_velocity.x, 0.98,0.01);
- EXPECT_NEAR(rigidbody.data.linear_velocity.y, 0.98,0.01);
- EXPECT_NEAR(rigidbody.data.angular_velocity, 0.98,0.01);
+ EXPECT_NEAR(rigidbody.data.linear_velocity.x, 0.98, 0.01);
+ EXPECT_NEAR(rigidbody.data.linear_velocity.y, 0.98, 0.01);
+ EXPECT_NEAR(rigidbody.data.angular_velocity, 0.98, 0.01);
rigidbody.data.constraints = {1, 1, 0};
rigidbody.data.angular_velocity_coefficient = 0;
rigidbody.data.max_angular_velocity = 1000;
rigidbody.data.angular_velocity = 360;
system.update();
- EXPECT_NEAR(transform.rotation, 7.22,0.0001);
+ EXPECT_NEAR(transform.rotation, 7.22, 0.0001);
rigidbody.data.angular_velocity = -360;
system.update();
- EXPECT_NEAR(transform.rotation, 0.02,0.001);
+ EXPECT_NEAR(transform.rotation, 0.02, 0.001);
}
--
cgit v1.2.3
From b6ed980b0374868868ac274ed46a1a823c10db4f Mon Sep 17 00:00:00 2001
From: JAROWMR <jarorutjes07@gmail.com>
Date: Thu, 12 Dec 2024 15:35:17 +0100
Subject: change get dt
---
src/crepe/system/AISystem.cpp | 4 ++--
src/crepe/system/PhysicsSystem.cpp | 3 +--
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/crepe/system/AISystem.cpp b/src/crepe/system/AISystem.cpp
index 6578ecb..77de123 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>();
- duration_t dt = loop_timer.get_scaled_fixed_delta_time();
+ float dt = std::chrono::duration<float>(loop_timer.get_scaled_fixed_delta_time()).count();
// Loop through all AI components
for (AI & ai : ai_components) {
@@ -43,7 +43,7 @@ void AISystem::update() {
// Calculate the acceleration (using the above calculated force)
vec2 acceleration = force / rigidbody.data.mass;
// Finally, update Rigidbody's velocity
- rigidbody.data.linear_velocity += acceleration * duration<float>(dt).count();
+ rigidbody.data.linear_velocity += acceleration * dt;
}
}
diff --git a/src/crepe/system/PhysicsSystem.cpp b/src/crepe/system/PhysicsSystem.cpp
index a1d35bb..5629809 100644
--- a/src/crepe/system/PhysicsSystem.cpp
+++ b/src/crepe/system/PhysicsSystem.cpp
@@ -20,8 +20,7 @@ void PhysicsSystem::update() {
LoopTimerManager & loop_timer = mediator.loop_timer;
RefVector<Rigidbody> rigidbodies = mgr.get_components_by_type<Rigidbody>();
- duration_t delta_time = loop_timer.get_scaled_fixed_delta_time();
- float dt = duration<float>(delta_time).count();
+ float dt = std::chrono::duration<float>(loop_timer.get_scaled_fixed_delta_time()).count();
float gravity = Config::get_instance().physics.gravity;
for (Rigidbody & rigidbody : rigidbodies) {
--
cgit v1.2.3
From f1650941336db0b1b5152dc900022e99853770ed Mon Sep 17 00:00:00 2001
From: JAROWMR <jarorutjes07@gmail.com>
Date: Thu, 12 Dec 2024 16:22:43 +0100
Subject: updated constraints
---
src/crepe/system/PhysicsSystem.cpp | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/crepe/system/PhysicsSystem.cpp b/src/crepe/system/PhysicsSystem.cpp
index 5629809..38deb43 100644
--- a/src/crepe/system/PhysicsSystem.cpp
+++ b/src/crepe/system/PhysicsSystem.cpp
@@ -41,7 +41,7 @@ void PhysicsSystem::update() {
throw std::runtime_error("Config Gravity must be greater than 0");
}
- if (rigidbody.data.gravity_scale > 0) {
+ if (rigidbody.data.gravity_scale > 0 && !rigidbody.data.constraints.y) {
rigidbody.data.linear_velocity.y
+= (rigidbody.data.mass * rigidbody.data.gravity_scale * gravity
* dt);
@@ -53,13 +53,15 @@ void PhysicsSystem::update() {
}
// Add coefficient movement horizontal
- if (rigidbody.data.linear_velocity_coefficient.x > 0) {
+ if (rigidbody.data.linear_velocity_coefficient.x > 0
+ && !rigidbody.data.constraints.x) {
rigidbody.data.linear_velocity.x
*= std::pow(rigidbody.data.linear_velocity_coefficient.x, dt);
}
// Add coefficient movement horizontal
- if (rigidbody.data.linear_velocity_coefficient.y > 0) {
+ if (rigidbody.data.linear_velocity_coefficient.y > 0
+ && !rigidbody.data.constraints.y) {
rigidbody.data.linear_velocity.y
*= std::pow(rigidbody.data.linear_velocity_coefficient.y, dt);
}
--
cgit v1.2.3
From 64b60939637da53422948417da5f026888c3d9ae Mon Sep 17 00:00:00 2001
From: JAROWMR <jarorutjes07@gmail.com>
Date: Thu, 12 Dec 2024 18:06:24 +0100
Subject: updated test values
---
src/test/PhysicsTest.cpp | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/test/PhysicsTest.cpp b/src/test/PhysicsTest.cpp
index c04e3ff..3afb3c7 100644
--- a/src/test/PhysicsTest.cpp
+++ b/src/test/PhysicsTest.cpp
@@ -108,7 +108,7 @@ TEST_F(PhysicsTest, movement) {
EXPECT_NEAR(transform.position.x, 0.02, 0.001);
EXPECT_NEAR(transform.position.y, 0.02, 0.001);
EXPECT_NEAR(transform.rotation, 0.02, 0.001);
-
+ rigidbody.data.constraints = {0, 0, 0};
rigidbody.data.linear_velocity_coefficient.x = 0.5;
rigidbody.data.linear_velocity_coefficient.y = 0.5;
rigidbody.data.angular_velocity_coefficient = 0.5;
@@ -122,9 +122,11 @@ TEST_F(PhysicsTest, movement) {
rigidbody.data.max_angular_velocity = 1000;
rigidbody.data.angular_velocity = 360;
system.update();
- EXPECT_NEAR(transform.rotation, 7.22, 0.0001);
+ EXPECT_NEAR(transform.rotation, 7.24, 0.01);
rigidbody.data.angular_velocity = -360;
system.update();
- EXPECT_NEAR(transform.rotation, 0.02, 0.001);
+ EXPECT_NEAR(transform.rotation, 0.04, 0.001);
+ system.update();
+ EXPECT_NEAR(transform.rotation, 352.84, 0.01);
}
--
cgit v1.2.3
From 32ab9f586491ec513a170160f201acfb8df90f3d Mon Sep 17 00:00:00 2001
From: JAROWMR <jarorutjes07@gmail.com>
Date: Thu, 12 Dec 2024 18:18:10 +0100
Subject: made better readable
---
src/crepe/system/AISystem.cpp | 2 +-
src/crepe/system/PhysicsSystem.cpp | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/crepe/system/AISystem.cpp b/src/crepe/system/AISystem.cpp
index 77de123..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 = std::chrono::duration<float>(loop_timer.get_scaled_fixed_delta_time()).count();
+ 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 38deb43..6970e03 100644
--- a/src/crepe/system/PhysicsSystem.cpp
+++ b/src/crepe/system/PhysicsSystem.cpp
@@ -19,8 +19,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 = std::chrono::duration<float>(loop_timer.get_scaled_fixed_delta_time()).count();
+ float dt = loop_timer.get_scaled_fixed_delta_time().count();
float gravity = Config::get_instance().physics.gravity;
for (Rigidbody & rigidbody : rigidbodies) {
--
cgit v1.2.3
From 15bb400deafa1ea4fea1ff11e835f103fa82090f Mon Sep 17 00:00:00 2001
From: JAROWMR <jarorutjes07@gmail.com>
Date: Thu, 12 Dec 2024 18:21:38 +0100
Subject: change get fixed_dt to float
---
src/crepe/manager/LoopTimerManager.cpp | 4 ++--
src/crepe/manager/LoopTimerManager.h | 2 +-
src/crepe/system/AISystem.cpp | 2 +-
src/crepe/system/PhysicsSystem.cpp | 3 +--
4 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/src/crepe/manager/LoopTimerManager.cpp b/src/crepe/manager/LoopTimerManager.cpp
index 9819632..4a3df0a 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;
}
-duration_t LoopTimerManager::get_scaled_fixed_delta_time() const {
- return this->fixed_delta_time * this->time_scale;
+float LoopTimerManager::get_scaled_fixed_delta_time() const {
+ return (this->fixed_delta_time * this->time_scale).count();
}
void LoopTimerManager::set_fixed_delta_time(float seconds) {
diff --git a/src/crepe/manager/LoopTimerManager.h b/src/crepe/manager/LoopTimerManager.h
index 91403e4..dcbe21c 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.
*/
- duration_t get_scaled_fixed_delta_time() const;
+ float 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 680dbb8..e9d8fa7 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().count();
+ float dt = loop_timer.get_scaled_fixed_delta_time();
// 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 6970e03..ca10b25 100644
--- a/src/crepe/system/PhysicsSystem.cpp
+++ b/src/crepe/system/PhysicsSystem.cpp
@@ -11,7 +11,6 @@
#include "PhysicsSystem.h"
using namespace crepe;
-using namespace std::chrono;
void PhysicsSystem::update() {
@@ -19,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().count();
+ float dt = loop_timer.get_scaled_fixed_delta_time();
float gravity = Config::get_instance().physics.gravity;
for (Rigidbody & rigidbody : rigidbodies) {
--
cgit v1.2.3
From ab1423f48d82ba9b0619ec107639a80773edbfc2 Mon Sep 17 00:00:00 2001
From: JAROWMR <jarorutjes07@gmail.com>
Date: Thu, 12 Dec 2024 18:37:27 +0100
Subject: reverted
---
src/crepe/manager/LoopTimerManager.cpp | 4 ++--
src/crepe/manager/LoopTimerManager.h | 2 +-
src/crepe/system/AISystem.cpp | 2 +-
src/crepe/system/PhysicsSystem.cpp | 2 +-
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) {
--
cgit v1.2.3