Implement motion_movesteps

Author: adazem009

src/blocks/motionblocks.cpp

@@ -1,9 +1,16 @@
 // SPDX-License-Identifier: Apache-2.0
 
+#include <scratchcpp/iengine.h>
+#include <scratchcpp/compiler.h>
+#include <scratchcpp/sprite.h>
+#include <cmath>
+
 #include "motionblocks.h"
 
 using namespace libscratchcpp;
 
+static const double pi = std::acos(-1); // TODO: Use std::numbers::pi in C++20
+
 std::string MotionBlocks::name() const
 {
     return "Motion";
@@ -21,4 +28,21 @@ Rgb MotionBlocks::color() const
 
 void MotionBlocks::registerBlocks(IEngine *engine)
 {
+    engine->addCompileFunction(this, "motion_movesteps", &compileMoveSteps);
+}
+
+CompilerValue *MotionBlocks::compileMoveSteps(Compiler *compiler)
+{
+    CompilerValue *steps = compiler->addInput("STEPS");
+    compiler->addTargetFunctionCall("motion_movesteps", Compiler::StaticType::Void, { Compiler::StaticType::Number }, { steps });
+    return nullptr;
+}
+
+extern "C" void motion_movesteps(Target *target, double steps)
+{
+    if (!target->isStage()) {
+        Sprite *sprite = static_cast<Sprite *>(target);
+        double dir = sprite->direction();
+        sprite->setPosition(sprite->x() + std::sin(dir * pi / 180) * steps, sprite->y() + std::cos(dir * pi / 180) * steps);
+    }
 }

src/blocks/motionblocks.h

@@ -15,6 +15,9 @@ class MotionBlocks : public IExtension
         Rgb color() const override;
 
         void registerBlocks(IEngine *engine) override;
+
+    private:
+        static CompilerValue *compileMoveSteps(Compiler *compiler);
 };
 
 } // namespace libscratchcpp

test/blocks/motion_blocks_test.cpp

@@ -1,15 +1,60 @@
+#include <scratchcpp/project.h>
+#include <scratchcpp/test/scriptbuilder.h>
+#include <scratchcpp/sprite.h>
+#include <scratchcpp/stage.h>
 #include <enginemock.h>
 
 #include "../common.h"
 #include "blocks/motionblocks.h"
 
 using namespace libscratchcpp;
+using namespace libscratchcpp::test;
 
 class MotionBlocksTest : public testing::Test
 {
     public:
-        void SetUp() override { m_extension = std::make_unique<MotionBlocks>(); }
+        void SetUp() override
+        {
+            m_extension = std::make_unique<MotionBlocks>();
+            m_engine = m_project.engine().get();
+            m_extension->registerBlocks(m_engine);
+        }
 
         std::unique_ptr<IExtension> m_extension;
+        Project m_project;
+        IEngine *m_engine = nullptr;
         EngineMock m_engineMock;
 };
+
+TEST_F(MotionBlocksTest, MoveSteps)
+{
+    {
+        auto sprite = std::make_shared<Sprite>();
+        ScriptBuilder builder(m_extension.get(), m_engine, sprite);
+
+        builder.addBlock("motion_movesteps");
+        builder.addValueInput("STEPS", 30.25);
+
+        sprite->setX(5.2);
+        sprite->setY(-0.25);
+        sprite->setDirection(-61.42);
+
+        builder.build();
+        builder.run();
+        ASSERT_EQ(std::round(sprite->x() * 100) / 100, -21.36);
+        ASSERT_EQ(std::round(sprite->y() * 100) / 100, 14.22);
+    }
+
+    m_engine->clear();
+
+    {
+        auto stage = std::make_shared<Stage>();
+        ScriptBuilder builder(m_extension.get(), m_engine, stage);
+
+        builder.addBlock("motion_movesteps");
+        builder.addValueInput("STEPS", 30.25);
+
+        builder.build();
+        builder.run();
+    }
+}