From deaf0467a571a0db63b72a6320fe4a8f90e7b60e Mon Sep 17 00:00:00 2001 From: Micah Acinapura Date: Thu, 5 May 2022 22:09:48 -0400 Subject: [PATCH] Feature/apogee galah update (#2080) * Updated color map for gala and apogee * Adding apogee-galah values for when they are read properly --- data/assets/modules/exoplanets/exoplanets_data.asset | 2 +- data/assets/scene/digitaluniverse/stars.asset | 2 +- data/assets/scene/milkyway/gaia/apogee.asset | 7 ++++--- data/assets/scene/milkyway/gaia/gaiastars.asset | 2 +- data/assets/scene/milkyway/gaia/galah.asset | 7 ++++--- 5 files changed, 11 insertions(+), 9 deletions(-) diff --git a/data/assets/modules/exoplanets/exoplanets_data.asset b/data/assets/modules/exoplanets/exoplanets_data.asset index 35df99ab90..197e23cb87 100644 --- a/data/assets/modules/exoplanets/exoplanets_data.asset +++ b/data/assets/modules/exoplanets/exoplanets_data.asset @@ -9,7 +9,7 @@ local colormaps = asset.syncedResource({ Name = "Stars Color Table", Type = "HttpSynchronization", Identifier = "stars_colormap", - Version = 2 + Version = 3 }) asset.onInitialize(function () diff --git a/data/assets/scene/digitaluniverse/stars.asset b/data/assets/scene/digitaluniverse/stars.asset index 26e959dd23..a5a9e60cb0 100644 --- a/data/assets/scene/digitaluniverse/stars.asset +++ b/data/assets/scene/digitaluniverse/stars.asset @@ -16,7 +16,7 @@ local colormaps = asset.syncedResource({ Name = "Stars Color Table", Type = "HttpSynchronization", Identifier = "stars_colormap", - Version = 2 + Version = 3 }) local textures = asset.syncedResource({ diff --git a/data/assets/scene/milkyway/gaia/apogee.asset b/data/assets/scene/milkyway/gaia/apogee.asset index 8691d0fa5f..8685674ca9 100644 --- a/data/assets/scene/milkyway/gaia/apogee.asset +++ b/data/assets/scene/milkyway/gaia/apogee.asset @@ -9,7 +9,7 @@ local colormaps = asset.syncedResource({ Name = "Stars Color Table", Type = "HttpSynchronization", Identifier = "stars_colormap", - Version = 2 + Version = 3 }) local textures = asset.syncedResource({ @@ -27,13 +27,14 @@ local gaia_abundance_apogee = { File = speck .. "GaiaAbundApogee.speck", ColorOption = "Other Data", OtherData = "FeH", - MagnitudeExponent = 6.2, + MagnitudeExponent = 7.25, SizeComposition = "Distance Modulus", RenderMethod = "Texture Based", Texture = textures .. "halo.png", + ColorRange = { { -0.8, 0.6 } }, -- ShapeTexture = textures .. "disc.png", ColorMap = colormaps .. "colorbv.cmap", - OtherDataColorMap = colormaps .. "viridis.cmap", + OtherDataColorMap = colormaps .. "RainbowGradient.cmap", StaticFilter = -9999, StaticFilterReplacement = 0.0, DataMapping = { diff --git a/data/assets/scene/milkyway/gaia/gaiastars.asset b/data/assets/scene/milkyway/gaia/gaiastars.asset index f284e6fe9e..8ee150b4f9 100644 --- a/data/assets/scene/milkyway/gaia/gaiastars.asset +++ b/data/assets/scene/milkyway/gaia/gaiastars.asset @@ -16,7 +16,7 @@ local colormaps = asset.syncedResource({ Name = "Stars Color Table", Type = "HttpSynchronization", Identifier = "stars_colormap", - Version = 2 + Version = 3 }) local textures = asset.syncedResource({ diff --git a/data/assets/scene/milkyway/gaia/galah.asset b/data/assets/scene/milkyway/gaia/galah.asset index 69c7a162c9..06d6e68129 100644 --- a/data/assets/scene/milkyway/gaia/galah.asset +++ b/data/assets/scene/milkyway/gaia/galah.asset @@ -9,7 +9,7 @@ local colormaps = asset.syncedResource({ Name = "Stars Color Table", Type = "HttpSynchronization", Identifier = "stars_colormap", - Version = 2 + Version = 3 }) local textures = asset.syncedResource({ @@ -27,13 +27,14 @@ local gaia_abundance_galah = { File = speck .. "GaiaAbundGalah.speck", Texture = textures .. "halo.png", -- ShapeTexture = textures .. "disc.png", - MagnitudeExponent = 6.2, + MagnitudeExponent = 7.25, SizeComposition = "Distance Modulus", RenderMethod = "Texture Based", ColorOption = "Other Data", OtherData = "FeH", ColorMap = colormaps .. "colorbv.cmap", - OtherDataColorMap = colormaps .. "viridis.cmap", + OtherDataColorMap = colormaps .. "RainbowGradient.cmap", + ColorRange = { { -0.8, 0.6 } }, StaticFilter = -9999, StaticFilterReplacement = 0.0, DataMapping = {