Implement motion_setx block

Author: adazem009

src/blocks/motionblocks.cpp

@@ -34,6 +34,7 @@ void MotionBlocks::registerBlocks(IEngine *engine)
     engine->addCompileFunction(this, "motion_glidesecstoxy", &compileGlideSecsToXY);
     engine->addCompileFunction(this, "motion_glideto", &compileGlideTo);
     engine->addCompileFunction(this, "motion_changexby", &compileChangeXBy);
+    engine->addCompileFunction(this, "motion_setx", &compileSetX);
 
     // Inputs
     engine->addInput(this, "STEPS", STEPS);
@@ -166,6 +167,12 @@ void MotionBlocks::compileChangeXBy(Compiler *compiler)
     compiler->addFunctionCall(&changeXBy);
 }
 
+void MotionBlocks::compileSetX(Compiler *compiler)
+{
+    compiler->addInput(X);
+    compiler->addFunctionCall(&setX);
+}
+
 unsigned int MotionBlocks::moveSteps(VirtualMachine *vm)
 {
     Sprite *sprite = dynamic_cast<Sprite *>(vm->target());
@@ -537,3 +544,13 @@ unsigned int MotionBlocks::changeXBy(VirtualMachine *vm)
 
     return 1;
 }
+
+unsigned int MotionBlocks::setX(VirtualMachine *vm)
+{
+    Sprite *sprite = dynamic_cast<Sprite *>(vm->target());
+
+    if (sprite)
+        sprite->setX(vm->getInput(0, 1)->toDouble());
+
+    return 1;
+}

src/blocks/motionblocks.h

@@ -53,6 +53,7 @@ class MotionBlocks : public IBlockSection
         static void compileGlideSecsToXY(Compiler *compiler);
         static void compileGlideTo(Compiler *compiler);
         static void compileChangeXBy(Compiler *compiler);
+        static void compileSetX(Compiler *compiler);
 
         static unsigned int moveSteps(VirtualMachine *vm);
         static unsigned int turnRight(VirtualMachine *vm);
@@ -83,6 +84,7 @@ class MotionBlocks : public IBlockSection
         static unsigned int startGlideToRandomPosition(VirtualMachine *vm);
 
         static unsigned int changeXBy(VirtualMachine *vm);
+        static unsigned int setX(VirtualMachine *vm);
 
         static IRandomGenerator *rng;
         static IClock *clock;

test/blocks/motion_blocks_test.cpp

@@ -107,6 +107,7 @@ TEST_F(MotionBlocksTest, RegisterBlocks)
     EXPECT_CALL(m_engineMock, addCompileFunction(m_section.get(), "motion_glidesecstoxy", &MotionBlocks::compileGlideSecsToXY));
     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));
 
     // Inputs
     EXPECT_CALL(m_engineMock, addInput(m_section.get(), "STEPS", MotionBlocks::STEPS));
@@ -961,3 +962,42 @@ TEST_F(MotionBlocksTest, ChangeXByImpl)
     ASSERT_EQ(vm.registerCount(), 0);
     ASSERT_EQ(sprite.x(), 33.14);
 }
+
+TEST_F(MotionBlocksTest, SetX)
+{
+    Compiler compiler(&m_engineMock);
+
+    // set x to (-63.4)
+    auto block = std::make_shared<Block>("a", "motion_setx");
+    addValueInput(block, "X", MotionBlocks::X, -63.4);
+
+    EXPECT_CALL(m_engineMock, functionIndex(&MotionBlocks::setX)).WillOnce(Return(0));
+
+    compiler.init();
+    compiler.setBlock(block);
+    MotionBlocks::compileSetX(&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(), -63.4);
+}
+
+TEST_F(MotionBlocksTest, SetXImpl)
+{
+    static unsigned int bytecode[] = { vm::OP_START, vm::OP_CONST, 0, vm::OP_EXEC, 0, vm::OP_HALT };
+    static BlockFunc functions[] = { &MotionBlocks::setX };
+    static Value constValues[] = { -63.4 };
+
+    Sprite sprite;
+    sprite.setX(239.98);
+
+    VirtualMachine vm(&sprite, nullptr, nullptr);
+    vm.setBytecode(bytecode);
+    vm.setFunctions(functions);
+    vm.setConstValues(constValues);
+    vm.run();
+
+    ASSERT_EQ(vm.registerCount(), 0);
+    ASSERT_EQ(sprite.x(), -63.4);
+}