Add new powerup sprites (#56)

* Add new powerup icons

* Cleanup.

---------

Co-authored-by: Karn Kaul <karnkaul@gmail.com>

Author: aleokdev

assets/assets/images/powerup_1up.png

@@ -9,12 +9,12 @@ using bave::Resources;
 using bave::Seconds;
 using bave::Services;
 using bave::Shader;
+using bave::Texture;
 
 Powerup::Powerup(Services const& services, std::string_view const name)
 	: m_services(&services), m_layout(&services.get<Layout>()), m_audio(&services.get<IAudio>()), m_name(name) {
-	auto circle = Circle{};
-	circle.diameter = 40.0f;
-	shape.set_shape(circle);
+
+	sprite.set_size({80., 80.});
 
 	auto const& resources = services.get<Resources>();
 	if (auto const pu_emitter = resources.get<ParticleEmitter>("assets/particles/powerup.json")) { emitter = *pu_emitter; }
@@ -23,10 +23,10 @@ Powerup::Powerup(Services const& services, std::string_view const name)
 }
 
 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; }
+	sprite.transform.position.x -= speed * dt.count();
+	if (sprite.transform.position.x < m_layout->play_area.lt.x - 0.5f * sprite.get_size().x - 300.) { m_destroyed = true; }
 
-	emitter.set_position(shape.transform.position);
+	emitter.set_position(sprite.transform.position);
 	if (!m_emitter_ticked) {
 		m_emitter_ticked = true;
 		emitter.pre_warm();
@@ -35,8 +35,8 @@ void Powerup::tick(Seconds const dt) {
 }
 
 void Powerup::draw(Shader& shader) const {
-	shape.draw(shader);
 	emitter.draw(shader);
+	sprite.draw(shader);
 }
 
 void Powerup::activate(Player& player) {

assets/assets/images/powerup_beam.png

@@ -16,13 +16,13 @@ class Powerup : public bave::IDrawable {
 	void tick(bave::Seconds dt);
 	void draw(bave::Shader& shader) const final;
 
-	[[nodiscard]] auto get_bounds() const -> bave::Rect<> { return shape.get_bounds(); }
+	[[nodiscard]] auto get_bounds() const -> bave::Rect<> { return sprite.get_bounds(); }
 	void activate(Player& player);
 
 	[[nodiscard]] auto is_destroyed() const -> bool { return m_destroyed; }
 
 	float speed{300.0f};
-	bave::CircleShape shape{};
+	bave::Sprite sprite{};
 	bave::ParticleEmitter emitter{};
 
   protected:

src/spaced/spaced/game/powerup.cpp

@@ -1,15 +1,21 @@
+#include <bave/services/resources.hpp>
 #include <bave/services/styles.hpp>
 #include <spaced/game/player.hpp>
 #include <spaced/game/powerups/beam.hpp>
 #include <spaced/game/weapons/gun_beam.hpp>
 
 namespace spaced::powerup {
+using bave::Resources;
 using bave::Services;
 using bave::Styles;
+using bave::Texture;
 
 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.lo = emitter.config.lerp.tint.hi = services.get<Styles>().rgbas["gun_beam"];
 	emitter.config.lerp.tint.hi.channels.w = 0;
+
+	auto const& resources = services.get<Resources>();
+	sprite.set_texture(resources.get<Texture>("assets/images/powerup_beam.png"));
 }
 
 void Beam::do_activate(Player& player) {

src/spaced/spaced/game/powerup.hpp

@@ -1,14 +1,20 @@
+#include <bave/services/resources.hpp>
 #include <bave/services/styles.hpp>
 #include <spaced/game/player.hpp>
 #include <spaced/game/powerups/one_up.hpp>
 
 namespace spaced::powerup {
+using bave::Resources;
 using bave::Services;
 using bave::Styles;
+using bave::Texture;
 
 OneUp::OneUp(Services const& services) : Powerup(services, "OneUp") {
-	emitter.config.lerp.tint.lo = emitter.config.lerp.tint.hi = shape.tint = services.get<Styles>().rgbas["exhaust"];
+	emitter.config.lerp.tint.lo = emitter.config.lerp.tint.hi = services.get<Styles>().rgbas["exhaust"];
 	emitter.config.lerp.tint.hi.channels.w = 0;
+
+	auto const& resources = services.get<Resources>();
+	sprite.set_texture(resources.get<Texture>("assets/images/powerup_1up.png"));
 }
 
 void OneUp::do_activate(Player& player) { player.one_up(); }

src/spaced/spaced/game/powerups/beam.cpp

@@ -134,7 +134,7 @@ void EndlessScene::on_player_scored(Enemy const& enemy) {
 
 	if (!powerup) { return; }
 
-	powerup->shape.transform.position = enemy.get_position();
+	powerup->sprite.transform.position = enemy.get_position();
 	push_powerup(std::move(powerup));
 	m_since_powerup = 0s;
 }

src/spaced/spaced/game/powerups/one_up.cpp

@@ -78,6 +78,8 @@ auto GameScene::get_asset_manifest() -> AssetManifest {
 				"assets/images/round_kinetic_green.png",
 				"assets/images/round_kinetic_red.png",
 				"assets/images/round_beam.png",
+				"assets/images/powerup_beam.png",
+				"assets/images/powerup_1up.png",
 			},
 		.audio_clips =
 			{