summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMika Salmela <mika.salmela@digia.com>2013-10-07 16:14:05 +0300
committerMika Salmela <mika.salmela@digia.com>2013-10-08 09:50:39 +0300
commit8d8a1f5dfeab7fb892021576ab45205d4578acf5 (patch)
tree3d8843c294577b269dd9c7c6bb02e29f24a5f6ec
parent79ac7ce92c9651ce420a427f786f35af97dd8491 (diff)
Better height map for surface example
Task-number: QTRD-2347 Change-Id: I59646ea0559fee4a29edc72bd8c8238ed484d728 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
-rw-r--r--examples/surface/Heightmap.pngbin71764 -> 0 bytes
-rw-r--r--examples/surface/mountain.pngbin0 -> 34540 bytes
-rw-r--r--examples/surface/surface.qrc2
-rw-r--r--examples/surface/surfacegraph.cpp2
4 files changed, 2 insertions, 2 deletions
diff --git a/examples/surface/Heightmap.png b/examples/surface/Heightmap.png
deleted file mode 100644
index 2a860111..00000000
--- a/examples/surface/Heightmap.png
+++ /dev/null
Binary files differ
diff --git a/examples/surface/mountain.png b/examples/surface/mountain.png
new file mode 100644
index 00000000..9138c710
--- /dev/null
+++ b/examples/surface/mountain.png
Binary files differ
diff --git a/examples/surface/surface.qrc b/examples/surface/surface.qrc
index c18da2c4..e4a7c38b 100644
--- a/examples/surface/surface.qrc
+++ b/examples/surface/surface.qrc
@@ -1,5 +1,5 @@
<RCC>
<qresource prefix="/maps">
- <file alias="map">Heightmap.png</file>
+ <file alias="mountain">mountain.png</file>
</qresource>
</RCC>
diff --git a/examples/surface/surfacegraph.cpp b/examples/surface/surfacegraph.cpp
index cb405eb8..a33f060b 100644
--- a/examples/surface/surfacegraph.cpp
+++ b/examples/surface/surfacegraph.cpp
@@ -43,7 +43,7 @@ SurfaceGraph::SurfaceGraph(Q3DSurface *surface)
fillSqrtSinProxy();
//! [2]
- QImage heightMapImage(":/maps/map");
+ QImage heightMapImage(":/maps/mountain");
m_heightMapProxy = new QHeightMapSurfaceDataProxy(heightMapImage);
m_heightMapProxy->setValueRanges(34.0, 40.0, 18.0, 24.0);
//! [2]