Update libscratchcpp to latest master

adazem009 · adazem009 · commit 7e7c15fada17 · 2024-09-06T23:07:12.000+02:00
* color is touching color is going to be implemented later
diff --git a/libscratchcpp b/libscratchcpp
@@ -1 +1 @@
-Subproject commit 363bec1b8658a25cb558021f09907bdf3b69f80f
+Subproject commit f74e2448f5f174be7c0fcc9d826102a4588c6b47
diff --git a/src/spritemodel.cpp b/src/spritemodel.cpp
@@ -175,6 +175,11 @@ bool SpriteModel::touchingColor(const libscratchcpp::Value &color) const
     return m_renderedTarget->touchingColor(color);
 }
 
+bool SpriteModel::touchingColor(const libscratchcpp::Value &color, const libscratchcpp::Value &mask) const
+{
+    return false;
+}
+
 libscratchcpp::Sprite *SpriteModel::sprite() const
 {
     return m_sprite;
diff --git a/src/spritemodel.h b/src/spritemodel.h
@@ -63,6 +63,7 @@ class SpriteModel
         bool touchingClones(const std::vector<libscratchcpp::Sprite *> &clones) const override;
         bool touchingPoint(double x, double y) const override;
         bool touchingColor(const libscratchcpp::Value &color) const override;
+        bool touchingColor(const libscratchcpp::Value &color, const libscratchcpp::Value &mask) const override;
 
         libscratchcpp::Sprite *sprite() const;
 
diff --git a/src/stagemodel.cpp b/src/stagemodel.cpp
@@ -112,6 +112,11 @@ bool StageModel::touchingColor(const libscratchcpp::Value &color) const
     return m_renderedTarget->touchingColor(color);
 }
 
+bool StageModel::touchingColor(const libscratchcpp::Value &color, const libscratchcpp::Value &mask) const
+{
+    return false;
+}
+
 void StageModel::loadCostume()
 {
     if (m_renderedTarget && m_stage)
diff --git a/src/stagemodel.h b/src/stagemodel.h
@@ -49,6 +49,7 @@ class StageModel
         bool touchingClones(const std::vector<libscratchcpp::Sprite *> &clones) const override;
         bool touchingPoint(double x, double y) const override;
         bool touchingColor(const libscratchcpp::Value &color) const override;
+        bool touchingColor(const libscratchcpp::Value &color, const libscratchcpp::Value &mask) const override;
 
         Q_INVOKABLE void loadCostume();
 

Original file line number	Diff line number	Diff line change
`@@ -175,6 +175,11 @@ bool SpriteModel::touchingColor(const libscratchcpp::Value &color) const`
`175`	`175`	`return m_renderedTarget->touchingColor(color);`
`176`	`176`	`}`
`177`	`177`
	`178`	`+bool SpriteModel::touchingColor(const libscratchcpp::Value &color, const libscratchcpp::Value &mask) const`
	`179`	`+{`
	`180`	`+ return false;`
	`181`	`+}`
	`182`	`+`
`178`	`183`	`libscratchcpp::Sprite *SpriteModel::sprite() const`
`179`	`184`	`{`
`180`	`185`	`return m_sprite;`
Original file line number	Diff line number	Diff line change
`@@ -112,6 +112,11 @@ bool StageModel::touchingColor(const libscratchcpp::Value &color) const`
`112`	`112`	`return m_renderedTarget->touchingColor(color);`
`113`	`113`	`}`
`114`	`114`
	`115`	`+bool StageModel::touchingColor(const libscratchcpp::Value &color, const libscratchcpp::Value &mask) const`
	`116`	`+{`
	`117`	`+ return false;`
	`118`	`+}`
	`119`	`+`
`115`	`120`	`void StageModel::loadCostume()`
`116`	`121`	`{`
`117`	`122`	`if (m_renderedTarget && m_stage)`