Call touchingColor() with mask param from target models

scratchcpp · Sep 10, 2024 · ebc60c8 · ebc60c8
1 parent adaf9e0
commit ebc60c8
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 12 deletions.
diff --git a/src/spritemodel.cpp b/src/spritemodel.cpp
@@ -177,7 +177,7 @@ bool SpriteModel::touchingColor(const libscratchcpp::Value &color) const
 
 bool SpriteModel::touchingColor(const libscratchcpp::Value &color, const libscratchcpp::Value &mask) const
 {
-    return false;
+    return m_renderedTarget->touchingColor(color, mask);
 }
 
 libscratchcpp::Sprite *SpriteModel::sprite() const

diff --git a/src/stagemodel.cpp b/src/stagemodel.cpp
@@ -114,7 +114,7 @@ bool StageModel::touchingColor(const libscratchcpp::Value &color) const
 
 bool StageModel::touchingColor(const libscratchcpp::Value &color, const libscratchcpp::Value &mask) const
 {
-    return false;
+    return m_renderedTarget->touchingColor(color, mask);
 }
 
 void StageModel::loadCostume()

diff --git a/test/target_models/spritemodel_test.cpp b/test/target_models/spritemodel_test.cpp
@@ -388,12 +388,18 @@ TEST(SpriteModelTest, TouchingColor)
     RenderedTargetMock renderedTarget;
     model.setRenderedTarget(&renderedTarget);
 
-    Value color = 123;
-    EXPECT_CALL(renderedTarget, touchingColor(color)).WillOnce(Return(false));
-    ASSERT_FALSE(model.touchingColor(color));
+    Value color1 = 123, color2 = 456;
+    EXPECT_CALL(renderedTarget, touchingColor(color1)).WillOnce(Return(false));
+    ASSERT_FALSE(model.touchingColor(color1));
 
-    EXPECT_CALL(renderedTarget, touchingColor(color)).WillOnce(Return(true));
-    ASSERT_TRUE(model.touchingColor(color));
+    EXPECT_CALL(renderedTarget, touchingColor(color1)).WillOnce(Return(true));
+    ASSERT_TRUE(model.touchingColor(color1));
+
+    EXPECT_CALL(renderedTarget, touchingColor(color1, color2)).WillOnce(Return(false));
+    ASSERT_FALSE(model.touchingColor(color1, color2));
+
+    EXPECT_CALL(renderedTarget, touchingColor(color1, color2)).WillOnce(Return(true));
+    ASSERT_TRUE(model.touchingColor(color1, color2));
 }
 
 TEST(SpriteModelTest, RenderedTarget)

diff --git a/test/target_models/stagemodel_test.cpp b/test/target_models/stagemodel_test.cpp
@@ -181,12 +181,18 @@ TEST(StageModelTest, TouchingColor)
     RenderedTargetMock renderedTarget;
     model.setRenderedTarget(&renderedTarget);
 
-    Value color = 123;
-    EXPECT_CALL(renderedTarget, touchingColor(color)).WillOnce(Return(false));
-    ASSERT_FALSE(model.touchingColor(color));
+    Value color1 = 123, color2 = 456;
+    EXPECT_CALL(renderedTarget, touchingColor(color1)).WillOnce(Return(false));
+    ASSERT_FALSE(model.touchingColor(color1));
 
-    EXPECT_CALL(renderedTarget, touchingColor(color)).WillOnce(Return(true));
-    ASSERT_TRUE(model.touchingColor(color));
+    EXPECT_CALL(renderedTarget, touchingColor(color1)).WillOnce(Return(true));
+    ASSERT_TRUE(model.touchingColor(color1));
+
+    EXPECT_CALL(renderedTarget, touchingColor(color1, color2)).WillOnce(Return(false));
+    ASSERT_FALSE(model.touchingColor(color1, color2));
+
+    EXPECT_CALL(renderedTarget, touchingColor(color1, color2)).WillOnce(Return(true));
+    ASSERT_TRUE(model.touchingColor(color1, color2));
 }
 
 TEST(StageModelTest, RenderedTarget)