diff options
| author | Loek Le Blansch <loek@pipeframe.xyz> | 2024-11-15 17:27:41 +0100 |
|---|---|---|
| committer | Loek Le Blansch <loek@pipeframe.xyz> | 2024-11-15 17:27:41 +0100 |
| commit | b597af6c64ccf50c7f92a2b78e7950ee3ab230f7 (patch) | |
| tree | c99d08f7455514c16eb3c34bd164674237620b0c /src/crepe/system/PhysicsSystem.cpp | |
| parent | f51ddfac7b8948a43a40894185238c8a1ceeb5c4 (diff) | |
`make format`loek/wrap
Diffstat (limited to 'src/crepe/system/PhysicsSystem.cpp')
| -rw-r--r-- | src/crepe/system/PhysicsSystem.cpp | 46 |
1 files changed, 31 insertions, 15 deletions
diff --git a/src/crepe/system/PhysicsSystem.cpp b/src/crepe/system/PhysicsSystem.cpp index a5b6bde..402dfab 100644 --- a/src/crepe/system/PhysicsSystem.cpp +++ b/src/crepe/system/PhysicsSystem.cpp @@ -12,8 +12,10 @@ using namespace crepe; void PhysicsSystem::update() { ComponentManager & mgr = ComponentManager::get_instance(); - std::vector<std::reference_wrapper<Rigidbody>> rigidbodies = mgr.get_components_by_type<Rigidbody>(); - std::vector<std::reference_wrapper<Transform>> transforms = mgr.get_components_by_type<Transform>(); + std::vector<std::reference_wrapper<Rigidbody>> rigidbodies + = mgr.get_components_by_type<Rigidbody>(); + std::vector<std::reference_wrapper<Transform>> transforms + = mgr.get_components_by_type<Transform>(); double gravity = Config::get_instance().physics.gravity; for (Rigidbody & rigidbody : rigidbodies) { @@ -26,7 +28,9 @@ void PhysicsSystem::update() { // Add gravity if (rigidbody.data.use_gravity) { - rigidbody.data.linear_velocity.y += (rigidbody.data.mass * rigidbody.data.gravity_scale * gravity); + rigidbody.data.linear_velocity.y + += (rigidbody.data.mass * rigidbody.data.gravity_scale + * gravity); } // Add damping if (rigidbody.data.angular_damping != 0) { @@ -37,22 +41,34 @@ void PhysicsSystem::update() { } // 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; + 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; } - 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.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; + 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; } // Move object |