Add SVG support

scratchcpp · Dec 11, 2023 · 4fff9c9 · 4fff9c9
1 parent 5655f81
commit 4fff9c9
Show file tree

Hide file tree

Showing 10 changed files with 264 additions and 14 deletions.
diff --git a/ScratchCPPGui/irenderedtarget.h b/ScratchCPPGui/irenderedtarget.h
@@ -5,6 +5,7 @@
 #include <qnanoquickitem.h>
 
 class QBuffer;
+class QNanoPainter;
 
 namespace libscratchcpp
 {
@@ -59,6 +60,9 @@ class IRenderedTarget : public QNanoQuickItem
         virtual void unlockCostume() = 0;
 
         virtual bool mirrorHorizontally() const = 0;
+
+        virtual bool isSvg() const = 0;
+        virtual void paintSvg(QNanoPainter *painter) = 0;
 };
 
 } // namespace scratchcppgui
diff --git a/ScratchCPPGui/renderedtarget.cpp b/ScratchCPPGui/renderedtarget.cpp
@@ -2,6 +2,8 @@
 
 #include <scratchcpp/iengine.h>
 #include <scratchcpp/costume.h>
+#include <QtSvg/QSvgRenderer>
+#include <qnanopainter.h>
 
 #include "renderedtarget.h"
 #include "targetpainter.h"
@@ -80,6 +82,8 @@ void RenderedTarget::loadCostume(Costume *costume)
     m_imageChanged = true;
 
     if (costume->dataFormat() == "svg") {
+        if (costume != m_costume)
+            m_svgRenderer.load(QByteArray::fromRawData(static_cast<const char *>(costume->data()), costume->dataSize()));
     }
 
     m_costume = costume;
@@ -202,6 +206,8 @@ void RenderedTarget::doLoadCostume()
     Target *target = scratchTarget();
 
     if (m_costume->dataFormat() == "svg") {
+        QRectF rect = m_svgRenderer.viewBoxF();
+        calculateSize(target, rect.width(), rect.height());
     } else {
         m_bitmapBuffer.open(QBuffer::WriteOnly);
         m_bitmapBuffer.write(static_cast<const char *>(m_costume->data()), m_costume->dataSize());
@@ -217,6 +223,41 @@ void RenderedTarget::doLoadCostume()
     m_costumeMutex.unlock();
 }
 
+void RenderedTarget::paintSvg(QNanoPainter *painter)
+{
+    Q_ASSERT(painter);
+    QOpenGLContext *context = QOpenGLContext::currentContext();
+    Q_ASSERT(context);
+
+    if (!context)
+        return;
+
+    QOffscreenSurface surface;
+    surface.setFormat(context->format());
+    surface.create();
+    Q_ASSERT(surface.isValid());
+
+    QSurface *oldSurface = context->surface();
+    context->makeCurrent(&surface);
+
+    const QRectF drawRect(0, 0, width(), height());
+    const QSize drawRectSize = drawRect.size().toSize();
+
+    /*QOpenGLFramebufferObjectFormat fboFormat;
+    fboFormat.setSamples(16);
+    fboFormat.setAttachment(QOpenGLFramebufferObject::CombinedDepthStencil);*/
+
+    QOpenGLPaintDevice device(drawRectSize);
+    QPainter qPainter;
+    qPainter.begin(&device);
+    qPainter.setRenderHints(QPainter::Antialiasing | QPainter::SmoothPixmapTransform);
+    m_svgRenderer.render(&qPainter, drawRect);
+    qPainter.end();
+
+    context->doneCurrent();
+    context->makeCurrent(oldSurface);
+}
+
 void RenderedTarget::calculateSize(Target *target, double costumeWidth, double costumeHeight)
 {
     if (m_costume) {
@@ -258,3 +299,11 @@ bool RenderedTarget::mirrorHorizontally() const
 {
     return m_mirrorHorizontally;
 }
+
+bool RenderedTarget::isSvg() const
+{
+    if (!m_costume)
+        return false;
+
+    return (m_costume->dataFormat() == "svg");
+}
diff --git a/ScratchCPPGui/renderedtarget.h b/ScratchCPPGui/renderedtarget.h
@@ -5,6 +5,7 @@
 #include <qnanoquickitem.h>
 #include <QBuffer>
 #include <QMutex>
+#include <QtSvg/QSvgRenderer>
 
 #include "irenderedtarget.h"
 
@@ -55,6 +56,9 @@ class RenderedTarget : public IRenderedTarget
 
         bool mirrorHorizontally() const override;
 
+        bool isSvg() const override;
+        void paintSvg(QNanoPainter *painter) override;
+
     signals:
         void engineChanged();
         void stageModelChanged();
@@ -73,6 +77,7 @@ class RenderedTarget : public IRenderedTarget
         libscratchcpp::Costume *m_costume = nullptr;
         StageModel *m_stageModel = nullptr;
         SpriteModel *m_spriteModel = nullptr;
+        QSvgRenderer m_svgRenderer;
         QBuffer m_bitmapBuffer;
         QString m_bitmapUniqueKey;
         QMutex m_costumeMutex;

diff --git a/ScratchCPPGui/targetpainter.cpp b/ScratchCPPGui/targetpainter.cpp
@@ -23,8 +23,12 @@ void TargetPainter::paint(QNanoPainter *painter)
     double width = m_target->width();
     double height = m_target->height();
 
-    QNanoImage image = QNanoImage::fromCache(painter, m_target->bitmapBuffer(), m_target->bitmapUniqueKey());
-    painter->drawImage(image, 0, 0, width, height);
+    if (m_target->isSvg())
+        m_target->paintSvg(painter);
+    else {
+        QNanoImage image = QNanoImage::fromCache(painter, m_target->bitmapBuffer(), m_target->bitmapUniqueKey());
+        painter->drawImage(image, 0, 0, width, height);
+    }
 
     m_target->unlockCostume();
 }

diff --git a/test/image.svg b/test/image.svg
diff --git a/test/mocks/renderedtargetmock.h b/test/mocks/renderedtargetmock.h
@@ -41,6 +41,9 @@ class RenderedTargetMock : public IRenderedTarget
 
         MOCK_METHOD(bool, mirrorHorizontally, (), (const, override));
 
+        MOCK_METHOD(bool, isSvg, (), (const, override));
+        MOCK_METHOD(void, paintSvg, (QNanoPainter *), (override));
+
         MOCK_METHOD(QNanoQuickItemPainter *, createItemPainter, (), (const, override));
 };