Set random direction in point towards random block

Author: adazem009

src/blocks/motionblocks.cpp

@@ -112,7 +112,7 @@ CompilerValue *MotionBlocks::compilePointTowards(Compiler *compiler)
         if (value == "_mouse_")
             compiler->addTargetFunctionCall("motion_point_towards_mouse");
         else if (value == "_random_")
-            compiler->addFunctionCallWithCtx("motion_point_towards_random_pos");
+            compiler->addFunctionCallWithCtx("motion_point_towards_random_direction");
         else {
             int index = compiler->engine()->findTarget(value);
             Target *anotherTarget = compiler->engine()->targetAt(index);
@@ -398,14 +398,11 @@ extern "C" void motion_point_towards_mouse(Sprite *sprite)
     motion_point_towards_pos(sprite, engine->mouseX(), engine->mouseY());
 }
 
-extern "C" void motion_point_towards_random_pos(ExecutionContext *ctx)
+extern "C" void motion_point_towards_random_direction(ExecutionContext *ctx)
 {
     Sprite *sprite = static_cast<Sprite *>(ctx->thread()->target());
-    IEngine *engine = ctx->engine();
-    const int stageWidth = engine->stageWidth();
-    const int stageHeight = engine->stageHeight();
     IRandomGenerator *rng = ctx->rng();
-    motion_point_towards_pos(sprite, rng->randintDouble(-stageWidth / 2.0, stageWidth / 2.0), rng->randintDouble(-stageHeight / 2.0, stageHeight / 2.0));
+    sprite->setDirection(rng->randint(-180, 179));
 }
 
 extern "C" void motion_point_towards_target_by_index(Sprite *sprite, double index)
@@ -424,7 +421,7 @@ extern "C" void motion_pointtowards(ExecutionContext *ctx, const StringPtr *towa
     if (string_compare_case_sensitive(towards, &MOUSE_STR) == 0)
         motion_point_towards_mouse(sprite);
     else if (string_compare_case_sensitive(towards, &RANDOM_STR) == 0)
-        motion_point_towards_random_pos(ctx);
+        motion_point_towards_random_direction(ctx);
     else {
         // TODO: Use UTF-16 in engine
         std::string u8name = utf8::utf16to8(std::u16string(towards->data));

test/blocks/motion_blocks_test.cpp

@@ -224,7 +224,7 @@ TEST_F(MotionBlocksTest, PointTowardsMouse)
     }
 }
 
-TEST_F(MotionBlocksTest, PointTowardsRandomPosition)
+TEST_F(MotionBlocksTest, PointTowardsRandomDirection)
 {
     {
         auto sprite = std::make_shared<Sprite>();
@@ -247,12 +247,9 @@ TEST_F(MotionBlocksTest, PointTowardsRandomPosition)
         RandomGeneratorMock rng;
         ctx->setRng(&rng);
 
-        EXPECT_CALL(m_engineMock, stageWidth()).WillOnce(Return(640));
-        EXPECT_CALL(m_engineMock, stageHeight()).WillOnce(Return(500));
-        EXPECT_CALL(rng, randintDouble(-320, 320)).WillOnce(Return(95.2));
-        EXPECT_CALL(rng, randintDouble(-250, 250)).WillOnce(Return(-100.025));
+        EXPECT_CALL(rng, randint(-180, 179)).WillOnce(Return(95));
         code->run(ctx.get());
-        ASSERT_EQ(std::round(sprite->direction() * 100) / 100, 90);
+        ASSERT_EQ(sprite->direction(), 95);
     }
 
     {
@@ -276,12 +273,9 @@ TEST_F(MotionBlocksTest, PointTowardsRandomPosition)
         RandomGeneratorMock rng;
         ctx->setRng(&rng);
 
-        EXPECT_CALL(m_engineMock, stageWidth()).WillOnce(Return(640));
-        EXPECT_CALL(m_engineMock, stageHeight()).WillOnce(Return(500));
-        EXPECT_CALL(rng, randintDouble(-320, 320)).WillOnce(Return(-21.28));
-        EXPECT_CALL(rng, randintDouble(-250, 250)).WillOnce(Return(-100.025));
+        EXPECT_CALL(rng, randint(-180, 179)).WillOnce(Return(-42));
         code->run(ctx.get());
-        ASSERT_EQ(std::round(sprite->direction() * 100) / 100, -90);
+        ASSERT_EQ(sprite->direction(), -42);
     }
 
     {