Add touchingColor() with mask param to Target

Author: adazem009

include/scratchcpp/sprite.h

@@ -82,6 +82,7 @@ class LIBSCRATCHCPP_EXPORT Sprite
 
         bool touchingPoint(double x, double y) const override;
         bool touchingColor(const Value &color) const override;
+        bool touchingColor(const Value &color, const Value &mask) const override;
 
         void setGraphicsEffectValue(IGraphicsEffect *effect, double value) override;
 

include/scratchcpp/stage.h

@@ -56,6 +56,7 @@ class LIBSCRATCHCPP_EXPORT Stage : public Target
 
         bool touchingPoint(double x, double y) const override;
         bool touchingColor(const Value &color) const override;
+        bool touchingColor(const Value &color, const Value &mask) const override;
 
         void setGraphicsEffectValue(IGraphicsEffect *effect, double value) override;
 

include/scratchcpp/target.h

@@ -101,6 +101,7 @@ class LIBSCRATCHCPP_EXPORT Target
         virtual bool touchingPoint(double x, double y) const;
         bool touchingEdge() const;
         virtual bool touchingColor(const Value &color) const;
+        virtual bool touchingColor(const Value &color, const Value &mask) const;
 
         double graphicsEffectValue(IGraphicsEffect *effect) const;
         virtual void setGraphicsEffectValue(IGraphicsEffect *effect, double value);

src/scratch/sprite.cpp

@@ -503,6 +503,15 @@ bool Sprite::touchingColor(const Value &color) const
     return impl->iface->touchingColor(color);
 }
 
+/*! Overrides Target#touchingColor(). */
+bool Sprite::touchingColor(const Value &color, const Value &mask) const
+{
+    if (!impl->iface)
+        return false;
+
+    return impl->iface->touchingColor(color, mask);
+}
+
 /*! Overrides Target#setGraphicsEffectValue(). */
 void Sprite::setGraphicsEffectValue(IGraphicsEffect *effect, double value)
 {

src/scratch/stage.cpp

@@ -185,6 +185,15 @@ bool Stage::touchingColor(const Value &color) const
     return impl->iface->touchingColor(color);
 }
 
+/*! Overrides Target#touchingColor(). */
+bool Stage::touchingColor(const Value &color, const Value &mask) const
+{
+    if (!impl->iface)
+        return false;
+
+    return impl->iface->touchingColor(color, mask);
+}
+
 /*! Overrides Target#setGraphicsEffectValue(). */
 void Stage::setGraphicsEffectValue(IGraphicsEffect *effect, double value)
 {

src/scratch/target.cpp

@@ -520,6 +520,12 @@ bool Target::touchingColor(const Value &color) const
     return false;
 }
 
+/*! Returns true if the mask part of the Target is touching the given color (RGB triplet). */
+bool Target::touchingColor(const Value &color, const Value &mask) const
+{
+    return false;
+}
+
 /*! Returns the value of the given graphics effect. */
 double Target::graphicsEffectValue(IGraphicsEffect *effect) const
 {

test/mocks/targetmock.h

@@ -28,6 +28,7 @@ class TargetMock : public Target
         MOCK_METHOD(bool, touchingPoint, (double, double), (const, override));
 
         MOCK_METHOD(bool, touchingColor, (const Value &), (const, override));
+        MOCK_METHOD(bool, touchingColor, (const Value &, const Value &), (const, override));
 
         MOCK_METHOD(void, setGraphicsEffectValue, (IGraphicsEffect *, double), (override));
         MOCK_METHOD(void, clearGraphicsEffects, (), (override));

test/scratch_classes/sprite_test.cpp

@@ -825,6 +825,7 @@ TEST(SpriteTest, TouchingColor)
 {
     Sprite sprite;
     ASSERT_FALSE(sprite.touchingColor(0));
+    ASSERT_FALSE(sprite.touchingColor(0, 0));
 
     SpriteHandlerMock iface;
     EXPECT_CALL(iface, init);
@@ -836,6 +837,12 @@ TEST(SpriteTest, TouchingColor)
 
     EXPECT_CALL(iface, touchingColor(v2)).WillOnce(Return(true));
     ASSERT_TRUE(sprite.touchingColor(v2));
+
+    EXPECT_CALL(iface, touchingColor(v1, v2)).WillOnce(Return(false));
+    ASSERT_FALSE(sprite.touchingColor(v1, v2));
+
+    EXPECT_CALL(iface, touchingColor(v2, v1)).WillOnce(Return(true));
+    ASSERT_TRUE(sprite.touchingColor(v2, v1));
 }
 
 TEST(SpriteTest, GraphicsEffects)

test/scratch_classes/stage_test.cpp

@@ -222,6 +222,7 @@ TEST(SpriteTest, TouchingColor)
 {
     Stage stage;
     ASSERT_FALSE(stage.touchingColor(0));
+    ASSERT_FALSE(stage.touchingColor(0, 0));
 
     StageHandlerMock iface;
     EXPECT_CALL(iface, init);
@@ -233,6 +234,12 @@ TEST(SpriteTest, TouchingColor)
 
     EXPECT_CALL(iface, touchingColor(v2)).WillOnce(Return(true));
     ASSERT_TRUE(stage.touchingColor(v2));
+
+    EXPECT_CALL(iface, touchingColor(v1, v2)).WillOnce(Return(false));
+    ASSERT_FALSE(stage.touchingColor(v1, v2));
+
+    EXPECT_CALL(iface, touchingColor(v2, v1)).WillOnce(Return(true));
+    ASSERT_TRUE(stage.touchingColor(v2, v1));
 }
 
 TEST(StageTest, GraphicsEffects)

test/scratch_classes/target_test.cpp

@@ -716,6 +716,7 @@ TEST(TargetTest, TouchingColor)
     Target target;
     Value v;
     ASSERT_FALSE(target.touchingColor(v));
+    ASSERT_FALSE(target.touchingColor(v, v));
 }
 
 TEST(TargetTest, GraphicsEffects)