Implement motion_xposition block

Author: adazem009

src/blocks/motionblocks.cpp

@@ -39,6 +39,7 @@ void MotionBlocks::registerBlocks(IEngine *engine)
     engine->addCompileFunction(this, "motion_changeyby", &compileChangeYBy);
     engine->addCompileFunction(this, "motion_sety", &compileSetY);
     engine->addCompileFunction(this, "motion_setrotationstyle", &compileSetRotationStyle);
+    engine->addCompileFunction(this, "motion_xposition", &compileXPosition);
 
     // Inputs
     engine->addInput(this, "STEPS", STEPS);
@@ -215,6 +216,11 @@ void MotionBlocks::compileSetRotationStyle(Compiler *compiler)
     }
 }
 
+void MotionBlocks::compileXPosition(Compiler *compiler)
+{
+    compiler->addFunctionCall(&xPosition);
+}
+
 unsigned int MotionBlocks::moveSteps(VirtualMachine *vm)
 {
     Sprite *sprite = dynamic_cast<Sprite *>(vm->target());
@@ -646,3 +652,15 @@ unsigned int MotionBlocks::setAllAroundRotationStyle(VirtualMachine *vm)
 
     return 0;
 }
+
+unsigned int MotionBlocks::xPosition(VirtualMachine *vm)
+{
+    Sprite *sprite = dynamic_cast<Sprite *>(vm->target());
+
+    if (sprite)
+        vm->addReturnValue(sprite->x());
+    else
+        vm->addReturnValue(0);
+
+    return 0;
+}

src/blocks/motionblocks.h

@@ -62,6 +62,7 @@ class MotionBlocks : public IBlockSection
         static void compileChangeYBy(Compiler *compiler);
         static void compileSetY(Compiler *compiler);
         static void compileSetRotationStyle(Compiler *compiler);
+        static void compileXPosition(Compiler *compiler);
 
         static unsigned int moveSteps(VirtualMachine *vm);
         static unsigned int turnRight(VirtualMachine *vm);
@@ -98,6 +99,7 @@ class MotionBlocks : public IBlockSection
         static unsigned int setLeftRightRotationStyle(VirtualMachine *vm);
         static unsigned int setDoNotRotateRotationStyle(VirtualMachine *vm);
         static unsigned int setAllAroundRotationStyle(VirtualMachine *vm);
+        static unsigned int xPosition(VirtualMachine *vm);
 
         static IRandomGenerator *rng;
         static IClock *clock;

test/blocks/motion_blocks_test.cpp

@@ -111,6 +111,7 @@ TEST_F(MotionBlocksTest, RegisterBlocks)
     EXPECT_CALL(m_engineMock, addCompileFunction(m_section.get(), "motion_changeyby", &MotionBlocks::compileChangeYBy));
     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));
 
     // Inputs
     EXPECT_CALL(m_engineMock, addInput(m_section.get(), "STEPS", MotionBlocks::STEPS));
@@ -1153,3 +1154,37 @@ TEST_F(MotionBlocksTest, SetRotationStyleImpl)
     ASSERT_EQ(vm.registerCount(), 0);
     ASSERT_EQ(sprite.rotationStyle(), Sprite::RotationStyle::AllAround);
 }
+
+TEST_F(MotionBlocksTest, XPosition)
+{
+    Compiler compiler(&m_engineMock);
+
+    auto block = std::make_shared<Block>("a", "motion_xposition");
+
+    EXPECT_CALL(m_engineMock, functionIndex(&MotionBlocks::xPosition)).WillOnce(Return(0));
+
+    compiler.init();
+    compiler.setBlock(block);
+    MotionBlocks::compileXPosition(&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, XPositionImpl)
+{
+    static unsigned int bytecode[] = { vm::OP_START, vm::OP_EXEC, 0, vm::OP_HALT };
+    static BlockFunc functions[] = { &MotionBlocks::xPosition };
+
+    Sprite sprite;
+    sprite.setX(198.0874);
+
+    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(), 198.0874);
+}