Add pen properties to SpriteModel

Author: adazem009

src/spritemodel.cpp

@@ -5,6 +5,7 @@
 
 #include "spritemodel.h"
 #include "renderedtarget.h"
+#include "ipenlayer.h"
 
 namespace scratchcpprender
 {
@@ -115,6 +116,41 @@ void SpriteModel::setRenderedTarget(IRenderedTarget *newRenderedTarget)
     emit renderedTargetChanged();
 }
 
+IPenLayer *SpriteModel::penLayer() const
+{
+    return m_penLayer;
+}
+
+void SpriteModel::setPenLayer(IPenLayer *newPenLayer)
+{
+    if (m_penLayer == newPenLayer)
+        return;
+
+    m_penLayer = newPenLayer;
+    emit penLayerChanged();
+}
+
+PenAttributes &SpriteModel::penAttributes()
+{
+    return m_penAttributes;
+}
+
+bool SpriteModel::penDown() const
+{
+    return m_penDown;
+}
+
+void SpriteModel::setPenDown(bool newPenDown)
+{
+    if (m_penDown == newPenDown)
+        return;
+
+    m_penDown = newPenDown;
+
+    if (m_penDown && m_penLayer && m_sprite)
+        m_penLayer->drawPoint(m_penAttributes, m_sprite->x(), m_sprite->y());
+}
+
 SpriteModel *SpriteModel::cloneRoot() const
 {
     if (m_cloneRoot == this)

src/spritemodel.h

@@ -6,12 +6,16 @@
 #include <QQmlEngine>
 #include <scratchcpp/ispritehandler.h>
 
+#include "penattributes.h"
+
 Q_MOC_INCLUDE("renderedtarget.h");
+Q_MOC_INCLUDE("ipenlayer.h");
 
 namespace scratchcpprender
 {
 
 class IRenderedTarget;
+class IPenLayer;
 
 class SpriteModel
     : public QObject
@@ -20,6 +24,7 @@ class SpriteModel
         Q_OBJECT
         QML_ELEMENT
         Q_PROPERTY(IRenderedTarget *renderedTarget READ renderedTarget WRITE setRenderedTarget NOTIFY renderedTargetChanged)
+        Q_PROPERTY(IPenLayer *penLayer READ penLayer WRITE setPenLayer NOTIFY penLayerChanged)
 
     public:
         SpriteModel(QObject *parent = nullptr);
@@ -49,16 +54,29 @@ class SpriteModel
         IRenderedTarget *renderedTarget() const;
         void setRenderedTarget(IRenderedTarget *newRenderedTarget);
 
+        IPenLayer *penLayer() const;
+        void setPenLayer(IPenLayer *newPenLayer);
+
+        PenAttributes &penAttributes();
+        void setPenAttributes(const PenAttributes &newPenAttributes);
+
+        bool penDown() const;
+        void setPenDown(bool newPenDown);
+
         SpriteModel *cloneRoot() const;
 
     signals:
         void renderedTargetChanged();
+        void penLayerChanged();
         void cloned(SpriteModel *cloneModel);
         void cloneDeleted(SpriteModel *clone);
 
     private:
         libscratchcpp::Sprite *m_sprite = nullptr;
         IRenderedTarget *m_renderedTarget = nullptr;
+        IPenLayer *m_penLayer = nullptr;
+        PenAttributes m_penAttributes;
+        bool m_penDown = false;
         SpriteModel *m_cloneRoot = nullptr;
 };
 

test/target_models/spritemodel_test.cpp

@@ -2,13 +2,17 @@
 #include <scratchcpp/costume.h>
 #include <spritemodel.h>
 #include <renderedtargetmock.h>
+#include <penlayermock.h>
 
 #include "../common.h"
 
 using namespace scratchcpprender;
 using namespace libscratchcpp;
 
 using ::testing::Return;
+using ::testing::WithArgs;
+using ::testing::Invoke;
+using ::testing::_;
 
 TEST(SpriteModelTest, Constructors)
 {
@@ -204,3 +208,42 @@ TEST(SpriteModelTest, RenderedTarget)
     ASSERT_EQ(spy.count(), 1);
     ASSERT_EQ(model.renderedTarget(), &renderedTarget);
 }
+
+TEST(SpriteModelTest, PenLayer)
+{
+    SpriteModel model;
+    ASSERT_EQ(model.penLayer(), nullptr);
+
+    PenLayerMock penLayer;
+    QSignalSpy spy(&model, &SpriteModel::penLayerChanged);
+    model.setPenLayer(&penLayer);
+    ASSERT_EQ(spy.count(), 1);
+    ASSERT_EQ(model.penLayer(), &penLayer);
+}
+
+TEST(SpriteModelTest, PenDown)
+{
+    SpriteModel model;
+    Sprite sprite;
+    sprite.setX(24.6);
+    sprite.setY(-48.8);
+    model.init(&sprite);
+    ASSERT_FALSE(model.penDown());
+
+    PenLayerMock penLayer;
+    model.setPenLayer(&penLayer);
+
+    PenAttributes &attr = model.penAttributes();
+
+    EXPECT_CALL(penLayer, drawPoint(_, 24.6, -48.8)).WillOnce(WithArgs<0>(Invoke([&attr](const PenAttributes &attrArg) { ASSERT_EQ(&attr, &attrArg); })));
+    model.setPenDown(true);
+    ASSERT_TRUE(model.penDown());
+
+    EXPECT_CALL(penLayer, drawPoint).Times(0);
+    model.setPenDown(true);
+    ASSERT_TRUE(model.penDown());
+
+    EXPECT_CALL(penLayer, drawPoint).Times(0);
+    model.setPenDown(false);
+    ASSERT_FALSE(model.penDown());
+}