Allow usage of both TiledBuffer and Mypaint

This allows us to use TiledBuffer for Vector now and Mypaint for bitmap.
Right now it's just to get things working again. Next i'll try to make a proper interface for the drawing buffers, so we can get rid of so much manual branching.

3rdlib/paint_lib/src/paintlib-pch.h

@@ -1,6 +1,3 @@
-#ifndef PAINTLIBPCH_H
-#define PAINTLIBPCH_H
-
 /* Add C includes here */
 
 #if defined __cplusplus
@@ -10,4 +7,4 @@
 #include <QString>
 #include <QList>
 
-#endif // PAINTLIBPCH_H
+#endif

3rdlib/paint_lib/src/qtmypaint/mphandler.cpp

@@ -148,7 +148,6 @@ void
 MPHandler::endStroke()
 {
     mypaint_brush_reset(mBrush->brush);
-    mSurface->clear();
 }
 
 float MPHandler::getBrushSettingBaseValue(MyPaintBrushSetting setting)

core_lib/src/canvaspainter.cpp

@@ -25,6 +25,8 @@ GNU General Public License for more details.
 #include "vectorimage.h"
 
 #include "painterutils.h"
+#include "mptile.h"
+#include "tiledbuffer.h"
 
 CanvasPainter::CanvasPainter(QPixmap& canvas) : mCanvas(canvas)
 {
@@ -157,16 +159,17 @@ void CanvasPainter::renderPostLayers(QPainter& painter, const QRect& blitRect)
     }
 }
 
-void CanvasPainter::setPaintSettings(const Object* object, int currentLayer, int frame, QHash<QString, MPTile*> tiledBuffer, const QRect& tilesBounds)
+void CanvasPainter::setPaintSettings(const Object* object, int currentLayer, int frame, QHash<QString, MPTile*> tiledHash, const QRect& tilesBounds, const TiledBuffer* tiledBuffer)
 {
     Q_ASSERT(object);
     mObject = object;
 
     CANVASPAINTER_LOG("Set CurrentLayerIndex = %d", currentLayer);
     mCurrentLayerIndex = currentLayer;
     mFrameNumber = frame;
-    mTiledBuffer = tiledBuffer;
+    mTiledHash = tiledHash;
     mTilesRect = tilesBounds;
+    mTiledBuffer = tiledBuffer;
 }
 
 void CanvasPainter::paint(const QRect& blitRect)
@@ -289,15 +292,15 @@ void CanvasPainter::paintCurrentBitmapFrame(QPainter& painter, const QRect& blit
     if (paintedImage == nullptr) { return; }
     paintedImage->loadFile(); // Critical! force the BitmapImage to load the image
 
-    const bool isDrawing = !mTiledBuffer.isEmpty();
+    const bool isDrawing = !mTiledHash.isEmpty();
 
     QPainter currentBitmapPainter;
     initializePainter(currentBitmapPainter, mCurrentLayerPixmap, blitRect);
 
     painter.setOpacity(paintedImage->getOpacity() - (1.0-painter.opacity()));
     painter.setWorldMatrixEnabled(false);
 
-    if (isCurrentLayer && isDrawing)
+    if ((isCurrentLayer && isDrawing) || (mOptions.bIgnoreCanvasBuffer))
     {
         // Certain tools require being painted continuously, for example, the Polyline tool.
         // The tiled buffer does not update the area outside which it paints,
@@ -309,7 +312,7 @@ void CanvasPainter::paintCurrentBitmapFrame(QPainter& painter, const QRect& blit
             currentBitmapPainter.drawImage(paintedImage->topLeft(), *paintedImage->image());
         }
 
-        const auto tilesMap = mTiledBuffer;
+        const auto tilesMap = mTiledHash;
         for (const MPTile* tile : tilesMap) {
             currentBitmapPainter.drawImage(tile->pos(), tile->image());
         }
@@ -340,7 +343,7 @@ void CanvasPainter::paintCurrentVectorFrame(QPainter& painter, const QRect& blit
     QPainter currentVectorPainter;
     initializePainter(currentVectorPainter, mCurrentLayerPixmap, blitRect);
 
-    const bool isDrawing = !mTiledBuffer.isEmpty();
+    const bool isDrawing = mTiledBuffer->isValid();
 
     // Paint existing vector image to the painter
     vectorImage->paintImage(currentVectorPainter, mOptions.bOutlines, mOptions.bThinLines, mOptions.bAntiAlias);
@@ -349,9 +352,9 @@ void CanvasPainter::paintCurrentVectorFrame(QPainter& painter, const QRect& blit
         if (isDrawing) {
             currentVectorPainter.setCompositionMode(mOptions.cmBufferBlendMode);
 
-            const auto tiles = mTiledBuffer;
-            for (const MPTile* tile : tiles) {
-                currentVectorPainter.drawImage(tile->pos(), tile->image());
+            const auto tiles = mTiledBuffer->tiles();
+            for (const Tile* tile : tiles) {
+                currentVectorPainter.drawPixmap(tile->posF(), tile->pixmap());
             }
         } else if (mRenderTransform) {
             vectorImage->setSelectionTransformation(mSelectionTransform);

core_lib/src/canvaspainter.h

@@ -30,8 +30,8 @@ GNU General Public License for more details.
 #include "onionskinpainteroptions.h"
 #include "onionskinsubpainter.h"
 
-#include "mpsurface.h"
-
+class MPTile;
+class TiledBuffer;
 class Object;
 class BitmapImage;
 class ViewManager;
@@ -67,7 +67,7 @@ class CanvasPainter
     void setTransformedSelection(QRect selection, QTransform transform);
     void ignoreTransformedSelection();
 
-    void setPaintSettings(const Object* object, int currentLayer, int frame, QHash<QString, MPTile*> tilesBuffer, const QRect& tilesBounds);
+    void setPaintSettings(const Object* object, int currentLayer, int frame, QHash<QString, MPTile*> tiledHash, const QRect& tilesBounds, const TiledBuffer* tiledBuffer);
     void paint(const QRect& blitRect);
     void paintCached(const QRect& blitRect);
     void resetLayerCache();
@@ -108,9 +108,11 @@ class CanvasPainter
 
     int mCurrentLayerIndex = 0;
     int mFrameNumber = 0;
-    QHash<QString, MPTile*> mTiledBuffer;
+    QHash<QString, MPTile*> mTiledHash;
     QRect mTilesRect;
 
+    const TiledBuffer* mTiledBuffer;
+
     QImage mScaledBitmap;
 
     // Handle selection transformation

core_lib/src/graphics/bitmap/bitmapimage.h

@@ -22,8 +22,7 @@ GNU General Public License for more details.
 #include <QtMath>
 #include <QHash>
 
-class MPTile;
-
+#include "mptile.h"
 
 class BitmapImage : public KeyFrame
 {