New Hardware Renderer: Add tool brush to mapview.qml

src/libtiledquick/mapitem.cpp

@@ -42,6 +42,13 @@ void MapItem::setMap(Tiled::EditableMap *editableMap)
 
     mEditableMap = editableMap;
     mMap = editableMap ? editableMap->map() : nullptr;
+
+    if (editableMap)
+    {
+        Tiled::MapDocument *mapDocument = editableMap->mapDocument();
+        connect(mapDocument, &Tiled::MapDocument::regionChanged, this, &MapItem::repaintRegion);
+    }
+
     refresh();
     emit mapChanged();
 }
@@ -170,3 +177,9 @@ void MapItem::refresh()
     const QRect rect = mRenderer->mapBoundingRect();
     setImplicitSize(rect.width(), rect.height());
 }
+
+void MapItem::repaintRegion(const QRegion &region, Tiled::TileLayer *tileLayer)
+{
+    // TODO: update only the region edited
+    refresh();
+}

src/libtiledquick/mapitem.h

@@ -80,6 +80,8 @@ class TILEDQUICK_SHARED_EXPORT MapItem : public QQuickItem
 private:
     void refresh();
 
+    void repaintRegion(const QRegion &region, Tiled::TileLayer *tileLayer);
+
     Tiled::Map *mMap;
     Tiled::EditableMap *mEditableMap;
     QRectF mVisibleArea;

src/tiled/editablemap.cpp

@@ -497,6 +497,7 @@ void EditableMap::setSize(int width, int height)
         map()->setWidth(width);
         map()->setHeight(height);
     }
+    emit sizeChanged();
 }
 
 void EditableMap::setTileWidth(int value)
@@ -505,6 +506,7 @@ void EditableMap::setTileWidth(int value)
         push(new ChangeMapTileSize(doc, QSize(value, tileHeight())));
     else if (!checkReadOnly())
         map()->setTileWidth(value);
+    emit tileSizeChanged();
 }
 
 void EditableMap::setTileHeight(int value)
@@ -513,6 +515,7 @@ void EditableMap::setTileHeight(int value)
         push(new ChangeMapTileSize(doc, QSize(tileWidth(), value)));
     else if (!checkReadOnly())
         map()->setTileHeight(value);
+    emit tileSizeChanged();
 }
 
 void EditableMap::setTileSize(int width, int height)
@@ -529,6 +532,7 @@ void EditableMap::setTileSize(int width, int height)
     } else {
         map()->setTileWidth(width);
         map()->setTileHeight(height);
+        emit tileSizeChanged();
     }
 }
 

src/tiled/editablemap.h

