Implement motion_yposition block

Author: adazem009

src/blocks/motionblocks.cpp

@@ -40,6 +40,7 @@ void MotionBlocks::registerBlocks(IEngine *engine)
     engine->addCompileFunction(this, "motion_sety", &compileSetY);
     engine->addCompileFunction(this, "motion_setrotationstyle", &compileSetRotationStyle);
     engine->addCompileFunction(this, "motion_xposition", &compileXPosition);
+    engine->addCompileFunction(this, "motion_yposition", &compileYPosition);
 
     // Inputs
     engine->addInput(this, "STEPS", STEPS);
@@ -221,6 +222,11 @@ void MotionBlocks::compileXPosition(Compiler *compiler)
     compiler->addFunctionCall(&xPosition);
 }
 
+void MotionBlocks::compileYPosition(Compiler *compiler)
+{
+    compiler->addFunctionCall(&yPosition);
+}
+
 unsigned int MotionBlocks::moveSteps(VirtualMachine *vm)
 {
     Sprite *sprite = dynamic_cast<Sprite *>(vm->target());
@@ -664,3 +670,15 @@ unsigned int MotionBlocks::xPosition(VirtualMachine *vm)
 
     return 0;
 }
+
+unsigned int MotionBlocks::yPosition(VirtualMachine *vm)
+{
+    Sprite *sprite = dynamic_cast<Sprite *>(vm->target());
+
+    if (sprite)
+        vm->addReturnValue(sprite->y());
+    else
+        vm->addReturnValue(0);
+
+    return 0;
+}

src/blocks/motionblocks.h

@@ -63,6 +63,7 @@ class MotionBlocks : public IBlockSection
         static void compileSetY(Compiler *compiler);
         static void compileSetRotationStyle(Compiler *compiler);
         static void compileXPosition(Compiler *compiler);
+        static void compileYPosition(Compiler *compiler);
 
         static unsigned int moveSteps(VirtualMachine *vm);
         static unsigned int turnRight(VirtualMachine *vm);
@@ -100,6 +101,7 @@ class MotionBlocks : public IBlockSection
         static unsigned int setDoNotRotateRotationStyle(VirtualMachine *vm);
         static unsigned int setAllAroundRotationStyle(VirtualMachine *vm);
         static unsigned int xPosition(VirtualMachine *vm);
+        static unsigned int yPosition(VirtualMachine *vm);
 
         static IRandomGenerator *rng;
         static IClock *clock;

test/blocks/motion_blocks_test.cpp

@@ -112,6 +112,7 @@ TEST_F(MotionBlocksTest, RegisterBlocks)
     EXPECT_CALL(m_engineMock, addCompileFunction(m_section.get(), "motion_sety", &MotionBlocks::compileSetY));
     EXPECT_CALL(m_engineMock, addCompileFunction(m_section.get(), "motion_setrotationstyle", &MotionBlocks::compileSetRotationStyle));
     EXPECT_CALL(m_engineMock, addCompileFunction(m_section.get(), "motion_xposition", &MotionBlocks::compileXPosition));
+    EXPECT_CALL(m_engineMock, addCompileFunction(m_section.get(), "motion_yposition", &MotionBlocks::compileYPosition));
 
     // Inputs
     EXPECT_CALL(m_engineMock, addInput(m_section.get(), "STEPS", MotionBlocks::STEPS));
@@ -1188,3 +1189,37 @@ TEST_F(MotionBlocksTest, XPositionImpl)
     ASSERT_EQ(vm.registerCount(), 1);
     ASSERT_EQ(vm.getInput(0, 1)->toDouble(), 198.0874);
 }
+
+TEST_F(MotionBlocksTest, YPosition)
+{
+    Compiler compiler(&m_engineMock);
+
+    auto block = std::make_shared<Block>("a", "motion_yposition");
+
+    EXPECT_CALL(m_engineMock, functionIndex(&MotionBlocks::yPosition)).WillOnce(Return(0));
+
+    compiler.init();
+    compiler.setBlock(block);
+    MotionBlocks::compileYPosition(&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(MotionBlocksTest, YPositionImpl)
+{
+    static unsigned int bytecode[] = { vm::OP_START, vm::OP_EXEC, 0, vm::OP_HALT };
+    static BlockFunc functions[] = { &MotionBlocks::yPosition };
+
+    Sprite sprite;
+    sprite.setY(-68.5408);
+
+    VirtualMachine vm(&sprite, nullptr, nullptr);
+    vm.setBytecode(bytecode);
+    vm.setFunctions(functions);
+    vm.run();
+
+    ASSERT_EQ(vm.registerCount(), 1);
+    ASSERT_EQ(vm.getInput(0, 1)->toDouble(), -68.5408);
+}