Implement sprite fencing option

Author: adazem009

src/scratch/sprite.cpp

@@ -316,5 +316,11 @@ Target *Sprite::dataSource() const
 
 void Sprite::setXY(double x, double y)
 {
-    impl->getFencedPosition(x, y, &impl->x, &impl->y);
+    IEngine *eng = engine();
+
+    if (eng && !eng->spriteFencingEnabled()) {
+        impl->x = x;
+        impl->y = y;
+    } else
+        impl->getFencedPosition(x, y, &impl->x, &impl->y);
 }

test/scratch_classes/sprite_test.cpp

@@ -217,14 +217,14 @@ TEST(SpriteTest, XY)
     sprite.setX(-53.25);
     ASSERT_EQ(sprite.x(), -53.25);
 
-    sprite.setX(239.999);
-    ASSERT_EQ(sprite.x(), 239.999);
+    sprite.setX(259.999);
+    ASSERT_EQ(sprite.x(), 259.999);
 
     sprite.setY(-53.25);
     ASSERT_EQ(sprite.y(), -53.25);
 
-    sprite.setY(179.999);
-    ASSERT_EQ(sprite.y(), 179.999);
+    sprite.setY(189.999);
+    ASSERT_EQ(sprite.y(), 189.999);
 
     auto imageFormatFactory = std::make_shared<ImageFormatFactoryMock>();
     auto imageFormat = std::make_shared<ImageFormatMock>();
@@ -265,60 +265,84 @@ TEST(SpriteTest, XY)
 
     EXPECT_CALL(*imageFormat, width()).WillOnce(Return(4));
     EXPECT_CALL(*imageFormat, height()).WillOnce(Return(3));
+    EXPECT_CALL(engine, spriteFencingEnabled()).WillOnce(Return(true));
     EXPECT_CALL(engine, stageWidth()).WillOnce(Return(480));
     EXPECT_CALL(engine, stageHeight()).WillOnce(Return(360));
     sprite.setX(230);
     ASSERT_EQ(sprite.x(), 230);
 
     EXPECT_CALL(*imageFormat, width()).WillOnce(Return(4));
     EXPECT_CALL(*imageFormat, height()).WillOnce(Return(3));
+    EXPECT_CALL(engine, spriteFencingEnabled()).WillOnce(Return(true));
     EXPECT_CALL(engine, stageWidth()).WillOnce(Return(480));
     EXPECT_CALL(engine, stageHeight()).WillOnce(Return(360));
     sprite.setX(-230);
     ASSERT_EQ(sprite.x(), -230);
 
     EXPECT_CALL(*imageFormat, width()).WillOnce(Return(4));
     EXPECT_CALL(*imageFormat, height()).WillOnce(Return(3));
+    EXPECT_CALL(engine, spriteFencingEnabled()).WillOnce(Return(true));
     EXPECT_CALL(engine, stageWidth()).WillOnce(Return(480));
     EXPECT_CALL(engine, stageHeight()).WillOnce(Return(360));
     sprite.setX(250);
     ASSERT_EQ(sprite.x(), 241);
 
+    EXPECT_CALL(engine, spriteFencingEnabled()).WillOnce(Return(false));
+    sprite.setX(250);
+    ASSERT_EQ(sprite.x(), 250);
+
     EXPECT_CALL(*imageFormat, width()).WillOnce(Return(4));
     EXPECT_CALL(*imageFormat, height()).WillOnce(Return(3));
+    EXPECT_CALL(engine, spriteFencingEnabled()).WillOnce(Return(true));
     EXPECT_CALL(engine, stageWidth()).WillOnce(Return(480));
     EXPECT_CALL(engine, stageHeight()).WillOnce(Return(360));
     sprite.setX(-250);
     ASSERT_EQ(sprite.x(), -241);
 
+    EXPECT_CALL(engine, spriteFencingEnabled()).WillOnce(Return(false));
+    sprite.setX(-250);
+    ASSERT_EQ(sprite.x(), -250);
+
     EXPECT_CALL(*imageFormat, width()).WillOnce(Return(4));
     EXPECT_CALL(*imageFormat, height()).WillOnce(Return(3));
