Skip to content

Call "when key pressed" scripts when keys are pressed #310

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 8, 2023
Merged

Call "when key pressed" scripts when keys are pressed #310

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
22106d7
Engine: Do not stop scripts in start()
adazem009 Nov 8, 2023
2787701
Call "when key pressed" scripts when keys are pressed
adazem009 Nov 8, 2023
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
42 changes: 40 additions & 2 deletions src/engine/internal/engine.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,8 +179,9 @@ void Engine::frame()

void Engine::start()
{
if (m_running)
finalize();
// NOTE: Running scripts should be deleted, but this method will probably be removed anyway
/*if (m_running)
finalize();*/

deleteClones();

Expand Down Expand Up @@ -425,11 +426,32 @@ void Engine::setKeyState(const std::string &name, bool pressed)
{
KeyEvent event(name);
m_keyMap[event.name()] = pressed;

// Start "when key pressed" scripts
if (pressed) {
auto it = m_whenKeyPressedScripts.find(event.name());

if (it != m_whenKeyPressedScripts.cend())
startWhenKeyPressedScripts(it->second);

it = m_whenKeyPressedScripts.find("any");

if (it != m_whenKeyPressedScripts.cend())
startWhenKeyPressedScripts(it->second);
}
}

void Engine::setAnyKeyPressed(bool pressed)
{
m_anyKeyPressed = pressed;

// Start "when key pressed" scripts
if (pressed) {
auto it = m_whenKeyPressedScripts.find("any");

if (it != m_whenKeyPressedScripts.cend())
startWhenKeyPressedScripts(it->second);
}
}

double Engine::mouseX() const
Expand Down Expand Up @@ -947,3 +969,19 @@ void Engine::updateFrameDuration()
{
m_frameDuration = std::chrono::milliseconds(static_cast<long>(1000 / m_fps));
}

void Engine::startWhenKeyPressedScripts(const std::vector<Script *> &scripts)
{
for (auto script : scripts) {
std::shared_ptr<Block> block = nullptr;

for (const auto &[b, s] : m_scripts) {
if (s.get() == script)
block = b;
}

assert(block);
assert(std::find_if(m_targets.begin(), m_targets.end(), [script](std::shared_ptr<Target> target) { return script->target() == target.get(); }) != m_targets.end());
startScript(block, *std::find_if(m_targets.begin(), m_targets.end(), [script](std::shared_ptr<Target> target) { return script->target() == target.get(); }));
}
}
1 change: 1 addition & 0 deletions src/engine/internal/engine.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,7 @@ class Engine : public IEngine
std::shared_ptr<IBlockSection> blockSection(const std::string &opcode) const;

void updateFrameDuration();
void startWhenKeyPressedScripts(const std::vector<Script *> &scripts);

std::unordered_map<std::shared_ptr<IBlockSection>, std::unique_ptr<BlockSectionContainer>> m_sections;
std::vector<std::shared_ptr<Target>> m_targets;
Expand Down
185 changes: 185 additions & 0 deletions test/engine/engine_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,191 @@ TEST(EngineTest, KeyState)
ASSERT_FALSE(engine.keyPressed("any"));
}

