diff options
author | WBoerenkamps <wrj.boerenkamps@student.avans.nl> | 2024-12-13 08:17:16 +0100 |
---|---|---|
committer | WBoerenkamps <wrj.boerenkamps@student.avans.nl> | 2024-12-13 08:17:16 +0100 |
commit | 2793e8be0e6c44bb34a25522e1e75ed8a2868b32 (patch) | |
tree | 7e94ba52ac68fc42072f41dc9f19b900b0b7a345 /src/crepe/api | |
parent | 193d5bf4d9577e63202cec45b21ed85a76a89f09 (diff) | |
parent | fd403d038b017ec8976023471073329896035e36 (diff) |
Merge branch 'master' of https://github.com/lonkaars/crepe into wouter/inputSystem
Diffstat (limited to 'src/crepe/api')
-rw-r--r-- | src/crepe/api/Config.h | 2 | ||||
-rw-r--r-- | src/crepe/api/LoopManager.h | 1 | ||||
-rw-r--r-- | src/crepe/api/Rigidbody.h | 4 |
3 files changed, 3 insertions, 4 deletions
diff --git a/src/crepe/api/Config.h b/src/crepe/api/Config.h index 925ded8..ed1cf38 100644 --- a/src/crepe/api/Config.h +++ b/src/crepe/api/Config.h @@ -53,7 +53,7 @@ struct Config final { * * Gravity value of game. */ - double gravity = 1; + float gravity = 10; } physics; //! default window settings 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/crepe/api/Rigidbody.h b/src/crepe/api/Rigidbody.h index 40c6bf1..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. * @@ -79,7 +79,7 @@ public: //! Linear velocity of the object (speed and direction). vec2 linear_velocity; //! Maximum linear velocity of the object. This limits the object's speed. - vec2 max_linear_velocity = {INFINITY, INFINITY}; + float max_linear_velocity = INFINITY; //! Linear velocity coefficient. This scales the object's velocity for adjustment or damping. vec2 linear_velocity_coefficient = {1, 1}; //! \} |