PenLayer: Add refresh() method

Author: adazem009

src/penlayer.cpp

@@ -86,7 +86,7 @@ void PenLayer::setEngine(libscratchcpp::IEngine *newEngine)
             m_glF->initializeOpenGLFunctions();
         }
 
-        createFbo();
+        refresh();
 
         if (m_vao == 0) {
             // Set up VBO and VAO
@@ -133,7 +133,7 @@ void PenLayer::setHqPen(bool newHqPen)
 
     m_hqPen = newHqPen;
     emit hqPenChanged();
-    createFbo();
+    refresh();
 }
 
 void scratchcpprender::PenLayer::clear()
@@ -332,6 +332,38 @@ void PenLayer::stamp(IRenderedTarget *target)
     update();
 }
 
+void PenLayer::refresh()
+{
+    if (!m_glCtx || !m_surface || !m_engine || !m_glF)
+        return;
+
+    QOpenGLContext *oldCtx = QOpenGLContext::currentContext();
+    QSurface *oldSurface = oldCtx->surface();
+
+    if (oldCtx != m_glCtx) {
+        oldCtx->doneCurrent();
+        m_glCtx->makeCurrent(m_surface);
+    }
+
+    QOpenGLFramebufferObjectFormat fboFormat;
+    fboFormat.setAttachment(QOpenGLFramebufferObject::CombinedDepthStencil);
+
+    QOpenGLFramebufferObject *newFbo = new QOpenGLFramebufferObject(width(), height(), fboFormat);
+    Q_ASSERT(newFbo->isValid());
+
+    if (m_fbo)
+        QOpenGLFramebufferObject::blitFramebuffer(newFbo, m_fbo.get());
+
+    m_fbo.reset(newFbo);
+    m_texture = Texture(m_fbo->texture(), m_fbo->size());
+    m_scale = width() / m_engine->stageWidth();
+
+    if (oldCtx != m_glCtx) {
+        m_glCtx->doneCurrent();
+        oldCtx->makeCurrent(oldSurface);
+    }
+}
+
 QOpenGLFramebufferObject *PenLayer::framebufferObject() const
 {
     return m_fbo.get();
@@ -445,43 +477,11 @@ QNanoQuickItemPainter *PenLayer::createItemPainter() const
 void PenLayer::geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry)
 {
     if (m_hqPen && newGeometry != oldGeometry)
-        createFbo();
+        refresh();
 
     QNanoQuickItem::geometryChange(newGeometry, oldGeometry);
 }
 
-void PenLayer::createFbo()
-{
-    if (!m_glCtx || !m_surface || !m_engine || !m_glF)
-        return;
-
-    QOpenGLContext *oldCtx = QOpenGLContext::currentContext();
-    QSurface *oldSurface = oldCtx->surface();
-
-    if (oldCtx != m_glCtx) {
-        oldCtx->doneCurrent();
-        m_glCtx->makeCurrent(m_surface);
-    }
-
-    QOpenGLFramebufferObjectFormat fboFormat;
-    fboFormat.setAttachment(QOpenGLFramebufferObject::CombinedDepthStencil);
-
-    QOpenGLFramebufferObject *newFbo = new QOpenGLFramebufferObject(width(), height(), fboFormat);
-    Q_ASSERT(newFbo->isValid());
-
-    if (m_fbo)
-        QOpenGLFramebufferObject::blitFramebuffer(newFbo, m_fbo.get());
-
-    m_fbo.reset(newFbo);
-    m_texture = Texture(m_fbo->texture(), m_fbo->size());
-    m_scale = width() / m_engine->stageWidth();
-
-    if (oldCtx != m_glCtx) {
-        m_glCtx->doneCurrent();
-        oldCtx->makeCurrent(oldSurface);
-    }
-}
-
 void PenLayer::updateTexture()
 {
     if (!m_fbo)

src/penlayer.h

@@ -39,6 +39,8 @@ class PenLayer : public IPenLayer
         void drawLine(const PenAttributes &penAttributes, double x0, double y0, double x1, double y1) override;
         void stamp(IRenderedTarget *target) override;
 
+        Q_INVOKABLE void refresh();
+
         QOpenGLFramebufferObject *framebufferObject() const override;
         QRgb colorAtScratchPoint(double x, double y) const override;
 
@@ -56,7 +58,6 @@ class PenLayer : public IPenLayer
         void geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry) override;
 
     private:
-        void createFbo();
         void updateTexture();
 
         static std::unordered_map<libscratchcpp::IEngine *, IPenLayer *> m_projectPenLayers;

test/penlayer/penlayer_test.cpp

@@ -148,6 +148,27 @@ TEST_F(PenLayerTest, FramebufferObject)
     ASSERT_EQ(fbo->format().samples(), 0);
 }
 
+TEST_F(PenLayerTest, Refresh)
+{
+    PenLayer penLayer;
+
+    EngineMock engine1, engine2, engine3;
+    penLayer.setWidth(480);
+    penLayer.setHeight(360);
+    EXPECT_CALL(engine1, stageWidth()).WillOnce(Return(480));
+    penLayer.setEngine(&engine1);
+
+    penLayer.setWidth(500);
+    penLayer.setHeight(400);
+
+    EXPECT_CALL(engine1, stageWidth()).WillOnce(Return(500));
+    penLayer.refresh();
+
+    QOpenGLFramebufferObject *fbo = penLayer.framebufferObject();
+    ASSERT_EQ(fbo->width(), 500);
+    ASSERT_EQ(fbo->height(), 400);
+}
+
 TEST_F(PenLayerTest, GetProjectPenLayer)
 {
     PenLayer penLayer;