Implement looks_gotofrontback block

Author: adazem009

src/blocks/looksblocks.cpp

@@ -54,6 +54,7 @@ void LooksBlocks::registerBlocks(IEngine *engine)
     engine->addCompileFunction(this, "looks_switchcostumeto", &compileSwitchCostumeTo);
     engine->addCompileFunction(this, "looks_nextcostume", &compileNextCostume);
     engine->addCompileFunction(this, "looks_switchbackdropto", &compileSwitchBackdropTo);
+    engine->addCompileFunction(this, "looks_gotofrontback", &compileGoToFrontBack);
 }
 
 void LooksBlocks::onInit(IEngine *engine)
@@ -232,6 +233,26 @@ CompilerValue *LooksBlocks::compileSwitchBackdropTo(Compiler *compiler)
     return nullptr;
 }
 
+CompilerValue *LooksBlocks::compileGoToFrontBack(Compiler *compiler)
+{
+    if (compiler->target()->isStage())
+        return nullptr;
+
+    Field *field = compiler->field("FRONT_BACK");
+
+    if (!field)
+        return nullptr;
+
+    const std::string &option = field->value().toString();
+
+    if (option == "front")
+        compiler->addFunctionCallWithCtx("looks_move_to_front");
+    else if (option == "back")
+        compiler->addFunctionCallWithCtx("looks_move_to_back");
+
+    return nullptr;
+}
+
 extern "C" void looks_start_stack_timer(ExecutionContext *ctx, double duration)
 {
     ctx->stackTimer()->start(duration);
@@ -425,3 +446,15 @@ extern "C" void looks_switchbackdropto(ExecutionContext *ctx, const ValueData *b
             looks_set_costume_by_index(stage, value_toLong(backdrop) - 1);
     }
 }
+
+extern "C" void looks_move_to_front(ExecutionContext *ctx)
+{
+    Target *target = ctx->thread()->target();
+    ctx->engine()->moveDrawableToFront(target);
+}
+
+extern "C" void looks_move_to_back(ExecutionContext *ctx)
+{
+    Target *target = ctx->thread()->target();
+    ctx->engine()->moveDrawableToBack(target);
+}

src/blocks/looksblocks.h

@@ -42,6 +42,7 @@ class LooksBlocks : public IExtension
         static CompilerValue *compileSwitchCostumeTo(Compiler *compiler);
         static CompilerValue *compileNextCostume(Compiler *compiler);
         static CompilerValue *compileSwitchBackdropTo(Compiler *compiler);
+        static CompilerValue *compileGoToFrontBack(Compiler *compiler);
 };
 
 } // namespace libscratchcpp

test/blocks/looks_blocks_test.cpp

@@ -1609,3 +1609,86 @@ TEST_F(LooksBlocksTest, SwitchBackdropTo_Stage)
     thread.run();
     ASSERT_EQ(stage->costumeIndex(), 0);
 }
+
+TEST_F(LooksBlocksTest, GoToFrontBack_MoveSpriteToFront)
+{
+    auto stage = std::make_shared<Stage>();
+    auto sprite = std::make_shared<Sprite>();
+    auto sprite1 = std::make_shared<Sprite>();
+    auto sprite2 = std::make_shared<Sprite>();
+    auto sprite3 = std::make_shared<Sprite>();
+    m_engine->setTargets({ stage, sprite, sprite1, sprite2, sprite3 });
+    ScriptBuilder builder(m_extension.get(), m_engine, sprite);
+
+    builder.addBlock("looks_gotofrontback");
+    builder.addDropdownField("FRONT_BACK", "front");
+    builder.build();
+
+    m_engine->moveDrawableToBack(sprite.get());
+
+    builder.run();
+    std::initializer_list<int> layers = { sprite->layerOrder(), sprite1->layerOrder(), sprite2->layerOrder(), sprite3->layerOrder() };
+    ASSERT_EQ(sprite->layerOrder(), std::max(layers));
+
+    builder.run();
+    ASSERT_EQ(sprite->layerOrder(), std::max(layers));
+}
+
+TEST_F(LooksBlocksTest, GoToFrontBack_MoveSpriteToBack)
+{
+    auto stage = std::make_shared<Stage>();
+    auto sprite = std::make_shared<Sprite>();
+    auto sprite1 = std::make_shared<Sprite>();
+    auto sprite2 = std::make_shared<Sprite>();
+    auto sprite3 = std::make_shared<Sprite>();
+    m_engine->setTargets({ stage, sprite, sprite1, sprite2, sprite3 });
+    ScriptBuilder builder(m_extension.get(), m_engine, sprite);
+
+    builder.addBlock("looks_gotofrontback");
+    builder.addDropdownField("FRONT_BACK", "back");
+    builder.build();
+
+    m_engine->moveDrawableToFront(sprite.get());
+
+    builder.run();
+    ASSERT_EQ(sprite->layerOrder(), 1);
+
+    builder.run();
+    ASSERT_EQ(sprite->layerOrder(), 1);
+}
+
+TEST_F(LooksBlocksTest, GoToFrontBack_MoveStageToFront)
+{
+    auto stage = std::make_shared<Stage>();
+    auto sprite = std::make_shared<Sprite>();
+    auto sprite1 = std::make_shared<Sprite>();
+    auto sprite2 = std::make_shared<Sprite>();
+    auto sprite3 = std::make_shared<Sprite>();
+    m_engine->setTargets({ stage, sprite, sprite1, sprite2, sprite3 });
+    ScriptBuilder builder(m_extension.get(), m_engine, stage);
+
+    builder.addBlock("looks_gotofrontback");
+    builder.addDropdownField("FRONT_BACK", "front");
+    builder.build();
+
+    builder.run();
+    ASSERT_EQ(stage->layerOrder(), 0);
+}
+
+TEST_F(LooksBlocksTest, GoToFrontBack_MoveStageToBack)
+{
+    auto stage = std::make_shared<Stage>();
+    auto sprite = std::make_shared<Sprite>();
+    auto sprite1 = std::make_shared<Sprite>();
+    auto sprite2 = std::make_shared<Sprite>();
+    auto sprite3 = std::make_shared<Sprite>();
+    m_engine->setTargets({ stage, sprite, sprite1, sprite2, sprite3 });
+    ScriptBuilder builder(m_extension.get(), m_engine, stage);
+
+    builder.addBlock("looks_gotofrontback");
+    builder.addDropdownField("FRONT_BACK", "back");
+    builder.build();
+
+    builder.run();
+    ASSERT_EQ(sprite->layerOrder(), 0);
+}