From 54c5b052a582de21df40111025caa4808750b2de Mon Sep 17 00:00:00 2001 From: Emma Broman Date: Fri, 29 Jan 2021 13:14:40 +0100 Subject: [PATCH] Update disc and habitable zone textures --- .../milkyway/exoplanets/exoplanets_textures.asset | 2 +- modules/exoplanets/exoplanetsmodule_lua.inl | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/data/assets/scene/milkyway/exoplanets/exoplanets_textures.asset b/data/assets/scene/milkyway/exoplanets/exoplanets_textures.asset index 62470b7bc9..1b4c40dd2a 100644 --- a/data/assets/scene/milkyway/exoplanets/exoplanets_textures.asset +++ b/data/assets/scene/milkyway/exoplanets/exoplanets_textures.asset @@ -2,7 +2,7 @@ local ExoplanetsTexturesPath = asset.syncedResource({ Name = "Exoplanet Textures", Type = "HttpSynchronization", Identifier = "exoplanets_textures", - Version = 1 + Version = 2 }) local HabitableZoneTexturesPath = asset.syncedResource({ diff --git a/modules/exoplanets/exoplanetsmodule_lua.inl b/modules/exoplanets/exoplanetsmodule_lua.inl index 662eb2243c..00bd2bb2c9 100644 --- a/modules/exoplanets/exoplanetsmodule_lua.inl +++ b/modules/exoplanets/exoplanetsmodule_lua.inl @@ -50,13 +50,13 @@ constexpr const char* LookUpTablePath = "${SYNC}/http/exoplanets_data/2/lookup.t constexpr const char* ExoplanetsDataPath = "${SYNC}/http/exoplanets_data/2/exoplanets_data.bin"; -constexpr const char* StarTextureFile = "${SYNC}/http/exoplanets_textures/1/sun.jpg"; +constexpr const char* StarTextureFile = "${SYNC}/http/exoplanets_textures/2/sun.jpg"; constexpr const char* NoDataTextureFile = - "${SYNC}/http/exoplanets_textures/1/grid-32.png"; + "${SYNC}/http/exoplanets_textures/2/grid-32.png"; constexpr const char* DiscTextureFile = - "${SYNC}/http/exoplanets_textures/1/disc_texture.png"; + "${SYNC}/http/exoplanets_textures/2/disc_bw_texture.png"; constexpr const char* HabitableZoneTextureFile = - "${SYNC}/http/habitable_zone_textures/1/green_faded.png"; + "${SYNC}/http/habitable_zone_textures/1/hot_to_cold_faded.png"; constexpr const float AU = static_cast(distanceconstants::AstronomicalUnit); constexpr const float SolarRadius = static_cast(distanceconstants::SolarRadius); @@ -389,7 +389,7 @@ void createExoplanetSystem(const std::string& starName) { std::to_string(lowerOffset) + ", " + std::to_string(upperOffset) + "}," //min / max extend - "Opacity = 0.3" + "Opacity = 0.25" "}," "Transform = {" "Rotation = {" @@ -442,6 +442,7 @@ void createExoplanetSystem(const std::string& starName) { "Texture = openspace.absPath('" + HabitableZoneTextureFile + "')," "Luminosity = " + std::to_string(system.starData.luminosity) + "," "EffectiveTemperature = " + std::to_string(system.starData.teff) + "," + "Optimistic = true," "Opacity = 0.07" "}," "Transform = {"