Move lighting classes to subfolder

doc/CMakeLists.txt

@@ -137,6 +137,7 @@ if(WITH_APIDOC)
       ${CMAKE_SOURCE_DIR}/src/analysis/vector/geometry_checker
       ${CMAKE_SOURCE_DIR}/src/3d
       ${CMAKE_SOURCE_DIR}/src/3d/chunks
+      ${CMAKE_SOURCE_DIR}/src/3d/lights
       ${CMAKE_SOURCE_DIR}/src/3d/materials
       ${CMAKE_SOURCE_DIR}/src/3d/processing
       ${CMAKE_SOURCE_DIR}/src/3d/symbols

python/3d/3d_auto.sip

@@ -6,11 +6,11 @@
 %Include auto_generated/qgsabstractvectorlayer3drenderer.sip
 %Include auto_generated/qgscamerapose.sip
 %Include auto_generated/qgslayoutitem3dmap.sip
-%Include auto_generated/qgspointlightsettings.sip
-%Include auto_generated/qgsdirectionallightsettings.sip
 %Include auto_generated/qgsrulebased3drenderer.sip
 %Include auto_generated/qgsvectorlayer3drenderer.sip
 %Include auto_generated/qgspointcloudlayer3drenderer.sip
+%Include auto_generated/lights/qgsdirectionallightsettings.sip
+%Include auto_generated/lights/qgspointlightsettings.sip
 %Include auto_generated/materials/qgsabstractmaterialsettings.sip
 %Include auto_generated/materials/qgsgoochmaterialsettings.sip
 %Include auto_generated/materials/qgsmaterialregistry.sip

python/3d/auto_generated/lights/qgsdirectionallightsettings.sip.in

@@ -1,7 +1,7 @@
 /************************************************************************
  * This file has been generated automatically from                      *
  *                                                                      *
- * src/3d/qgsdirectionallightsettings.h                                 *
+ * src/3d/lights/qgsdirectionallightsettings.h                          *
  *                                                                      *
  * Do not edit manually ! Edit header and run scripts/sipify.pl again   *
  ************************************************************************/
@@ -69,7 +69,7 @@ Reads configuration from a DOM element previously written using :py:func:`~QgsDi
 /************************************************************************
  * This file has been generated automatically from                      *
  *                                                                      *
- * src/3d/qgsdirectionallightsettings.h                                 *
+ * src/3d/lights/qgsdirectionallightsettings.h                          *
  *                                                                      *
  * Do not edit manually ! Edit header and run scripts/sipify.pl again   *
  ************************************************************************/

python/3d/auto_generated/lights/qgspointlightsettings.sip.in

@@ -1,7 +1,7 @@
 /************************************************************************
  * This file has been generated automatically from                      *
  *                                                                      *
- * src/3d/qgspointlightsettings.h                                       *
+ * src/3d/lights/qgspointlightsettings.h                                *
  *                                                                      *
  * Do not edit manually ! Edit header and run scripts/sipify.pl again   *
  ************************************************************************/
@@ -102,7 +102,7 @@ Reads configuration from a DOM element previously written using :py:func:`~QgsPo
 /************************************************************************
  * This file has been generated automatically from                      *
  *                                                                      *
- * src/3d/qgspointlightsettings.h                                       *
+ * src/3d/lights/qgspointlightsettings.h                                *
  *                                                                      *
  * Do not edit manually ! Edit header and run scripts/sipify.pl again   *
  ************************************************************************/

src/3d/CMakeLists.txt

@@ -19,8 +19,6 @@ set(QGIS_3D_SRCS
   qgsimagetexture.cpp
   qgslayoutitem3dmap.cpp
   qgsoffscreen3dengine.cpp
-  qgspointlightsettings.cpp
-  qgsdirectionallightsettings.cpp
   qgsraycastingutils_p.cpp
   qgsrulebased3drenderer.cpp
   qgsrulebasedchunkloader_p.cpp
@@ -49,6 +47,9 @@ set(QGIS_3D_SRCS
   chunks/qgschunknode_p.cpp
   chunks/qgschunkqueuejob_p.cpp
 
+  lights/qgsdirectionallightsettings.cpp
+  lights/qgspointlightsettings.cpp
+
   materials/qgsabstractmaterialsettings.cpp
   materials/qgsgoochmaterialsettings.cpp
   materials/qgsmaterialregistry.cpp
@@ -112,8 +113,6 @@ set(QGIS_3D_HDRS
   qgslayoutitem3dmap.h
   qgsmeshlayer3drenderer.h
   qgsoffscreen3dengine.h
-  qgspointlightsettings.h
-  qgsdirectionallightsettings.h
   qgsrulebased3drenderer.h
   qgstessellatedpolygongeometry.h
   qgstilingscheme.h
@@ -127,6 +126,9 @@ set(QGIS_3D_HDRS
   qgsshadowsettings.h
   qgspointcloudlayer3drenderer.h
 
+  lights/qgsdirectionallightsettings.h
+  lights/qgspointlightsettings.h
+
   materials/qgsabstractmaterialsettings.h
   materials/qgsgoochmaterialsettings.h
   materials/qgsmaterialregistry.h
@@ -208,6 +210,7 @@ endif()
 target_include_directories(qgis_3d PUBLIC
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}/chunks
+  ${CMAKE_CURRENT_SOURCE_DIR}/lights
   ${CMAKE_CURRENT_SOURCE_DIR}/materials
   ${CMAKE_CURRENT_SOURCE_DIR}/mesh
   ${CMAKE_CURRENT_SOURCE_DIR}/processing