diff options
author | Sean Harmer <sean.harmer@kdab.com> | 2015-09-18 16:03:24 +0100 |
---|---|---|
committer | Paul Lemire <paul.lemire@kdab.com> | 2015-10-13 12:13:01 +0000 |
commit | c65de5cc688e09c50a470bc9d303734fd8b9858a (patch) | |
tree | 9145f1d657740dff863629abc66e0a95bdcef80b /src | |
parent | 9ecf6ab9f8a59058a1171df47e837f5d2a1a9c1b (diff) |
Move lights into their own directory
Change-Id: I4caecd5072dfc2c0ad11ec2a76f1e6be44d3ce8f
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/render/frontend/render-frontend.pri | 12 | ||||
-rw-r--r-- | src/render/lights/lights.pri | 18 | ||||
-rw-r--r-- | src/render/lights/qabstractlight.cpp (renamed from src/render/frontend/qabstractlight.cpp) | 0 | ||||
-rw-r--r-- | src/render/lights/qabstractlight.h (renamed from src/render/frontend/qabstractlight.h) | 0 | ||||
-rw-r--r-- | src/render/lights/qabstractlight_p.h (renamed from src/render/frontend/qabstractlight_p.h) | 0 | ||||
-rw-r--r-- | src/render/lights/qdirectionallight.cpp (renamed from src/render/frontend/qdirectionallight.cpp) | 0 | ||||
-rw-r--r-- | src/render/lights/qdirectionallight.h (renamed from src/render/frontend/qdirectionallight.h) | 0 | ||||
-rw-r--r-- | src/render/lights/qdirectionallight_p.h (renamed from src/render/frontend/qdirectionallight_p.h) | 0 | ||||
-rw-r--r-- | src/render/lights/qpointlight.cpp (renamed from src/render/frontend/qpointlight.cpp) | 0 | ||||
-rw-r--r-- | src/render/lights/qpointlight.h (renamed from src/render/frontend/qpointlight.h) | 0 | ||||
-rw-r--r-- | src/render/lights/qpointlight_p.h (renamed from src/render/frontend/qpointlight_p.h) | 0 | ||||
-rw-r--r-- | src/render/lights/qspotlight.cpp (renamed from src/render/frontend/qspotlight.cpp) | 0 | ||||
-rw-r--r-- | src/render/lights/qspotlight.h (renamed from src/render/frontend/qspotlight.h) | 0 | ||||
-rw-r--r-- | src/render/lights/qspotlight_p.h (renamed from src/render/frontend/qspotlight_p.h) | 0 | ||||
-rw-r--r-- | src/render/render.pro | 1 |
15 files changed, 19 insertions, 12 deletions
diff --git a/src/render/frontend/render-frontend.pri b/src/render/frontend/render-frontend.pri index d4ab488ef..c3fb519fe 100644 --- a/src/render/frontend/render-frontend.pri +++ b/src/render/frontend/render-frontend.pri @@ -10,14 +10,6 @@ HEADERS += \ $$PWD/sphere.h \ $$PWD/qabstractsceneloader.h \ $$PWD/qsceneloader.h \ - $$PWD/qabstractlight.h \ - $$PWD/qpointlight.h \ - $$PWD/qspotlight.h \ - $$PWD/qdirectionallight.h \ - $$PWD/qabstractlight_p.h \ - $$PWD/qspotlight_p.h \ - $$PWD/qdirectionallight_p.h \ - $$PWD/qpointlight_p.h \ $$PWD/qabstractsceneloader_p.h \ $$PWD/qlayer.h \ $$PWD/qlayer_p.h \ @@ -41,10 +33,6 @@ SOURCES += \ $$PWD/sphere.cpp \ $$PWD/qabstractsceneloader.cpp \ $$PWD/qsceneloader.cpp \ - $$PWD/qabstractlight.cpp \ - $$PWD/qpointlight.cpp \ - $$PWD/qspotlight.cpp \ - $$PWD/qdirectionallight.cpp \ $$PWD/qlayer.cpp \ $$PWD/qrenderattachment.cpp \ $$PWD/qrendertarget.cpp \ diff --git a/src/render/lights/lights.pri b/src/render/lights/lights.pri new file mode 100644 index 000000000..e12428e9d --- /dev/null +++ b/src/render/lights/lights.pri @@ -0,0 +1,18 @@ +INCLUDEPATH += $$PWD + +HEADERS += \ + $$PWD/qabstractlight.h \ + $$PWD/qabstractlight_p.h \ + $$PWD/qdirectionallight.h \ + $$PWD/qdirectionallight_p.h \ + $$PWD/qpointlight.h \ + $$PWD/qpointlight_p.h \ + $$PWD/qspotlight.h \ + $$PWD/qspotlight_p.h + + +SOURCES += \ + $$PWD/qabstractlight.cpp \ + $$PWD/qdirectionallight.cpp \ + $$PWD/qpointlight.cpp \ + $$PWD/qspotlight.cpp diff --git a/src/render/frontend/qabstractlight.cpp b/src/render/lights/qabstractlight.cpp index 82e1826be..82e1826be 100644 --- a/src/render/frontend/qabstractlight.cpp +++ b/src/render/lights/qabstractlight.cpp diff --git a/src/render/frontend/qabstractlight.h b/src/render/lights/qabstractlight.h index 6f30fe955..6f30fe955 100644 --- a/src/render/frontend/qabstractlight.h +++ b/src/render/lights/qabstractlight.h diff --git a/src/render/frontend/qabstractlight_p.h b/src/render/lights/qabstractlight_p.h index 9d70d4bb9..9d70d4bb9 100644 --- a/src/render/frontend/qabstractlight_p.h +++ b/src/render/lights/qabstractlight_p.h diff --git a/src/render/frontend/qdirectionallight.cpp b/src/render/lights/qdirectionallight.cpp index ebdc1e170..ebdc1e170 100644 --- a/src/render/frontend/qdirectionallight.cpp +++ b/src/render/lights/qdirectionallight.cpp diff --git a/src/render/frontend/qdirectionallight.h b/src/render/lights/qdirectionallight.h index f626d4f6a..f626d4f6a 100644 --- a/src/render/frontend/qdirectionallight.h +++ b/src/render/lights/qdirectionallight.h diff --git a/src/render/frontend/qdirectionallight_p.h b/src/render/lights/qdirectionallight_p.h index 4cff5e192..4cff5e192 100644 --- a/src/render/frontend/qdirectionallight_p.h +++ b/src/render/lights/qdirectionallight_p.h diff --git a/src/render/frontend/qpointlight.cpp b/src/render/lights/qpointlight.cpp index 94653ee41..94653ee41 100644 --- a/src/render/frontend/qpointlight.cpp +++ b/src/render/lights/qpointlight.cpp diff --git a/src/render/frontend/qpointlight.h b/src/render/lights/qpointlight.h index 076f8b3cd..076f8b3cd 100644 --- a/src/render/frontend/qpointlight.h +++ b/src/render/lights/qpointlight.h diff --git a/src/render/frontend/qpointlight_p.h b/src/render/lights/qpointlight_p.h index f39daabee..f39daabee 100644 --- a/src/render/frontend/qpointlight_p.h +++ b/src/render/lights/qpointlight_p.h diff --git a/src/render/frontend/qspotlight.cpp b/src/render/lights/qspotlight.cpp index 191be0e62..191be0e62 100644 --- a/src/render/frontend/qspotlight.cpp +++ b/src/render/lights/qspotlight.cpp diff --git a/src/render/frontend/qspotlight.h b/src/render/lights/qspotlight.h index c22ef62e5..c22ef62e5 100644 --- a/src/render/frontend/qspotlight.h +++ b/src/render/lights/qspotlight.h diff --git a/src/render/frontend/qspotlight_p.h b/src/render/lights/qspotlight_p.h index 673438a33..673438a33 100644 --- a/src/render/frontend/qspotlight_p.h +++ b/src/render/lights/qspotlight_p.h diff --git a/src/render/render.pro b/src/render/render.pro index 94193243b..d32e3c335 100644 --- a/src/render/render.pro +++ b/src/render/render.pro @@ -15,6 +15,7 @@ include (backend/render-backend.pri) include (geometry/geometry.pri) include (graphicshelpers/graphicshelpers.pri) include (frontend/render-frontend.pri) +include (lights/lights.pri) include (materialsystem/materialsystem.pri) include (renderstates/renderstates.pri) include (io/render-io.pri) |