Remove the need to allocate an empty QPointF to draw pixmaps

MrStevns · Sep 29, 2023 · f3501ca · f3501ca · J5lx · Sep 29, 2023
1 parent 03ba9fa
commit f3501ca
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 10 deletions.
diff --git a/core_lib/src/canvaspainter.cpp b/core_lib/src/canvaspainter.cpp
@@ -97,7 +97,7 @@ void CanvasPainter::paintCached(const QRect& blitRect)
     QPainter mainPainter;
     initializePainter(mainPainter, mCanvas, blitRect);
     mainPainter.setWorldMatrixEnabled(false);
-    mainPainter.drawPixmap(QPointF(), mPreLayersPixmap);
+    mainPainter.drawPixmap(pointZero, mPreLayersPixmap);
     mainPainter.setWorldMatrixEnabled(true);
 
     paintCurrentFrame(mainPainter, blitRect, mCurrentLayerIndex, mCurrentLayerIndex);
@@ -112,7 +112,7 @@ void CanvasPainter::paintCached(const QRect& blitRect)
     }
 
     mainPainter.setWorldMatrixEnabled(false);
-    mainPainter.drawPixmap(QPointF(), mPostLayersPixmap);
+    mainPainter.drawPixmap(pointZero, mPostLayersPixmap);
     mainPainter.setWorldMatrixEnabled(true);
 }
 
@@ -184,7 +184,7 @@ void CanvasPainter::paint(const QRect& blitRect)
     preLayerPainter.end();
 
     mainPainter.setWorldMatrixEnabled(false);
-    mainPainter.drawPixmap(QPointF(), mPreLayersPixmap);
+    mainPainter.drawPixmap(pointZero, mPreLayersPixmap);
     mainPainter.setWorldMatrixEnabled(true);
 
     paintCurrentFrame(mainPainter, blitRect, mCurrentLayerIndex, mCurrentLayerIndex);
@@ -194,7 +194,7 @@ void CanvasPainter::paint(const QRect& blitRect)
     postLayerPainter.end();
 
     mainPainter.setWorldMatrixEnabled(false);
-    mainPainter.drawPixmap(QPointF(), mPostLayersPixmap);
+    mainPainter.drawPixmap(pointZero, mPostLayersPixmap);
     mainPainter.setWorldMatrixEnabled(true);
 
     mPreLayersPixmapCacheValid = true;
@@ -280,7 +280,7 @@ void CanvasPainter::paintOnionSkinFrame(QPainter& painter, QPainter& onionSkinPa
         onionSkinPainter.setBrush(colorBrush);
         onionSkinPainter.drawRect(painter.viewport());
     }
-    painter.drawPixmap(QPointF(), mOnionSkinPixmap);
+    painter.drawPixmap(pointZero, mOnionSkinPixmap);
 }
 
 void CanvasPainter::paintCurrentBitmapFrame(QPainter& painter, const QRect& blitRect, Layer* layer, bool isCurrentLayer)
@@ -313,7 +313,7 @@ void CanvasPainter::paintCurrentBitmapFrame(QPainter& painter, const QRect& blit
 
         const auto tiles = mTiledBuffer->tiles();
         for (const Tile* tile : tiles) {
-            currentBitmapPainter.drawPixmap(tile->pos(), tile->pixmap());
+            currentBitmapPainter.drawPixmap(tile->posF(), tile->pixmap());
         }
     } else {
         // When we're drawing using a tool, the surface will be painted by the tiled buffer,
@@ -327,7 +327,7 @@ void CanvasPainter::paintCurrentBitmapFrame(QPainter& painter, const QRect& blit
         paintTransformedSelection(currentBitmapPainter, paintedImage, mSelection);
     }
 
-    painter.drawPixmap(QPointF(), mCurrentLayerPixmap);
+    painter.drawPixmap(pointZero, mCurrentLayerPixmap);
 }
 
 void CanvasPainter::paintCurrentVectorFrame(QPainter& painter, const QRect& blitRect, Layer* layer, bool isCurrentLayer)
@@ -353,7 +353,7 @@ void CanvasPainter::paintCurrentVectorFrame(QPainter& painter, const QRect& blit
 
             const auto tiles = mTiledBuffer->tiles();
             for (const Tile* tile : tiles) {
-                currentVectorPainter.drawPixmap(tile->pos(), tile->pixmap());
+                currentVectorPainter.drawPixmap(tile->posF(), tile->pixmap());
             }
         } else if (mRenderTransform) {
             vectorImage->setSelectionTransformation(mSelectionTransform);
@@ -366,7 +366,7 @@ void CanvasPainter::paintCurrentVectorFrame(QPainter& painter, const QRect& blit
 
     // Remember to adjust opacity based on additional opacity value from the keyframe
     painter.setOpacity(vectorImage->getOpacity() - (1.0-painter.opacity()));
-    painter.drawPixmap(QPointF(), mCurrentLayerPixmap);
+    painter.drawPixmap(pointZero, mCurrentLayerPixmap);
 }
 
 void CanvasPainter::paintTransformedSelection(QPainter& painter, BitmapImage* bitmapImage, const QRect& selection) const

diff --git a/core_lib/src/canvaspainter.h b/core_lib/src/canvaspainter.h
@@ -125,6 +125,10 @@ class CanvasPainter
     bool mPreLayersPixmapCacheValid = false;
     bool mPostLayersPixmapCacheValid = false;
 
+    // There's a considerable amount of overhead in simply allocating a QPointF on the fly.
+    // Since we just need to draw it at 0,0, we might as well make a const value for that purpose
+    const QPointF pointZero;
+
 
     OnionSkinSubPainter mOnionSkinSubPainter;
     OnionSkinPainterOptions mOnionSkinPainterOptions;

diff --git a/core_lib/src/graphics/bitmap/tile.cpp b/core_lib/src/graphics/bitmap/tile.cpp
@@ -21,6 +21,7 @@ GNU General Public License for more details.
 Tile::Tile(const QPoint& pos, QSize size):
     mTilePixmap(size),
     mPos(pos),
+    mPosF(pos),
     mBounds(pos, size),
     mSize(size)
 {

diff --git a/core_lib/src/graphics/bitmap/tile.h b/core_lib/src/graphics/bitmap/tile.h
@@ -31,6 +31,7 @@ class Tile
     QPixmap& pixmap() { return mTilePixmap; }
 
     const QPoint& pos() const { return mPos; }
+    const QPointF& posF() const { return mPosF; }
     const QRect& bounds() const { return mBounds; }
     const QSize& size() const { return mSize; }
 
@@ -39,7 +40,8 @@ class Tile
     void clear();
 
 private:
-    QPixmap    mTilePixmap;
+    QPixmap mTilePixmap;
+    QPointF mPosF;
     QPoint mPos;
     QRect mBounds;
     QSize mSize;