Move grid renderables to their own folder

modules/base/CMakeLists.txt

@@ -39,9 +39,10 @@ set(HEADER_FILES
   ${CMAKE_CURRENT_SOURCE_DIR}/lightsource/scenegraphlightsource.h
   ${CMAKE_CURRENT_SOURCE_DIR}/rendering/modelgeometry.h
   ${CMAKE_CURRENT_SOURCE_DIR}/rendering/multimodelgeometry.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderableboxgrid.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/grids/renderableboxgrid.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/grids/renderablegrid.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/grids/renderablesphericalgrid.h
   ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablecartesianaxes.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablegrid.h
   ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablelabels.h
   ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablemodel.h
   ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablenodeline.h
@@ -49,7 +50,6 @@ set(HEADER_FILES
   ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderableplaneimagelocal.h
   ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderableplaneimageonline.h
   ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablesphere.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablesphericalgrid.h
   ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderabletrail.h
   ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderabletrailorbit.h
   ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderabletrailtrajectory.h
@@ -90,9 +90,10 @@ set(SOURCE_FILES
   ${CMAKE_CURRENT_SOURCE_DIR}/lightsource/scenegraphlightsource.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/rendering/modelgeometry.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/rendering/multimodelgeometry.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderableboxgrid.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/grids/renderableboxgrid.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/grids/renderablegrid.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/grids/renderablesphericalgrid.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablecartesianaxes.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablegrid.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablelabels.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablemodel.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablenodeline.cpp
@@ -100,7 +101,6 @@ set(SOURCE_FILES
   ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderableplaneimagelocal.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderableplaneimageonline.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablesphere.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablesphericalgrid.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderabletrail.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderabletrailorbit.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderabletrailtrajectory.cpp

modules/base/basemodule.cpp

@@ -33,17 +33,17 @@
 #include <modules/base/dashboard/dashboarditempropertyvalue.h>
 #include <modules/base/dashboard/dashboarditemsimulationincrement.h>
 #include <modules/base/dashboard/dashboarditemspacing.h>
-#include <modules/base/rendering/renderableboxgrid.h>
 #include <modules/base/dashboard/dashboarditemvelocity.h>
 #include <modules/base/lightsource/cameralightsource.h>
 #include <modules/base/lightsource/scenegraphlightsource.h>
+#include <modules/base/rendering/grids/renderableboxgrid.h>
+#include <modules/base/rendering/grids/renderablegrid.h>
+#include <modules/base/rendering/grids/renderablesphericalgrid.h>
 #include <modules/base/rendering/renderablecartesianaxes.h>
-#include <modules/base/rendering/renderablegrid.h>
 #include <modules/base/rendering/renderablelabels.h>
 #include <modules/base/rendering/renderablemodel.h>
 #include <modules/base/rendering/renderablenodeline.h>
 #include <modules/base/rendering/renderablesphere.h>
-#include <modules/base/rendering/renderablesphericalgrid.h>
 #include <modules/base/rendering/renderabletrailorbit.h>
 #include <modules/base/rendering/renderabletrailtrajectory.h>
 #include <modules/base/rendering/renderableplaneimagelocal.h>

modules/base/rendering/grids/renderableboxgrid.cpp

@@ -22,7 +22,7 @@
  * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
  ****************************************************************************************/
 
-#include <modules/base/rendering/renderableboxgrid.h>
+#include <modules/base/rendering/grids/renderableboxgrid.h>
 
 #include <modules/base/basemodule.h>
 #include <openspace/engine/globals.h>

modules/base/rendering/grids/renderablegrid.cpp

@@ -22,7 +22,7 @@
  * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
  ****************************************************************************************/
 
-#include <modules/base/rendering/renderablegrid.h>
+#include <modules/base/rendering/grids/renderablegrid.h>
 
 #include <modules/base/basemodule.h>
 #include <openspace/documentation/verifier.h>

modules/base/rendering/grids/renderablesphericalgrid.cpp

@@ -22,7 +22,7 @@
  * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
  ****************************************************************************************/
 
-#include <modules/base/rendering/renderablesphericalgrid.h>
+#include <modules/base/rendering/grids/renderablesphericalgrid.h>
 
 #include <modules/base/basemodule.h>
 #include <openspace/engine/globals.h>