summaryrefslogtreecommitdiffstats
path: root/src/src.pro
diff options
context:
space:
mode:
authorRobert Brock <robert.brock@kdab.com>2016-01-28 11:22:58 +0000
committerSean Harmer <sean.harmer@kdab.com>2016-03-24 18:43:10 +0000
commita1470b6b380a4612264956b1e09484c6752da20e (patch)
tree88430325ddf1579e50593b75700c200a86030876 /src/src.pro
parent0832616efeb705d31e26ba88ea47210210f046d9 (diff)
OrbitController Qml and Cpp for Qt3D Camera
Adding an Orbit control that will allow a user to orbit / pan in a 3D QML scene. --- QML - LMB translate - RMB orbit - RMB + LMB dolly - Arrow keys translate - Shift + Up/Down keys dolly - Alt + Arrow keys orbit --- CPP - LMB translate - RMB orbit - RMB + LMB dolly - Arrow keys translate - Shift + Up/Down keys dolly - Alt + Arrow keys orbit Both examples have their speed inputs clamped to -1 and 1 Zoom in can now be limited Change-Id: If24c45c7350767a1682dccfd2e4d49d95433fd5d Task-number: QTBUG-50660 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/src.pro')
-rw-r--r--src/src.pro10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/src.pro b/src/src.pro
index 097d2df25..82d53cbf1 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -7,14 +7,14 @@ src_render.subdir = $$PWD/render
src_render.target = sub-render
src_render.depends = src_core
-src_input.subdir = $$PWD/input
-src_input.target = sub-input
-src_input.depends = src_render
-
src_logic.subdir = $$PWD/logic
src_logic.target = sub-logic
src_logic.depends = src_core
+src_input.subdir = $$PWD/input
+src_input.target = sub-input
+src_input.depends = src_render
+
# Quick3D libs
src_quick3d_core.subdir = $$PWD/quick3d/quick3d
src_quick3d_core.target = sub-quick3d-core
@@ -57,8 +57,8 @@ src_plugins_sceneparsers.depends = src_render
SUBDIRS += \
src_core \
src_render \
- src_input \
src_logic \
+ src_input \
src_quick3d_core \
src_quick3d_core_imports \
src_quick3d_render \