diff --git a/data/assets/scene/digitaluniverse/stars.asset b/data/assets/scene/digitaluniverse/stars.asset index 35a3565535..db0ac4adb7 100644 --- a/data/assets/scene/digitaluniverse/stars.asset +++ b/data/assets/scene/digitaluniverse/stars.asset @@ -1,13 +1,7 @@ local assetHelper = asset.require('util/asset_helper') local colormaps = asset.require('./stars_colormap').ColorMaps - -local textures = asset.syncedResource({ - Name = "Stars Textures", - Type = "HttpSynchronization", - Identifier = "stars_textures", - Version = 1 -}) +local textures = asset.require('./stars_textures').textures local speck = asset.syncedResource({ Name = "Stars Speck Files", diff --git a/data/assets/scene/digitaluniverse/stars_textures.asset b/data/assets/scene/digitaluniverse/stars_textures.asset new file mode 100644 index 0000000000..d57f6d0907 --- /dev/null +++ b/data/assets/scene/digitaluniverse/stars_textures.asset @@ -0,0 +1,20 @@ +local assetHelper = asset.require('util/asset_helper') + +local textures = asset.syncedResource({ + Name = "Stars Textures", + Type = "HttpSynchronization", + Identifier = "stars_textures", + Version = 1 +}) + +asset.export("textures", textures) + +asset.meta = { + Name = "Star Textures", + Version = "1.0", + Description = [[Square textures used to represent stars when applied to camera-facing bil;board]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT License" +} + diff --git a/data/assets/scene/milkyway/gaia/apogee.asset b/data/assets/scene/milkyway/gaia/apogee.asset index 12c495264a..b6abe3159a 100644 --- a/data/assets/scene/milkyway/gaia/apogee.asset +++ b/data/assets/scene/milkyway/gaia/apogee.asset @@ -1,14 +1,9 @@ local assetHelper = asset.require('util/asset_helper') +local colorLUT = asset.require('scene/digitaluniverse/stars_colormap').ColorMaps +local textures = asset.require('scene/digitaluniverse/stars_textures').textures -local textures = asset.syncedResource({ - Name = "Stars Textures", - Type = "HttpSynchronization", - Identifier = "stars_textures", - Version = 1 -}) - local speck = asset.syncedResource({ Name = "Apogee Speck Files", Type = "HttpSynchronization", @@ -16,13 +11,6 @@ local speck = asset.syncedResource({ Version = 1 }) -local colorLUT = asset.syncedResource({ - Name = "Stars Color Table", - Type = "HttpSynchronization", - Identifier = "stars_colormap", - Version = 2 -}) - local gaia_abundance_apogee = { Identifier = "Gaia Abundance Apogee", Renderable = { diff --git a/data/assets/scene/milkyway/gaia/galah.asset b/data/assets/scene/milkyway/gaia/galah.asset index 121ee8f510..f4c814c20a 100644 --- a/data/assets/scene/milkyway/gaia/galah.asset +++ b/data/assets/scene/milkyway/gaia/galah.asset @@ -1,13 +1,7 @@ local assetHelper = asset.require('util/asset_helper') - - -local textures = asset.syncedResource({ - Name = "Stars Textures", - Type = "HttpSynchronization", - Identifier = "stars_textures", - Version = 1 -}) +local colorLUT = asset.require('scene/digitaluniverse/stars_colormap').ColorMaps +local textures = asset.require('scene/digitaluniverse/stars_textures').textures local speck = asset.syncedResource({ Name = "Galah Speck Files", @@ -16,12 +10,6 @@ local speck = asset.syncedResource({ Version = 1 }) -local colorLUT = asset.syncedResource({ - Name = "Stars Color Table", - Type = "HttpSynchronization", - Identifier = "stars_colormap", - Version = 2 -}) local gaia_abundance_galah = { Identifier = "Gaia Abundance Galah", diff --git a/scripts/configuration_helper.lua b/scripts/configuration_helper.lua index 84dd547e75..deb3b94651 100644 --- a/scripts/configuration_helper.lua +++ b/scripts/configuration_helper.lua @@ -797,6 +797,7 @@ function sgct.config.fisheye(arg) arg["background"] = { r = 0.0, g = 0.0, b = 0.0, a = 1.0 } end + local trackedSpecifier = "" if (arg["tracked"] ~= nil and arg["tracked"] == true) then trackedSpecifier = "tracked=\"true\"" else