Add antialiasingEnabled property to PenLayer

Author: adazem009

src/ipenlayer.h

@@ -26,6 +26,9 @@ class IPenLayer : public QNanoQuickItem
 
         virtual ~IPenLayer() { }
 
+        virtual bool antialiasingEnabled() const = 0;
+        virtual void setAntialiasingEnabled(bool enabled) = 0;
+
         virtual libscratchcpp::IEngine *engine() const = 0;
         virtual void setEngine(libscratchcpp::IEngine *newEngine) = 0;
 

src/penlayer.cpp

@@ -12,7 +12,7 @@ PenLayer::PenLayer(QNanoQuickItem *parent) :
     IPenLayer(parent)
 {
     m_fboFormat.setAttachment(QOpenGLFramebufferObject::CombinedDepthStencil);
-    m_fboFormat.setSamples(4);
+    m_fboFormat.setSamples(m_antialiasingEnabled ? 4 : 0);
 }
 
 PenLayer::~PenLayer()
@@ -24,6 +24,17 @@ PenLayer::~PenLayer()
         m_painter->end();
 }
 
+bool PenLayer::antialiasingEnabled() const
+{
+    return m_antialiasingEnabled;
+}
+
+void PenLayer::setAntialiasingEnabled(bool enabled)
+{
+    m_antialiasingEnabled = enabled;
+    m_fboFormat.setSamples(enabled ? 4 : 0);
+}
+
 libscratchcpp::IEngine *PenLayer::engine() const
 {
     return m_engine;
@@ -81,7 +92,7 @@ void scratchcpprender::PenLayer::drawLine(const PenAttributes &penAttributes, do
     // Begin painting
     m_fbo->bind();
     m_painter->beginNativePainting();
-    m_painter->setRenderHint(QPainter::Antialiasing);
+    m_painter->setRenderHint(QPainter::Antialiasing, m_antialiasingEnabled);
     m_painter->setRenderHint(QPainter::SmoothPixmapTransform, false);
 
     // Translate to Scratch coordinate system

src/penlayer.h

@@ -20,6 +20,9 @@ class PenLayer : public IPenLayer
         PenLayer(QNanoQuickItem *parent = nullptr);
         ~PenLayer();
 
+        bool antialiasingEnabled() const override;
+        void setAntialiasingEnabled(bool enabled) override;
+
         libscratchcpp::IEngine *engine() const override;
         void setEngine(libscratchcpp::IEngine *newEngine) override;
 
@@ -39,6 +42,7 @@ class PenLayer : public IPenLayer
 
     private:
         static std::unordered_map<libscratchcpp::IEngine *, IPenLayer *> m_projectPenLayers;
+        bool m_antialiasingEnabled = true;
         libscratchcpp::IEngine *m_engine = nullptr;
         std::unique_ptr<QOpenGLFramebufferObject> m_fbo;
         std::unique_ptr<QOpenGLPaintDevice> m_paintDevice;

test/lines.png

@@ -12,6 +12,9 @@ namespace scratchcpprender
 class PenLayerMock : public IPenLayer
 {
     public:
+        MOCK_METHOD(bool, antialiasingEnabled, (), (const, override));
+        MOCK_METHOD(void, setAntialiasingEnabled, (bool), (override));
+
         MOCK_METHOD(libscratchcpp::IEngine *, engine, (), (const, override));
         MOCK_METHOD(void, setEngine, (libscratchcpp::IEngine *), (override));
 

test/lines_old.png

@@ -69,6 +69,8 @@ TEST_F(PenLayerTest, Engine)
 TEST_F(PenLayerTest, FramebufferObject)
 {
     PenLayer penLayer;
+    ASSERT_TRUE(penLayer.antialiasingEnabled());
+
     EngineMock engine1, engine2;
     EXPECT_CALL(engine1, stageWidth()).WillOnce(Return(480));
     EXPECT_CALL(engine1, stageHeight()).WillOnce(Return(360));
@@ -80,6 +82,9 @@ TEST_F(PenLayerTest, FramebufferObject)
     ASSERT_EQ(fbo->format().attachment(), QOpenGLFramebufferObject::CombinedDepthStencil);
     ASSERT_EQ(fbo->format().samples(), 4);
 
+    penLayer.setAntialiasingEnabled(false);
+    ASSERT_FALSE(penLayer.antialiasingEnabled());
+
     EXPECT_CALL(engine2, stageWidth()).WillOnce(Return(500));
     EXPECT_CALL(engine2, stageHeight()).WillOnce(Return(400));
     penLayer.setEngine(&engine2);
@@ -88,7 +93,7 @@ TEST_F(PenLayerTest, FramebufferObject)
     ASSERT_EQ(fbo->width(), 500);
     ASSERT_EQ(fbo->height(), 400);
     ASSERT_EQ(fbo->format().attachment(), QOpenGLFramebufferObject::CombinedDepthStencil);
-    ASSERT_EQ(fbo->format().samples(), 4);
+    ASSERT_EQ(fbo->format().samples(), 0);
 }
 
 TEST_F(PenLayerTest, GetProjectPenLayer)
@@ -161,6 +166,7 @@ TEST_F(PenLayerTest, Clear)
 TEST_F(PenLayerTest, DrawPoint)
 {
     PenLayer penLayer;
+    penLayer.setAntialiasingEnabled(false);
     EngineMock engine;
     EXPECT_CALL(engine, stageWidth()).WillOnce(Return(480));
     EXPECT_CALL(engine, stageHeight()).WillOnce(Return(360));
@@ -207,6 +213,7 @@ TEST_F(PenLayerTest, DrawPoint)
 TEST_F(PenLayerTest, DrawLine)
 {
     PenLayer penLayer;
+    penLayer.setAntialiasingEnabled(false);
     EngineMock engine;
     EXPECT_CALL(engine, stageWidth()).WillOnce(Return(480));
     EXPECT_CALL(engine, stageHeight()).WillOnce(Return(360));
@@ -238,7 +245,7 @@ TEST_F(PenLayerTest, DrawLine)
     penLayer.drawLine(attr, -54, 21, 88, -6);
 
     QOpenGLFramebufferObject *fbo = penLayer.framebufferObject();
-    QImage image = fbo->toImage();
+    QImage image = fbo->toImage().scaled(240, 180);
     QBuffer buffer;
     image.save(&buffer, "png");
     QFile ref("lines.png");