From 9026eea38124b73b17f19b137dbc71eab4a7a2e9 Mon Sep 17 00:00:00 2001 From: Aki Date: Mon, 18 Apr 2022 11:12:37 +0200 Subject: Cleaned up ConstantVelocity a bit --- ConstantVelocity.cpp | 10 ++-------- ConstantVelocity.h | 28 ++++++++++++---------------- 2 files changed, 14 insertions(+), 24 deletions(-) diff --git a/ConstantVelocity.cpp b/ConstantVelocity.cpp index 37f3c3d..efe3117 100644 --- a/ConstantVelocity.cpp +++ b/ConstantVelocity.cpp @@ -3,15 +3,9 @@ #include -ConstantVelocitySystem::ConstantVelocitySystem() : - ConstantVelocitySystem(10000) +ConstantVelocitySystem::ConstantVelocitySystem() { -} - - -ConstantVelocitySystem::ConstantVelocitySystem(int reserved) -{ - m_bullets.reserve(reserved); + m_bullets.reserve(RESERVED); } diff --git a/ConstantVelocity.h b/ConstantVelocity.h index 3970aff..e28400d 100644 --- a/ConstantVelocity.h +++ b/ConstantVelocity.h @@ -5,22 +5,6 @@ #include -static constexpr float MARGIN {40}; - - -struct ConstantVelocityBullet; - - -struct ConstantVelocitySystem -{ - ConstantVelocitySystem(); - explicit ConstantVelocitySystem(int reserved); - void update(float dt); - void draw(); - std::vector m_bullets; -}; - - struct ConstantVelocityBullet { using Vector = std::vector; @@ -29,3 +13,15 @@ struct ConstantVelocityBullet float radius; Color color; }; + + +struct ConstantVelocitySystem +{ + static constexpr float MARGIN {40}; + static constexpr int RESERVED {10000}; + + ConstantVelocitySystem(); + void update(float dt); + void draw(); + ConstantVelocityBullet::Vector m_bullets; +}; -- cgit v1.1