diff --git a/data/assets/scene/solarsystem/planets/earth/atmosphere.asset b/data/assets/scene/solarsystem/planets/earth/advanced_atmosphere.asset similarity index 100% rename from data/assets/scene/solarsystem/planets/earth/atmosphere.asset rename to data/assets/scene/solarsystem/planets/earth/advanced_atmosphere.asset diff --git a/data/assets/scene/solarsystem/planets/mars/atmosphere.asset b/data/assets/scene/solarsystem/planets/mars/advanced_atmosphere.asset similarity index 100% rename from data/assets/scene/solarsystem/planets/mars/atmosphere.asset rename to data/assets/scene/solarsystem/planets/mars/advanced_atmosphere.asset diff --git a/modules/atmosphere/CMakeLists.txt b/modules/advancedatmosphere/CMakeLists.txt similarity index 98% rename from modules/atmosphere/CMakeLists.txt rename to modules/advancedatmosphere/CMakeLists.txt index 68f88ebda5..729c695ce5 100644 --- a/modules/atmosphere/CMakeLists.txt +++ b/modules/advancedatmosphere/CMakeLists.txt @@ -69,8 +69,8 @@ set(SHADER_FILES source_group("Shader Files" FILES ${SHADER_FILES}) create_new_module( - "Atmosphere" - atmosphere_module + "AdvancedAtmosphere" + advancedatmosphere_module STATIC ${HEADER_FILES} ${SOURCE_FILES} ${SHADER_FILES} ) diff --git a/modules/atmosphere/atmospheremodule.cpp b/modules/advancedatmosphere/advancedatmospheremodule.cpp similarity index 86% rename from modules/atmosphere/atmospheremodule.cpp rename to modules/advancedatmosphere/advancedatmospheremodule.cpp index 94fb594ef0..8b4cab015d 100644 --- a/modules/atmosphere/atmospheremodule.cpp +++ b/modules/advancedatmosphere/advancedatmospheremodule.cpp @@ -22,9 +22,9 @@ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * ****************************************************************************************/ -#include +#include -#include +#include #include #include #include @@ -32,12 +32,14 @@ namespace openspace { -AtmosphereModule::AtmosphereModule() : OpenSpaceModule(Name) {} +AdvancedAtmosphereModule::AdvancedAtmosphereModule() : OpenSpaceModule(Name) {} -void AtmosphereModule::internalInitialize(const ghoul::Dictionary&) { +void AdvancedAtmosphereModule::internalInitialize(const ghoul::Dictionary&) { auto fRenderable = FactoryManager::ref().factory(); ghoul_assert(fRenderable, "No renderable factory existed"); - fRenderable->registerClass("RenderableAtmosphere"); + fRenderable->registerClass( + "RenderableAdvancedAtmosphere" + ); } } // namespace openspace diff --git a/modules/atmosphere/atmospheremodule.h b/modules/advancedatmosphere/advancedatmospheremodule.h similarity index 86% rename from modules/atmosphere/atmospheremodule.h rename to modules/advancedatmosphere/advancedatmospheremodule.h index 6b89bc761f..94d0eea8b8 100644 --- a/modules/atmosphere/atmospheremodule.h +++ b/modules/advancedatmosphere/advancedatmospheremodule.h @@ -22,18 +22,18 @@ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * ****************************************************************************************/ -#ifndef __OPENSPACE_MODULE_ATMOSPHERE___ATMOSPHERE_MODULE___H__ -#define __OPENSPACE_MODULE_ATMOSPHERE___ATMOSPHERE_MODULE___H__ +#ifndef __OPENSPACE_MODULE_ATMOSPHERE___ADVANCEDATMOSPHERE_MODULE___H__ +#define __OPENSPACE_MODULE_ATMOSPHERE___ADVANCEDATMOSPHERE_MODULE___H__ #include namespace openspace { -class AtmosphereModule : public OpenSpaceModule { +class AdvancedAtmosphereModule : public OpenSpaceModule { public: - constexpr static const char* Name = "Atmosphere"; + constexpr static const char* Name = "AdvancedAtmosphere"; - AtmosphereModule(); + AdvancedAtmosphereModule(); private: void internalInitialize(const ghoul::Dictionary&) override; @@ -41,4 +41,4 @@ private: } // namespace openspace -#endif // __OPENSPACE_MODULE_ATMOSPHERE___ATMOSPHERE_MODULE___H__ +#endif // __OPENSPACE_MODULE_ATMOSPHERE___ADVANCEDATMOSPHERE_MODULE___H__ diff --git a/modules/atmosphere/include.cmake b/modules/advancedatmosphere/include.cmake similarity index 100% rename from modules/atmosphere/include.cmake rename to modules/advancedatmosphere/include.cmake diff --git a/modules/atmosphere/rendering/atmospheredeferredcaster.cpp b/modules/advancedatmosphere/rendering/atmospheredeferredcaster.cpp similarity index 97% rename from modules/atmosphere/rendering/atmospheredeferredcaster.cpp rename to modules/advancedatmosphere/rendering/atmospheredeferredcaster.cpp index d917e3e5d2..c2839c4048 100644 --- a/modules/atmosphere/rendering/atmospheredeferredcaster.cpp +++ b/modules/advancedatmosphere/rendering/atmospheredeferredcaster.cpp @@ -113,11 +113,11 @@ namespace { }; constexpr const char* GlslDeferredcastPath = - "${MODULES}/atmosphere/shaders/atmosphere_deferred_fs.glsl"; + "${MODULES}/advancedatmosphere/shaders/atmosphere_deferred_fs.glsl"; constexpr const char* GlslDeferredcastFSPath = - "${MODULES}/atmosphere/shaders/atmosphere_deferred_fs.glsl"; + "${MODULES}/advancedatmosphere/shaders/atmosphere_deferred_fs.glsl"; constexpr const char* GlslDeferredcastVsPath = - "${MODULES}/atmosphere/shaders/atmosphere_deferred_vs.glsl"; + "${MODULES}/advancedatmosphere/shaders/atmosphere_deferred_vs.glsl"; constexpr const float ATM_EPS = 2.f; constexpr const float KM_TO_M = 1000.f; @@ -610,8 +610,8 @@ void AtmosphereDeferredcaster::loadComputationPrograms() { if (!_transmittanceProgramObject) { _transmittanceProgramObject = ghoul::opengl::ProgramObject::Build( "transmittanceCalcProgram", - absPath("${MODULE_ATMOSPHERE}/shaders/transmittance_calc_vs.glsl"), - absPath("${MODULE_ATMOSPHERE}/shaders/transmittance_calc_fs.glsl") + absPath("${MODULE_ADVANCEDATMOSPHERE}/shaders/transmittance_calc_vs.glsl"), + absPath("${MODULE_ADVANCEDATMOSPHERE}/shaders/transmittance_calc_fs.glsl") ); } using IgnoreError = ghoul::opengl::ProgramObject::IgnoreError; @@ -624,8 +624,8 @@ void AtmosphereDeferredcaster::loadComputationPrograms() { if (!_irradianceProgramObject) { _irradianceProgramObject = ghoul::opengl::ProgramObject::Build( "irradianceCalcProgram", - absPath("${MODULE_ATMOSPHERE}/shaders/irradiance_calc_vs.glsl"), - absPath("${MODULE_ATMOSPHERE}/shaders/irradiance_calc_fs.glsl")); + absPath("${MODULE_ADVANCEDATMOSPHERE}/shaders/irradiance_calc_vs.glsl"), + absPath("${MODULE_ADVANCEDATMOSPHERE}/shaders/irradiance_calc_fs.glsl")); } _irradianceProgramObject->setIgnoreSubroutineUniformLocationError(IgnoreError::Yes); _irradianceProgramObject->setIgnoreUniformLocationError(IgnoreError::Yes); @@ -633,8 +633,8 @@ void AtmosphereDeferredcaster::loadComputationPrograms() { if (!_irradianceSupTermsProgramObject) { _irradianceSupTermsProgramObject = ghoul::opengl::ProgramObject::Build( "irradianceSupTermsCalcProgram", - absPath("${MODULE_ATMOSPHERE}/shaders/irradiance_sup_calc_vs.glsl"), - absPath("${MODULE_ATMOSPHERE}/shaders/irradiance_sup_calc_fs.glsl")); + absPath("${MODULE_ADVANCEDATMOSPHERE}/shaders/irradiance_sup_calc_vs.glsl"), + absPath("${MODULE_ADVANCEDATMOSPHERE}/shaders/irradiance_sup_calc_fs.glsl")); } _irradianceSupTermsProgramObject->setIgnoreSubroutineUniformLocationError( IgnoreError::Yes @@ -645,9 +645,9 @@ void AtmosphereDeferredcaster::loadComputationPrograms() { if (!_inScatteringProgramObject) { _inScatteringProgramObject = ghoul::opengl::ProgramObject::Build( "inScatteringCalcProgram", - absPath("${MODULE_ATMOSPHERE}/shaders/inScattering_calc_vs.glsl"), - absPath("${MODULE_ATMOSPHERE}/shaders/inScattering_calc_fs.glsl"), - absPath("${MODULE_ATMOSPHERE}/shaders/inScattering_calc_gs.glsl")); + absPath("${MODULE_ADVANCEDATMOSPHERE}/shaders/inScattering_calc_vs.glsl"), + absPath("${MODULE_ADVANCEDATMOSPHERE}/shaders/inScattering_calc_fs.glsl"), + absPath("${MODULE_ADVANCEDATMOSPHERE}/shaders/inScattering_calc_gs.glsl")); } _inScatteringProgramObject->setIgnoreSubroutineUniformLocationError(IgnoreError::Yes); _inScatteringProgramObject->setIgnoreUniformLocationError(IgnoreError::Yes); @@ -655,9 +655,9 @@ void AtmosphereDeferredcaster::loadComputationPrograms() { if (!_inScatteringSupTermsProgramObject) { _inScatteringSupTermsProgramObject = ghoul::opengl::ProgramObject::Build( "inScatteringSupTermsCalcProgram", - absPath("${MODULE_ATMOSPHERE}/shaders/inScattering_sup_calc_vs.glsl"), - absPath("${MODULE_ATMOSPHERE}/shaders/inScattering_sup_calc_fs.glsl"), - absPath("${MODULE_ATMOSPHERE}/shaders/inScattering_sup_calc_gs.glsl")); + absPath("${MODULE_ADVANCEDATMOSPHERE}/shaders/inScattering_sup_calc_vs.glsl"), + absPath("${MODULE_ADVANCEDATMOSPHERE}/shaders/inScattering_sup_calc_fs.glsl"), + absPath("${MODULE_ADVANCEDATMOSPHERE}/shaders/inScattering_sup_calc_gs.glsl")); } _inScatteringSupTermsProgramObject->setIgnoreSubroutineUniformLocationError( IgnoreError::Yes @@ -668,8 +668,8 @@ void AtmosphereDeferredcaster::loadComputationPrograms() { if (!_deltaEProgramObject) { _deltaEProgramObject = ghoul::opengl::ProgramObject::Build( "deltaECalcProgram", - absPath("${MODULE_ATMOSPHERE}/shaders/deltaE_calc_vs.glsl"), - absPath("${MODULE_ATMOSPHERE}/shaders/deltaE_calc_fs.glsl")); + absPath("${MODULE_ADVANCEDATMOSPHERE}/shaders/deltaE_calc_vs.glsl"), + absPath("${MODULE_ADVANCEDATMOSPHERE}/shaders/deltaE_calc_fs.glsl")); } _deltaEProgramObject->setIgnoreSubroutineUniformLocationError(IgnoreError::Yes); _deltaEProgramObject->setIgnoreUniformLocationError(IgnoreError::Yes); @@ -678,8 +678,8 @@ void AtmosphereDeferredcaster::loadComputationPrograms() { if (!_irradianceFinalProgramObject) { _irradianceFinalProgramObject = ghoul::opengl::ProgramObject::Build( "irradianceEFinalProgram", - absPath("${MODULE_ATMOSPHERE}/shaders/irradiance_final_vs.glsl"), - absPath("${MODULE_ATMOSPHERE}/shaders/irradiance_final_fs.glsl")); + absPath("${MODULE_ADVANCEDATMOSPHERE}/shaders/irradiance_final_vs.glsl"), + absPath("${MODULE_ADVANCEDATMOSPHERE}/shaders/irradiance_final_fs.glsl")); } _irradianceFinalProgramObject->setIgnoreSubroutineUniformLocationError( IgnoreError::Yes @@ -690,9 +690,9 @@ void AtmosphereDeferredcaster::loadComputationPrograms() { if (!_deltaSProgramObject) { _deltaSProgramObject = ghoul::opengl::ProgramObject::Build( "deltaSCalcProgram", - absPath("${MODULE_ATMOSPHERE}/shaders/deltaS_calc_vs.glsl"), - absPath("${MODULE_ATMOSPHERE}/shaders/deltaS_calc_fs.glsl"), - absPath("${MODULE_ATMOSPHERE}/shaders/deltaS_calc_gs.glsl")); + absPath("${MODULE_ADVANCEDATMOSPHERE}/shaders/deltaS_calc_vs.glsl"), + absPath("${MODULE_ADVANCEDATMOSPHERE}/shaders/deltaS_calc_fs.glsl"), + absPath("${MODULE_ADVANCEDATMOSPHERE}/shaders/deltaS_calc_gs.glsl")); } _deltaSProgramObject->setIgnoreSubroutineUniformLocationError(IgnoreError::Yes); _deltaSProgramObject->setIgnoreUniformLocationError(IgnoreError::Yes); @@ -700,9 +700,9 @@ void AtmosphereDeferredcaster::loadComputationPrograms() { if (!_deltaSSupTermsProgramObject) { _deltaSSupTermsProgramObject = ghoul::opengl::ProgramObject::Build( "deltaSSUPTermsCalcProgram", - absPath("${MODULE_ATMOSPHERE}/shaders/deltaS_sup_calc_vs.glsl"), - absPath("${MODULE_ATMOSPHERE}/shaders/deltaS_sup_calc_fs.glsl"), - absPath("${MODULE_ATMOSPHERE}/shaders/deltaS_sup_calc_gs.glsl")); + absPath("${MODULE_ADVANCEDATMOSPHERE}/shaders/deltaS_sup_calc_vs.glsl"), + absPath("${MODULE_ADVANCEDATMOSPHERE}/shaders/deltaS_sup_calc_fs.glsl"), + absPath("${MODULE_ADVANCEDATMOSPHERE}/shaders/deltaS_sup_calc_gs.glsl")); } _deltaSSupTermsProgramObject->setIgnoreSubroutineUniformLocationError( IgnoreError::Yes @@ -713,9 +713,9 @@ void AtmosphereDeferredcaster::loadComputationPrograms() { if (!_deltaJProgramObject) { _deltaJProgramObject = ghoul::opengl::ProgramObject::Build( "deltaJCalcProgram", - absPath("${MODULE_ATMOSPHERE}/shaders/deltaJ_calc_vs.glsl"), - absPath("${MODULE_ATMOSPHERE}/shaders/deltaJ_calc_fs.glsl"), - absPath("${MODULE_ATMOSPHERE}/shaders/deltaJ_calc_gs.glsl")); + absPath("${MODULE_ADVANCEDATMOSPHERE}/shaders/deltaJ_calc_vs.glsl"), + absPath("${MODULE_ADVANCEDATMOSPHERE}/shaders/deltaJ_calc_fs.glsl"), + absPath("${MODULE_ADVANCEDATMOSPHERE}/shaders/deltaJ_calc_gs.glsl")); } _deltaJProgramObject->setIgnoreSubroutineUniformLocationError(IgnoreError::Yes); _deltaJProgramObject->setIgnoreUniformLocationError(IgnoreError::Yes); @@ -1410,8 +1410,8 @@ void AtmosphereDeferredcaster::saveSkyLuminance() const { cieCurveExtractionProgramObject = ghoul::opengl::ProgramObject::Build( "CIECurveExtractionProgram", - absPath("${MODULE_ATMOSPHERE}/shaders/extract_cie_curve_vs.glsl"), - absPath("${MODULE_ATMOSPHERE}/shaders/extract_cie_curve_fs.glsl") + absPath("${MODULE_ADVANCEDATMOSPHERE}/shaders/extract_cie_curve_vs.glsl"), + absPath("${MODULE_ADVANCEDATMOSPHERE}/shaders/extract_cie_curve_fs.glsl") ); using IgnoreError = ghoul::opengl::ProgramObject::IgnoreError; cieCurveExtractionProgramObject->setIgnoreSubroutineUniformLocationError( diff --git a/modules/atmosphere/rendering/atmospheredeferredcaster.h b/modules/advancedatmosphere/rendering/atmospheredeferredcaster.h similarity index 100% rename from modules/atmosphere/rendering/atmospheredeferredcaster.h rename to modules/advancedatmosphere/rendering/atmospheredeferredcaster.h diff --git a/modules/atmosphere/rendering/renderableatmosphere.cpp b/modules/advancedatmosphere/rendering/renderableatmosphere.cpp similarity index 100% rename from modules/atmosphere/rendering/renderableatmosphere.cpp rename to modules/advancedatmosphere/rendering/renderableatmosphere.cpp diff --git a/modules/atmosphere/rendering/renderableatmosphere.h b/modules/advancedatmosphere/rendering/renderableatmosphere.h similarity index 100% rename from modules/atmosphere/rendering/renderableatmosphere.h rename to modules/advancedatmosphere/rendering/renderableatmosphere.h diff --git a/modules/atmosphere/shaders/atmosphere_common.glsl b/modules/advancedatmosphere/shaders/atmosphere_common.glsl similarity index 100% rename from modules/atmosphere/shaders/atmosphere_common.glsl rename to modules/advancedatmosphere/shaders/atmosphere_common.glsl diff --git a/modules/atmosphere/shaders/atmosphere_deferred_fs.glsl b/modules/advancedatmosphere/shaders/atmosphere_deferred_fs.glsl similarity index 100% rename from modules/atmosphere/shaders/atmosphere_deferred_fs.glsl rename to modules/advancedatmosphere/shaders/atmosphere_deferred_fs.glsl diff --git a/modules/atmosphere/shaders/atmosphere_deferred_vs.glsl b/modules/advancedatmosphere/shaders/atmosphere_deferred_vs.glsl similarity index 100% rename from modules/atmosphere/shaders/atmosphere_deferred_vs.glsl rename to modules/advancedatmosphere/shaders/atmosphere_deferred_vs.glsl diff --git a/modules/atmosphere/shaders/deltaE_calc_fs.glsl b/modules/advancedatmosphere/shaders/deltaE_calc_fs.glsl similarity index 100% rename from modules/atmosphere/shaders/deltaE_calc_fs.glsl rename to modules/advancedatmosphere/shaders/deltaE_calc_fs.glsl diff --git a/modules/atmosphere/shaders/deltaE_calc_vs.glsl b/modules/advancedatmosphere/shaders/deltaE_calc_vs.glsl similarity index 100% rename from modules/atmosphere/shaders/deltaE_calc_vs.glsl rename to modules/advancedatmosphere/shaders/deltaE_calc_vs.glsl diff --git a/modules/atmosphere/shaders/deltaJ_calc_fs.glsl b/modules/advancedatmosphere/shaders/deltaJ_calc_fs.glsl similarity index 100% rename from modules/atmosphere/shaders/deltaJ_calc_fs.glsl rename to modules/advancedatmosphere/shaders/deltaJ_calc_fs.glsl diff --git a/modules/atmosphere/shaders/deltaJ_calc_gs.glsl b/modules/advancedatmosphere/shaders/deltaJ_calc_gs.glsl similarity index 100% rename from modules/atmosphere/shaders/deltaJ_calc_gs.glsl rename to modules/advancedatmosphere/shaders/deltaJ_calc_gs.glsl diff --git a/modules/atmosphere/shaders/deltaJ_calc_vs.glsl b/modules/advancedatmosphere/shaders/deltaJ_calc_vs.glsl similarity index 100% rename from modules/atmosphere/shaders/deltaJ_calc_vs.glsl rename to modules/advancedatmosphere/shaders/deltaJ_calc_vs.glsl diff --git a/modules/atmosphere/shaders/deltaS_calc_fs.glsl b/modules/advancedatmosphere/shaders/deltaS_calc_fs.glsl similarity index 100% rename from modules/atmosphere/shaders/deltaS_calc_fs.glsl rename to modules/advancedatmosphere/shaders/deltaS_calc_fs.glsl diff --git a/modules/atmosphere/shaders/deltaS_calc_gs.glsl b/modules/advancedatmosphere/shaders/deltaS_calc_gs.glsl similarity index 100% rename from modules/atmosphere/shaders/deltaS_calc_gs.glsl rename to modules/advancedatmosphere/shaders/deltaS_calc_gs.glsl diff --git a/modules/atmosphere/shaders/deltaS_calc_vs.glsl b/modules/advancedatmosphere/shaders/deltaS_calc_vs.glsl similarity index 100% rename from modules/atmosphere/shaders/deltaS_calc_vs.glsl rename to modules/advancedatmosphere/shaders/deltaS_calc_vs.glsl diff --git a/modules/atmosphere/shaders/deltaS_sup_calc_fs.glsl b/modules/advancedatmosphere/shaders/deltaS_sup_calc_fs.glsl similarity index 100% rename from modules/atmosphere/shaders/deltaS_sup_calc_fs.glsl rename to modules/advancedatmosphere/shaders/deltaS_sup_calc_fs.glsl diff --git a/modules/atmosphere/shaders/deltaS_sup_calc_gs.glsl b/modules/advancedatmosphere/shaders/deltaS_sup_calc_gs.glsl similarity index 100% rename from modules/atmosphere/shaders/deltaS_sup_calc_gs.glsl rename to modules/advancedatmosphere/shaders/deltaS_sup_calc_gs.glsl diff --git a/modules/atmosphere/shaders/deltaS_sup_calc_vs.glsl b/modules/advancedatmosphere/shaders/deltaS_sup_calc_vs.glsl similarity index 100% rename from modules/atmosphere/shaders/deltaS_sup_calc_vs.glsl rename to modules/advancedatmosphere/shaders/deltaS_sup_calc_vs.glsl diff --git a/modules/atmosphere/shaders/extract_cie_curve_fs.glsl b/modules/advancedatmosphere/shaders/extract_cie_curve_fs.glsl similarity index 100% rename from modules/atmosphere/shaders/extract_cie_curve_fs.glsl rename to modules/advancedatmosphere/shaders/extract_cie_curve_fs.glsl diff --git a/modules/atmosphere/shaders/extract_cie_curve_vs.glsl b/modules/advancedatmosphere/shaders/extract_cie_curve_vs.glsl similarity index 100% rename from modules/atmosphere/shaders/extract_cie_curve_vs.glsl rename to modules/advancedatmosphere/shaders/extract_cie_curve_vs.glsl diff --git a/modules/atmosphere/shaders/inScattering_calc_fs.glsl b/modules/advancedatmosphere/shaders/inScattering_calc_fs.glsl similarity index 100% rename from modules/atmosphere/shaders/inScattering_calc_fs.glsl rename to modules/advancedatmosphere/shaders/inScattering_calc_fs.glsl diff --git a/modules/atmosphere/shaders/inScattering_calc_gs.glsl b/modules/advancedatmosphere/shaders/inScattering_calc_gs.glsl similarity index 100% rename from modules/atmosphere/shaders/inScattering_calc_gs.glsl rename to modules/advancedatmosphere/shaders/inScattering_calc_gs.glsl diff --git a/modules/atmosphere/shaders/inScattering_calc_vs.glsl b/modules/advancedatmosphere/shaders/inScattering_calc_vs.glsl similarity index 100% rename from modules/atmosphere/shaders/inScattering_calc_vs.glsl rename to modules/advancedatmosphere/shaders/inScattering_calc_vs.glsl diff --git a/modules/atmosphere/shaders/inScattering_sup_calc_fs.glsl b/modules/advancedatmosphere/shaders/inScattering_sup_calc_fs.glsl similarity index 100% rename from modules/atmosphere/shaders/inScattering_sup_calc_fs.glsl rename to modules/advancedatmosphere/shaders/inScattering_sup_calc_fs.glsl diff --git a/modules/atmosphere/shaders/inScattering_sup_calc_gs.glsl b/modules/advancedatmosphere/shaders/inScattering_sup_calc_gs.glsl similarity index 100% rename from modules/atmosphere/shaders/inScattering_sup_calc_gs.glsl rename to modules/advancedatmosphere/shaders/inScattering_sup_calc_gs.glsl diff --git a/modules/atmosphere/shaders/inScattering_sup_calc_vs.glsl b/modules/advancedatmosphere/shaders/inScattering_sup_calc_vs.glsl similarity index 100% rename from modules/atmosphere/shaders/inScattering_sup_calc_vs.glsl rename to modules/advancedatmosphere/shaders/inScattering_sup_calc_vs.glsl diff --git a/modules/atmosphere/shaders/irradiance_calc_fs.glsl b/modules/advancedatmosphere/shaders/irradiance_calc_fs.glsl similarity index 100% rename from modules/atmosphere/shaders/irradiance_calc_fs.glsl rename to modules/advancedatmosphere/shaders/irradiance_calc_fs.glsl diff --git a/modules/atmosphere/shaders/irradiance_calc_vs.glsl b/modules/advancedatmosphere/shaders/irradiance_calc_vs.glsl similarity index 100% rename from modules/atmosphere/shaders/irradiance_calc_vs.glsl rename to modules/advancedatmosphere/shaders/irradiance_calc_vs.glsl diff --git a/modules/atmosphere/shaders/irradiance_final_fs.glsl b/modules/advancedatmosphere/shaders/irradiance_final_fs.glsl similarity index 100% rename from modules/atmosphere/shaders/irradiance_final_fs.glsl rename to modules/advancedatmosphere/shaders/irradiance_final_fs.glsl diff --git a/modules/atmosphere/shaders/irradiance_final_vs.glsl b/modules/advancedatmosphere/shaders/irradiance_final_vs.glsl similarity index 100% rename from modules/atmosphere/shaders/irradiance_final_vs.glsl rename to modules/advancedatmosphere/shaders/irradiance_final_vs.glsl diff --git a/modules/atmosphere/shaders/irradiance_sup_calc_fs.glsl b/modules/advancedatmosphere/shaders/irradiance_sup_calc_fs.glsl similarity index 100% rename from modules/atmosphere/shaders/irradiance_sup_calc_fs.glsl rename to modules/advancedatmosphere/shaders/irradiance_sup_calc_fs.glsl diff --git a/modules/atmosphere/shaders/irradiance_sup_calc_vs.glsl b/modules/advancedatmosphere/shaders/irradiance_sup_calc_vs.glsl similarity index 100% rename from modules/atmosphere/shaders/irradiance_sup_calc_vs.glsl rename to modules/advancedatmosphere/shaders/irradiance_sup_calc_vs.glsl diff --git a/modules/atmosphere/shaders/transmittance_calc_fs.glsl b/modules/advancedatmosphere/shaders/transmittance_calc_fs.glsl similarity index 100% rename from modules/atmosphere/shaders/transmittance_calc_fs.glsl rename to modules/advancedatmosphere/shaders/transmittance_calc_fs.glsl diff --git a/modules/atmosphere/shaders/transmittance_calc_vs.glsl b/modules/advancedatmosphere/shaders/transmittance_calc_vs.glsl similarity index 100% rename from modules/atmosphere/shaders/transmittance_calc_vs.glsl rename to modules/advancedatmosphere/shaders/transmittance_calc_vs.glsl