+    EXPECT_CALL(engine, spriteFencingEnabled()).WillOnce(Return(true));
     EXPECT_CALL(engine, stageWidth()).WillOnce(Return(480));
     EXPECT_CALL(engine, stageHeight()).WillOnce(Return(360));
     sprite.setY(170);
     ASSERT_EQ(sprite.y(), 170);
 
     EXPECT_CALL(*imageFormat, width()).WillOnce(Return(4));
     EXPECT_CALL(*imageFormat, height()).WillOnce(Return(3));
+    EXPECT_CALL(engine, spriteFencingEnabled()).WillOnce(Return(true));
     EXPECT_CALL(engine, stageWidth()).WillOnce(Return(480));
     EXPECT_CALL(engine, stageHeight()).WillOnce(Return(360));
     sprite.setY(-170);
     ASSERT_EQ(sprite.y(), -170);
 
     EXPECT_CALL(*imageFormat, width()).WillOnce(Return(4));
     EXPECT_CALL(*imageFormat, height()).WillOnce(Return(3));
+    EXPECT_CALL(engine, spriteFencingEnabled()).WillOnce(Return(true));
     EXPECT_CALL(engine, stageWidth()).WillOnce(Return(480));
     EXPECT_CALL(engine, stageHeight()).WillOnce(Return(360));
     sprite.setY(190);
     ASSERT_EQ(sprite.y(), 181);
 
+    EXPECT_CALL(engine, spriteFencingEnabled()).WillOnce(Return(false));
+    sprite.setY(190);
+    ASSERT_EQ(sprite.y(), 190);
+
     EXPECT_CALL(*imageFormat, width()).WillOnce(Return(4));
     EXPECT_CALL(*imageFormat, height()).WillOnce(Return(3));
+    EXPECT_CALL(engine, spriteFencingEnabled()).WillOnce(Return(true));
     EXPECT_CALL(engine, stageWidth()).WillOnce(Return(480));
     EXPECT_CALL(engine, stageHeight()).WillOnce(Return(360));
     sprite.setY(-190);
     ASSERT_EQ(sprite.y(), -180);
 
+    EXPECT_CALL(engine, spriteFencingEnabled()).WillOnce(Return(false));
+    sprite.setY(-190);
+    ASSERT_EQ(sprite.y(), -190);
+
     ScratchConfiguration::removeImageFormat("test");
 }
 

test/target_interfaces/ispritehandler_test.cpp

@@ -52,17 +52,27 @@ TEST_F(ISpriteHandlerTest, Visible)
 TEST_F(ISpriteHandlerTest, X)
 {
     EXPECT_CALL(m_handler, onXChanged(189.46)).Times(1);
+    EXPECT_CALL(m_engine, spriteFencingEnabled()).WillOnce(Return(true));
     EXPECT_CALL(m_engine, stageWidth()).WillOnce(Return(480));
     EXPECT_CALL(m_engine, stageHeight()).WillOnce(Return(360));
     m_sprite.setX(189.46);
+
+    EXPECT_CALL(m_handler, onXChanged(284.61)).Times(1);
+    EXPECT_CALL(m_engine, spriteFencingEnabled()).WillOnce(Return(false));
+    m_sprite.setX(284.61);
 }
 
 TEST_F(ISpriteHandlerTest, Y)
 {
     EXPECT_CALL(m_handler, onYChanged(-153.7)).Times(1);
+    EXPECT_CALL(m_engine, spriteFencingEnabled()).WillOnce(Return(true));
     EXPECT_CALL(m_engine, stageWidth()).WillOnce(Return(480));
     EXPECT_CALL(m_engine, stageHeight()).WillOnce(Return(360));
     m_sprite.setY(-153.7);
+
+    EXPECT_CALL(m_handler, onYChanged(207.08)).Times(1);
+    EXPECT_CALL(m_engine, spriteFencingEnabled()).WillOnce(Return(false));
+    m_sprite.setY(207.08);
 }
 
 TEST_F(ISpriteHandlerTest, Size)