Implement looks_cleargraphiceffects block

Author: adazem009

src/blocks/looksblocks.cpp

@@ -28,6 +28,7 @@ void LooksBlocks::registerBlocks(IEngine *engine)
     engine->addCompileFunction(this, "looks_hide", &compileHide);
     engine->addCompileFunction(this, "looks_changeeffectby", &compileChangeEffectBy);
     engine->addCompileFunction(this, "looks_seteffectto", &compileSetEffectTo);
+    engine->addCompileFunction(this, "looks_cleargraphiceffects", &compileClearGraphicEffects);
     engine->addCompileFunction(this, "looks_changesizeby", &compileChangeSizeBy);
     engine->addCompileFunction(this, "looks_setsizeto", &compileSetSizeTo);
     engine->addCompileFunction(this, "looks_size", &compileSize);
@@ -238,6 +239,11 @@ void LooksBlocks::compileSetEffectTo(Compiler *compiler)
     }
 }
 
+void LooksBlocks::compileClearGraphicEffects(Compiler *compiler)
+{
+    compiler->addFunctionCall(&clearGraphicEffects);
+}
+
 void LooksBlocks::compileChangeSizeBy(Compiler *compiler)
 {
     compiler->addInput(CHANGE);
@@ -594,6 +600,16 @@ unsigned int LooksBlocks::setGhostEffectTo(VirtualMachine *vm)
     return 1;
 }
 
+unsigned int LooksBlocks::clearGraphicEffects(VirtualMachine *vm)
+{
+    Sprite *sprite = dynamic_cast<Sprite *>(vm->target());
+
+    if (sprite)
+        sprite->clearGraphicsEffects();
+
+    return 0;
+}
+
 unsigned int LooksBlocks::changeSizeBy(VirtualMachine *vm)
 {
     Sprite *sprite = dynamic_cast<Sprite *>(vm->target());

src/blocks/looksblocks.h

@@ -54,6 +54,7 @@ class LooksBlocks : public IBlockSection
         static void compileHide(Compiler *compiler);
         static void compileChangeEffectBy(Compiler *compiler);
         static void compileSetEffectTo(Compiler *compiler);
+        static void compileClearGraphicEffects(Compiler *compiler);
         static void compileChangeSizeBy(Compiler *compiler);
         static void compileSetSizeTo(Compiler *compiler);
         static void compileSize(Compiler *compiler);
@@ -86,6 +87,7 @@ class LooksBlocks : public IBlockSection
         static unsigned int setBrightnessEffectTo(VirtualMachine *vm);
         static unsigned int setGhostEffectTo(VirtualMachine *vm);
 
+        static unsigned int clearGraphicEffects(VirtualMachine *vm);
         static unsigned int changeSizeBy(VirtualMachine *vm);
         static unsigned int setSizeTo(VirtualMachine *vm);
         static unsigned int size(VirtualMachine *vm);

test/blocks/looks_blocks_test.cpp

@@ -108,6 +108,7 @@ TEST_F(LooksBlocksTest, RegisterBlocks)
     EXPECT_CALL(m_engineMock, addCompileFunction(m_section.get(), "looks_hide", &LooksBlocks::compileHide));
     EXPECT_CALL(m_engineMock, addCompileFunction(m_section.get(), "looks_changeeffectby", &LooksBlocks::compileChangeEffectBy));
     EXPECT_CALL(m_engineMock, addCompileFunction(m_section.get(), "looks_seteffectto", &LooksBlocks::compileSetEffectTo));
+    EXPECT_CALL(m_engineMock, addCompileFunction(m_section.get(), "looks_cleargraphiceffects", &LooksBlocks::compileClearGraphicEffects));
     EXPECT_CALL(m_engineMock, addCompileFunction(m_section.get(), "looks_changesizeby", &LooksBlocks::compileChangeSizeBy));
     EXPECT_CALL(m_engineMock, addCompileFunction(m_section.get(), "looks_setsizeto", &LooksBlocks::compileSetSizeTo));
     EXPECT_CALL(m_engineMock, addCompileFunction(m_section.get(), "looks_size", &LooksBlocks::compileSize));
@@ -785,6 +786,43 @@ TEST_F(LooksBlocksTest, SetEffectToImpl)
     ASSERT_EQ(sprite.graphicsEffectValue(ScratchConfiguration::getGraphicsEffect("ghost")), 0.01);*/
 }
 
+TEST_F(LooksBlocksTest, ClearGraphicEffects)
+{
+    Compiler compiler(&m_engineMock);
+
+    auto block = std::make_shared<Block>("a", "looks_cleargraphiceffects");
+
+    EXPECT_CALL(m_engineMock, functionIndex(&LooksBlocks::clearGraphicEffects)).WillOnce(Return(0));
+
+    compiler.init();
+    compiler.setBlock(block);
+    LooksBlocks::compileClearGraphicEffects(&compiler);
+    compiler.end();
+
+    ASSERT_EQ(compiler.bytecode(), std::vector<unsigned int>({ vm::OP_START, vm::OP_EXEC, 0, vm::OP_HALT }));
+    ASSERT_TRUE(compiler.constValues().empty());
+}
+
+TEST_F(LooksBlocksTest, ClearGraphicEffectsImpl)
+{
+    static unsigned int bytecode[] = { vm::OP_START, vm::OP_EXEC, 0, vm::OP_HALT };
+    static BlockFunc functions[] = { &LooksBlocks::clearGraphicEffects };
+
+    Sprite sprite;
+    GraphicsEffectMock effect1, effect2;
+    sprite.setGraphicsEffectValue(&effect1, 48.21);
+    sprite.setGraphicsEffectValue(&effect2, -107.08);
+
+    VirtualMachine vm(&sprite, nullptr, nullptr);
+    vm.setBytecode(bytecode);
+    vm.setFunctions(functions);
+    vm.run();
+
+    ASSERT_EQ(vm.registerCount(), 0);
+    ASSERT_EQ(sprite.graphicsEffectValue(&effect1), 0);
+    ASSERT_EQ(sprite.graphicsEffectValue(&effect2), 0);
+}
+
 TEST_F(LooksBlocksTest, ChangeSizeBy)
 {
     Compiler compiler(&m_engineMock);