Adjust particle visuals #23
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…tion emitters and player exhaust. # Conflicts: # src/spaced/spaced/game/hud.cpp
# Conflicts: # src/spaced/spaced/scenes/game.cpp
swagween
force-pushed
the
lana/particles
branch
from
56c43ae to
191b8a6
Compare
karnkaul
previously approved these changes
Mar 16, 2024
karnkaul
previously approved these changes
Mar 16, 2024
src/spaced/spaced/game/player.hpp
Outdated
| @@ -5,6 +5,7 @@ | |||
| #include <spaced/game/controller.hpp> | |||
| #include <spaced/game/health.hpp> | |||
| #include <spaced/game/weapon.hpp> | |||
| #include <spaced/services/styles.hpp> | |||
There was a problem hiding this comment.
Move this include to the cpp file.
| @@ -12,6 +12,7 @@ struct Styles : IService { | |||
| StringMap<bave::Rgba> rgbas{}; | |||
| StringMap<ui::ButtonStyle> buttons{}; | |||
| StringMap<ui::ProgressBarStyle> progress_bars{}; | |||
| StringMap<ui::ProgressBarStyle> player{}; | |||
src/spaced/spaced/scenes/game.cpp
Outdated
| @@ -48,16 +49,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] { | |||
There was a problem hiding this comment.
Don't copy rgbas by value in the lambda, take it by reference instead; we know that the Styles reference will outlive m_enemy_spawner (because it's a service indirectly owned by Spaced) so it's safe. [this, &rgbas]
src/spaced/spaced/scenes/game.cpp
Outdated
| auto ret = std::make_unique<Creep>(get_services(), this); | ||
| ret->shape.tint = bave::yellow_v; | ||
| ret->shape.tint = random_in_range(-1.f, 1.f) < 0.f ? rgbas["orange"] : rgbas["milk"]; |
There was a problem hiding this comment.
Why not random_in_range(0, 1) == 0? Floating point randomness is more computationally expensive, and you just want a binary range (this or that), not a theoretically infinite range of floats.
src/spaced/spaced/scenes/home.cpp
Outdated
| @@ -3,11 +3,13 @@ | |||
| #include <spaced/services/layout.hpp> | |||
| #include <spaced/services/resources.hpp> | |||
| #include <spaced/services/scene_switcher.hpp> | |||
| #include <spaced/services/styles.hpp> | |||
src/spaced/spaced/scenes/home.cpp
Outdated
| #include <spaced/ui/button.hpp> | ||
| #include <spaced/ui/text.hpp> | ||
| #include <spaced/util.hpp> | ||
|
|
||
| namespace spaced { | ||
| using bave::Rgba; |
src/spaced/spaced/scenes/home.cpp
Outdated
| @@ -22,6 +24,7 @@ Home::Home(bave::App& app, Services const& services) : Scene(app, services, "Hom | |||
| void Home::on_loaded() { create_ui(); } | |||
|
|
|||
| void Home::create_ui() { | |||
|
|
|||
karnkaul
dismissed
their stale review
goddammit, pressed approve instead of request changes
karnkaul
requested changes
Mar 16, 2024
karnkaul
approved these changes
Mar 16, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
need help with line 106 in
player.cpp