summaryrefslogtreecommitdiffstats
path: root/src/render
diff options
context:
space:
mode:
authorSean Harmer <sean.harmer@kdab.com>2015-10-25 10:13:19 +0000
committerPaul Lemire <paul.lemire@kdab.com>2015-10-25 11:07:14 +0000
commit9273ccc5dd0616d1443791dfba90ba9aa7b9c458 (patch)
treecdb8e4049b56d5116099a6a02aeb517e4229aa8c /src/render
parentc0cf00711a84b2ec5c2d0d24a83db57a31bfcdae (diff)
Move picking into its own directory
Change-Id: I4982f08d18c855a57f621af28b13cc876f20eb16 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/render')
-rw-r--r--src/render/backend/render-backend.pri8
-rw-r--r--src/render/frontend/render-frontend.pri6
-rw-r--r--src/render/picking/objectpicker.cpp (renamed from src/render/backend/objectpicker.cpp)0
-rw-r--r--src/render/picking/objectpicker_p.h (renamed from src/render/backend/objectpicker_p.h)0
-rw-r--r--src/render/picking/pickeventfilter.cpp (renamed from src/render/backend/pickeventfilter.cpp)0
-rw-r--r--src/render/picking/pickeventfilter_p.h (renamed from src/render/backend/pickeventfilter_p.h)0
-rw-r--r--src/render/picking/picking.pri13
-rw-r--r--src/render/picking/qobjectpicker.cpp (renamed from src/render/frontend/qobjectpicker.cpp)0
-rw-r--r--src/render/picking/qobjectpicker.h (renamed from src/render/frontend/qobjectpicker.h)0
-rw-r--r--src/render/picking/qpickevent.cpp (renamed from src/render/frontend/qpickevent.cpp)0
-rw-r--r--src/render/picking/qpickevent.h (renamed from src/render/frontend/qpickevent.h)0
-rw-r--r--src/render/render.pro1
12 files changed, 17 insertions, 11 deletions
diff --git a/src/render/backend/render-backend.pri b/src/render/backend/render-backend.pri
index a2d0e8395..a69f1d450 100644
--- a/src/render/backend/render-backend.pri
+++ b/src/render/backend/render-backend.pri
@@ -21,9 +21,7 @@ HEADERS += \
$$PWD/entity_p.h \
$$PWD/layer_p.h \
$$PWD/nodefunctor_p.h \
- $$PWD/transform_p.h \
- $$PWD/objectpicker_p.h \
- $$PWD/pickeventfilter_p.h
+ $$PWD/transform_p.h
SOURCES += \
$$PWD/renderthread.cpp \
@@ -41,6 +39,4 @@ SOURCES += \
$$PWD/cameralens.cpp \
$$PWD/entity.cpp \
$$PWD/layer.cpp \
- $$PWD/transform.cpp \
- $$PWD/objectpicker.cpp \
- $$PWD/pickeventfilter.cpp
+ $$PWD/transform.cpp
diff --git a/src/render/frontend/render-frontend.pri b/src/render/frontend/render-frontend.pri
index 1cca3dcac..e354c5600 100644
--- a/src/render/frontend/render-frontend.pri
+++ b/src/render/frontend/render-frontend.pri
@@ -12,8 +12,6 @@ HEADERS += \
$$PWD/qrendertarget_p.h \
$$PWD/qwindow.h \
$$PWD/qwindow_p.h \
- $$PWD/qobjectpicker.h \
- $$PWD/qpickevent.h \
$$PWD/sphere_p.h
SOURCES += \
@@ -23,6 +21,4 @@ SOURCES += \
$$PWD/qlayer.cpp \
$$PWD/qrenderattachment.cpp \
$$PWD/qrendertarget.cpp \
- $$PWD/qwindow.cpp \
- $$PWD/qobjectpicker.cpp \
- $$PWD/qpickevent.cpp
+ $$PWD/qwindow.cpp
diff --git a/src/render/backend/objectpicker.cpp b/src/render/picking/objectpicker.cpp
index 38775327c..38775327c 100644
--- a/src/render/backend/objectpicker.cpp
+++ b/src/render/picking/objectpicker.cpp
diff --git a/src/render/backend/objectpicker_p.h b/src/render/picking/objectpicker_p.h
index a7dc0e3a2..a7dc0e3a2 100644
--- a/src/render/backend/objectpicker_p.h
+++ b/src/render/picking/objectpicker_p.h
diff --git a/src/render/backend/pickeventfilter.cpp b/src/render/picking/pickeventfilter.cpp
index 35aed07a7..35aed07a7 100644
--- a/src/render/backend/pickeventfilter.cpp
+++ b/src/render/picking/pickeventfilter.cpp
diff --git a/src/render/backend/pickeventfilter_p.h b/src/render/picking/pickeventfilter_p.h
index d34172e69..d34172e69 100644
--- a/src/render/backend/pickeventfilter_p.h
+++ b/src/render/picking/pickeventfilter_p.h
diff --git a/src/render/picking/picking.pri b/src/render/picking/picking.pri
new file mode 100644
index 000000000..72ec6498c
--- /dev/null
+++ b/src/render/picking/picking.pri
@@ -0,0 +1,13 @@
+INCLUDEPATH += $$PWD
+
+HEADERS += \
+ $$PWD/qobjectpicker.h \
+ $$PWD/qpickevent.h \
+ $$PWD/objectpicker_p.h \
+ $$PWD/pickeventfilter_p.h
+
+SOURCES += \
+ $$PWD/qobjectpicker.cpp \
+ $$PWD/qpickevent.cpp \
+ $$PWD/objectpicker.cpp \
+ $$PWD/pickeventfilter.cpp
diff --git a/src/render/frontend/qobjectpicker.cpp b/src/render/picking/qobjectpicker.cpp
index 7d1e4a946..7d1e4a946 100644
--- a/src/render/frontend/qobjectpicker.cpp
+++ b/src/render/picking/qobjectpicker.cpp
diff --git a/src/render/frontend/qobjectpicker.h b/src/render/picking/qobjectpicker.h
index d7efe3c2b..d7efe3c2b 100644
--- a/src/render/frontend/qobjectpicker.h
+++ b/src/render/picking/qobjectpicker.h
diff --git a/src/render/frontend/qpickevent.cpp b/src/render/picking/qpickevent.cpp
index b2f7179b1..b2f7179b1 100644
--- a/src/render/frontend/qpickevent.cpp
+++ b/src/render/picking/qpickevent.cpp
diff --git a/src/render/frontend/qpickevent.h b/src/render/picking/qpickevent.h
index 5a9408516..5a9408516 100644
--- a/src/render/frontend/qpickevent.h
+++ b/src/render/picking/qpickevent.h
diff --git a/src/render/render.pro b/src/render/render.pro
index 768fed5bd..d96c8e0ca 100644
--- a/src/render/render.pro
+++ b/src/render/render.pro
@@ -22,6 +22,7 @@ include (materialsystem/materialsystem.pri)
include (renderstates/renderstates.pri)
include (io/io.pri)
include (defaults/defaults.pri)
+include (picking/picking.pri)
include (services/services.pri)
include (texture/texture.pri)