From d055098540df99a5d426360e9322c659e678e5ee Mon Sep 17 00:00:00 2001 From: Paolo Angelelli Date: Wed, 27 Nov 2019 15:37:07 +0100 Subject: Enable mercator-to-screen projection in GLSL With this change, all the geo-to-screen conversion, and the triangulation operations for geo polylines and geo polygon are performed either at set time or in the shader. A separate bounding box geometry is processed in the old way to provide a correct QtQuick Item geometry, that can be used for nesting mouse areas, performing translations, input event delivery, etc. With this approach, performance are improved by more than one order of magnitude in average, but complex geometries will of course benefit more. It also adds correct rendering support for polygons with holes, previously only rendered correctly by the MapboxGL plugin. The polyline shader has basic miter joins. The miter is skipped if the angle is too sharp to avoid complicating the implementation. This shader introduces some glitches when the polyline is minified, for which the real fix is to have LOD for the geometry, and render simplified geometries at low zoom levels (added in a subsequent patch). Note: this approach, at least in its current implementation, does not support enabling layers on individual items, only on the Map element. Task-number: QTBUG-49303 Task-number: QTBUG-38459 Change-Id: I0c2dc0bf364d32f74ca7c4014f6d66e6219c8ae4 Reviewed-by: Alexandru Croitor --- tests/manual/mapitems_backends/main.cpp | 48 ++ tests/manual/mapitems_backends/main.qml | 552 +++++++++++++++++++++ .../manual/mapitems_backends/mapitems_backends.pro | 29 ++ tests/manual/mapitems_backends/qml.qrc | 6 + 4 files changed, 635 insertions(+) create mode 100644 tests/manual/mapitems_backends/main.cpp create mode 100644 tests/manual/mapitems_backends/main.qml create mode 100644 tests/manual/mapitems_backends/mapitems_backends.pro create mode 100644 tests/manual/mapitems_backends/qml.qrc (limited to 'tests/manual/mapitems_backends') diff --git a/tests/manual/mapitems_backends/main.cpp b/tests/manual/mapitems_backends/main.cpp new file mode 100644 index 00000000..c04944d0 --- /dev/null +++ b/tests/manual/mapitems_backends/main.cpp @@ -0,0 +1,48 @@ +/**************************************************************************** +** +** Copyright (C) 2020 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the test suite of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:GPL-EXCEPT$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 as published by the Free Software +** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include +#include + +int main(int argc, char *argv[]) +{ + QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); + + QGuiApplication app(argc, argv); + + QQmlApplicationEngine engine; + const QUrl url(QStringLiteral("qrc:/main.qml")); + QObject::connect(&engine, &QQmlApplicationEngine::objectCreated, + &app, [url](QObject *obj, const QUrl &objUrl) { + if (!obj && url == objUrl) + QCoreApplication::exit(-1); + }, Qt::QueuedConnection); + engine.load(url); + + return app.exec(); +} diff --git a/tests/manual/mapitems_backends/main.qml b/tests/manual/mapitems_backends/main.qml new file mode 100644 index 00000000..d28605c9 --- /dev/null +++ b/tests/manual/mapitems_backends/main.qml @@ -0,0 +1,552 @@ +/**************************************************************************** +** +** Copyright (C) 2020 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the test suite of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:GPL-EXCEPT$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 as published by the Free Software +** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.7 +import QtQuick.Window 2.2 +import QtQuick.Controls 2.2 as C2 +import QtPositioning 5.6 +import QtLocation 5.15 + +Window { + id: win + visible: true + width: 1600 + height: 800 + title: qsTr("MapItems backends") + + + property real initialZL: 4 + property var initialCenter: QtPositioning.coordinate(59.9154, 10.7425) //QtPositioning.coordinate(66.9961, -175.012) + property real rotation : 0 + + Shortcut { + sequence: "Ctrl+R" + onActivated: { + rotation = 57 + } + } + + function syncMaps(mFrom, mTo, propName) + { + if (mTo[propName] !== mFrom[propName]) { + mTo[propName] = mFrom[propName] + } + } + + Plugin { + id: osm // use only one plugin, to avoid messing up the cache + name: "osm" + PluginParameter { + name: "osm.mapping.prefetching_style" + value: "NoPrefetching" + } + PluginParameter { + name: "osm.mapping.cache.memory.cost_strategy" + value: "unitary" + } + PluginParameter { + name: "osm.mapping.cache.memory.size" + value: 0 + } + PluginParameter { + name: "osm.mapping.cache.texture.cost_strategy" + value: "unitary" + } + PluginParameter { + name: "osm.mapping.cache.texture.size" + value: 70 + } + } + Rectangle { + id: mapContainer + rotation: win.rotation + anchors.fill: parent + color: "lightsteelblue" + + Map { + id: map + rotation: win.rotation + gesture.enabled: true + objectName: "map1" + anchors { + bottom: parent.bottom + top: parent.top + left: parent.left + right: parent.horizontalCenter + } + + onCenterChanged: syncMaps(map, map2, "center") + onTiltChanged: syncMaps(map, map2, "tilt") + onBearingChanged: syncMaps(map, map2, "bearing") + onZoomLevelChanged: syncMaps(map, map2, "zoomLevel") + onFieldOfViewChanged: syncMaps(map, map2, "fieldOfView") + + opacity: 1.0 + color: 'transparent' + plugin: osm + center: initialCenter + activeMapType: map.supportedMapTypes[2] + zoomLevel: initialZL + z : parent.z + 1 + copyrightsVisible: false + + Component.onCompleted: { + var o = migComponent.createObject(map) + o.glPolygons = Qt.binding(function() {return switchPolygons1.checked}) + o.glPolylines = Qt.binding(function() {return switchPolylines1.currentText}) + o.glCircles = Qt.binding(function() {return switchCircles1.checked}) + o.glRectangles = Qt.binding(function() {return switchRectangles1.checked}) + map.addMapItemGroup(o); + } + MouseArea { + anchors.fill: parent + onClicked: { + mouse.accepted = false + var crd = map.toCoordinate(Qt.point(mouse.x, mouse.y)) + var s = crd.toString(0) + console.log("Clicked on ",s) + } + } + C2.Switch { + text: qsTr("OGL Polygons") + id: switchPolygons1 + checked: true + anchors { + top: parent.top + right: parent.right + topMargin: 12 + rightMargin: 12 + } + } + C2.ComboBox { + model: ['Software','OpenGL','Triangulated'] + id: switchPolylines1 + anchors { + top: switchPolygons1.bottom + right: parent.right + topMargin: 12 + rightMargin: 12 + } + } + C2.Switch { + text: qsTr("OGL Circles") + id: switchCircles1 + anchors { + top: switchPolylines1.bottom + right: parent.right + topMargin: 12 + rightMargin: 12 + } + } + C2.Switch { + text: qsTr("OGL Rectangles") + id: switchRectangles1 + anchors { + top: switchCircles1.bottom + right: parent.right + topMargin: 12 + rightMargin: 12 + } + } + +// MapPolygon { +// id: geoJsonFeature +// color: "limegreen" +// border.color: "black" +// border.width: 15 +// objectName: parent.objectName + "limegreen" +// backend: polygonBackend() +// path: [ +// { longitude:17.13, latitude: 51.11}, +// { longitude:30.54, latitude: 50.42}, +// { longitude:26.70, latitude: 58.36}, +// { longitude:17.13, latitude: 51.11} +// ] + +// function polygonBackend() +// { +// return (switchPolygons1.checked) +// ? MapPolygon.OpenGL : MapPolygon.Software +// } +// } + + layer { + enabled: true + samples: 8 + } + } + Map { + id: map2 + rotation: win.rotation + gesture.enabled: true + objectName: "map2" + anchors { + bottom: parent.bottom + top: parent.top + left: parent.horizontalCenter + right: parent.right + } + + onCenterChanged: syncMaps(map2, map, "center") + onTiltChanged: syncMaps(map2, map, "tilt") + onBearingChanged: syncMaps(map2, map, "bearing") + onZoomLevelChanged: syncMaps(map2, map, "zoomLevel") + onFieldOfViewChanged: syncMaps(map2, map, "fieldOfView") + + color: 'transparent' + plugin: osm + activeMapType: map.supportedMapTypes[2] + center: initialCenter + zoomLevel: initialZL + copyrightsVisible: false + + Component.onCompleted: { + var o = migComponent.createObject(map2) + o.glPolygons = Qt.binding(function() {return switchPolygons2.checked}) + o.glPolylines = Qt.binding(function() {return switchPolylines2.currentText}) + o.glCircles = Qt.binding(function() {return switchCircles2.checked}) + o.glRectangles = Qt.binding(function() {return switchRectangles2.checked}) + map2.addMapItemGroup(o); + } + + C2.Switch { + text: qsTr("OGL Polygons") + id: switchPolygons2 + checked: false + anchors { + top: parent.top + right: parent.right + topMargin: 12 + rightMargin: 12 + } + } + C2.ComboBox { + model: ['Software','OpenGL','Triangulated'] + id: switchPolylines2 + anchors { + top: switchPolygons2.bottom + right: parent.right + topMargin: 12 + rightMargin: 12 + } + onCurrentTextChanged: console.log("CURRENT TEXT CHANGED ",currentText) + } + C2.Switch { + text: qsTr("OGL Circles") + id: switchCircles2 + anchors { + top: switchPolylines2.bottom + right: parent.right + topMargin: 12 + rightMargin: 12 + } + } + C2.Switch { + text: qsTr("OGL Rectangles") + id: switchRectangles2 + anchors { + top: switchCircles2.bottom + right: parent.right + topMargin: 12 + rightMargin: 12 + } + } + + layer { + enabled: true + samples: 8 + } + } + } + + Component { + id: migComponent + MapItemGroup { + id: polyGroup + property bool glPolygons : true + property string glPolylines : "Software" + property bool glCircles : true + property bool glRectangles : true + objectName: parent.objectName + "_MIG_" + function polylineBackend() + { + return (polyGroup.glPolylines === "OpenGL") + ? MapPolyline.OpenGLLineStrip + : ((polyGroup.glPolylines === "Software") + ? MapPolyline.Software : MapPolyline.OpenGLExtruded) + } + + function polygonBackend() + { + return (polyGroup.glPolygons) + ? MapPolygon.OpenGL : MapPolygon.Software + } + + function rectangleBackend() + { + return (polyGroup.glRectangles) + ? MapRectangle.OpenGL : MapRectangle.Software + } + + function circleBackend() + { + return (polyGroup.glCircles) + ? MapCircle.OpenGL : MapCircle.Software + } + MapPolyline { + id: tstPolyLine // to verify the polygon stays where it's supposed to + line.color: 'black' + objectName: parent.objectName + "black" + line.width: 1 + opacity: 1.0 + backend: polylineBackend() + path: [ + { latitude: 76.9965, longitude: -175.012 }, + { latitude: 26.9965, longitude: -175.012 } + ] + } + + MapPolyline { + id: timeline + line.color: "red" + objectName: parent.objectName + "timeline" + line.width: 4 + backend: polylineBackend() + path: [ + { latitude: 90, longitude: 180 }, + { latitude: -90, longitude: -180 } + ] + } + + MapPolygon { + id: poly1 + color: "red" + objectName: parent.objectName + "red" + backend: polygonBackend() + path: [ + { latitude: 55, longitude: 170 }, + { latitude: 66.9965, longitude: -175.012 }, + { latitude: 55, longitude: -160 }, + { latitude: 40, longitude: -165 }, + { latitude: 45, longitude: 178 } + ] + MouseArea { + anchors.fill: parent + onClicked: console.log("poly1 in "+parent.parent.objectName + "clicked") + + Rectangle { // this is technically unsupported, but practically works. + color: "transparent" + border.color: "red" + anchors.fill: parent + } + } + } + + MapPolygon { + id: selfIntersectingPolygon + color: 'darkmagenta' + objectName: parent.objectName + "darkmagenta" + backend: polygonBackend() + opacity: 1.0 + path: [ + { latitude: 19, longitude: 49 }, + { latitude: 18, longitude: 49 }, + { latitude: 18, longitude: 51 }, + { latitude: 20, longitude: 51 }, + { latitude: 20, longitude: 50 }, + { latitude: 18.5, longitude: 50 }, + { latitude: 18.5, longitude: 52 }, + { latitude: 19, longitude: 52 } + ] + + MouseArea{ + anchors.fill: parent + drag.target: parent // This one might glitch as the tessellation done by earcut might be + // inaccurate, so clicking in an area that is covered by earcut but + // does not exist will not trigger the panning + + Rectangle { // this is technically unsupported, but practically works. + color: "transparent" + border.color: "red" + anchors.fill: parent + } + } + } + + MapPolygon { + id: poly2 + color: "green" + border.color: "black" + border.width: 8 + objectName: parent.objectName + "green" + backend: polygonBackend() + path: [ + { latitude: -45, longitude: -170 }, + { latitude: -55, longitude: -155 }, + { latitude: -45, longitude: -130 }, + { latitude: -35, longitude: -155 } + ] + MouseArea{ + anchors.fill: parent + drag.target: parent + Rectangle { // this is technically unsupported, but practically works. + color: "transparent" + border.color: "red" + anchors.fill: parent + } + } + } + + MapPolygon { + id: poly3 + color: "deepskyblue" + objectName: parent.objectName + "deepskyblue" + backend: polygonBackend() + opacity: 0.2 + path: [ + { latitude: 65, longitude: -20 }, + { latitude: 75, longitude: 140 }, + { latitude: 65, longitude: 80 }, + { latitude: 55, longitude: -30 } + ] + } + + MapPolygon { + id: geoJsonFeature + color: "limegreen" + border.color: "black" + border.width: 15 + objectName: parent.objectName + "limegreen" + backend: polygonBackend() + path: [ + { longitude:17.13, latitude: 51.11}, + { longitude:30.54, latitude: 50.42}, + { longitude:26.70, latitude: 58.36}, + { longitude:17.13, latitude: 51.11} + ] + } + + MapPolygon { + id: geoJsonRect + color: "yellow" + border.color: "black" + border.width: 8 + objectName: parent.objectName + "yellow" + backend: polygonBackend() + path: [ + { longitude:4, latitude: 15}, + { longitude:5, latitude: 15}, + { longitude:5, latitude: 14}, + { longitude:4, latitude: 14}, + { longitude:4, latitude: 15} + ] + + + } + + MapRectangle { + id: rect + color: 'tomato' + border.color: 'black' + border.width: 6 + topLeft: QtPositioning.coordinate(10,-10) + bottomRight: QtPositioning.coordinate(-10,10) + backend: rectangleBackend() + MouseArea { + anchors.fill: parent + Rectangle { + color: "transparent" + border.color: "red" + border.width: 1 + anchors.fill: parent + } + } + } + + LongPolyline { + id: longPolyline + line.width: sliLineWidth.value + line.color: 'firebrick' + backend: polylineBackend() + } + + MapCircle { + center: QtPositioning.coordinate(52, 0) + radius: 100*1000 + color: 'deepskyblue' + border.width: 6 + border.color: 'firebrick' + backend: circleBackend() + MouseArea { + anchors.fill: parent + Rectangle { + color: "transparent" + border.color: "red" + border.width: 1 + anchors.fill: parent + } + } + } + + MapCircle { + id: circle1 + border.color: 'deepskyblue' + border.width: 26 + backend: circleBackend() + center: QtPositioning.coordinate(17, 44); + radius: 200*1000 + color: "firebrick" +// layer.enabled: (backend == MapCircle.Software) +// layer.samples: 4 + } + } + } + + C2.Slider { + id: sliLineWidth + orientation: Qt.Vertical + anchors { + left: parent.left + top: parent.top + bottom: parent.bottom + topMargin: 10 + leftMargin: 10 + bottomMargin: 10 + } + from: 1 + to: 20 + value: 10 + } + + Text { + id: zl + text: "" + map.zoomLevel.toFixed(2) + anchors.top: parent.top + anchors.left: parent.left + } +} diff --git a/tests/manual/mapitems_backends/mapitems_backends.pro b/tests/manual/mapitems_backends/mapitems_backends.pro new file mode 100644 index 00000000..a517b750 --- /dev/null +++ b/tests/manual/mapitems_backends/mapitems_backends.pro @@ -0,0 +1,29 @@ +QT += quick +CONFIG += c++11 + +# The following define makes your compiler emit warnings if you use +# any Qt feature that has been marked deprecated (the exact warnings +# depend on your compiler). Refer to the documentation for the +# deprecated API to know how to port your code away from it. +DEFINES += QT_DEPRECATED_WARNINGS + +# You can also make your code fail to compile if it uses deprecated APIs. +# In order to do so, uncomment the following line. +# You can also select to disable deprecated APIs only up to a certain version of Qt. +#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0 + +SOURCES += \ + main.cpp + +RESOURCES += qml.qrc + +# Additional import path used to resolve QML modules in Qt Creator's code model +QML_IMPORT_PATH = + +# Additional import path used to resolve QML modules just for Qt Quick Designer +QML_DESIGNER_IMPORT_PATH = + +# Default rules for deployment. +qnx: target.path = /tmp/$${TARGET}/bin +else: unix:!android: target.path = /opt/$${TARGET}/bin +!isEmpty(target.path): INSTALLS += target diff --git a/tests/manual/mapitems_backends/qml.qrc b/tests/manual/mapitems_backends/qml.qrc new file mode 100644 index 00000000..3a8a697d --- /dev/null +++ b/tests/manual/mapitems_backends/qml.qrc @@ -0,0 +1,6 @@ + + + main.qml + ../mappolyline_tester/LongPolyline.qml + + -- cgit v1.2.1