Add motion monitor name functions

Author: adazem009

src/blocks/motionblocks.cpp

@@ -45,6 +45,11 @@ void MotionBlocks::registerBlocks(IEngine *engine)
     engine->addCompileFunction(this, "motion_yposition", &compileYPosition);
     engine->addCompileFunction(this, "motion_direction", &compileDirection);
 
+    // Monitor names
+    engine->addMonitorNameFunction(this, "motion_xposition", &xPositionMonitorName);
+    engine->addMonitorNameFunction(this, "motion_yposition", &yPositionMonitorName);
+    engine->addMonitorNameFunction(this, "motion_direction", &directionMonitorName);
+
     // Inputs
     engine->addInput(this, "STEPS", STEPS);
     engine->addInput(this, "DEGREES", DEGREES);
@@ -245,6 +250,24 @@ void MotionBlocks::compileDirection(Compiler *compiler)
     compiler->addFunctionCall(&direction);
 }
 
+const std::string &MotionBlocks::xPositionMonitorName(Block *block)
+{
+    static const std::string name = "x position";
+    return name;
+}
+
+const std::string &MotionBlocks::yPositionMonitorName(Block *block)
+{
+    static const std::string name = "y position";
+    return name;
+}
+
+const std::string &MotionBlocks::directionMonitorName(Block *block)
+{
+    static const std::string name = "direction";
+    return name;
+}
+
 unsigned int MotionBlocks::moveSteps(VirtualMachine *vm)
 {
     Sprite *sprite = dynamic_cast<Sprite *>(vm->target());

src/blocks/motionblocks.h

@@ -67,6 +67,10 @@ class MotionBlocks : public IBlockSection
         static void compileYPosition(Compiler *compiler);
         static void compileDirection(Compiler *compiler);
 
+        static const std::string &xPositionMonitorName(Block *block);
+        static const std::string &yPositionMonitorName(Block *block);
+        static const std::string &directionMonitorName(Block *block);
+
         static unsigned int moveSteps(VirtualMachine *vm);
         static unsigned int turnRight(VirtualMachine *vm);
         static unsigned int turnLeft(VirtualMachine *vm);

test/blocks/motion_blocks_test.cpp

@@ -124,6 +124,11 @@ TEST_F(MotionBlocksTest, RegisterBlocks)
     EXPECT_CALL(m_engineMock, addCompileFunction(m_section.get(), "motion_yposition", &MotionBlocks::compileYPosition));
     EXPECT_CALL(m_engineMock, addCompileFunction(m_section.get(), "motion_direction", &MotionBlocks::compileDirection));
 
+    // Monitor names
+    EXPECT_CALL(m_engineMock, addMonitorNameFunction(m_section.get(), "motion_xposition", &MotionBlocks::xPositionMonitorName));
+    EXPECT_CALL(m_engineMock, addMonitorNameFunction(m_section.get(), "motion_yposition", &MotionBlocks::yPositionMonitorName));
+    EXPECT_CALL(m_engineMock, addMonitorNameFunction(m_section.get(), "motion_direction", &MotionBlocks::directionMonitorName));
+
     // Inputs
     EXPECT_CALL(m_engineMock, addInput(m_section.get(), "STEPS", MotionBlocks::STEPS));
     EXPECT_CALL(m_engineMock, addInput(m_section.get(), "DEGREES", MotionBlocks::DEGREES));
@@ -1301,6 +1306,11 @@ TEST_F(MotionBlocksTest, XPosition)
     ASSERT_TRUE(compiler.constValues().empty());
 }
 
+TEST_F(MotionBlocksTest, XPositionMonitorName)
+{
+    ASSERT_EQ(MotionBlocks::xPositionMonitorName(nullptr), "x position");
+}
+
 TEST_F(MotionBlocksTest, XPositionImpl)
 {
     static unsigned int bytecode[] = { vm::OP_START, vm::OP_EXEC, 0, vm::OP_HALT };
@@ -1335,6 +1345,11 @@ TEST_F(MotionBlocksTest, YPosition)
     ASSERT_TRUE(compiler.constValues().empty());
 }
 
+TEST_F(MotionBlocksTest, YPositionMonitorName)
+{
+    ASSERT_EQ(MotionBlocks::yPositionMonitorName(nullptr), "y position");
+}
+
 TEST_F(MotionBlocksTest, YPositionImpl)
 {
     static unsigned int bytecode[] = { vm::OP_START, vm::OP_EXEC, 0, vm::OP_HALT };
@@ -1369,6 +1384,11 @@ TEST_F(MotionBlocksTest, Direction)
     ASSERT_TRUE(compiler.constValues().empty());
 }
 
+TEST_F(MotionBlocksTest, DirectionMonitorName)
+{
+    ASSERT_EQ(MotionBlocks::directionMonitorName(nullptr), "direction");
+}
+
 TEST_F(MotionBlocksTest, DirectionImpl)
 {
     static unsigned int bytecode[] = { vm::OP_START, vm::OP_EXEC, 0, vm::OP_HALT };