Refactor powerup hierarchy.

Author: karnkaul

src/spaced/spaced/game/enemies/creep.cpp

@@ -1,7 +1,7 @@
 #include <bave/services/resources.hpp>
 #include <spaced/game/enemies/creep.hpp>
 
-namespace spaced {
+namespace spaced::enemy {
 using bave::Resources;
 using bave::Seconds;
 using bave::Texture;
@@ -20,4 +20,4 @@ void Creep::tick(Seconds const dt, bool const in_play) {
 
 	update_health_bar();
 }
-} // namespace spaced
+} // namespace spaced::enemy

src/spaced/spaced/game/enemies/creep.hpp

@@ -1,7 +1,7 @@
 #pragma once
 #include <spaced/game/enemy.hpp>
 
-namespace spaced {
+namespace spaced::enemy {
 class Creep : public Enemy {
   public:
 	explicit Creep(bave::Services const& services);
@@ -10,4 +10,4 @@ class Creep : public Enemy {
 
 	float x_speed{100.0f};
 };
-} // namespace spaced
+} // namespace spaced::enemy

src/spaced/spaced/game/player.hpp

@@ -15,7 +15,7 @@ class Player : public bave::IDrawable {
   public:
 	struct State {
 		std::span<bave::NotNull<IDamageable*> const> targets{};
-		std::span<bave::NotNull<IPowerup*> const> powerups{};
+		std::span<bave::NotNull<Powerup*> const> powerups{};
 	};
 
 	explicit Player(bave::Services const& services, std::unique_ptr<IController> controller);

src/spaced/spaced/game/powerups/pu_base.cpp renamed to src/spaced/spaced/game/powerup.cpp

@@ -1,5 +1,5 @@
 #include <bave/services/resources.hpp>
-#include <spaced/game/powerups/pu_base.hpp>
+#include <spaced/game/powerup.hpp>
 
 namespace spaced {
 using bave::Circle;
@@ -9,7 +9,7 @@ using bave::Seconds;
 using bave::Services;
 using bave::Shader;
 
-PUBase::PUBase(Services const& services, std::string_view const name) : m_services(&services), m_layout(&services.get<Layout>()), m_name(name) {
+Powerup::Powerup(Services const& services, std::string_view const name) : m_services(&services), m_layout(&services.get<Layout>()), m_name(name) {
 	auto circle = Circle{};
 	circle.diameter = 40.0f;
 	shape.set_shape(circle);
@@ -20,7 +20,7 @@ PUBase::PUBase(Services const& services, std::string_view const name) : m_servic
 	emitter.config.respawn = true;
 }
 
-void PUBase::tick(Seconds const dt) {
+void Powerup::tick(Seconds const dt) {
 	shape.transform.position.x -= speed * dt.count();
 	if (shape.transform.position.x < m_layout->play_area.lt.x - 0.5f * shape.get_shape().diameter) { m_destroyed = true; }
 
@@ -32,12 +32,12 @@ void PUBase::tick(Seconds const dt) {
 	emitter.tick(dt);
 }
 
-void PUBase::draw(Shader& shader) const {
+void Powerup::draw(Shader& shader) const {
 	shape.draw(shader);
 	emitter.draw(shader);
 }
 
-void PUBase::activate(Player& player) {
+void Powerup::activate(Player& player) {
 	do_activate(player);
 	m_destroyed = true;
 }

src/spaced/spaced/game/powerup.hpp

@@ -1,19 +1,36 @@
 #pragma once
-#include <bave/core/polymorphic.hpp>
 #include <bave/core/time.hpp>
-#include <bave/graphics/drawable.hpp>
-#include <bave/graphics/rect.hpp>
+#include <bave/graphics/particle_system.hpp>
+#include <bave/graphics/shape.hpp>
+#include <bave/services/services.hpp>
+#include <spaced/services/layout.hpp>
 
 namespace spaced {
 class Player;
 
-class IPowerup : public bave::IDrawable {
+class Powerup : public bave::IDrawable {
   public:
-	[[nodiscard]] virtual auto get_bounds() const -> bave::Rect<> = 0;
-	virtual void activate(Player& player) = 0;
+	explicit Powerup(bave::Services const& services, std::string_view name);
 
-	[[nodiscard]] virtual auto is_destroyed() const -> bool = 0;
+	void tick(bave::Seconds dt);
+	void draw(bave::Shader& shader) const final;
 
-	virtual void tick(bave::Seconds dt) = 0;
+	[[nodiscard]] auto get_bounds() const -> bave::Rect<> { return shape.get_bounds(); }
+	void activate(Player& player);
+
+	[[nodiscard]] auto is_destroyed() const -> bool { return m_destroyed; }
+
+	float speed{300.0f};
+	bave::CircleShape shape{};
+	bave::ParticleEmitter emitter{};
+
+  protected:
+	virtual void do_activate(Player& player) = 0;
+
+	bave::NotNull<bave::Services const*> m_services;
+	bave::NotNull<Layout const*> m_layout;
+	std::string_view m_name{};
+	bool m_emitter_ticked{};
+	bool m_destroyed{};
 };
 } // namespace spaced

src/spaced/spaced/game/powerups/pu_beam.cpp renamed to src/spaced/spaced/game/powerups/beam.cpp

@@ -1,20 +1,20 @@
 #include <bave/services/styles.hpp>
 #include <spaced/game/player.hpp>
-#include <spaced/game/powerups/pu_beam.hpp>
+#include <spaced/game/powerups/beam.hpp>
 #include <spaced/game/weapons/gun_beam.hpp>
 
-namespace spaced {
+namespace spaced::powerup {
 using bave::Services;
 using bave::Styles;
 
-PUBeam::PUBeam(Services const& services, int rounds) : PUBase(services, "Beam"), m_rounds(rounds) {
+Beam::Beam(Services const& services, int rounds) : Powerup(services, "Beam"), m_rounds(rounds) {
 	emitter.config.lerp.tint.lo = emitter.config.lerp.tint.hi = shape.tint = services.get<Styles>().rgbas["gun_beam"];
 	emitter.config.lerp.tint.hi.channels.w = 0;
 }
 
-void PUBeam::do_activate(Player& player) {
+void Beam::do_activate(Player& player) {
 	auto beam = std::make_unique<GunBeam>(*m_services);
 	beam->rounds = m_rounds;
 	player.set_special_weapon(std::move(beam));
 }
-} // namespace spaced
+} // namespace spaced::powerup

src/spaced/spaced/game/powerups/beam.hpp

@@ -0,0 +1,14 @@
+#pragma once
+#include <spaced/game/powerup.hpp>
+
+namespace spaced::powerup {
+class Beam : public Powerup {
+  public:
+	explicit Beam(bave::Services const& services, int rounds = 2);
+
+  private:
+	void do_activate(Player& player) final;
+
+	int m_rounds{};
+};
+} // namespace spaced::powerup

src/spaced/spaced/game/powerups/pu_base.hpp

@@ -77,7 +77,7 @@ void World::push(std::unique_ptr<Enemy> enemy) {
 	m_active_enemies.push_back(std::move(enemy));
 }
 
-void World::push(std::unique_ptr<IPowerup> powerup) {
+void World::push(std::unique_ptr<Powerup> powerup) {
 	if (!powerup) { return; }
 	m_active_powerups.push_back(std::move(powerup));
 }