TEST(EngineTest, WhenKeyPressed)
{
Project p("when_key_pressed.sb3");
ASSERT_TRUE(p.load());

p.run();

auto engine = p.engine();

Stage *stage = engine->stage();
ASSERT_TRUE(stage);

// no pressed key
ASSERT_VAR(stage, "space_pressed");
ASSERT_EQ(GET_VAR(stage, "space_pressed")->value().toInt(), 0);
ASSERT_VAR(stage, "right_arrow_pressed");
ASSERT_EQ(GET_VAR(stage, "right_arrow_pressed")->value().toInt(), 0);
ASSERT_VAR(stage, "any_key_pressed");
ASSERT_EQ(GET_VAR(stage, "any_key_pressed")->value().toInt(), 0);
ASSERT_VAR(stage, "a_pressed");
ASSERT_EQ(GET_VAR(stage, "a_pressed")->value().toInt(), 0);
ASSERT_VAR(stage, "x_pressed");
ASSERT_EQ(GET_VAR(stage, "x_pressed")->value().toInt(), 0);
ASSERT_VAR(stage, "4_pressed");
ASSERT_EQ(GET_VAR(stage, "4_pressed")->value().toInt(), 0);

// space
engine->setKeyState("space", true);
p.run();

ASSERT_VAR(stage, "space_pressed");
ASSERT_EQ(GET_VAR(stage, "space_pressed")->value().toInt(), 1);
engine->setKeyState("space", false);
p.run();

ASSERT_VAR(stage, "space_pressed");
ASSERT_EQ(GET_VAR(stage, "space_pressed")->value().toInt(), 1);
ASSERT_VAR(stage, "right_arrow_pressed");
ASSERT_EQ(GET_VAR(stage, "right_arrow_pressed")->value().toInt(), 0);
ASSERT_VAR(stage, "any_key_pressed");
ASSERT_EQ(GET_VAR(stage, "any_key_pressed")->value().toInt(), 1);
ASSERT_VAR(stage, "a_pressed");
ASSERT_EQ(GET_VAR(stage, "a_pressed")->value().toInt(), 0);
ASSERT_VAR(stage, "x_pressed");
ASSERT_EQ(GET_VAR(stage, "x_pressed")->value().toInt(), 0);
ASSERT_VAR(stage, "4_pressed");
ASSERT_EQ(GET_VAR(stage, "4_pressed")->value().toInt(), 0);

// right arrow
engine->setKeyState("right arrow", true);
p.run();

ASSERT_VAR(stage, "right_arrow_pressed");
ASSERT_EQ(GET_VAR(stage, "right_arrow_pressed")->value().toInt(), 1);
engine->setKeyState("right arrow", false);
p.run();

ASSERT_VAR(stage, "space_pressed");
ASSERT_EQ(GET_VAR(stage, "space_pressed")->value().toInt(), 1);
ASSERT_VAR(stage, "right_arrow_pressed");
ASSERT_EQ(GET_VAR(stage, "right_arrow_pressed")->value().toInt(), 1);
ASSERT_VAR(stage, "any_key_pressed");
ASSERT_EQ(GET_VAR(stage, "any_key_pressed")->value().toInt(), 2);
ASSERT_VAR(stage, "a_pressed");
ASSERT_EQ(GET_VAR(stage, "a_pressed")->value().toInt(), 0);
ASSERT_VAR(stage, "x_pressed");
ASSERT_EQ(GET_VAR(stage, "x_pressed")->value().toInt(), 0);
ASSERT_VAR(stage, "4_pressed");
ASSERT_EQ(GET_VAR(stage, "4_pressed")->value().toInt(), 0);

// any key
engine->setAnyKeyPressed(true);
p.run();

ASSERT_VAR(stage, "any_key_pressed");
ASSERT_EQ(GET_VAR(stage, "any_key_pressed")->value().toInt(), 3);
engine->setAnyKeyPressed(false);
p.run();

ASSERT_VAR(stage, "space_pressed");
ASSERT_EQ(GET_VAR(stage, "space_pressed")->value().toInt(), 1);
ASSERT_VAR(stage, "right_arrow_pressed");
ASSERT_EQ(GET_VAR(stage, "right_arrow_pressed")->value().toInt(), 1);
ASSERT_VAR(stage, "any_key_pressed");
ASSERT_EQ(GET_VAR(stage, "any_key_pressed")->value().toInt(), 3);
ASSERT_VAR(stage, "a_pressed");
ASSERT_EQ(GET_VAR(stage, "a_pressed")->value().toInt(), 0);
ASSERT_VAR(stage, "x_pressed");
ASSERT_EQ(GET_VAR(stage, "x_pressed")->value().toInt(), 0);
ASSERT_VAR(stage, "4_pressed");
ASSERT_EQ(GET_VAR(stage, "4_pressed")->value().toInt(), 0);

// a
engine->setKeyState("a", true);
p.run();

ASSERT_VAR(stage, "a_pressed");
ASSERT_EQ(GET_VAR(stage, "a_pressed")->value().toInt(), 1);
engine->setKeyState("a", false);
p.run();

ASSERT_VAR(stage, "space_pressed");
ASSERT_EQ(GET_VAR(stage, "space_pressed")->value().toInt(), 1);
ASSERT_VAR(stage, "right_arrow_pressed");
ASSERT_EQ(GET_VAR(stage, "right_arrow_pressed")->value().toInt(), 1);
ASSERT_VAR(stage, "any_key_pressed");
ASSERT_EQ(GET_VAR(stage, "any_key_pressed")->value().toInt(), 4);
ASSERT_VAR(stage, "a_pressed");
ASSERT_EQ(GET_VAR(stage, "a_pressed")->value().toInt(), 1);
ASSERT_VAR(stage, "x_pressed");
ASSERT_EQ(GET_VAR(stage, "x_pressed")->value().toInt(), 0);
ASSERT_VAR(stage, "4_pressed");
ASSERT_EQ(GET_VAR(stage, "4_pressed")->value().toInt(), 0);

// x
engine->setKeyState("x", true);
p.run();

ASSERT_VAR(stage, "x_pressed");
ASSERT_EQ(GET_VAR(stage, "x_pressed")->value().toInt(), 1);
engine->setKeyState("x", false);
p.run();

ASSERT_VAR(stage, "space_pressed");
ASSERT_EQ(GET_VAR(stage, "space_pressed")->value().toInt(), 1);
ASSERT_VAR(stage, "right_arrow_pressed");
ASSERT_EQ(GET_VAR(stage, "right_arrow_pressed")->value().toInt(), 1);
ASSERT_VAR(stage, "any_key_pressed");
ASSERT_EQ(GET_VAR(stage, "any_key_pressed")->value().toInt(), 5);
ASSERT_VAR(stage, "a_pressed");
ASSERT_EQ(GET_VAR(stage, "a_pressed")->value().toInt(), 1);
ASSERT_VAR(stage, "x_pressed");
ASSERT_EQ(GET_VAR(stage, "x_pressed")->value().toInt(), 1);
ASSERT_VAR(stage, "4_pressed");
ASSERT_EQ(GET_VAR(stage, "4_pressed")->value().toInt(), 0);

// 4
engine->setKeyState("4", true);
p.run();

ASSERT_VAR(stage, "4_pressed");
ASSERT_EQ(GET_VAR(stage, "4_pressed")->value().toInt(), 1);
engine->setKeyState("4", false);
p.run();

ASSERT_VAR(stage, "space_pressed");
ASSERT_EQ(GET_VAR(stage, "space_pressed")->value().toInt(), 1);
ASSERT_VAR(stage, "right_arrow_pressed");
ASSERT_EQ(GET_VAR(stage, "right_arrow_pressed")->value().toInt(), 1);
ASSERT_VAR(stage, "any_key_pressed");
ASSERT_EQ(GET_VAR(stage, "any_key_pressed")->value().toInt(), 6);
ASSERT_VAR(stage, "a_pressed");
ASSERT_EQ(GET_VAR(stage, "a_pressed")->value().toInt(), 1);
ASSERT_VAR(stage, "x_pressed");
ASSERT_EQ(GET_VAR(stage, "x_pressed")->value().toInt(), 1);
ASSERT_VAR(stage, "4_pressed");
ASSERT_EQ(GET_VAR(stage, "4_pressed")->value().toInt(), 1);

// multiple
engine->setKeyState("space", true);
engine->setKeyState("x", true);
p.run();

ASSERT_VAR(stage, "space_pressed");
ASSERT_EQ(GET_VAR(stage, "space_pressed")->value().toInt(), 2);
ASSERT_VAR(stage, "x_pressed");
ASSERT_EQ(GET_VAR(stage, "x_pressed")->value().toInt(), 2);
engine->setKeyState("space", false);
engine->setKeyState("x", false);
p.run();

ASSERT_VAR(stage, "space_pressed");
ASSERT_EQ(GET_VAR(stage, "space_pressed")->value().toInt(), 2);
ASSERT_VAR(stage, "right_arrow_pressed");
ASSERT_EQ(GET_VAR(stage, "right_arrow_pressed")->value().toInt(), 1);
ASSERT_VAR(stage, "any_key_pressed");
ASSERT_EQ(GET_VAR(stage, "any_key_pressed")->value().toInt(), 8);
ASSERT_VAR(stage, "a_pressed");
ASSERT_EQ(GET_VAR(stage, "a_pressed")->value().toInt(), 1);
ASSERT_VAR(stage, "x_pressed");
ASSERT_EQ(GET_VAR(stage, "x_pressed")->value().toInt(), 2);
ASSERT_VAR(stage, "4_pressed");
ASSERT_EQ(GET_VAR(stage, "4_pressed")->value().toInt(), 1);
}

TEST(EngineTest, MouseX)
{
Engine engine;
Expand Down
Binary file added test/when_key_pressed.sb3
View file
Open in desktop
Binary file not shown.