WIP

CMakeLists.txt

@@ -124,6 +124,11 @@ endif()
 # source directory to not go insane figuring out what is included from where
 include_directories(${CMAKE_CURRENT_LIST_DIR}/src)
 
+# Error messages shouldn't include home directories and such, so we use the
+# project directory length to chop it off the beginning of __FILE__.
+string(LENGTH "${PROJECT_SOURCE_DIR}/" project_dir_length)
+add_compile_definitions("DP_PROJECT_DIR_LENGTH=${project_dir_length}")
+
 add_subdirectory(src/cmake-config)
 
 if(CLIENT OR SERVER)

src/desktop/dialogs/playbackdialog.cpp

@@ -354,7 +354,10 @@ void PlaybackDialog::exportFrame(int count)
 	Q_ASSERT(m_exporter);
 	count = qMax(1, count);
 
-	const QImage image = m_paintengine->getPixmap().toImage();
+	QImage image;
+	m_paintengine->withPixmap([&image](const QPixmap &pixmap) {
+		image = pixmap.toImage();
+	});
 	if(image.isNull()) {
 		qWarning("exportFrame: image is null!");
 		onExporterReady();

src/desktop/docks/navigator.cpp

@@ -71,9 +71,10 @@ NavigatorView::NavigatorView(QWidget *parent)
 void NavigatorView::setCanvasModel(canvas::CanvasModel *model)
 {
 	m_model = model;
-	connect(m_model->paintEngine(), &canvas::PaintEngine::areaChanged, this, &NavigatorView::onChange);
-	connect(m_model->paintEngine(), &canvas::PaintEngine::resized, this, &NavigatorView::onResize);
+	connect(m_model->paintEngine(), &canvas::PaintEngine::areaChanged, this, &NavigatorView::onChange, Qt::QueuedConnection);
+	connect(m_model->paintEngine(), &canvas::PaintEngine::resized, this, &NavigatorView::onResize, Qt::QueuedConnection);
 	connect(m_model->paintEngine(), &canvas::PaintEngine::cursorMoved, this, &NavigatorView::onCursorMove);
+	m_model->paintEngine()->setRenderOutsideView(isVisible());
 
 	refreshCache();
 }
@@ -132,6 +133,22 @@ void NavigatorView::wheelEvent(QWheelEvent *event)
 	}
 }
 
