Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file removed assets/fonts/Vera.ttf
Binary file not shown.
Binary file added assets/fonts/hesitation.regular.ttf
Binary file not shown.
Binary file modified assets/images/foam_bubble.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions assets/styles.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
}
},
"loading_screen": {
"background_tint": "#1a1a1aff",
"background_tint": "#231d2aff",
"spinner": {
"size": [
100.000000,
Expand All @@ -53,4 +53,4 @@
"outline_width": 10
}
}
}
}
18 changes: 11 additions & 7 deletions src/spaced/spaced/game/player.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
#include <bave/platform.hpp>
#include <spaced/game/player.hpp>
#include <spaced/services/resources.hpp>
#include <spaced/services/styles.hpp>

// temp for testing
#include <spaced/game/weapons/gun_beam.hpp>
Expand Down Expand Up @@ -94,24 +95,27 @@ void Player::do_inspect() {
}

void Player::setup_ship() {
auto const& rgbas = m_services->get<Styles>().rgbas;
auto const& layout = m_services->get<ILayout>();
auto const x = layout.get_player_x();
ship.transform.position.x = x;
ship.transform.position.x = layout.get_player_x();
auto rounded_quad = RoundedQuad{};
rounded_quad.size = layout.get_player_size();
rounded_quad.corner_radius = 20.0f;
ship.tint = rgbas["black"];
ship.set_shape(rounded_quad);
}

void Player::setup_foam() {
using Modifier = ParticleEmitter::Modifier;
foam_particles.config.quad_size = glm::vec2{20.0f};
foam_particles.config.quad_size = glm::vec2{80.f};
foam_particles.config.velocity.linear.angle = {Degrees{80.0f}, Degrees{100.0f}};
foam_particles.config.velocity.linear.speed = {-200.0f, -100.0f};
foam_particles.config.ttl = {1s, 2s};
foam_particles.config.velocity.linear.speed = {-360.0f, -270.0f};
foam_particles.config.ttl = {2s, 3s};
foam_particles.config.lerp.scale.hi = glm::vec2{0.5f};
foam_particles.config.count = 80;
auto const& rgbas = m_services->get<Styles>().rgbas;
foam_particles.config.lerp.tint = {rgbas["black"], rgbas["black"]};
foam_particles.config.lerp.tint.hi.channels.w = 0x0;
foam_particles.config.lerp.scale.hi = {};
foam_particles.config.count = 500;
foam_particles.modifiers = {Modifier::eTranslate, Modifier::eTint, Modifier::eScale};
foam_particles.set_position(get_exhaust_position());
foam_particles.pre_warm();
Expand Down
13 changes: 8 additions & 5 deletions src/spaced/spaced/scenes/game.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ using bave::KeyMods;
using bave::PointerMove;
using bave::PointerTap;
using bave::Ptr;
using bave::Rgba;
using bave::random_in_range;
using bave::Seconds;
using bave::Shader;
using bave::Texture;
Expand Down Expand Up @@ -56,16 +56,19 @@ void Game::on_loaded() {
m_player.foam_particles.set_texture(foam_texture);

auto const& rgbas = get_services().get<Styles>().rgbas;
auto spawn = [this] {
auto spawn = [this, &rgbas] {
auto ret = std::make_unique<Creep>(get_services(), this);
ret->shape.tint = bave::yellow_v;
ret->shape.tint = random_in_range(0, 1) == 0 ? rgbas["orange"] : rgbas["milk"];
return ret;
};
auto emitter = bave::ParticleEmitter{};
emitter.config.ttl = {0.5s, 1s};
emitter.config.velocity.linear.speed = {-360.0f, -80.0f};
emitter.config.ttl = {0.5s, 3s};
emitter.config.count = 40;
emitter.set_texture(foam_texture);
emitter.config.lerp.tint = {rgbas["orange"], rgbas["milk"]};
emitter.config.lerp.tint.hi.channels.w = 0x0;
emitter.config.lerp.scale.hi = glm::vec2{0.7f};
emitter.config.lerp.tint.hi.channels.w = 0xff;
m_enemy_spawner.emplace(spawn, std::move(emitter));

auto hud = std::make_unique<Hud>(get_services());
Expand Down
2 changes: 1 addition & 1 deletion src/spaced/spaced/spaced.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ void Spaced::render() const { m_scene->render_frame(); }
void Spaced::load_resources() {
auto const loader = Loader{&get_app().get_data_store(), &get_app().get_render_device()};
auto resources = std::make_unique<Resources>();
resources->main_font = loader.load_font("fonts/Vera.ttf");
resources->main_font = loader.load_font("fonts/hesitation.regular.ttf");
resources->spinner = loader.load_texture("images/spinner.png", true);
m_resources = resources.get();
m_services.bind<Resources>(std::move(resources));
Expand Down