Add: Support for 16-bit heightmap

Added support for 16-bit heightmap in
QHeightmapSurfaceDataProxy. In addition, added a
manual test for testing the heightmap support.

Fixes: QTBUG-74814
Change-Id: Ief028a459600680593e8859c9e7b51fb2e43203c
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>

9 files changed, 317 insertions, 0 deletions

diff --git a/tests/manual/CMakeLists.txt b/tests/manual/CMakeLists.txt
index 36175991..a1ca1dba 100644
--- a/tests/manual/CMakeLists.txt
+++ b/tests/manual/CMakeLists.txt
@@ -4,6 +4,7 @@ if(TARGET Qt::Quick)
     add_subdirectory(qmlvolume)
     add_subdirectory(qmlperf)
     add_subdirectory(qmlgradient)
+    add_subdirectory(qmlheightmap)
 endif()
 if(NOT ANDROID AND NOT IOS AND NOT WINRT)
     add_subdirectory(barstest)
diff --git a/tests/manual/qmlheightmap/CMakeLists.txt b/tests/manual/qmlheightmap/CMakeLists.txt
new file mode 100644
index 00000000..174b7bcf
--- /dev/null
+++ b/tests/manual/qmlheightmap/CMakeLists.txt
@@ -0,0 +1,41 @@
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+qt_internal_add_manual_test(qmlheightmap
+    GUI
+    SOURCES
+        main.cpp
+    )
+target_link_libraries(qmlheightmap PUBLIC
+    Qt::Gui
+    Qt::DataVisualization
+    )
+
+set_source_files_properties("gradientGRAY8.png"
+    PROPERTIES QT_RESOURCE_ALIAS "mapGRAY8"
+    )
+set_source_files_properties("gradientGRAY16.png"
+    PROPERTIES QT_RESOURCE_ALIAS "mapGRAY16"
+    )
+set_source_files_properties("gradientRGB8.png"
+    PROPERTIES QT_RESOURCE_ALIAS "mapRGB8"
+    )
+set_source_files_properties("gradientRGB16.png"
+    PROPERTIES QT_RESOURCE_ALIAS "mapRGB16"
+    )
+
+set(qmlheightmap_resource_files
+    "qml/qmlheightmap/main.qml"
+    "gradientGRAY8.png"
+    "gradientGRAY16.png"
+    "gradientRGB8.png"
+    "gradientRGB16.png"
+    )
+qt_internal_add_resource(qmlheightmap "qmlheightmap"
+    PREFIX
+    "/"
+    FILES
+    ${qmlheightmap_resource_files}
+    )
diff --git a/tests/manual/qmlheightmap/gradientGRAY16.png b/tests/manual/qmlheightmap/gradientGRAY16.png
new file mode 100644
index 00000000..28df3673
--- /dev/null
+++ b/tests/manual/qmlheightmap/gradientGRAY16.png
diff --git a/tests/manual/qmlheightmap/gradientGRAY8.png b/tests/manual/qmlheightmap/gradientGRAY8.png
new file mode 100644
index 00000000..6696e57c
--- /dev/null
+++ b/tests/manual/qmlheightmap/gradientGRAY8.png
diff --git a/tests/manual/qmlheightmap/gradientRGB16.png b/tests/manual/qmlheightmap/gradientRGB16.png
new file mode 100644
index 00000000..b62e510b
--- /dev/null
+++ b/tests/manual/qmlheightmap/gradientRGB16.png
diff --git a/tests/manual/qmlheightmap/gradientRGB8.png b/tests/manual/qmlheightmap/gradientRGB8.png
new file mode 100644
index 00000000..79879f35
--- /dev/null
+++ b/tests/manual/qmlheightmap/gradientRGB8.png
diff --git a/tests/manual/qmlheightmap/main.cpp b/tests/manual/qmlheightmap/main.cpp
new file mode 100644
index 00000000..b54e9fea
--- /dev/null
+++ b/tests/manual/qmlheightmap/main.cpp
@@ -0,0 +1,63 @@
+/****************************************************************************
+**
+** Copyright (C) 2021 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the Qt Data Visualization module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:GPL$
+** 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 or (at your option) any later version
+** approved by the KDE Free Qt Foundation. The licenses are as published by
+** the Free Software Foundation and appearing in the file LICENSE.GPL3
+** 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 <QtGui/QGuiApplication>
+#include <QtCore/QDir>
+#include <QtQuick/QQuickView>
+#include <QtQml/QQmlEngine>
+
+int main(int argc, char *argv[])
+{
+    qputenv("QSG_RHI_BACKEND", "opengl");
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+    QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
+#endif
+
+    QGuiApplication app(argc, argv);
+
+    QQuickView viewer;
+
+    const QUrl url(QStringLiteral("qrc:/qml/qmlheightmap/main.qml"));
+
+    // The following are needed to make examples run without having to install the module
+    // in desktop environments.
+#ifdef Q_OS_WIN
+    QString extraImportPath(QStringLiteral("%1/../../../%2"));
+#else
+    QString extraImportPath(QStringLiteral("%1/../../%2"));
+#endif
+
+    viewer.engine()->addImportPath(extraImportPath.arg(QGuiApplication::applicationDirPath(),
+                                      QString::fromLatin1("qml")));
+    QObject::connect( viewer.engine(), &QQmlEngine::quit, &viewer, &QWindow::close);
+    viewer.setSource(url);
+    viewer.show();
+    viewer.setResizeMode(QQuickView::SizeRootObjectToView);
+    return app.exec();
+}
diff --git a/tests/manual/qmlheightmap/qml.qrc b/tests/manual/qmlheightmap/qml.qrc
new file mode 100644
index 00000000..b1cbc545
--- /dev/null
+++ b/tests/manual/qmlheightmap/qml.qrc
@@ -0,0 +1,5 @@
+<RCC>
+    <qresource prefix="/">
+        <file>qml/qmlheightmap/qml/main.qml</file>
+    </qresource>
+</RCC>
diff --git a/tests/manual/qmlheightmap/qml/qmlheightmap/main.qml b/tests/manual/qmlheightmap/qml/qmlheightmap/main.qml
new file mode 100644
index 00000000..d7e29514
--- /dev/null
+++ b/tests/manual/qmlheightmap/qml/qmlheightmap/main.qml
@@ -0,0 +1,207 @@
+/****************************************************************************
+**
+** Copyright (C) 2021 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the Qt Data Visualization module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:GPL$
+** 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 or (at your option) any later version
+** approved by the KDE Free Qt Foundation. The licenses are as published by
+** the Free Software Foundation and appearing in the file LICENSE.GPL3
+** 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
+import QtQuick.Window
+import QtQuick.Layouts
+import QtQuick.Controls
+import QtDataVisualization
+import "."
+
+Item {
+    id: mainwindow
+
+    width: 1024
+    height: 768
+    visible: true
+
+    Item {
+        id: surfaceview
+        width: mainwindow.width
+        height: mainwindow.height
+
+        anchors.top: mainwindow.top
+        anchors.left: mainwindow.left
+
+        ColorGradient {
+            id: surfaceGradient
+            ColorGradientStop { position: 0.0; color: "darkslategray" }
+            ColorGradientStop { id: middleGradient; position: 0.50; color: "peru" }
+            ColorGradientStop { position: 1.0; color: "red" }
+        }
+
+        Theme3D {
+            id: mainTheme
+            type: Q3DTheme.ThemeStoneMoss
+            colorStyle: Q3DTheme.ColorStyleRangeGradient
+            baseGradients: [surfaceGradient]
+        }
+
+        Surface3D {
+            id: surfaceGraph
+            width: surfaceview.width
+            height: surfaceview.height
+            theme: mainTheme
+            shadowQuality: AbstractGraph3D.ShadowQualityMedium
+            selectionMode: AbstractGraph3D.SelectionSlice | AbstractGraph3D.SelectionItemAndRow
+            scene.activeCamera.cameraPreset: Camera3D.CameraPresetIsometricLeft
+            axisY.min: 0.0
+            axisY.max: 500.0
+            axisX.segmentCount: 10
+            axisX.subSegmentCount: 2
+            axisX.labelFormat: "%i"
+            axisZ.segmentCount: 10
+            axisZ.subSegmentCount: 2
+            axisZ.labelFormat: "%i"
+            axisY.segmentCount: 5
+            axisY.subSegmentCount: 2
+            axisY.labelFormat: "%i"
+            axisY.title: "Y"
+            axisX.title: "X"
+            axisZ.title: "Z"
+
+            Surface3DSeries {
+                id: heightSeriesRGB8
+                drawMode: Surface3DSeries.DrawSurface
+                visible: true
+                flatShadingEnabled: false
+
+                HeightMapSurfaceDataProxy {
+                    heightMapFile: ":/mapRGB8"
+                    minYValue: surfaceGraph.axisY.min
+                    maxYValue: surfaceGraph.axisY.max
+                }
+            }
+
+            Surface3DSeries {
+                id: heightSeriesRGB16
+                drawMode: Surface3DSeries.DrawSurface
+                visible: false
+                flatShadingEnabled: false
+
+                HeightMapSurfaceDataProxy {
+                    heightMapFile: ":/mapRGB16"
+                    minYValue: surfaceGraph.axisY.min
+                    maxYValue: surfaceGraph.axisY.max
+                }
+            }
+
+            Surface3DSeries {
+                id: heightSeriesGRAY8
+                drawMode: Surface3DSeries.DrawSurface
+                visible: false
+                flatShadingEnabled: false
+
+                HeightMapSurfaceDataProxy {
+                    heightMapFile: ":/mapGRAY8"
+                    minYValue: surfaceGraph.axisY.min
+                    maxYValue: surfaceGraph.axisY.max
+                }
+            }
+
+            Surface3DSeries {
+                id: heightSeriesGRAY16
+                drawMode: Surface3DSeries.DrawSurface
+                visible: false
+                flatShadingEnabled: false
+
+                HeightMapSurfaceDataProxy {
+                    heightMapFile: ":/mapGRAY16"
+                    minYValue: surfaceGraph.axisY.min
+                    maxYValue: surfaceGraph.axisY.max
+                }
+            }
+        }
+
+        RowLayout {
+            id: buttonLayout
+            anchors.top: parent.top
+            anchors.left: parent.left
+            anchors.right: parent.right
+
+            Button {
+                id: toggleHeightSeries
+                Layout.fillWidth: true
+                Layout.fillHeight: true
+
+                text: qsTr("Use 16-bit rgb map")
+                onClicked: {
+                    if (heightSeriesRGB8.visible === true) {
+                        heightSeriesRGB8.visible = false
+                        heightSeriesRGB16.visible = true
+                        heightSeriesGRAY8.visible = false
+                        heightSeriesGRAY16.visible = false
+                        text = "Use 8-bit grayscale map"
+                    } else if (heightSeriesRGB16.visible === true){
+                        heightSeriesRGB8.visible = false
+                        heightSeriesRGB16.visible = false
+                        heightSeriesGRAY8.visible = true
+                        heightSeriesGRAY16.visible = false
+                        text = "Use 16-bit grayscale map"
+                    } else if (heightSeriesGRAY8.visible === true){
+                        heightSeriesRGB8.visible = false
+                        heightSeriesRGB16.visible = false
+                        heightSeriesGRAY8.visible = false
+                        heightSeriesGRAY16.visible = true
+                        text = "Use 8-bit rgb map"
+                    } else if (heightSeriesGRAY16.visible === true){
+                        heightSeriesRGB8.visible = true
+                        heightSeriesRGB16.visible = false
+                        heightSeriesGRAY8.visible = false
+                        heightSeriesGRAY16.visible = false
+                        text = "Use 16-bit rgb map"
+                    }
+                }
+            }
+
+            Button {
+                id: toggleAutoScaleY
+                Layout.fillWidth: true
+                Layout.fillHeight: true
+
+                text: qsTr("Enable autoScaleY")
+                onClicked: {
+                    if (text === "Enable autoScaleY") {
+                        heightSeriesRGB8.dataProxy.autoScaleY = true
+                        heightSeriesRGB16.dataProxy.autoScaleY = true
+                        heightSeriesGRAY8.dataProxy.autoScaleY = true
+                        heightSeriesGRAY16.dataProxy.autoScaleY = true
+                        text = "Disable autoScaleY"
+                    } else {
+                        heightSeriesRGB8.dataProxy.autoScaleY = false
+                        heightSeriesRGB16.dataProxy.autoScaleY = false
+                        heightSeriesGRAY8.dataProxy.autoScaleY = false
+                        heightSeriesGRAY16.dataProxy.autoScaleY = false
+                        text = "Enable autoScaleY"
+                    }
+                }
+            }
+        }
+    }
+}