stephenseo/jumpartifact.com_demo_0
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Tweaks to WalkerHackScreen
All checks were successful
Build and Publish WASM version of demo / Build-And-Deploy (push) Successful in 22s
Details

Browse source
This commit is contained in:
Stephen Seo 2023-08-24 15:02:46 +09:00
parent b18728c684
commit fb7514139f
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/screen_walker_hack.cc
View file

@ -27,7 +27,8 @@ WalkerHackScreen::WalkerHackScreen(ScreenStack::Weak ss_weak,
type_j_size(1), type_j_size(1),
type_a_size(1), type_a_size(1),
type_l_size(1), type_l_size(1),
button_type(BUTTON_TYPE_F) { button_type(BUTTON_TYPE_F),
screen_pop_requested(false) {
button_type = button_type =
(ButtonType)((int)(call_js_get_random() * (float)BUTTON_TYPE_SIZE)); (ButtonType)((int)(call_js_get_random() * (float)BUTTON_TYPE_SIZE));
*walker_hack_success = false; *walker_hack_success = false;
@ -42,14 +43,14 @@ bool WalkerHackScreen::update(float dt, bool resized) {
} }
timer -= dt; timer -= dt;
if (timer < 0.0F) { if (timer < 0.0F && !screen_pop_requested) {
#ifndef NDEBUG #ifndef NDEBUG
std::clog << "WalkerHackScreen: timer ended.\n"; std::clog << "WalkerHackScreen: timer ended.\n";
#endif #endif
timer = WALKER_HACK_SCREEN_DURATION;
auto s_stack = stack.lock(); auto s_stack = stack.lock();
if (s_stack) { if (s_stack) {
s_stack->pop_screen(); s_stack->pop_screen();
screen_pop_requested = true;
} }
} }
@ -139,9 +140,10 @@ bool WalkerHackScreen::draw(RenderTexture *render_texture) {
GetScreenWidth() / 2 - instructions_size / 2, GetScreenWidth() / 2 - instructions_size / 2,
(GetScreenHeight() / 4) * 3, instructions_font_size, WHITE); (GetScreenHeight() / 4) * 3, instructions_font_size, WHITE);
float ratio = float ratio = timer > 0.0F ? (WALKER_HACK_SCREEN_DURATION - timer) /
(WALKER_HACK_SCREEN_DURATION - timer) / WALKER_HACK_SCREEN_DURATION; WALKER_HACK_SCREEN_DURATION
DrawRectangle(GetScreenWidth() * ratio, : 1.0F;
DrawRectangle(GetScreenWidth() * ratio / 2.0F,
(float)GetScreenHeight() * BUTTON_FONT_SIZE_RATIO * 2.0F + (float)GetScreenHeight() * BUTTON_FONT_SIZE_RATIO * 2.0F +
BUTTON_DRAW_OFFSET * 3.0F, BUTTON_DRAW_OFFSET * 3.0F,
GetScreenWidth() * (1.0F - ratio), 30, GREEN); GetScreenWidth() * (1.0F - ratio), 30, GREEN);

1
src/screen_walker_hack.h
View file

@ -43,6 +43,7 @@ class WalkerHackScreen : public Screen {
int type_a_size; int type_a_size;
int type_l_size; int type_l_size;
ButtonType button_type; ButtonType button_type;
bool screen_pop_requested;
void set_sizes(); void set_sizes();
}; };