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

Impl. "construct screen" fn for Screen/ScreenStack
All checks were successful
Build and Publish WASM version of demo / Build-And-Deploy (push) Successful in 19s
Details

Browse source 
Minor fix to push_screen() fn in ScreenStack.
This commit is contained in:
Stephen Seo 2023-08-17 12:58:52 +09:00
parent 11c7dec3ed
commit 89e19cf084
3 changed files with 34 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/game.cc
View file

@ -9,7 +9,7 @@
Game::Game() Game::Game()
: screen_stack(ScreenStack::new_instance()), : screen_stack(ScreenStack::new_instance()),
prev_time(std::chrono::steady_clock::now()) { prev_time(std::chrono::steady_clock::now()) {
screen_stack->push_screen<TRunnerScreen>(); screen_stack->push_constructing_screen<TRunnerScreen>();
} }
void Game::update() { void Game::update() {

13
src/screen.cc
View file

@ -19,6 +19,11 @@ ScreenStack::PendingAction::PendingAction(Action action)
ScreenStack::PendingAction::PendingAction(Screen::Ptr &&screen) ScreenStack::PendingAction::PendingAction(Screen::Ptr &&screen)
: screen(std::forward<Screen::Ptr>(screen)), action(Action::PUSH_SCREEN) {} : screen(std::forward<Screen::Ptr>(screen)), action(Action::PUSH_SCREEN) {}
ScreenStack::PendingAction::PendingAction(
std::function<Screen::Ptr(ScreenStack::Weak)> &&fn)
: screen(std::forward<std::function<Screen::Ptr(ScreenStack::Weak)> >(fn)),
action(Action::CONSTRUCT_SCREEN) {}
ScreenStack::Ptr ScreenStack::new_instance() { ScreenStack::Ptr ScreenStack::new_instance() {
std::shared_ptr<ScreenStack> ptr = std::shared_ptr<ScreenStack> ptr =
std::shared_ptr<ScreenStack>(new ScreenStack{}); std::shared_ptr<ScreenStack>(new ScreenStack{});
@ -66,7 +71,8 @@ void ScreenStack::handle_pending_actions() {
while (!actions.empty()) { while (!actions.empty()) {
switch (actions.front().action) { switch (actions.front().action) {
case Action::PUSH_SCREEN: case Action::PUSH_SCREEN:
stack.push_back(std::move(actions.front().screen)); stack.emplace_back(
std::move(std::get<Screen::Ptr>(actions.front().screen)));
break; break;
case Action::POP_SCREEN: case Action::POP_SCREEN:
if (!stack.empty()) { if (!stack.empty()) {
@ -86,6 +92,11 @@ void ScreenStack::handle_pending_actions() {
#endif #endif
stack.clear(); stack.clear();
break; break;
case Action::CONSTRUCT_SCREEN:
stack.emplace_back(
std::get<std::function<Screen::Ptr(ScreenStack::Weak)> >(
actions.front().screen)(self_weak));
break;
case Action::NOP: case Action::NOP:
// Intentionally left blank. // Intentionally left blank.
break; break;

27
src/screen.h
View file

@ -2,7 +2,9 @@
#define JUMPARTIFACT_DOT_COM_DEMO_0_SCREEN_H_ #define JUMPARTIFACT_DOT_COM_DEMO_0_SCREEN_H_
#include <deque> #include <deque>
#include <functional>
#include <memory> #include <memory>
#include <variant>
#include <vector> #include <vector>
// Forward declaration. // Forward declaration.
@ -36,13 +38,18 @@ class Screen {
}; };
class ScreenStack { class ScreenStack {
public:
using Ptr = std::shared_ptr<ScreenStack>;
using Weak = std::weak_ptr<ScreenStack>;
private: private:
enum Action { PUSH_SCREEN, POP_SCREEN, CLEAR_SCREENS, NOP }; enum Action { PUSH_SCREEN, POP_SCREEN, CLEAR_SCREENS, CONSTRUCT_SCREEN, NOP };
struct PendingAction { struct PendingAction {
PendingAction(); PendingAction();
PendingAction(Action action); PendingAction(Action action);
PendingAction(Screen::Ptr&&); PendingAction(Screen::Ptr&&);
PendingAction(std::function<Screen::Ptr(ScreenStack::Weak)>&&);
// No copy. // No copy.
PendingAction(const PendingAction&) = delete; PendingAction(const PendingAction&) = delete;
@ -52,14 +59,12 @@ class ScreenStack {
PendingAction(PendingAction&&) = default; PendingAction(PendingAction&&) = default;
PendingAction& operator=(PendingAction&&) = default; PendingAction& operator=(PendingAction&&) = default;
Screen::Ptr screen; std::variant<Screen::Ptr, std::function<Screen::Ptr(ScreenStack::Weak)> >
screen;
Action action; Action action;
}; };
public: public:
using Ptr = std::shared_ptr<ScreenStack>;
using Weak = std::weak_ptr<ScreenStack>;
static Ptr new_instance(); static Ptr new_instance();
// No copy. // No copy.
@ -78,6 +83,9 @@ class ScreenStack {
template <typename SubScreen> template <typename SubScreen>
void push_screen(); void push_screen();
template <typename SubScreen>
void push_constructing_screen();
void pop_screen(); void pop_screen();
void clear_screens(); void clear_screens();
@ -99,7 +107,14 @@ Screen::Ptr Screen::new_screen(std::weak_ptr<ScreenStack> stack) {
template <typename SubScreen> template <typename SubScreen>
void ScreenStack::push_screen() { void ScreenStack::push_screen() {
stack.emplace_back(Screen::new_screen<SubScreen>(self_weak)); actions.emplace_back(Screen::new_screen<SubScreen>(self_weak));
}
template <typename SubScreen>
void ScreenStack::push_constructing_screen() {
actions.emplace_back([](ScreenStack::Weak ss) -> Screen::Ptr {
return Screen::new_screen<SubScreen>(ss);
});
} }
#endif #endif