Implement motion_changeyby block

Author: adazem009

src/blocks/motionblocks.cpp

@@ -35,6 +35,7 @@ void MotionBlocks::registerBlocks(IEngine *engine)
     engine->addCompileFunction(this, "motion_glideto", &compileGlideTo);
     engine->addCompileFunction(this, "motion_changexby", &compileChangeXBy);
     engine->addCompileFunction(this, "motion_setx", &compileSetX);
+    engine->addCompileFunction(this, "motion_changeyby", &compileChangeYBy);
 
     // Inputs
     engine->addInput(this, "STEPS", STEPS);
@@ -46,6 +47,7 @@ void MotionBlocks::registerBlocks(IEngine *engine)
     engine->addInput(this, "TO", TO);
     engine->addInput(this, "SECS", SECS);
     engine->addInput(this, "DX", DX);
+    engine->addInput(this, "DY", DY);
 }
 
 void MotionBlocks::compileMoveSteps(Compiler *compiler)
@@ -173,6 +175,12 @@ void MotionBlocks::compileSetX(Compiler *compiler)
     compiler->addFunctionCall(&setX);
 }
 
+void MotionBlocks::compileChangeYBy(Compiler *compiler)
+{
+    compiler->addInput(DY);
+    compiler->addFunctionCall(&changeYBy);
+}
+
 unsigned int MotionBlocks::moveSteps(VirtualMachine *vm)
 {
     Sprite *sprite = dynamic_cast<Sprite *>(vm->target());
@@ -554,3 +562,13 @@ unsigned int MotionBlocks::setX(VirtualMachine *vm)
 
     return 1;
 }
+
+unsigned int MotionBlocks::changeYBy(VirtualMachine *vm)
+{
+    Sprite *sprite = dynamic_cast<Sprite *>(vm->target());
+
+    if (sprite)
+        sprite->setY(sprite->y() + vm->getInput(0, 1)->toDouble());
+
+    return 1;
+}

src/blocks/motionblocks.h

@@ -28,7 +28,8 @@ class MotionBlocks : public IBlockSection
             Y,
             TO,
             SECS,
-            DX
+            DX,
+            DY
         };
 
         enum Fields
@@ -54,6 +55,7 @@ class MotionBlocks : public IBlockSection
         static void compileGlideTo(Compiler *compiler);
         static void compileChangeXBy(Compiler *compiler);
         static void compileSetX(Compiler *compiler);
+        static void compileChangeYBy(Compiler *compiler);
 
         static unsigned int moveSteps(VirtualMachine *vm);
         static unsigned int turnRight(VirtualMachine *vm);
@@ -85,6 +87,7 @@ class MotionBlocks : public IBlockSection
 
         static unsigned int changeXBy(VirtualMachine *vm);
         static unsigned int setX(VirtualMachine *vm);
+        static unsigned int changeYBy(VirtualMachine *vm);
 
         static IRandomGenerator *rng;
         static IClock *clock;

test/blocks/motion_blocks_test.cpp

@@ -108,6 +108,7 @@ TEST_F(MotionBlocksTest, RegisterBlocks)
     EXPECT_CALL(m_engineMock, addCompileFunction(m_section.get(), "motion_glideto", &MotionBlocks::compileGlideTo));
     EXPECT_CALL(m_engineMock, addCompileFunction(m_section.get(), "motion_changexby", &MotionBlocks::compileChangeXBy));
     EXPECT_CALL(m_engineMock, addCompileFunction(m_section.get(), "motion_setx", &MotionBlocks::compileSetX));
+    EXPECT_CALL(m_engineMock, addCompileFunction(m_section.get(), "motion_changeyby", &MotionBlocks::compileChangeYBy));
 
     // Inputs
     EXPECT_CALL(m_engineMock, addInput(m_section.get(), "STEPS", MotionBlocks::STEPS));
@@ -119,6 +120,7 @@ TEST_F(MotionBlocksTest, RegisterBlocks)
     EXPECT_CALL(m_engineMock, addInput(m_section.get(), "TO", MotionBlocks::TO));
     EXPECT_CALL(m_engineMock, addInput(m_section.get(), "SECS", MotionBlocks::SECS));
     EXPECT_CALL(m_engineMock, addInput(m_section.get(), "DX", MotionBlocks::DX));
+    EXPECT_CALL(m_engineMock, addInput(m_section.get(), "DY", MotionBlocks::DY));
 
     m_section->registerBlocks(&m_engineMock);
 }
@@ -1001,3 +1003,42 @@ TEST_F(MotionBlocksTest, SetXImpl)
     ASSERT_EQ(vm.registerCount(), 0);
     ASSERT_EQ(sprite.x(), -63.4);
 }
+
+TEST_F(MotionBlocksTest, ChangeYBy)
+{
+    Compiler compiler(&m_engineMock);
+
+    // change y by (135.2)
+    auto block = std::make_shared<Block>("a", "motion_changeyby");
+    addValueInput(block, "DY", MotionBlocks::DY, 135.2);
+
+    EXPECT_CALL(m_engineMock, functionIndex(&MotionBlocks::changeYBy)).WillOnce(Return(0));
+
+    compiler.init();
+    compiler.setBlock(block);
+    MotionBlocks::compileChangeYBy(&compiler);
+    compiler.end();
+
+    ASSERT_EQ(compiler.bytecode(), std::vector<unsigned int>({ vm::OP_START, vm::OP_CONST, 0, vm::OP_EXEC, 0, vm::OP_HALT }));
+    ASSERT_EQ(compiler.constValues().size(), 1);
+    ASSERT_EQ(compiler.constValues()[0].toDouble(), 135.2);
+}
+
+TEST_F(MotionBlocksTest, ChangeYByImpl)
+{
+    static unsigned int bytecode[] = { vm::OP_START, vm::OP_CONST, 0, vm::OP_EXEC, 0, vm::OP_HALT };
+    static BlockFunc functions[] = { &MotionBlocks::changeYBy };
+    static Value constValues[] = { 135.2 };
+
+    Sprite sprite;
+    sprite.setY(200.657);
+
+    VirtualMachine vm(&sprite, nullptr, nullptr);
+    vm.setBytecode(bytecode);
+    vm.setFunctions(functions);
+    vm.setConstValues(constValues);
+    vm.run();
+
+    ASSERT_EQ(vm.registerCount(), 0);
+    ASSERT_EQ(std::round(sprite.y() * 1000) / 1000, 335.857);
+}