Skip to content

Commit 8f76477

Browse files
committedSep 15, 2017
Move all chunk-related functionality to a sub-directory
1 parent 74ed07d commit 8f76477

11 files changed

+15
-11
lines changed
 

‎src/3d/CMakeLists.txt

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,6 @@
33

44
SET(QGIS_3D_SRCS
55
cameracontroller.cpp
6-
chunkboundsentity.cpp
7-
chunkedentity.cpp
8-
chunklist.cpp
9-
chunkloader.cpp
10-
chunknode.cpp
116
lineentity.cpp
127
map3d.cpp
138
pointentity.cpp
@@ -18,6 +13,12 @@ SET(QGIS_3D_SRCS
1813
tilingscheme.cpp
1914
utils.cpp
2015

16+
chunks/chunkboundsentity.cpp
17+
chunks/chunkedentity.cpp
18+
chunks/chunklist.cpp
19+
chunks/chunkloader.cpp
20+
chunks/chunknode.cpp
21+
2122
terrain/demterraingenerator.cpp
2223
terrain/demterraintilegeometry.cpp
2324
terrain/flatterraingenerator.cpp
@@ -38,9 +39,10 @@ SET(QGIS_3D_SRCS
3839

3940
SET(QGIS_3D_MOC_HDRS
4041
cameracontroller.h
41-
chunkedentity.h
4242
scene.h
4343

44+
chunks/chunkedentity.h
45+
4446
terrain/demterraingenerator.h
4547
terrain/demterraintilegeometry.h
4648
terrain/maptexturegenerator.h
@@ -57,11 +59,6 @@ QT5_ADD_RESOURCES(QGIS_3D_RCC_SRCS shaders.qrc)
5759
SET(QGIS_3D_HDRS
5860
aabb.h
5961
cameracontroller.h
60-
chunkboundsentity.h
61-
chunkedentity.h
62-
chunklist.h
63-
chunkloader.h
64-
chunknode.h
6562
lineentity.h
6663
map3d.h
6764
pointentity.h
@@ -72,6 +69,12 @@ SET(QGIS_3D_HDRS
7269
tilingscheme.h
7370
utils.h
7471

72+
chunks/chunkboundsentity.h
73+
chunks/chunkedentity.h
74+
chunks/chunklist.h
75+
chunks/chunkloader.h
76+
chunks/chunknode.h
77+
7578
terrain/demterraingenerator.h
7679
terrain/demterraintilegeometry.h
7780
terrain/flatterraingenerator.h
@@ -86,6 +89,7 @@ SET(QGIS_3D_HDRS
8689

8790
INCLUDE_DIRECTORIES(
8891
${CMAKE_CURRENT_SOURCE_DIR}
92+
${CMAKE_CURRENT_SOURCE_DIR}/chunks
8993
${CMAKE_CURRENT_SOURCE_DIR}/terrain
9094
${CMAKE_SOURCE_DIR}/src/core/
9195
${CMAKE_SOURCE_DIR}/src/core/geometry
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)
Please sign in to comment.