Update QNanoPainter

2c2d9d2f08dc0fc04e6781493b6e5f1bd16c4d65

Author: adazem009

thirdparty/libqnanopainter/CMakeLists.txt

@@ -1,8 +1,6 @@
 cmake_minimum_required(VERSION 3.0.0)
 project(qnanopainter VERSION 0.1.0)
 
-set(CMAKE_VERBOSE_MAKEFILE ON CACHE BOOL "ON" FORCE)
-
 option(QNANO_DEBUG_COLLECT "Enable this to get the drawing debug information" OFF)
 option(QNANO_DEBUG_RENDER "Enable this to render the drawing debug information" OFF)
 option(QNANO_QT_GL_INCLUDE "Enable this to let Qt include OpenGL headers" ON)
@@ -12,6 +10,7 @@ option(QNANO_ENABLE_TOUCH_SIGNALS "This will enable signalling touch events
 option(QNANO_ENABLE_PAINT_SIGNALS "This will enable signalling paint events
                                    Can be useful when using view/widget classes directly" OFF)
 option(QNANO_USE_RENDERNODE "Enable this to use QRenderNode (available since Qt 5.8.0) instead of QQuickFramebufferObject" OFF)
+option(QNANO_ENABLE_PAINTER_SHARING "Enable this to share QNanoPainter instance between QNanoQuickItemPainters" ON)
 option(QNANO_USE_RHI "Enable this to use QRhi (available since Qt 6.7) instead of QQuickFramebufferObject" OFF)
 
 option(QNANO_BUILD_GLES_BACKENDS "When building for embedded devices you can define manually which backends are supported" OFF)
@@ -168,7 +167,9 @@ endif()
 target_link_libraries(qnanopainter ${QNANOPAINTER_QT_LIBS} )
 
 # add to INCLUDE PATH 
-target_include_directories(qnanopainter PUBLIC .)  
+target_include_directories(qnanopainter
+    PUBLIC .
+    PUBLIC nanovg)
 
 # cmake variable ==> c++ #define
 if(QNANO_QT_GL_INCLUDE)

thirdparty/libqnanopainter/include.pri

@@ -33,6 +33,11 @@ DEFINES += QNANO_ENABLE_GLES3
 # Enable this to use QRenderNode (available since Qt 5.8.0) instead of QQuickFramebufferObject
 #DEFINES += QNANO_USE_RENDERNODE
 
+# This will enable sharing the QNanoPainter instance between QNanoQuickItemPainters
+# Sharing the painter saves memory, but can have issues e.g. when using QNanoPainter
+# from multiple windows (see https://github.com/QUItCoding/qnanopainter/issues/80)
+DEFINES += QNANO_ENABLE_PAINTER_SHARING
+
 # Suppress fontstash warnings about fopen & strncpy usage
 DEFINES += _CRT_SECURE_NO_WARNINGS
 

thirdparty/libqnanopainter/qnanoimage.cpp

@@ -99,15 +99,6 @@ QNanoImage::QNanoImage(const QImage &image, const QString &filename, ImageFlags
     updateUniqueKey();
 }
 
-QNanoImage::QNanoImage(QIODevice *device, const QString &uniqueKey, ImageFlags flags)
-    : m_device(device)
-    , m_uniqueKey(uniqueKey)
-    , m_flags(flags)
-{
-    Q_ASSERT(device);
-    updateUniqueKey();
-}
-
 /*!
     \fn void QNanoImage::setFilename(const QString &filename)
 
@@ -220,21 +211,6 @@ QNanoImage QNanoImage::fromCache(QNanoPainter *painter, const QString &filename,
     return image;
 }
 
-QNanoImage QNanoImage::fromCache(QNanoPainter *painter, QIODevice *device, const QString &uniqueKey, ImageFlags flags)
-{
-    Q_ASSERT(painter);
-    Q_ASSERT(device);
-    QNanoImage image;
-    image.m_imageData.reset(new QNanoDataElement());
-    image.m_device = device;
-    image.m_uniqueKey = uniqueKey;
-    image.m_flags = flags;
-    image.updateUniqueKey();
-    image.m_parentPainter = painter;
-    image.getID(painter->nvgCtx());
-    return image;
-}
-
 // ***** Private *****
 
 /*!
@@ -280,17 +256,10 @@ int QNanoImage::getID(NVGcontext* nvg)
         }
     } else {
         // Image is not yet in cache, so load and add it
-        QIODevice *device;
-        QFile file;
-        if (m_device)
-            device = m_device;
-        else {
-            file.setFileName(m_filename);
-            device = &file;
-        }
-        if (device->open(QIODevice::ReadOnly)) {
+        QFile file(m_filename);
+        if (file.open(QFile::ReadOnly)) {
             m_imageData.reset(new QNanoDataElement());
-            QByteArray array = device->readAll();
+            QByteArray array = file.readAll();
             int length = array.size();
             unsigned char* data = reinterpret_cast<unsigned char*>(&array.data()[0]);
             m_imageData->id = nvgCreateImageMem(nvg, m_flags, data, length);
@@ -310,7 +279,7 @@ void QNanoImage::updateUniqueKey()
 {
     if (m_textureId > 0)
         m_uniqueKey = QString("%1_").arg(QString::number(m_textureId));
-    else if(!m_device)
+    else
         m_uniqueKey = m_filename;
 
     m_uniqueKey.append(QString::number(m_flags));

thirdparty/libqnanopainter/qnanoimage.h

@@ -55,9 +55,6 @@ class QNanoImage
     // Constructs an image from QImage with the filename and flags
     QNanoImage(const QImage &image, const QString &filename, ImageFlags flags = {});
 
-    // Constructs an image from the data in the QIODevice, unique key and flags
-    QNanoImage(QIODevice *device, const QString &uniqueKey, ImageFlags flags = {});
-
     // Set the filename of the image
     void setFilename(const QString &filename);
 
@@ -72,7 +69,6 @@ class QNanoImage
 
     static QNanoImage fromFrameBuffer(const QOpenGLFramebufferObject *fbo, ImageFlags flags = QNanoImage::FLIPY);
     static QNanoImage fromCache(QNanoPainter *painter, const QString &filename, ImageFlags flags = {});
-    static QNanoImage fromCache(QNanoPainter *painter, QIODevice *device, const QString &uniqueKey, ImageFlags flags = {});
 
 private:
     friend class QNanoPainter;
@@ -89,7 +85,6 @@ class QNanoImage
     QNanoPainter *m_parentPainter = nullptr;
     QSharedPointer<QNanoDataElement> m_imageData;
     std::unique_ptr<QImage> m_image;
-    QIODevice *m_device = nullptr;
     QString m_filename;
     GLuint m_textureId = 0;
     QNanoImage::ImageFlags m_flags = {};

thirdparty/libqnanopainter/qnanopainter.h

@@ -246,6 +246,10 @@ class QNanoPainter
     int textBreakLines(const char* string, const char* end, float breakRowWidth, NVGtextRow* rows, int maxRows);
 */
 
+    inline NVGcontext* nvgCtx() const {
+        return m_nvgContext;
+    }
+
 private:
 
     friend class QNanoDebug;
@@ -261,9 +265,6 @@ class QNanoPainter
 
     static QNanoPainter *getInstance();
 
-    inline NVGcontext* nvgCtx() const {
-        return m_nvgContext;
-    }
 #ifdef QNANO_USE_RHI
     inline void setNvgCtx(NVGcontext* ctx) {
         m_nvgContext = ctx;

thirdparty/libqnanopainter/qnanoquickitempainter.cpp

@@ -46,7 +46,11 @@
 */
 
 QNanoQuickItemPainter::QNanoQuickItemPainter()
+#ifdef QNANO_ENABLE_PAINTER_SHARING
     : m_painter(QNanoPainter::getInstance())
+#else
+    : m_painter(new QNanoPainter())
+#endif
 {
 #ifndef QNANO_USE_RHI
     // Initialize QOpenGLFunctions for the context
@@ -60,6 +64,10 @@ QNanoQuickItemPainter::QNanoQuickItemPainter()
 
 QNanoQuickItemPainter::~QNanoQuickItemPainter()
 {
+#ifndef QNANO_ENABLE_PAINTER_SHARING
+    delete m_painter;
+    m_painter = nullptr;
+#endif
 }
 
 /*!
@@ -385,7 +393,9 @@ void QNanoQuickItemPainter::render(const RenderState *)
 void QNanoQuickItemPainter::render()
 #endif
 {
+#ifdef QNANO_ENABLE_PAINTER_SHARING
     m_painter->reset(); // reset context data as painter is shared.
+#endif
 
     m_painter->setPixelAlign(static_cast<QNanoPainter::PixelAlign>(m_pixelAlign));
     m_painter->setPixelAlignText(static_cast<QNanoPainter::PixelAlign>(m_pixelAlignText));