Move terrain related classes to a sub-directory

qgis · Sep 15, 2017 · 74ed07d · 74ed07d
1 parent 04e12d9
commit 74ed07d
Show file tree

Hide file tree

Showing 22 changed files with 29 additions and 26 deletions.
diff --git a/src/3d/CMakeLists.txt b/src/3d/CMakeLists.txt
@@ -8,26 +8,27 @@ SET(QGIS_3D_SRCS
   chunklist.cpp
   chunkloader.cpp
   chunknode.cpp
-  demterraingenerator.cpp
-  demterraintilegeometry.cpp
-  flatterraingenerator.cpp
   lineentity.cpp
   map3d.cpp
-  maptexturegenerator.cpp
-  maptextureimage.cpp
   pointentity.cpp
   polygonentity.cpp
   polygongeometry.cpp
-  #quantizedmeshgeometry.cpp
-  #quantizedmeshterraingenerator.cpp
   scene.cpp
-  terrain.cpp
-  terrainchunkloader.cpp
-  terraingenerator.cpp
   tessellator.cpp
   tilingscheme.cpp
   utils.cpp
 
+  terrain/demterraingenerator.cpp
+  terrain/demterraintilegeometry.cpp
+  terrain/flatterraingenerator.cpp
+  terrain/maptexturegenerator.cpp
+  terrain/maptextureimage.cpp
+  #terrain/quantizedmeshgeometry.cpp
+  #terrain/quantizedmeshterraingenerator.cpp
+  terrain/terrain.cpp
+  terrain/terrainchunkloader.cpp
+  terrain/terraingenerator.cpp
+
   poly2tri/common/shapes.cc
   poly2tri/sweep/advancing_front.cc
   poly2tri/sweep/cdt.cc
@@ -38,12 +39,13 @@ SET(QGIS_3D_SRCS
 SET(QGIS_3D_MOC_HDRS
   cameracontroller.h
   chunkedentity.h
-  demterraingenerator.h
-  demterraintilegeometry.h
-  maptexturegenerator.h
-  maptextureimage.h
   scene.h
-  terrain.h
+
+  terrain/demterraingenerator.h
+  terrain/demterraintilegeometry.h
+  terrain/maptexturegenerator.h
+  terrain/maptextureimage.h
+  terrain/terrain.h
 )
 
 QT5_WRAP_CPP(QGIS_3D_MOC_SRCS ${QGIS_3D_MOC_HDRS})
@@ -60,29 +62,31 @@ SET(QGIS_3D_HDRS
   chunklist.h
   chunkloader.h
   chunknode.h
-  demterraingenerator.h
-  demterraintilegeometry.h
-  flatterraingenerator.h
   lineentity.h
   map3d.h
-  maptexturegenerator.h
-  maptextureimage.h
   pointentity.h
   polygonentity.h
   polygongeometry.h
-  #quantizedmeshgeometry.h
-  #quantizedmeshterraingenerator.h
   scene.h
-  terrain.h
-  terrainchunkloader.h
-  terraingenerator.h
   tessellator.h
   tilingscheme.h
   utils.h
+
+  terrain/demterraingenerator.h
+  terrain/demterraintilegeometry.h
+  terrain/flatterraingenerator.h
+  terrain/maptexturegenerator.h
+  terrain/maptextureimage.h
+  #terrain/quantizedmeshgeometry.h
+  #terrain/quantizedmeshterraingenerator.h
+  terrain/terrain.h
+  terrain/terrainchunkloader.h
+  terrain/terraingenerator.h
 )
 
 INCLUDE_DIRECTORIES(
   ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}/terrain
   ${CMAKE_SOURCE_DIR}/src/core/
   ${CMAKE_SOURCE_DIR}/src/core/geometry
   ${CMAKE_SOURCE_DIR}/src/core/raster

diff --git a/src/3d/map3d.h b/src/3d/map3d.h
@@ -14,7 +14,6 @@ class QgsMapLayer;
 class QgsRasterLayer;
 class QgsVectorLayer;
 
-class MapTextureGenerator;
 class TerrainGenerator;
 
 

diff --git a/src/3d/demterraingenerator.cpp → src/3d/terrain/demterraingenerator.cpp b/src/3d/demterraingenerator.cpp → src/3d/terrain/demterraingenerator.cpp
diff --git a/src/3d/demterraingenerator.h → src/3d/terrain/demterraingenerator.h b/src/3d/demterraingenerator.h → src/3d/terrain/demterraingenerator.h
diff --git a/src/3d/demterraintilegeometry.cpp → src/3d/terrain/demterraintilegeometry.cpp b/src/3d/demterraintilegeometry.cpp → src/3d/terrain/demterraintilegeometry.cpp
diff --git a/src/3d/demterraintilegeometry.h → src/3d/terrain/demterraintilegeometry.h b/src/3d/demterraintilegeometry.h → src/3d/terrain/demterraintilegeometry.h
diff --git a/src/3d/flatterraingenerator.cpp → src/3d/terrain/flatterraingenerator.cpp b/src/3d/flatterraingenerator.cpp → src/3d/terrain/flatterraingenerator.cpp
diff --git a/src/3d/flatterraingenerator.h → src/3d/terrain/flatterraingenerator.h b/src/3d/flatterraingenerator.h → src/3d/terrain/flatterraingenerator.h
diff --git a/src/3d/maptexturegenerator.cpp → src/3d/terrain/maptexturegenerator.cpp b/src/3d/maptexturegenerator.cpp → src/3d/terrain/maptexturegenerator.cpp
diff --git a/src/3d/maptexturegenerator.h → src/3d/terrain/maptexturegenerator.h b/src/3d/maptexturegenerator.h → src/3d/terrain/maptexturegenerator.h
diff --git a/src/3d/maptextureimage.cpp → src/3d/terrain/maptextureimage.cpp b/src/3d/maptextureimage.cpp → src/3d/terrain/maptextureimage.cpp
diff --git a/src/3d/maptextureimage.h → src/3d/terrain/maptextureimage.h b/src/3d/maptextureimage.h → src/3d/terrain/maptextureimage.h
diff --git a/src/3d/quantizedmeshgeometry.cpp → src/3d/terrain/quantizedmeshgeometry.cpp b/src/3d/quantizedmeshgeometry.cpp → src/3d/terrain/quantizedmeshgeometry.cpp
diff --git a/src/3d/quantizedmeshgeometry.h → src/3d/terrain/quantizedmeshgeometry.h b/src/3d/quantizedmeshgeometry.h → src/3d/terrain/quantizedmeshgeometry.h
diff --git a/src/3d/quantizedmeshterraingenerator.cpp → ...terrain/quantizedmeshterraingenerator.cpp b/src/3d/quantizedmeshterraingenerator.cpp → ...terrain/quantizedmeshterraingenerator.cpp
diff --git a/src/3d/quantizedmeshterraingenerator.h → ...d/terrain/quantizedmeshterraingenerator.h b/src/3d/quantizedmeshterraingenerator.h → ...d/terrain/quantizedmeshterraingenerator.h
diff --git a/src/3d/terrain.cpp → src/3d/terrain/terrain.cpp b/src/3d/terrain.cpp → src/3d/terrain/terrain.cpp
diff --git a/src/3d/terrain.h → src/3d/terrain/terrain.h b/src/3d/terrain.h → src/3d/terrain/terrain.h
diff --git a/src/3d/terrainchunkloader.cpp → src/3d/terrain/terrainchunkloader.cpp b/src/3d/terrainchunkloader.cpp → src/3d/terrain/terrainchunkloader.cpp
diff --git a/src/3d/terrainchunkloader.h → src/3d/terrain/terrainchunkloader.h b/src/3d/terrainchunkloader.h → src/3d/terrain/terrainchunkloader.h
diff --git a/src/3d/terraingenerator.cpp → src/3d/terrain/terraingenerator.cpp b/src/3d/terraingenerator.cpp → src/3d/terrain/terraingenerator.cpp
diff --git a/src/3d/terraingenerator.h → src/3d/terrain/terraingenerator.h b/src/3d/terraingenerator.h → src/3d/terrain/terraingenerator.h