Move all chunk-related functionality to a sub-directory

qgis · Sep 15, 2017 · 8f76477 · 8f76477
1 parent 74ed07d
commit 8f76477
Show file tree

Hide file tree

Showing 11 changed files with 15 additions and 11 deletions.
diff --git a/src/3d/CMakeLists.txt b/src/3d/CMakeLists.txt
@@ -3,11 +3,6 @@
 
 SET(QGIS_3D_SRCS
   cameracontroller.cpp
-  chunkboundsentity.cpp
-  chunkedentity.cpp
-  chunklist.cpp
-  chunkloader.cpp
-  chunknode.cpp
   lineentity.cpp
   map3d.cpp
   pointentity.cpp
@@ -18,6 +13,12 @@ SET(QGIS_3D_SRCS
   tilingscheme.cpp
   utils.cpp
 
+  chunks/chunkboundsentity.cpp
+  chunks/chunkedentity.cpp
+  chunks/chunklist.cpp
+  chunks/chunkloader.cpp
+  chunks/chunknode.cpp
+
   terrain/demterraingenerator.cpp
   terrain/demterraintilegeometry.cpp
   terrain/flatterraingenerator.cpp
@@ -38,9 +39,10 @@ SET(QGIS_3D_SRCS
 
 SET(QGIS_3D_MOC_HDRS
   cameracontroller.h
-  chunkedentity.h
   scene.h
 
+  chunks/chunkedentity.h
+
   terrain/demterraingenerator.h
   terrain/demterraintilegeometry.h
   terrain/maptexturegenerator.h
@@ -57,11 +59,6 @@ QT5_ADD_RESOURCES(QGIS_3D_RCC_SRCS shaders.qrc)
 SET(QGIS_3D_HDRS
   aabb.h
   cameracontroller.h
-  chunkboundsentity.h
-  chunkedentity.h
-  chunklist.h
-  chunkloader.h
-  chunknode.h
   lineentity.h
   map3d.h
   pointentity.h
@@ -72,6 +69,12 @@ SET(QGIS_3D_HDRS
   tilingscheme.h
   utils.h
 
+  chunks/chunkboundsentity.h
+  chunks/chunkedentity.h
+  chunks/chunklist.h
+  chunks/chunkloader.h
+  chunks/chunknode.h
+
   terrain/demterraingenerator.h
   terrain/demterraintilegeometry.h
   terrain/flatterraingenerator.h
@@ -86,6 +89,7 @@ SET(QGIS_3D_HDRS
 
 INCLUDE_DIRECTORIES(
   ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}/chunks
   ${CMAKE_CURRENT_SOURCE_DIR}/terrain
   ${CMAKE_SOURCE_DIR}/src/core/
   ${CMAKE_SOURCE_DIR}/src/core/geometry

diff --git a/src/3d/chunkboundsentity.cpp → src/3d/chunks/chunkboundsentity.cpp b/src/3d/chunkboundsentity.cpp → src/3d/chunks/chunkboundsentity.cpp
diff --git a/src/3d/chunkboundsentity.h → src/3d/chunks/chunkboundsentity.h b/src/3d/chunkboundsentity.h → src/3d/chunks/chunkboundsentity.h
diff --git a/src/3d/chunkedentity.cpp → src/3d/chunks/chunkedentity.cpp b/src/3d/chunkedentity.cpp → src/3d/chunks/chunkedentity.cpp
diff --git a/src/3d/chunkedentity.h → src/3d/chunks/chunkedentity.h b/src/3d/chunkedentity.h → src/3d/chunks/chunkedentity.h
diff --git a/src/3d/chunklist.cpp → src/3d/chunks/chunklist.cpp b/src/3d/chunklist.cpp → src/3d/chunks/chunklist.cpp
diff --git a/src/3d/chunklist.h → src/3d/chunks/chunklist.h b/src/3d/chunklist.h → src/3d/chunks/chunklist.h
diff --git a/src/3d/chunkloader.cpp → src/3d/chunks/chunkloader.cpp b/src/3d/chunkloader.cpp → src/3d/chunks/chunkloader.cpp
diff --git a/src/3d/chunkloader.h → src/3d/chunks/chunkloader.h b/src/3d/chunkloader.h → src/3d/chunks/chunkloader.h
diff --git a/src/3d/chunknode.cpp → src/3d/chunks/chunknode.cpp b/src/3d/chunknode.cpp → src/3d/chunks/chunknode.cpp
diff --git a/src/3d/chunknode.h → src/3d/chunks/chunknode.h b/src/3d/chunknode.h → src/3d/chunks/chunknode.h