+void NavigatorView::showEvent(QShowEvent *event)
+{
+	QWidget::showEvent(event);
+	if(m_model) {
+		m_model->paintEngine()->setRenderOutsideView(true);
+	}
+}
+
+void NavigatorView::hideEvent(QHideEvent *event)
+{
+	QWidget::hideEvent(event);
+	if(m_model) {
+		m_model->paintEngine()->setRenderOutsideView(false);
+	}
+}
+
 /**
  * The focus rectangle represents the visible area in the
  * main viewport.
@@ -157,22 +174,22 @@ void NavigatorView::onResize()
 
 void NavigatorView::refreshCache()
 {
-	if(!m_model)
-		return;
-
-	const QPixmap &canvas = m_model->paintEngine()->getPixmap();
-	if(canvas.isNull())
+	if(!m_model) {
 		return;
-
-	const QSize size = this->size();
-	if(size != m_cachedSize) {
-		m_cachedSize = size;
-		const QSize pixmapSize = canvas.size().scaled(size, Qt::KeepAspectRatio);
-		m_cache = QPixmap(pixmapSize);
 	}
 
-	QPainter painter(&m_cache);
-	painter.drawPixmap(m_cache.rect(), canvas);
+	m_model->paintEngine()->withPixmap([this](const QPixmap &pixmap) {
+		if(!pixmap.isNull()) {
+			QSize navigatorSize = size();
+			if(navigatorSize != m_cachedSize) {
+				m_cachedSize = navigatorSize;
+				m_cache = QPixmap{
+					pixmap.size().scaled(navigatorSize, Qt::KeepAspectRatio)};
+			}
+			QPainter painter(&m_cache);
+			painter.drawPixmap(m_cache.rect(), pixmap);
+		}
+	});
 
 	update();
 }

src/desktop/docks/navigator.h

@@ -41,6 +41,8 @@ public slots:
 	void mouseMoveEvent(QMouseEvent *event) override;
 	void mousePressEvent(QMouseEvent *event) override;
 	void wheelEvent(QWheelEvent *event) override;
+    void showEvent(QShowEvent *event) override;
+    void hideEvent(QHideEvent *event) override;
 
 private slots:
 	void onChange();

src/desktop/mainwindow.cpp

@@ -2509,7 +2509,9 @@ void MainWindow::resizeCanvas()
 
 	const QSize size = m_doc->canvas()->size();
 	dialogs::ResizeDialog *dlg = new dialogs::ResizeDialog(size, this);
-	dlg->setPreviewImage(m_doc->canvas()->paintEngine()->getPixmap().scaled(300, 300, Qt::KeepAspectRatio).toImage());
+	m_doc->canvas()->paintEngine()->withPixmap([dlg](const QPixmap &pixmap) {
+		dlg->setPreviewImage(pixmap.scaled(300, 300, Qt::KeepAspectRatio).toImage());
+	});
 	dlg->setAttribute(Qt::WA_DeleteOnClose);
 
 	// Preset crop from selection if one exists

src/desktop/scene/canvasitem.cpp

@@ -27,8 +27,9 @@ void CanvasItem::setPaintEngine(canvas::PaintEngine *pe)
 {
 	m_image = pe;
 	if(m_image) {
-		connect(m_image, &canvas::PaintEngine::areaChanged, this, &CanvasItem::refreshImage);
-		connect(m_image, &canvas::PaintEngine::resized, this, &CanvasItem::canvasResize);
+		connect(m_image, &canvas::PaintEngine::areaChanged, this, &CanvasItem::refreshImage, Qt::QueuedConnection);
+		connect(m_image, &canvas::PaintEngine::resized, this, &CanvasItem::canvasResize, Qt::QueuedConnection);
+		m_image->setCanvasViewArea(m_visibleArea);
 	}
 	canvasResize();
 }
@@ -74,7 +75,9 @@ void CanvasItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option
 {
 	if(m_image) {
 		QRect exposed = option->exposedRect.toAlignedRect();
-		painter->drawPixmap(exposed, m_image->getPixmapView(m_visibleArea), exposed);
+		m_image->withPixmap([&](const QPixmap &pixmap) {
+			painter->drawPixmap(exposed, pixmap, exposed);
+		});
 		if(m_pixelGrid) {
 			QPen pen(QColor(160, 160, 160));
 			pen.setCosmetic(true);
@@ -92,6 +95,9 @@ void CanvasItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option
 void CanvasItem::updateVisibleArea()
 {
 	m_visibleArea = m_viewportBounds.intersected(m_boundingRect).toAlignedRect();
+	if(m_image) {
+		m_image->setCanvasViewArea(m_visibleArea);
+	}
 }
 
 }

src/desktop/scene/canvasscene.cpp

@@ -67,7 +67,7 @@ void CanvasScene::initCanvas(canvas::CanvasModel *model)
 
 	connect(
 		m_model->paintEngine(), &canvas::PaintEngine::resized, this,
-		&CanvasScene::handleCanvasResize);
+		&CanvasScene::handleCanvasResize, Qt::QueuedConnection);
 	connect(
 		m_model->paintEngine(), &canvas::PaintEngine::annotationsChanged, this,
 		&CanvasScene::annotationsChanged);

src/drawdance/CMakeLists.txt

@@ -1,8 +1,6 @@
 # SPDX-License-Identifier: MIT
 
-string(LENGTH "${PROJECT_SOURCE_DIR}/" project_dir_length)
 add_compile_definitions(
-    "DP_PROJECT_DIR_LENGTH=${project_dir_length}"
     WIN32_LEAN_AND_MEAN
     NOMINMAX
 )

src/drawdance/libcommon/dpcommon/common.h

@@ -268,9 +268,11 @@ DP_INLINE size_t DP_flex_size(size_t type_size, size_t flex_offset,
  * member. Takes potential trailing padding being used as part of the flexible
  * array member into account.
  */
