🔀 Merge pull request #374 from cosmoscout/feature/separate-atmosphere…

…-preprocessor
cosmoscout · Jul 15, 2024 · 38a95b3 · 38a95b3
2 parents 182535e + dd91342
commit 38a95b3
Show file tree

Hide file tree

Showing 143 changed files with 2,050 additions and 1,442 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -59,3 +59,6 @@
 [submodule "externals/openvr"]
  path = externals/openvr
  url = https://github.com/ValveSoftware/openvr.git
+[submodule "plugins/csp-atmospheres/bruneton-preprocessor/output"]
+ path = plugins/csp-atmospheres/bruneton-preprocessor/output
+ url = https://github.com/cosmoscout/atmosphere-data.git
diff --git a/.reuse/dep5 b/.reuse/dep5
@@ -1,14 +1,18 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 
-Files: plugins/csp-atmospheres/data/csp-atmospheres/*
+Files: plugins/csp-atmospheres/bruneton-preprocessor/settings/*
 Copyright: German Aerospace Center (DLR) <cosmoscout@dlr.de>
 License: CC0-1.0
 
-Files: plugins/csp-atmospheres/preprocessor/density-settings/*
+Files: plugins/csp-atmospheres/scattering-table-generator/mie-settings/*
 Copyright: German Aerospace Center (DLR) <cosmoscout@dlr.de>
 License: CC0-1.0
 
-Files: plugins/csp-atmospheres/preprocessor/mie-settings/*
+Files: plugins/csp-atmospheres/scattering-table-generator/density-settings/*
+Copyright: German Aerospace Center (DLR) <cosmoscout@dlr.de>
+License: CC0-1.0
+
+Files: plugins/csp-atmospheres/scattering-table-generator/output/*
 Copyright: German Aerospace Center (DLR) <cosmoscout@dlr.de>
 License: CC0-1.0
 

diff --git a/config/base/scene/simple_desktop.json b/config/base/scene/simple_desktop.json
@@ -743,47 +743,15 @@
  "bottomAltitude": -100,
  "model": "Bruneton",
  "modelSettings": {
- "sunAngularRadius": 0.004675,
- "multiScatteringOrder": 10,
- "molecules": {
- "phase": "../share/resources/data/csp-atmospheres/earth_cosmoscout_molecules_phase.csv",
- "betaSca": "../share/resources/data/csp-atmospheres/earth_cosmoscout_molecules_scattering.csv",
- "betaAbs": "../share/resources/data/csp-atmospheres/earth_cosmoscout_molecules_absorption.csv",
- "density": "../share/resources/data/csp-atmospheres/earth_cosmoscout_molecules_density.csv"
- },
- "aerosols": {
- "phase": "../share/resources/data/csp-atmospheres/earth_cosmoscout_aerosols_phase.csv",
- "betaSca": "../share/resources/data/csp-atmospheres/earth_cosmoscout_aerosols_scattering.csv",
- "betaAbs": "../share/resources/data/csp-atmospheres/earth_cosmoscout_aerosols_absorption.csv",
- "density": "../share/resources/data/csp-atmospheres/earth_cosmoscout_aerosols_density.csv"
- },
- "ozone": {
- "betaAbs": "../share/resources/data/csp-atmospheres/earth_cosmoscout_ozone_absorption.csv",
- "density": "../share/resources/data/csp-atmospheres/earth_cosmoscout_ozone_density.csv"
- }
+ "dataDirectory": "../share/resources/atmosphere-data/earth"
  }
  },
  "Mars": {
  "topAltitude": 80000,
  "bottomAltitude": -4500,
  "model": "Bruneton",
  "modelSettings": {
- "transmittanceTextureWidth": 1024,
- "transmittanceTextureHeight": 512,
- "sunAngularRadius": 0.003054,
- "multiScatteringOrder": 10,
- "molecules": {
- "phase": "../share/resources/data/csp-atmospheres/mars_cosmoscout_molecules_cinematic_phase.csv",
- "betaSca": "../share/resources/data/csp-atmospheres/mars_cosmoscout_molecules_cinematic_scattering.csv",
- "betaAbs": "../share/resources/data/csp-atmospheres/mars_cosmoscout_molecules_cinematic_absorption.csv",
- "density": "../share/resources/data/csp-atmospheres/mars_cosmoscout_molecules_cinematic_density.csv"
- },
- "aerosols": {
- "phase": "../share/resources/data/csp-atmospheres/mars_cosmoscout_aerosols_cinematic_phase.csv",
- "betaSca": "../share/resources/data/csp-atmospheres/mars_cosmoscout_aerosols_cinematic_scattering.csv",
- "betaAbs": "../share/resources/data/csp-atmospheres/mars_cosmoscout_aerosols_cinematic_absorption.csv",
- "density": "../share/resources/data/csp-atmospheres/mars_cosmoscout_aerosols_cinematic_density.csv"
- }
+ "dataDirectory": "../share/resources/atmosphere-data/mars"
  }
  }
  }

diff --git a/plugins/csp-atmospheres/CMakeLists.txt b/plugins/csp-atmospheres/CMakeLists.txt
@@ -11,9 +11,10 @@ if (NOT CSP_ATMOSPHERES)
  return()
 endif()
 
-# build the preprocessor ---------------------------------------------------------------------------
+# build the preprocessors --------------------------------------------------------------------------
 
-add_subdirectory(preprocessor)
+add_subdirectory(scattering-table-generator)
+add_subdirectory(bruneton-preprocessor)
 
 # build plugin -------------------------------------------------------------------------------------
 
@@ -47,8 +48,8 @@ source_group(TREE "${CMAKE_CURRENT_SOURCE_DIR}" FILES
 
 # install plugin -----------------------------------------------------------------------------------
 
-install(TARGETS csp-atmospheres DESTINATION "share/plugins")
-install(DIRECTORY "textures" DESTINATION "share/resources")
-install(DIRECTORY "data" DESTINATION "share/resources")
-install(DIRECTORY "shaders" DESTINATION "share/resources")
-install(DIRECTORY "gui" DESTINATION "share/resources")
+install(TARGETS csp-atmospheres  DESTINATION "share/plugins")
+install(DIRECTORY "textures"  DESTINATION "share/resources")
+install(DIRECTORY "shaders"  DESTINATION "share/resources")
+install(DIRECTORY "gui"  DESTINATION "share/resources")
+install(DIRECTORY "bruneton-preprocessor/output/" DESTINATION "share/resources/atmosphere-data")