summaryrefslogtreecommitdiffstats
path: root/examples/examples.pro
diff options
context:
space:
mode:
authorSean Harmer <sean.harmer@kdab.com>2014-09-20 18:45:09 +0100
committerSean Harmer <sean.harmer@kdab.com>2014-09-21 13:27:32 +0200
commit72aad5ee498ef47f1b76cfbf9431061c45975781 (patch)
treed9340f8b46639b97ef1021e490cc868832b801ca /examples/examples.pro
parent1d2aaae6a0e9d832690a7b6b1f872aaeca3ed86a (diff)
Add a wireframe example to exercise geometry shader support
Needed to extend the set of standard uniforms to include the viewport matrix. We also don't seem to get the type information for uniforms from glsl but rather infer it from QML. In this example it resulted in a bug where the line.width was being set with glUniformi() instead of glUniformf() when we used whole values such as 1.0 in the Parameter of WireframeEffect.qml. Worked aroudn by using a typed property in WireframeMaterial.qml for now but this needs fixing. Change-Id: Ie07a81b1b0b6c176e188d9e489643b22e339192a Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'examples/examples.pro')
-rw-r--r--examples/examples.pro7
1 files changed, 6 insertions, 1 deletions
diff --git a/examples/examples.pro b/examples/examples.pro
index 3a8c21656..c6abffcc4 100644
--- a/examples/examples.pro
+++ b/examples/examples.pro
@@ -43,6 +43,10 @@ src_deferredrenderer.subdir = $$PWD/deferred-renderer
src_deferredrenderer.target = sub-deferredrenderer
src_deferredrenderer.depends = src_exampleresources
+src_wireframe.subdir = $$PWD/wireframe
+src_wireframe.target = sub-wireframe
+src_wireframe.depends = src_exampleresources
+
SUBDIRS += \
src_exampleresources \
src_simpleqml \
@@ -53,7 +57,8 @@ SUBDIRS += \
src_torusqml \
src_toruscpp \
src_bigmodelqml \
- src_deferredrenderer
+ src_deferredrenderer \
+ src_wireframe
# TODO Port the old examples to new APIs
#SUBDIRS += qt3d