Remove Terrain Component (#235)

CMake/ConfigureBuild.cmake

@@ -292,14 +292,6 @@ if (UNIX)
     configure_file(${OGRE_TEMPLATES_DIR}/OGRE-MeshLodGenerator.pc.in ${OGRE_BINARY_DIR}/pkgconfig/OGRE-MeshLodGenerator.pc @ONLY)
     install(FILES ${OGRE_BINARY_DIR}/pkgconfig/OGRE-MeshLodGenerator.pc DESTINATION ${OGRE_LIB_DIRECTORY}/pkgconfig)
   endif ()
-
-  if (OGRE_BUILD_COMPONENT_TERRAIN)
-    if (OGRE_BUILD_COMPONENT_PAGING)
-      set(OGRE_PAGING_ADDITIONAL_PACKAGES ", OGRE-Paging = ${OGRE_VERSION}")
-    endif ()
-    configure_file(${OGRE_TEMPLATES_DIR}/OGRE-Terrain.pc.in ${OGRE_BINARY_DIR}/pkgconfig/OGRE-Terrain.pc @ONLY)
-    install(FILES ${OGRE_BINARY_DIR}/pkgconfig/OGRE-Terrain.pc DESTINATION ${OGRE_LIB_DIRECTORY}/pkgconfig)
-  endif ()
 
   if (OGRE_BUILD_COMPONENT_RTSHADERSYSTEM)
     configure_file(${OGRE_TEMPLATES_DIR}/OGRE-RTShaderSystem.pc.in ${OGRE_BINARY_DIR}/pkgconfig/OGRE-RTShaderSystem.pc @ONLY)

CMake/FeatureSummary.cmake

@@ -30,9 +30,6 @@ endif ()
 if (OGRE_BUILD_COMPONENT_SCENE_FORMAT)
 	set(_components "${_components}  + SceneFormat\n")
 endif ()
-if (OGRE_BUILD_COMPONENT_TERRAIN)
-	set(_components "${_components}  + Terrain\n")
-endif ()
 if (OGRE_BUILD_COMPONENT_RTSHADERSYSTEM)
 	set(_components "${_components}  + RTShader System\n")
 

CMake/InstallResources.cmake

@@ -105,18 +105,12 @@ endif ()
 if (NOT OGRE_BUILD_PLUGIN_PFX)
   set(OGRE_COMMENT_PLUGIN_PARTICLEFX "#")
 endif ()
-if (NOT OGRE_BUILD_COMPONENT_TERRAIN)
-  set(OGRE_COMMENT_COMPONENT_TERRAIN "#")
-endif ()
 if (NOT OGRE_BUILD_COMPONENT_RTSHADERSYSTEM)
   set(OGRE_COMMENT_COMPONENT_RTSHADERSYSTEM "#")
 endif ()
 if (NOT OGRE_BUILD_COMPONENT_VOLUME)
   set(OGRE_COMMENT_COMPONENT_VOLUME "#")
 endif ()
-if (NOT OGRE_BUILD_COMPONENT_TERRAIN OR NOT OGRE_BUILD_COMPONENT_PAGING)
-  set(OGRE_COMMENT_SAMPLE_ENDLESSWORLD "#")
-endif ()
 if( NOT OGRE_PROFILING_PROVIDER OR OGRE_PROFILING_PROVIDER STREQUAL "none" )
     set( OGRE_COMMENT_PROFILER_PATH "#" )
 endif()
@@ -135,10 +129,7 @@ configure_file(${OGRE_TEMPLATES_DIR}/plugins.cfg.in ${OGRE_BINARY_DIR}/inst/bin/
 # create plugins_tools.cfg
 configure_file(${OGRE_TEMPLATES_DIR}/plugins_tools_d.cfg.in ${OGRE_BINARY_DIR}/inst/bin/debug/plugins_tools_d.cfg)
 configure_file(${OGRE_TEMPLATES_DIR}/plugins_tools.cfg.in ${OGRE_BINARY_DIR}/inst/bin/release/plugins_tools.cfg)
-# create samples.cfg
-configure_file(${OGRE_TEMPLATES_DIR}/samples_d.cfg.in ${OGRE_BINARY_DIR}/inst/bin/debug/samples_d.cfg)
-configure_file(${OGRE_TEMPLATES_DIR}/samples.cfg.in ${OGRE_BINARY_DIR}/inst/bin/release/samples.cfg)
-# create samples.cfg
+# create tests.cfg
 configure_file(${OGRE_TEMPLATES_DIR}/tests.cfg.in ${OGRE_BINARY_DIR}/inst/bin/release/tests.cfg)
 configure_file(${OGRE_TEMPLATES_DIR}/tests_d.cfg.in ${OGRE_BINARY_DIR}/inst/bin/debug/tests_d.cfg)
 # create HiddenAreaMeshVr.cfg
@@ -272,11 +263,6 @@ if (MSVC AND NOT NMAKE)
   configure_file(${OGRE_TEMPLATES_DIR}/plugins_tools.cfg.in ${OGRE_BINARY_DIR}/bin/release/plugins_tools.cfg)
   configure_file(${OGRE_TEMPLATES_DIR}/plugins_tools.cfg.in ${OGRE_BINARY_DIR}/bin/relwithdebinfo/plugins_tools.cfg)
   configure_file(${OGRE_TEMPLATES_DIR}/plugins_tools.cfg.in ${OGRE_BINARY_DIR}/bin/minsizerel/plugins_tools.cfg)
-  # create samples.cfg
-  configure_file(${OGRE_TEMPLATES_DIR}/samples_d.cfg.in ${OGRE_BINARY_DIR}/bin/debug/samples_d.cfg)
-  configure_file(${OGRE_TEMPLATES_DIR}/samples.cfg.in ${OGRE_BINARY_DIR}/bin/release/samples.cfg)
-  configure_file(${OGRE_TEMPLATES_DIR}/samples.cfg.in ${OGRE_BINARY_DIR}/bin/relwithdebinfo/samples.cfg)
-  configure_file(${OGRE_TEMPLATES_DIR}/samples.cfg.in ${OGRE_BINARY_DIR}/bin/minsizerel/samples.cfg)
   # create tests.cfg
   configure_file(${OGRE_TEMPLATES_DIR}/tests_d.cfg.in ${OGRE_BINARY_DIR}/bin/debug/tests_d.cfg)
   configure_file(${OGRE_TEMPLATES_DIR}/tests.cfg.in ${OGRE_BINARY_DIR}/bin/release/tests.cfg)
@@ -300,8 +286,6 @@ else() # other OS only need one cfg file
   configure_file(${OGRE_TEMPLATES_DIR}/plugins${OGRE_CFG_SUFFIX}.cfg.in ${OGRE_BINARY_DIR}/bin/plugins${OGRE_CFG_SUFFIX}.cfg)
   # create plugins_tools.cfg
   configure_file(${OGRE_TEMPLATES_DIR}/plugins_tools${OGRE_CFG_SUFFIX}.cfg.in ${OGRE_BINARY_DIR}/bin/plugins_tools${OGRE_CFG_SUFFIX}.cfg)
-  # create samples.cfg
-  configure_file(${OGRE_TEMPLATES_DIR}/samples${OGRE_CFG_SUFFIX}.cfg.in ${OGRE_BINARY_DIR}/bin/samples${OGRE_CFG_SUFFIX}.cfg)
   # create tests.cfg
   configure_file(${OGRE_TEMPLATES_DIR}/tests${OGRE_CFG_SUFFIX}.cfg.in ${OGRE_BINARY_DIR}/bin/tests${OGRE_CFG_SUFFIX}.cfg)
   # create HiddenAreaMeshVr.cfg

CMakeLists.txt

@@ -316,7 +316,6 @@ elseif (ANDROID)
    set(OGRE_BUILD_COMPONENT_RTSHADERSYSTEM FALSE CACHE BOOL "Disable RTSS component on Android ES1" FORCE)
    set(OGRE_BUILD_COMPONENT_VOLUME FALSE CACHE BOOL "Disable volume component on Android ES1" FORCE)
    set(OGRE_BUILD_COMPONENT_PAGING FALSE CACHE BOOL "Disable paging component on Android ES1" FORCE)
-   set(OGRE_BUILD_COMPONENT_TERRAIN FALSE CACHE BOOL "Disable terrain component on Android ES1" FORCE)
   endif()
 
   set(OGRE_BUILD_TESTS FALSE CACHE BOOL "Disable tests on Android" FORCE)
@@ -339,7 +338,6 @@ elseif(EMSCRIPTEN)
   set(OGRE_BUILD_TESTS FALSE CACHE BOOL "Disable tests on Emscripten" FORCE)
   set(OGRE_BUILD_COMPONENT_VOLUME FALSE CACHE BOOL "Disable volume component on Emscripten" FORCE)
   set(OGRE_BUILD_COMPONENT_PAGING FALSE CACHE BOOL "Disable paging component on Emscripten" FORCE)
-  set(OGRE_BUILD_COMPONENT_TERRAIN FALSE CACHE BOOL "Disable terrain component on Emscripten" FORCE)
   set(OGRE_CONFIG_ALLOCATOR 1 CACHE STRING "Use default allocator on Emscripten" FORCE)
   set(OGRE_CONFIG_CONTAINERS_USE_CUSTOM_ALLOCATOR FALSE CACHE BOOL "Containers use default allocator on Emscripten" FORCE)
 elseif (APPLE AND NOT OGRE_BUILD_PLATFORM_APPLE_IOS)
@@ -441,7 +439,6 @@ cmake_dependent_option(OGRE_BUILD_COMPONENT_HLMS_UNLIT
 cmake_dependent_option(OGRE_BUILD_COMPONENT_PAGING "Build Paging component" FALSE "" FALSE)
 option( OGRE_BUILD_COMPONENT_PLANAR_REFLECTIONS "Component to use planar reflections, can be used by both HlmsPbs & HlmsUnlit" FALSE )
 cmake_dependent_option(OGRE_BUILD_COMPONENT_MESHLODGENERATOR "Build MeshLodGenerator component" TRUE "" FALSE)
-cmake_dependent_option(OGRE_BUILD_COMPONENT_TERRAIN "Build Terrain component" FALSE "" FALSE)
 cmake_dependent_option(OGRE_BUILD_COMPONENT_VOLUME "Build Volume component" FALSE "" FALSE)
 cmake_dependent_option(OGRE_BUILD_COMPONENT_PROPERTY "Build Property component" FALSE "Boost_FOUND" FALSE)
 cmake_dependent_option(OGRE_BUILD_COMPONENT_OVERLAY "Build Overlay component" TRUE "FREETYPE_FOUND OR OGRE_BUILD_PLATFORM_WINRT OR OGRE_BUILD_PLATFORM_WINDOWS_PHONE" FALSE)

Components/CMakeLists.txt

@@ -48,10 +48,6 @@ if (OGRE_BUILD_COMPONENT_PROPERTY)
   add_subdirectory(Property)
 endif ()
 
-if (OGRE_BUILD_COMPONENT_TERRAIN)
-  add_subdirectory(Terrain)
-endif ()
-
 if (OGRE_BUILD_COMPONENT_RTSHADERSYSTEM)
 	add_subdirectory(RTShaderSystem)
 endif ()