Sprites part2 (#48)

* Add creep ship texture.

* Add kinetic projectile texture.

* Fixup explode and exhaust particles.

* Add kinetic SFX, improve round lifetime.

* Add beam fire SFX.

* Replace explode SFX.

Author: karnkaul

assets/images/creep_ship.png

@@ -18,8 +18,8 @@
     "velocity": {
       "linear": {
         "angle": {
-          "lo": 80.000000,
-          "hi": 100.000000
+          "lo": 85.000000,
+          "hi": 95.000000
         },
         "speed": {
           "lo": -360.000000,
@@ -34,7 +34,7 @@
     "lerp": {
       "tint": {
         "lo": "#f48018ff",
-        "hi": "#ffffff00"
+        "hi": "#00000000"
       },
       "scale": {
         "lo": [

assets/images/explode.png

@@ -1,6 +1,6 @@
 {
   "asset_type": "ParticleEmitter",
-  "texture": "images/foam_bubble.png",
+  "texture": "images/explode.png",
   "config": {
     "initial": {
       "position": {
@@ -22,8 +22,8 @@
           "hi": 180.000000
         },
         "speed": {
-          "lo": -360.000000,
-          "hi": -80.000000
+          "lo": -200.000000,
+          "hi": 200.000000
         }
       },
       "angular": {
@@ -33,8 +33,8 @@
     },
     "lerp": {
       "tint": {
-        "lo": "#f75c03ff",
-        "hi": "#e5cdaeff"
+        "lo": "#ffffffff",
+        "hi": "#00000000"
       },
       "scale": {
         "lo": [
@@ -48,12 +48,12 @@
       }
     },
     "ttl": {
-      "lo": 0.500000,
-      "hi": 3.000000
+      "lo": 0.200000,
+      "hi": 0.800000
     },
     "quad_size": [
-      50.000000,
-      50.000000
+      100.000000,
+      100.000000
     ],
     "count": 40,
     "respawn": true

assets/images/foam_bubble.png

@@ -32,7 +32,7 @@
   "progress_bars": {
     "default": {
       "background": "#9f2b68ff",
-      "fill": "#ffffffff",
+      "fill": "milk",
       "corner_ratio": 0.5,
       "padding": 10
     },

assets/images/kinetic_projectile.png

@@ -1 +1,3 @@
 SpaceShooterRedux: https://opengameart.org/content/space-shooter-redux, https://www.kenney.nl
+sfx/beam_fire.wav: https://opengameart.org/content/laser-rifle
+sfx/swish.wav: https://opengameart.org/content/battle-sound-effects

assets/particles/exhaust.json

@@ -20,7 +20,7 @@ auto Arsenal::get_weapon() -> Weapon& {
 void Arsenal::tick(IWeaponRound::State const& round_state, bool const fire, Seconds const dt) {
 	tick_weapons(dt);
 	check_switch_weapon();
-	if (fire) { fire_weapon(round_state.muzzle_position); }
+	if (round_state.in_play && fire) { fire_weapon(round_state.muzzle_position); }
 	tick_rounds(round_state, dt);
 }
 

assets/particles/explode.json

@@ -7,7 +7,7 @@ void Creep::tick(Seconds const dt, bool const in_play) {
 	Enemy::tick(dt, in_play);
 	if (!in_play) { return; }
 
-	shape.transform.position.x -= x_speed * dt.count();
-	if (shape.transform.position.x < -0.5f * (get_layout().world_space.x + shape.get_shape().size.x)) { set_destroyed(); }
+	sprite.transform.position.x -= x_speed * dt.count();
+	if (sprite.transform.position.x < -0.5f * (get_layout().world_space.x + sprite.get_shape().size.x)) { set_destroyed(); }
 }
 } // namespace spaced

assets/sfx/beam_fire.wav

@@ -1,21 +1,21 @@
-#include <bave/core/random.hpp>
 #include <bave/services/resources.hpp>
-#include <bave/services/styles.hpp>
 #include <spaced/game/enemies/creep.hpp>
 #include <spaced/game/enemies/creep_factory.hpp>
 
 namespace spaced {
-using bave::random_in_range;
+using bave::NotNull;
+using bave::Resources;
 using bave::Seconds;
-using bave::Styles;
+using bave::Services;
+using bave::Texture;
+
+CreepFactory::CreepFactory(NotNull<Services const*> services)
+	: EnemyFactory(services), m_ship_texture(services->get<Resources>().get<Texture>("images/creep_ship.png")) {}
 
 auto CreepFactory::spawn_enemy() -> std::unique_ptr<Enemy> {
 	auto ret = std::make_unique<Creep>(get_services());
-	if (!m_tints.empty()) {
-		auto const& rgbas = get_services().get<Styles>().rgbas;
-		auto const tint_index = random_in_range(std::size_t{}, m_tints.size() - 1);
-		ret->shape.tint = rgbas[m_tints.at(tint_index)];
-	}
+	ret->sprite.set_texture(m_ship_texture);
+	ret->sprite.set_size(glm::vec2{80.0f});
 	ret->health = m_initial_health;
 	return ret;
 }

assets/sfx/bubble.wav

@@ -1,16 +1,15 @@
 #pragma once
-#include <djson/json.hpp>
 #include <spaced/game/enemy_factory.hpp>
 
 namespace spaced {
 class CreepFactory : public EnemyFactory {
   public:
-	using EnemyFactory::EnemyFactory;
+	explicit CreepFactory(bave::NotNull<bave::Services const*> services);
 
 	[[nodiscard]] auto spawn_enemy() -> std::unique_ptr<Enemy> final;
 
   private:
-	std::array<std::string_view, 2> m_tints{"orange", "milk"};
+	std::shared_ptr<bave::Texture const> m_ship_texture{};
 	float m_initial_health{2.0f};
 };
 } // namespace spaced

assets/sfx/kinetic_fire.wav

@@ -7,6 +7,7 @@
 namespace spaced {
 using bave::im_text;
 using bave::random_in_range;
+using bave::Rect;
 using bave::RoundedQuad;
 using bave::Seconds;
 using bave::Services;
@@ -23,6 +24,11 @@ Enemy::Enemy(Services const& services, std::string_view const type) : m_layout(&
 	m_health_bar.set_style(services.get<Styles>().progress_bars["enemy"]);
 }
 
+auto Enemy::get_bounds() const -> bave::Rect<> {
+	if (hitbox) { return Rect<>::from_size(*hitbox, sprite.transform.position); }
+	return sprite.get_bounds();
+}
+
 auto Enemy::take_damage(float const damage) -> bool {
 	if (is_destroyed()) { return false; }
 	health.inflict_damage(damage);
@@ -35,24 +41,24 @@ void Enemy::force_death() {
 }
 
 void Enemy::tick(Seconds const /*dt*/, bool const /*in_play*/) {
-	m_health_bar.position = shape.transform.position;
-	m_health_bar.position.y += 0.5f * shape.get_shape().size.y + 20.0f;
-	m_health_bar.size = {shape.get_shape().size.x, 10.0f};
+	m_health_bar.position = sprite.transform.position;
+	m_health_bar.position.y += 0.5f * sprite.get_shape().size.y + 20.0f;
+	m_health_bar.size = {sprite.get_shape().size.x, 10.0f};
 	m_health_bar.set_progress(health.get_hit_points() / health.get_total_hit_points());
 }
 
 void Enemy::draw(Shader& shader) const {
-	shape.draw(shader);
+	sprite.draw(shader);
 	m_health_bar.draw(shader);
 }
 
 void Enemy::setup(glm::vec2 max_size, float y_position) {
 	auto rounded_quad = RoundedQuad{};
 	rounded_quad.size = max_size;
 	rounded_quad.corner_radius = 0.2f * max_size.x;
-	shape.set_shape(rounded_quad);
-	shape.transform.position.x = 0.5f * (get_layout().world_space.x + rounded_quad.size.x);
-	shape.transform.position.y = y_position;
+	sprite.set_shape(rounded_quad);
+	sprite.transform.position.x = 0.5f * (get_layout().world_space.x + rounded_quad.size.x);
+	sprite.transform.position.y = y_position;
 }
 
 void Enemy::do_inspect() {

assets/sfx/swish.wav

@@ -1,6 +1,6 @@
 #pragma once
 #include <bave/core/time.hpp>
-#include <bave/graphics/shape.hpp>
+#include <bave/graphics/sprite.hpp>
 #include <bave/platform.hpp>
 #include <bave/services/services.hpp>
 #include <bave/ui/progress_bar.hpp>
@@ -14,7 +14,7 @@ class Enemy : public IDamageable, public bave::IDrawable {
 	explicit Enemy(bave::Services const& services, std::string_view type);
 
 	[[nodiscard]] auto get_instigator() const -> Instigator final { return Instigator::eEnemy; }
-	[[nodiscard]] auto get_bounds() const -> bave::Rect<> override { return shape.get_bounds(); }
+	[[nodiscard]] auto get_bounds() const -> bave::Rect<> override;
 	auto take_damage(float damage) -> bool override;
 	void force_death() override;
 
@@ -33,12 +33,13 @@ class Enemy : public IDamageable, public bave::IDrawable {
 		if constexpr (bave::debug_v) { do_inspect(); }
 	}
 
-	bave::RoundedQuadShape shape{};
+	bave::Sprite sprite{};
+	std::optional<glm::vec2> hitbox{};
 	Health health{};
 	std::int64_t points{10};
 
 	std::string death_emitter{"particles/explode.json"};
-	std::vector<std::string> death_sfx{"sfx/bubble.wav"};
+	std::vector<std::string> death_sfx{"sfx/swish.wav"};
 
   private:
 	virtual void do_inspect();

assets/styles.json

@@ -51,6 +51,13 @@ void Player::tick(State const& state, Seconds const dt) {
 		if (m_death->active_particles() == 0) { m_death.reset(); }
 	}
 
+	auto const round_state = IWeaponRound::State{
+		.targets = state.targets,
+		.muzzle_position = get_muzzle_position(),
+		.in_play = !health.is_dead(),
+	};
+	m_arsenal.tick(round_state, m_controller->is_firing(), dt);
+
 	if (health.is_dead()) { return; }
 
 	auto const y_position = m_controller->tick(dt);
@@ -65,9 +72,6 @@ void Player::tick(State const& state, Seconds const dt) {
 		}
 	}
 
-	auto const round_state = IWeaponRound::State{.targets = state.targets, .muzzle_position = get_muzzle_position()};
-	m_arsenal.tick(round_state, m_controller->is_firing(), dt);
-
 	m_exhaust.set_position(get_exhaust_position());
 	m_exhaust.tick(dt);
 

attribution.txt

@@ -1,5 +1,4 @@
 #include <bave/imgui/im_text.hpp>
-#include <bave/services/audio.hpp>
 #include <spaced/game/weapon.hpp>
 
 namespace spaced {
@@ -10,11 +9,7 @@ using bave::Services;
 
 Weapon::Weapon(Services const& services, std::string name) : m_log{std::move(name)}, m_display(&services.get<IDisplay>()), m_audio(&services.get<IAudio>()) {}
 
-auto Weapon::fire(glm::vec2 const muzzle_position) -> std::unique_ptr<Round> {
-	auto ret = do_fire(muzzle_position);
-	if (ret) { m_audio->play_any_sfx(m_fire_sfx); }
-	return ret;
-}
+auto Weapon::fire(glm::vec2 const muzzle_position) -> std::unique_ptr<Round> { return do_fire(muzzle_position); }
 
 void Weapon::do_inspect() {
 	if constexpr (bave::imgui_v) { im_text("rounds remaining: {}", get_rounds_remaining()); }

src/spaced/spaced/game/arsenal.cpp

@@ -1,14 +1,11 @@
 #pragma once
 #include <bave/logger.hpp>
 #include <bave/platform.hpp>
+#include <bave/services/audio.hpp>
 #include <bave/services/display.hpp>
 #include <bave/services/services.hpp>
 #include <spaced/game/weapon_round.hpp>
 
-namespace bave {
-class IAudio;
-}
-
 namespace spaced {
 class Weapon : public bave::Polymorphic {
   public:
@@ -31,12 +28,12 @@ class Weapon : public bave::Polymorphic {
 
   protected:
 	[[nodiscard]] auto get_display() const -> bave::IDisplay const& { return *m_display; }
+	[[nodiscard]] auto get_audio() const -> bave::IAudio& { return *m_audio; }
 
 	virtual auto do_fire(glm::vec2 muzzle_position) -> std::unique_ptr<Round> = 0;
 	virtual void do_inspect();
 
 	bave::Logger m_log{};
-	std::vector<std::string> m_fire_sfx{};
 
   private:
 	bave::NotNull<bave::IDisplay const*> m_display;

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

@@ -10,6 +10,7 @@ class IWeaponRound : public bave::IDrawable {
 	struct State {
 		std::span<bave::NotNull<IDamageable*> const> targets{};
 		glm::vec2 muzzle_position{};
+		bool in_play{true};
 	};
 
 	virtual void tick(State const& state, bave::Seconds dt) = 0;

src/spaced/spaced/game/enemies/creep_factory.cpp

@@ -26,9 +26,14 @@ class LaserCharge : public IWeaponRound {
 		m_ray.transform.position.y = muzzle_position.y;
 	}
 
-	[[nodiscard]] auto is_destroyed() const -> bool final { return m_fire_remain <= 0s; }
+	[[nodiscard]] auto is_destroyed() const -> bool final { return m_destroyed; }
 
 	void tick(State const& state, bave::Seconds dt) final {
+		if (!state.in_play || m_fire_remain <= 0s) {
+			m_destroyed = true;
+			return;
+		}
+
 		if (m_fire_remain > 0s) { m_fire_remain -= dt; }
 
 		sort_entries(state.targets, state.muzzle_position);
@@ -97,6 +102,7 @@ class LaserCharge : public IWeaponRound {
 	Sprite m_ray{};
 	Seconds m_fire_remain{};
 	std::vector<Entry> m_entries{};
+	bool m_destroyed{};
 };
 } // namespace
 
@@ -122,6 +128,7 @@ auto GunBeam::do_fire(glm::vec2 const muzzle_position) -> std::unique_ptr<Round>
 	if (rounds > 0) { --rounds; }
 	m_fire_remain = config.fire_duration;
 	m_reload_remain = 0s;
+	get_audio().play_sfx("sfx/beam_fire.wav");
 	return std::make_unique<LaserCharge>(&get_display(), config, muzzle_position);
 }
 

src/spaced/spaced/game/enemies/creep_factory.hpp

@@ -1,17 +1,19 @@
 #include <bave/imgui/im_text.hpp>
-#include <bave/services/styles.hpp>
+#include <bave/services/resources.hpp>
 #include <spaced/game/weapons/gun_kinetic.hpp>
 
 namespace spaced {
 using bave::IAudio;
 using bave::im_text;
+using bave::Resources;
 using bave::Rgba;
 using bave::Seconds;
 using bave::Services;
-using bave::Styles;
+using bave::Texture;
 
 GunKinetic::GunKinetic(Services const& services) : Weapon(services, "GunKinetic"), m_audio(&services.get<IAudio>()) {
-	projectile_config.tint = services.get<Styles>().rgbas["black"];
+	projectile_config.texture = services.get<Resources>().get<Texture>("images/kinetic_projectile.png");
+	if (projectile_config.texture) { projectile_config.size = projectile_config.texture->get_size(); }
 }
 
 void GunKinetic::tick(Seconds const dt) {
@@ -23,6 +25,7 @@ auto GunKinetic::do_fire(glm::vec2 const muzzle_position) -> std::unique_ptr<Rou
 
 	if (rounds > 0) { --rounds; }
 	m_reload_remain = reload_delay;
+	get_audio().play_sfx("sfx/kinetic_fire.wav");
 	return std::make_unique<Projectile>(&get_display(), projectile_config, muzzle_position);
 }