+// NOLINTBEGIN(bugprone-sizeof-expression)
 #define DP_FLEX_SIZEOF(TYPE, FIELD, COUNT)            \
     DP_flex_size(sizeof(TYPE), offsetof(TYPE, FIELD), \
                  sizeof(((TYPE *)NULL)->FIELD[0]), COUNT)
+// NOLINTEND(bugprone-sizeof-expression)
 
 
 void *DP_malloc(size_t size) DP_MALLOC_ATTR;

src/drawdance/libcommon/dpcommon/queue.c

@@ -178,3 +178,21 @@ bool DP_queue_all(DP_Queue *queue, size_t element_size,
     }
     return true;
 }
+
+size_t DP_queue_search_index(DP_Queue *queue, size_t element_size,
+                             bool (*predicate)(void *element, void *user),
+                             void *user)
+{
+    DP_ASSERT(queue);
+    DP_ASSERT(predicate);
+    size_t capacity = queue->capacity;
+    size_t used = queue->used;
+    size_t head = queue->head;
+    for (size_t i = 0; i < used; ++i) {
+        void *element = element_at(queue, (head + i) % capacity, element_size);
+        if (predicate(element, user)) {
+            return i;
+        }
+    }
+    return used;
+}

src/drawdance/libcommon/dpcommon/queue.h

