Move bounding rect methods to Target

Author: adazem009

include/scratchcpp/istagehandler.h

@@ -43,6 +43,15 @@ class LIBSCRATCHCPP_EXPORT IStageHandler
 
         /*! Called when the bubble text changes. */
         virtual void onBubbleTextChanged(const std::string &text) = 0;
+
+        /*! Used to get the bounding rectangle of the stage. */
+        virtual Rect boundingRect() const = 0;
+
+        /*!
+         * Used to get a less accurate bounding rectangle of the stage
+         * which is calculated by transforming the costume rectangle.
+         */
+        virtual Rect fastBoundingRect() const = 0;
 };
 
 } // namespace libscratchcpp

include/scratchcpp/sprite.h

@@ -8,7 +8,6 @@ namespace libscratchcpp
 {
 
 class ISpriteHandler;
-class Rect;
 class IGraphicsEffect;
 class SpritePrivate;
 
@@ -69,8 +68,8 @@ class LIBSCRATCHCPP_EXPORT Sprite
 
         void setLayerOrder(int newLayerOrder) override;
 
-        Rect boundingRect() const;
-        Rect fastBoundingRect() const;
+        Rect boundingRect() const override;
+        Rect fastBoundingRect() const override;
         void keepInFence(double newX, double newY, double *fencedX, double *fencedY) const;
 
         void setGraphicsEffectValue(IGraphicsEffect *effect, double value) override;

include/scratchcpp/stage.h

@@ -48,6 +48,9 @@ class LIBSCRATCHCPP_EXPORT Stage : public Target
         const std::string &textToSpeechLanguage() const;
         void setTextToSpeechLanguage(const std::string &newTextToSpeechLanguage);
 
+        Rect boundingRect() const override;
+        Rect fastBoundingRect() const override;
+
         void setGraphicsEffectValue(IGraphicsEffect *effect, double value) override;
 
         void clearGraphicsEffects() override;

include/scratchcpp/target.h

@@ -6,6 +6,7 @@
 
 #include "global.h"
 #include "spimpl.h"
+#include "rect.h"
 
 namespace libscratchcpp
 {
@@ -84,6 +85,9 @@ class LIBSCRATCHCPP_EXPORT Target
         double volume() const;
         void setVolume(double newVolume);
 
+        virtual Rect boundingRect() const;
+        virtual Rect fastBoundingRect() const;
+
         double graphicsEffectValue(IGraphicsEffect *effect) const;
         virtual void setGraphicsEffectValue(IGraphicsEffect *effect, double value);
 

src/scratch/sprite.cpp

@@ -341,7 +341,7 @@ void Sprite::setLayerOrder(int newLayerOrder)
         impl->iface->onLayerOrderChanged(newLayerOrder);
 }
 
-/*! Returns the bounding rectangle of the sprite. */
+/*! Overrides Target#boundingRect(). */
 Rect Sprite::boundingRect() const
 {
     if (!impl->iface)
@@ -350,10 +350,7 @@ Rect Sprite::boundingRect() const
     return impl->iface->boundingRect();
 }
 
-/*!
- * Returns the less accurate bounding rectangle of the sprite
- * which is calculated by transforming the costume rectangle.
- */
+/*! Overrides Target#fastBoundingRect(). */
 Rect Sprite::fastBoundingRect() const
 {
     if (!impl->iface)

src/scratch/stage.cpp

@@ -131,6 +131,24 @@ void Stage::setTextToSpeechLanguage(const std::string &newTextToSpeechLanguage)
     impl->textToSpeechLanguage = newTextToSpeechLanguage;
 }
 
+/*! Overrides Target#boundingRect(). */
+Rect Stage::boundingRect() const
+{
+    if (!impl->iface)
+        return Rect();
+
+    return impl->iface->boundingRect();
+}
+
+/*! Overrides Target#boundingRect(). */
+Rect Stage::fastBoundingRect() const
+{
+    if (!impl->iface)
+        return Rect();
+
+    return impl->iface->fastBoundingRect();
+}
+
 /*! Overrides Target#setGraphicsEffectValue(). */
 void Stage::setGraphicsEffectValue(IGraphicsEffect *effect, double value)
 {

src/scratch/target.cpp

@@ -416,6 +416,21 @@ void Target::setVolume(double newVolume)
     }
 }
 
+/*! Returns the bounding rectangle of the sprite. */
+Rect Target::boundingRect() const
+{
+    return Rect();
+}
+
+/*!
+ * Returns the less accurate bounding rectangle of the sprite
+ * which is calculated by transforming the costume rectangle.
+ */
+Rect Target::fastBoundingRect() const
+{
+    return Rect();
+}
+
 /*! Returns the value of the given graphics effect. */
 double Target::graphicsEffectValue(IGraphicsEffect *effect) const
 {

test/mocks/stagehandlermock.h

@@ -19,4 +19,7 @@ class StageHandlerMock : public IStageHandler
         MOCK_METHOD(void, onGraphicsEffectsCleared, (), (override));
         MOCK_METHOD(void, onBubbleTypeChanged, (Target::BubbleType), (override));
         MOCK_METHOD(void, onBubbleTextChanged, (const std::string &), (override));
+
+        MOCK_METHOD(Rect, boundingRect, (), (const, override));
+        MOCK_METHOD(Rect, fastBoundingRect, (), (const, override));
 };

test/scratch_classes/stage_test.cpp

@@ -119,6 +119,26 @@ TEST(StageTest, TextToSpeechLanguage)
     ASSERT_EQ(stage.textToSpeechLanguage(), "English");
 }
 
+TEST(StageTest, DefaultBoundingRect)
+{
+    Stage stage;
+    Rect rect = stage.boundingRect();
+    ASSERT_EQ(rect.left(), 0);
+    ASSERT_EQ(rect.top(), 0);
+    ASSERT_EQ(rect.right(), 0);
+    ASSERT_EQ(rect.bottom(), 0);
+}
+
+TEST(StageTest, DefaultFastBoundingRect)
+{
+    Stage stage;
+    Rect rect = stage.fastBoundingRect();
+    ASSERT_EQ(rect.left(), 0);
+    ASSERT_EQ(rect.top(), 0);
+    ASSERT_EQ(rect.right(), 0);
+    ASSERT_EQ(rect.bottom(), 0);
+}
+
 TEST(StageTest, GraphicsEffects)
 {
     Stage stage;

test/scratch_classes/target_test.cpp

@@ -560,6 +560,26 @@ TEST(TargetTest, Volume)
     SoundPrivate::audioOutput = nullptr;
 }
 
+TEST(TargetTest, BoundingRect)
+{
+    Target target;
+    Rect rect = target.boundingRect();
+    ASSERT_EQ(rect.left(), 0);
+    ASSERT_EQ(rect.top(), 0);
+    ASSERT_EQ(rect.right(), 0);
+    ASSERT_EQ(rect.bottom(), 0);
+}
+
+TEST(TargetTest, FastBoundingRect)
+{
+    Target target;
+    Rect rect = target.fastBoundingRect();
+    ASSERT_EQ(rect.left(), 0);
+    ASSERT_EQ(rect.top(), 0);
+    ASSERT_EQ(rect.right(), 0);
+    ASSERT_EQ(rect.bottom(), 0);
+}
+
 TEST(TargetTest, GraphicsEffects)
 {
     Target target;