@@ -40,11 +40,11 @@ class TILED_EDITOR_EXPORT EditableMap final : public EditableAsset
 {
     Q_OBJECT
 
-    Q_PROPERTY(int width READ width WRITE setWidth)
-    Q_PROPERTY(int height READ height WRITE setHeight)
-    Q_PROPERTY(QSize size READ size)
-    Q_PROPERTY(int tileWidth READ tileWidth WRITE setTileWidth)
-    Q_PROPERTY(int tileHeight READ tileHeight WRITE setTileHeight)
+    Q_PROPERTY(int width READ width WRITE setWidth NOTIFY sizeChanged)
+    Q_PROPERTY(int height READ height WRITE setHeight NOTIFY sizeChanged)
+    Q_PROPERTY(QSize size READ size NOTIFY sizeChanged)
+    Q_PROPERTY(int tileWidth READ tileWidth WRITE setTileWidth NOTIFY tileSizeChanged)
+    Q_PROPERTY(int tileHeight READ tileHeight WRITE setTileHeight NOTIFY tileSizeChanged)
     Q_PROPERTY(bool infinite READ infinite WRITE setInfinite)
     Q_PROPERTY(int hexSideLength READ hexSideLength WRITE setHexSideLength)
     Q_PROPERTY(StaggerAxis staggerAxis READ staggerAxis WRITE setStaggerAxis)
@@ -218,6 +218,8 @@ class TILED_EDITOR_EXPORT EditableMap final : public EditableAsset
     QSharedPointer<Document> createDocument() override;
 
 signals:
+    void sizeChanged();
+    void tileSizeChanged();
     void currentLayerChanged();
     void selectedLayersChanged();
     void selectedObjectsChanged();

src/tiled/mapeditor.cpp

@@ -373,6 +373,7 @@ void MapEditor::addDocument(Document *document)
     EditableMap *editableMap = qobject_cast<Tiled::EditableMap*>(mapDocument->editable());
 
     engine->rootContext()->setContextProperty(QStringLiteral("mapItemMap"), editableMap);
+    engine->rootContext()->setContextProperty(QStringLiteral("toolBrushMap"), nullptr);
     quickWidget->setSource(QUrl(QStringLiteral("qrc:/qml/mapview.qml")));
     quickWidget->setResizeMode(QQuickWidget::SizeRootObjectToView);
 #endif
@@ -825,6 +826,16 @@ void MapEditor::setStamp(const TileStamp &stamp)
 
     mTilesetDock->selectTilesInStamp(stamp);
 
+#ifdef TILEDQUICK_LIB
+    if (Preferences::instance()->useNewHardwareRenderer())
+    {
+        QQuickWidget* activeWidget = mViewForMap.value(mCurrentMapDocument)->quickWidget();
+        QQmlContext* rootContext = activeWidget->engine()->rootContext();
+
+        rootContext->setContextProperty(QStringLiteral("toolBrushMap"), currentBrush());
+    }
+#endif
+
     emit currentBrushChanged();
 }
 
@@ -1106,7 +1117,10 @@ EditableMap *MapEditor::currentBrush() const
 
     auto map = stamp.variations().first().map->clone();
     auto editableMap = new EditableMap(std::move(map));
-    QQmlEngine::setObjectOwnership(editableMap, QQmlEngine::JavaScriptOwnership);
+
+    // Disable JavaScriptOwnership for QtQuick rendering
+    if (!Preferences::instance()->useNewHardwareRenderer())
+        QQmlEngine::setObjectOwnership(editableMap, QQmlEngine::JavaScriptOwnership);
     return editableMap;
 }
 

src/tiled/resources/qml/mapview.qml

@@ -55,14 +55,35 @@ Rectangle {
             }
 
             Tiled.MapGridItem {
-                id: mapGriditem
+                id: mapGridItem
                 anchors.fill: mapItem
 
                 tileSize: Qt.point(mapItem.map.tileWidth, mapItem.map.tileHeight);
                 scale: mapContainer.scale;
 
                 color: "black"
             }
+
+            Tiled.MapItem { // Tool Brush
+                id: toolBrush
+                anchors.left: mapItem.left
+                anchors.top: mapItem.top
+                anchors.leftMargin: (Math.floor(cursorTileCoords().x) - Math.floor(this.map ? this.map.width/2 : 0)) * mapGridItem.tileSize.x
+                anchors.topMargin: (Math.floor(cursorTileCoords().y) - Math.floor(this.map ? this.map.height/2 : 0)) * mapGridItem.tileSize.y
+
+                map: toolBrushMap;
+
+                visibleArea: {
+                    var scale = mapContainer.scale
+                    if (this.map)
+                        Qt.rect(0,
+                                0,
+                                this.map.width * this.map.tileWidth,
+                                this.map.height * this.map.tileHeight);
+                    else
+                        Qt.rect(0, 0, 0, 0);
+                }
+            }
         }
     }
 
@@ -130,4 +151,11 @@ Rectangle {
             mapContainer.y = (mapView.height / 2) - ((mapItem.height * scale) / 2)
         }
     }
+
+    function cursorTileCoords() {
+        var mapRelativeCoords = singleFingerPanArea.mapToItem(mapItem, singleFingerPanArea.mouseX, singleFingerPanArea.mouseY);
+        var tileCoords = mapItem.screenToTileCoords(mapRelativeCoords.x, mapRelativeCoords.y);
+
+        return tileCoords;
+    }
 }