@@ -67,5 +67,9 @@ void DP_queue_each(DP_Queue *queue, size_t element_size,
 bool DP_queue_all(DP_Queue *queue, size_t element_size,
                   bool (*predicate)(void *element, void *user), void *user);
 
+size_t DP_queue_search_index(DP_Queue *queue, size_t element_size,
+                             bool (*predicate)(void *element, void *user),
+                             void *user);
+
 
 #endif

src/drawdance/libengine/CMakeLists.txt

@@ -32,6 +32,7 @@ dp_target_sources(dpengine
     dpengine/pixels.c
     dpengine/player.c
     dpengine/recorder.c
+    dpengine/renderer.c
     dpengine/snapshots.c
     dpengine/text.c
     dpengine/tile.c
@@ -72,6 +73,7 @@ dp_target_sources(dpengine
     dpengine/pixels.h
     dpengine/player.h
     dpengine/recorder.h
+    dpengine/renderer.h
     dpengine/snapshots.h
     dpengine/text.h
     dpengine/tile.h

src/drawdance/libengine/dpengine/canvas_diff.c

@@ -49,6 +49,18 @@ void DP_canvas_diff_free(DP_CanvasDiff *diff)
     }
 }
 
+int DP_canvas_diff_xtiles(DP_CanvasDiff *diff)
+{
+    DP_ASSERT(diff);
+    return diff->xtiles;
+}
+
+int DP_canvas_diff_ytiles(DP_CanvasDiff *diff)
+{
+    DP_ASSERT(diff);
+    return diff->ytiles;
+}
+
 
 void DP_canvas_diff_begin(DP_CanvasDiff *diff, int old_width, int old_height,
                           int current_width, int current_height,
@@ -170,6 +182,25 @@ void DP_canvas_diff_each_pos_reset(DP_CanvasDiff *diff,
     }
 }
 
+void DP_canvas_diff_bounds_clamp(DP_CanvasDiff *diff, int tile_left,
+                                 int tile_top, int tile_right, int tile_bottom,
+                                 int *out_left, int *out_top, int *out_right,
+                                 int *out_bottom, int *out_xtiles)
+{
+    DP_ASSERT(diff);
+    DP_ASSERT(out_left);
+    DP_ASSERT(out_top);
+    DP_ASSERT(out_right);
+    DP_ASSERT(out_bottom);
+    DP_ASSERT(out_xtiles);
+    int xtiles = diff->xtiles;
+    *out_left = DP_max_int(0, tile_left);
+    *out_top = DP_max_int(0, tile_top);
+    *out_right = DP_min_int(xtiles - 1, tile_right);
+    *out_bottom = DP_min_int(diff->ytiles - 1, tile_bottom);
+    *out_xtiles = xtiles;
+}
+
 void DP_canvas_diff_each_pos_tile_bounds_reset(DP_CanvasDiff *diff,
                                                int tile_left, int tile_top,
                                                int tile_right, int tile_bottom,
@@ -178,11 +209,10 @@ void DP_canvas_diff_each_pos_tile_bounds_reset(DP_CanvasDiff *diff,
 {
     DP_ASSERT(diff);
     DP_ASSERT(fn);
-    int xtiles = diff->xtiles;
-    int left = DP_max_int(0, tile_left);
-    int top = DP_max_int(0, tile_top);
-    int right = DP_min_int(xtiles - 1, tile_right);
-    int bottom = DP_min_int(diff->ytiles - 1, tile_bottom);
+    int left, top, right, bottom, xtiles;
+    DP_canvas_diff_bounds_clamp(diff, tile_left, tile_top, tile_right,
+                                tile_bottom, &left, &top, &right, &bottom,
+                                &xtiles);
     bool *tile_changes = diff->tile_changes;
     for (int y = top; y <= bottom; ++y) {
         for (int x = left; x <= right; ++x) {

src/drawdance/libengine/dpengine/canvas_diff.h

@@ -54,6 +54,11 @@ void DP_canvas_diff_each_pos(DP_CanvasDiff *diff, DP_CanvasDiffEachPosFn fn,
 void DP_canvas_diff_each_pos_reset(DP_CanvasDiff *diff,
                                    DP_CanvasDiffEachPosFn fn, void *data);
 
+void DP_canvas_diff_bounds_clamp(DP_CanvasDiff *diff, int tile_left,
+                                 int tile_top, int tile_right, int tile_bottom,
+                                 int *out_left, int *out_top, int *out_right,
+                                 int *out_bottom, int *out_xtiles);
+
 void DP_canvas_diff_each_pos_tile_bounds_reset(DP_CanvasDiff *diff,
                                                int tile_left, int tile_top,
                                                int tile_right, int tile_bottom,

src/drawdance/libengine/dpengine/canvas_state.h

@@ -22,6 +22,7 @@
 #ifndef DPENGINE_CANVAS_STATE_H
 #define DPENGINE_CANVAS_STATE_H
 #include "annotation_list.h"
+#include "pixels.h"
 #include <dpcommon/common.h>
 
 typedef struct DP_AnnotationList DP_AnnotationList;

src/drawdance/libengine/dpengine/local_state.c

@@ -145,13 +145,10 @@ int DP_local_state_active_frame_index(DP_LocalState *ls)
     return ls->active_frame_index;
 }
 
-DP_ViewModeFilter DP_local_state_view_mode_filter_make(DP_LocalState *ls,
-                                                       DP_ViewModeBuffer *vmb,
-                                                       DP_CanvasState *cs)
+DP_OnionSkins *DP_local_state_onion_skins(DP_LocalState *ls)
 {
     DP_ASSERT(ls);
-    return DP_view_mode_filter_make(vmb, ls->view_mode, cs, ls->active_layer_id,
-                                    ls->active_frame_index, ls->onion_skins);
+    return ls->onion_skins;
 }
 
 const DP_LocalTrackState *DP_local_state_track_states(DP_LocalState *ls,

src/drawdance/libengine/dpengine/local_state.h

@@ -40,14 +40,12 @@ bool DP_local_state_background_opaque(DP_LocalState *ls);
 
 DP_ViewMode DP_local_state_view_mode(DP_LocalState *ls);
 
+DP_OnionSkins *DP_local_state_onion_skins(DP_LocalState *ls);
+
 int DP_local_state_active_layer_id(DP_LocalState *ls);
 
 int DP_local_state_active_frame_index(DP_LocalState *ls);
 
-DP_ViewModeFilter DP_local_state_view_mode_filter_make(DP_LocalState *ls,
-                                                       DP_ViewModeBuffer *vmb,
-                                                       DP_CanvasState *cs);
-
 const DP_LocalTrackState *DP_local_state_track_states(DP_LocalState *ls,
                                                       int *out_count);