Implement motion_pointindirection block

Author: adazem009

src/blocks/motionblocks.cpp

@@ -21,10 +21,12 @@ void MotionBlocks::registerBlocks(IEngine *engine)
     engine->addCompileFunction(this, "motion_movesteps", &compileMoveSteps);
     engine->addCompileFunction(this, "motion_turnright", &compileTurnRight);
     engine->addCompileFunction(this, "motion_turnleft", &compileTurnLeft);
+    engine->addCompileFunction(this, "motion_pointindirection", &compilePointInDirection);
 
     // Inputs
     engine->addInput(this, "STEPS", STEPS);
     engine->addInput(this, "DEGREES", DEGREES);
+    engine->addInput(this, "DIRECTION", DIRECTION);
 }
 
 void MotionBlocks::compileMoveSteps(Compiler *compiler)
@@ -45,6 +47,12 @@ void MotionBlocks::compileTurnLeft(Compiler *compiler)
     compiler->addFunctionCall(&turnLeft);
 }
 
+void MotionBlocks::compilePointInDirection(Compiler *compiler)
+{
+    compiler->addInput(DIRECTION);
+    compiler->addFunctionCall(&pointInDirection);
+}
+
 unsigned int MotionBlocks::moveSteps(VirtualMachine *vm)
 {
     Sprite *sprite = dynamic_cast<Sprite *>(vm->target());
@@ -78,3 +86,13 @@ unsigned int MotionBlocks::turnLeft(VirtualMachine *vm)
 
     return 1;
 }
+
+unsigned int MotionBlocks::pointInDirection(VirtualMachine *vm)
+{
+    Sprite *sprite = dynamic_cast<Sprite *>(vm->target());
+
+    if (sprite)
+        sprite->setDirection(vm->getInput(0, 1)->toDouble());
+
+    return 1;
+}

src/blocks/motionblocks.h

@@ -14,7 +14,8 @@ class MotionBlocks : public IBlockSection
         enum Inputs
         {
             STEPS,
-            DEGREES
+            DEGREES,
+            DIRECTION
         };
 
         std::string name() const override;
@@ -24,10 +25,12 @@ class MotionBlocks : public IBlockSection
         static void compileMoveSteps(Compiler *compiler);
         static void compileTurnRight(Compiler *compiler);
         static void compileTurnLeft(Compiler *compiler);
+        static void compilePointInDirection(Compiler *compiler);
 
         static unsigned int moveSteps(VirtualMachine *vm);
         static unsigned int turnRight(VirtualMachine *vm);
         static unsigned int turnLeft(VirtualMachine *vm);
+        static unsigned int pointInDirection(VirtualMachine *vm);
 };
 
 } // namespace libscratchcpp

test/blocks/motion_blocks_test.cpp

@@ -54,10 +54,12 @@ TEST_F(MotionBlocksTest, RegisterBlocks)
     EXPECT_CALL(m_engineMock, addCompileFunction(m_section.get(), "motion_movesteps", &MotionBlocks::compileMoveSteps));
     EXPECT_CALL(m_engineMock, addCompileFunction(m_section.get(), "motion_turnright", &MotionBlocks::compileTurnRight));
     EXPECT_CALL(m_engineMock, addCompileFunction(m_section.get(), "motion_turnleft", &MotionBlocks::compileTurnLeft));
+    EXPECT_CALL(m_engineMock, addCompileFunction(m_section.get(), "motion_pointindirection", &MotionBlocks::compilePointInDirection));
 
     // Inputs
     EXPECT_CALL(m_engineMock, addInput(m_section.get(), "STEPS", MotionBlocks::STEPS));
     EXPECT_CALL(m_engineMock, addInput(m_section.get(), "DEGREES", MotionBlocks::DEGREES));
+    EXPECT_CALL(m_engineMock, addInput(m_section.get(), "DIRECTION", MotionBlocks::DIRECTION));
 
     m_section->registerBlocks(&m_engineMock);
 }
@@ -181,3 +183,42 @@ TEST_F(MotionBlocksTest, TurnLeftImpl)
     ASSERT_EQ(vm.registerCount(), 0);
     ASSERT_EQ(std::round(sprite.direction() * 100) / 100, 112.32);
 }
+
+TEST_F(MotionBlocksTest, PointInDirection)
+{
+    Compiler compiler(&m_engineMock);
+
+    // point in direction (-60.5)
+    auto block = std::make_shared<Block>("a", "motion_pointindirection");
+    addValueInput(block, "DIRECTION", MotionBlocks::DIRECTION, -60.5);
+
+    EXPECT_CALL(m_engineMock, functionIndex(&MotionBlocks::pointInDirection)).WillOnce(Return(0));
+
+    compiler.init();
+    compiler.setBlock(block);
+    MotionBlocks::compilePointInDirection(&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(), -60.5);
+}
+
+TEST_F(MotionBlocksTest, PointInDirectionImpl)
+{
+    static unsigned int bytecode[] = { vm::OP_START, vm::OP_CONST, 0, vm::OP_EXEC, 0, vm::OP_HALT };
+    static BlockFunc functions[] = { &MotionBlocks::pointInDirection };
+    static Value constValues[] = { -60.5 };
+
+    Sprite sprite;
+    sprite.setDirection(50.02);
+
+    VirtualMachine vm(&sprite, nullptr, nullptr);
+    vm.setBytecode(bytecode);
+    vm.setFunctions(functions);
+    vm.setConstValues(constValues);
+    vm.run();
+
+    ASSERT_EQ(vm.registerCount(), 0);
+    ASSERT_EQ(sprite.direction(), -60.5);
+}