From bfdfd44910ff6b4453a398193633fd502bcfae7d Mon Sep 17 00:00:00 2001 From: GPayne Date: Thu, 12 Mar 2020 13:40:28 -0600 Subject: [PATCH] Added GUI name title for sssb objects --- data/assets/asteroids.scene | 2 +- data/assets/default.scene | 2 -- data/assets/scene/solarsystem/sssb/amor_asteroid.asset | 2 +- data/assets/scene/solarsystem/sssb/apollo_asteroid.asset | 2 +- data/assets/scene/solarsystem/sssb/aten_asteroid.asset | 2 +- data/assets/scene/solarsystem/sssb/atira_asteroid.asset | 2 +- data/assets/scene/solarsystem/sssb/centaur_asteroid.asset | 2 +- data/assets/scene/solarsystem/sssb/chiron-type_comet.asset | 2 +- data/assets/scene/solarsystem/sssb/encke-type_comet.asset | 2 +- data/assets/scene/solarsystem/sssb/halley-type_comet.asset | 2 +- data/assets/scene/solarsystem/sssb/hyperbolic_asteroid.asset | 2 +- data/assets/scene/solarsystem/sssb/hyperbolic_comet.asset | 2 +- .../scene/solarsystem/sssb/inner_main_belt_asteroid.asset | 2 +- .../assets/scene/solarsystem/sssb/jupiter-family_comet.asset | 2 +- .../scene/solarsystem/sssb/jupiter_trojan_asteroid.asset | 2 +- data/assets/scene/solarsystem/sssb/main_belt_asteroid.asset | 2 +- .../scene/solarsystem/sssb/mars-crossing_asteroid.asset | 2 +- .../scene/solarsystem/sssb/outer_main_belt_asteroid.asset | 2 +- data/assets/scene/solarsystem/sssb/parabolic_asteroid.asset | 2 +- data/assets/scene/solarsystem/sssb/sssb_shared.asset | 5 +++-- .../solarsystem/sssb/transneptunian_object_asteroid.asset | 2 +- openspace.cfg | 3 ++- 22 files changed, 24 insertions(+), 24 deletions(-) diff --git a/data/assets/asteroids.scene b/data/assets/asteroids.scene index 8ac40d71fa..b53256a032 100644 --- a/data/assets/asteroids.scene +++ b/data/assets/asteroids.scene @@ -15,7 +15,7 @@ asset.require('scene/solarsystem/sssb/hyperbolic_comet') asset.require('scene/solarsystem/sssb/inner_main_belt_asteroid') asset.require('scene/solarsystem/sssb/jupiter_trojan_asteroid') asset.require('scene/solarsystem/sssb/jupiter-family_comet') --- asset.require('scene/solarsystem/sssb/main_belt_asteroid') +asset.require('scene/solarsystem/sssb/main_belt_asteroid') asset.require('scene/solarsystem/sssb/mars-crossing_asteroid') asset.require('scene/solarsystem/sssb/outer_main_belt_asteroid') asset.require('scene/solarsystem/sssb/parabolic_asteroid') diff --git a/data/assets/default.scene b/data/assets/default.scene index d3736bd8b9..31a2e83d4f 100644 --- a/data/assets/default.scene +++ b/data/assets/default.scene @@ -2,8 +2,6 @@ asset.require('./base') local earthAsset = asset.require('scene/solarsystem/planets/earth/earth') asset.require('scene/solarsystem/planets/earth/satellites/satellites.asset') -asset.require('scene/solarsystem/sssb/pha') -asset.require('scene/solarsystem/sssb/main_asteroid_belt') asset.onInitialize(function () local now = openspace.time.currentWallTime() diff --git a/data/assets/scene/solarsystem/sssb/amor_asteroid.asset b/data/assets/scene/solarsystem/sssb/amor_asteroid.asset index 546d3f3d96..9c3eda19cd 100644 --- a/data/assets/scene/solarsystem/sssb/amor_asteroid.asset +++ b/data/assets/scene/solarsystem/sssb/amor_asteroid.asset @@ -2,7 +2,7 @@ local assetHelper = asset.require('util/asset_helper') local sharedSssb = asset.require('./sssb_shared') local filepath = sharedSssb.downloadSssbDatabaseFile(asset, 'amor_asteroid', 'sssb_data_amor_asteroid') -local object = sharedSssb.createSssbGroupObject('sssb_data_amor_asteroid.csv', filepath, { 0.9, 0.3, 0.1 }) +local object = sharedSssb.createSssbGroupObject('sssb_data_amor_asteroid.csv', "Amor Asteroid", filepath, { 0.9, 0.3, 0.1 }) object.Renderable.Enabled = false object.Renderable.Segments = 50 object.Renderable.Fade = 5 diff --git a/data/assets/scene/solarsystem/sssb/apollo_asteroid.asset b/data/assets/scene/solarsystem/sssb/apollo_asteroid.asset index 5c47ed6222..d5b1bcb556 100644 --- a/data/assets/scene/solarsystem/sssb/apollo_asteroid.asset +++ b/data/assets/scene/solarsystem/sssb/apollo_asteroid.asset @@ -2,7 +2,7 @@ local assetHelper = asset.require('util/asset_helper') local sharedSssb = asset.require('./sssb_shared') local filepath = sharedSssb.downloadSssbDatabaseFile(asset, 'apollo_asteroid', 'sssb_data_apollo_asteroid') -local object = sharedSssb.createSssbGroupObject('sssb_data_apollo_asteroid.csv', filepath, { 0.9, 0.3, 0.1 }) +local object = sharedSssb.createSssbGroupObject('sssb_data_apollo_asteroid.csv', "Apollo Asteroid", filepath, { 0.9, 0.3, 0.1 }) object.Renderable.Enabled = false object.Renderable.Segments = 50 object.Renderable.Fade = 5 diff --git a/data/assets/scene/solarsystem/sssb/aten_asteroid.asset b/data/assets/scene/solarsystem/sssb/aten_asteroid.asset index a015070eb6..aca1505878 100644 --- a/data/assets/scene/solarsystem/sssb/aten_asteroid.asset +++ b/data/assets/scene/solarsystem/sssb/aten_asteroid.asset @@ -2,7 +2,7 @@ local assetHelper = asset.require('util/asset_helper') local sharedSssb = asset.require('./sssb_shared') local filepath = sharedSssb.downloadSssbDatabaseFile(asset, 'aten_asteroid', 'sssb_data_aten_asteroid') -local object = sharedSssb.createSssbGroupObject('sssb_data_aten_asteroid.csv', filepath, { 0.9, 0.3, 0.1 }) +local object = sharedSssb.createSssbGroupObject('sssb_data_aten_asteroid.csv', "Aten Asteroid", filepath, { 0.9, 0.3, 0.1 }) object.Renderable.Enabled = false object.Renderable.Segments = 50 object.Renderable.Fade = 5 diff --git a/data/assets/scene/solarsystem/sssb/atira_asteroid.asset b/data/assets/scene/solarsystem/sssb/atira_asteroid.asset index 0e55e6d628..e7787b1a0b 100644 --- a/data/assets/scene/solarsystem/sssb/atira_asteroid.asset +++ b/data/assets/scene/solarsystem/sssb/atira_asteroid.asset @@ -2,7 +2,7 @@ local assetHelper = asset.require('util/asset_helper') local sharedSssb = asset.require('./sssb_shared') local filepath = sharedSssb.downloadSssbDatabaseFile(asset, 'atira_asteroid', 'sssb_data_atira_asteroid') -local object = sharedSssb.createSssbGroupObject('sssb_data_atira_asteroid.csv', filepath, { 0.9, 0.3, 0.1 }) +local object = sharedSssb.createSssbGroupObject('sssb_data_atira_asteroid.csv', "Atira Asteroid", filepath, { 0.9, 0.3, 0.1 }) object.Renderable.Enabled = false object.Renderable.Segments = 50 object.Renderable.Fade = 5 diff --git a/data/assets/scene/solarsystem/sssb/centaur_asteroid.asset b/data/assets/scene/solarsystem/sssb/centaur_asteroid.asset index d60f5a93dd..df9d72c557 100644 --- a/data/assets/scene/solarsystem/sssb/centaur_asteroid.asset +++ b/data/assets/scene/solarsystem/sssb/centaur_asteroid.asset @@ -2,7 +2,7 @@ local assetHelper = asset.require('util/asset_helper') local sharedSssb = asset.require('./sssb_shared') local filepath = sharedSssb.downloadSssbDatabaseFile(asset, 'centaur_asteroid', 'sssb_data_centaur_asteroid') -local object = sharedSssb.createSssbGroupObject('sssb_data_centaur_asteroid.csv', filepath, { 0.9, 0.3, 0.1 }) +local object = sharedSssb.createSssbGroupObject('sssb_data_centaur_asteroid.csv', "Centaur Asteroid", filepath, { 0.9, 0.3, 0.1 }) object.Renderable.Enabled = false object.Renderable.Segments = 50 object.Renderable.Fade = 5 diff --git a/data/assets/scene/solarsystem/sssb/chiron-type_comet.asset b/data/assets/scene/solarsystem/sssb/chiron-type_comet.asset index ca9365f680..6d5a81b69b 100644 --- a/data/assets/scene/solarsystem/sssb/chiron-type_comet.asset +++ b/data/assets/scene/solarsystem/sssb/chiron-type_comet.asset @@ -2,7 +2,7 @@ local assetHelper = asset.require('util/asset_helper') local sharedSssb = asset.require('./sssb_shared') local filepath = sharedSssb.downloadSssbDatabaseFile(asset, 'chiron-type_comet', 'sssb_data_chiron-type_comet') -local object = sharedSssb.createSssbGroupObject('sssb_data_chiron-type_comet.csv', filepath, { 0.9, 0.3, 0.1 }) +local object = sharedSssb.createSssbGroupObject('sssb_data_chiron-type_comet.csv', "Chiron-type Comet", filepath, { 0.9, 0.3, 0.1 }) object.Renderable.Enabled = false object.Renderable.Segments = 50 object.Renderable.Fade = 5 diff --git a/data/assets/scene/solarsystem/sssb/encke-type_comet.asset b/data/assets/scene/solarsystem/sssb/encke-type_comet.asset index 6f60be8d2c..1f97ac9624 100644 --- a/data/assets/scene/solarsystem/sssb/encke-type_comet.asset +++ b/data/assets/scene/solarsystem/sssb/encke-type_comet.asset @@ -2,7 +2,7 @@ local assetHelper = asset.require('util/asset_helper') local sharedSssb = asset.require('./sssb_shared') local filepath = sharedSssb.downloadSssbDatabaseFile(asset, 'encke-type_comet', 'sssb_data_encke-type_comet') -local object = sharedSssb.createSssbGroupObject('sssb_data_encke-type_comet.csv', filepath, { 0.9, 0.3, 0.1 }) +local object = sharedSssb.createSssbGroupObject('sssb_data_encke-type_comet.csv', "Encke-type Comet", filepath, { 0.9, 0.3, 0.1 }) object.Renderable.Enabled = false object.Renderable.Segments = 50 object.Renderable.Fade = 5 diff --git a/data/assets/scene/solarsystem/sssb/halley-type_comet.asset b/data/assets/scene/solarsystem/sssb/halley-type_comet.asset index b8f3d80671..20a6542e42 100644 --- a/data/assets/scene/solarsystem/sssb/halley-type_comet.asset +++ b/data/assets/scene/solarsystem/sssb/halley-type_comet.asset @@ -2,7 +2,7 @@ local assetHelper = asset.require('util/asset_helper') local sharedSssb = asset.require('./sssb_shared') local filepath = sharedSssb.downloadSssbDatabaseFile(asset, 'halley-type_comet', 'sssb_data_halley-type_comet') -local object = sharedSssb.createSssbGroupObject('sssb_data_halley-type_comet.csv', filepath, { 0.9, 0.3, 0.1 }) +local object = sharedSssb.createSssbGroupObject('sssb_data_halley-type_comet.csv', "Halley-type Comet", filepath, { 0.9, 0.3, 0.1 }) object.Renderable.Enabled = false object.Renderable.Segments = 50 object.Renderable.Fade = 5 diff --git a/data/assets/scene/solarsystem/sssb/hyperbolic_asteroid.asset b/data/assets/scene/solarsystem/sssb/hyperbolic_asteroid.asset index 9b052b26e6..4ed8b01d22 100644 --- a/data/assets/scene/solarsystem/sssb/hyperbolic_asteroid.asset +++ b/data/assets/scene/solarsystem/sssb/hyperbolic_asteroid.asset @@ -2,7 +2,7 @@ local assetHelper = asset.require('util/asset_helper') local sharedSssb = asset.require('./sssb_shared') local filepath = sharedSssb.downloadSssbDatabaseFile(asset, 'hyperbolic_asteroid', 'sssb_data_hyperbolic_asteroid') -local object = sharedSssb.createSssbGroupObject('sssb_data_hyperbolic_asteroid.csv', filepath, { 0.9, 0.3, 0.1 }) +local object = sharedSssb.createSssbGroupObject('sssb_data_hyperbolic_asteroid.csv', "Hyperbolic Asteroid", filepath, { 0.9, 0.3, 0.1 }) object.Renderable.Enabled = false object.Renderable.Segments = 50 object.Renderable.Fade = 5 diff --git a/data/assets/scene/solarsystem/sssb/hyperbolic_comet.asset b/data/assets/scene/solarsystem/sssb/hyperbolic_comet.asset index 34787fee34..b0395c3fa5 100644 --- a/data/assets/scene/solarsystem/sssb/hyperbolic_comet.asset +++ b/data/assets/scene/solarsystem/sssb/hyperbolic_comet.asset @@ -2,7 +2,7 @@ local assetHelper = asset.require('util/asset_helper') local sharedSssb = asset.require('./sssb_shared') local filepath = sharedSssb.downloadSssbDatabaseFile(asset, 'hyperbolic_comet', 'sssb_data_hyperbolic_comet') -local object = sharedSssb.createSssbGroupObject('sssb_data_hyperbolic_comet.csv', filepath, { 0.9, 0.3, 0.1 }) +local object = sharedSssb.createSssbGroupObject('sssb_data_hyperbolic_comet.csv', "Hyperbolic Comet", filepath, { 0.9, 0.3, 0.1 }) object.Renderable.Enabled = false object.Renderable.Segments = 50 object.Renderable.Fade = 5 diff --git a/data/assets/scene/solarsystem/sssb/inner_main_belt_asteroid.asset b/data/assets/scene/solarsystem/sssb/inner_main_belt_asteroid.asset index b769e620ef..96077eb6b3 100644 --- a/data/assets/scene/solarsystem/sssb/inner_main_belt_asteroid.asset +++ b/data/assets/scene/solarsystem/sssb/inner_main_belt_asteroid.asset @@ -2,7 +2,7 @@ local assetHelper = asset.require('util/asset_helper') local sharedSssb = asset.require('./sssb_shared') local filepath = sharedSssb.downloadSssbDatabaseFile(asset, 'inner_main_belt_asteroid', 'sssb_data_inner_main_belt_asteroid') -local object = sharedSssb.createSssbGroupObject('sssb_data_inner_main_belt_asteroid.csv', filepath, { 0.9, 0.3, 0.1 }) +local object = sharedSssb.createSssbGroupObject('sssb_data_inner_main_belt_asteroid.csv', "Inner Main Belt Asteroid", filepath, { 0.9, 0.3, 0.1 }) object.Renderable.Enabled = false object.Renderable.Segments = 50 object.Renderable.Fade = 5 diff --git a/data/assets/scene/solarsystem/sssb/jupiter-family_comet.asset b/data/assets/scene/solarsystem/sssb/jupiter-family_comet.asset index 29e05584a7..6a67ad6052 100644 --- a/data/assets/scene/solarsystem/sssb/jupiter-family_comet.asset +++ b/data/assets/scene/solarsystem/sssb/jupiter-family_comet.asset @@ -2,7 +2,7 @@ local assetHelper = asset.require('util/asset_helper') local sharedSssb = asset.require('./sssb_shared') local filepath = sharedSssb.downloadSssbDatabaseFile(asset, 'jupiter-family_comet', 'sssb_data_jupiter-family_comet') -local object = sharedSssb.createSssbGroupObject('sssb_data_jupiter-family_comet.csv', filepath, { 0.9, 0.3, 0.1 }) +local object = sharedSssb.createSssbGroupObject('sssb_data_jupiter-family_comet.csv', "Jupiter-family Comet", filepath, { 0.9, 0.3, 0.1 }) object.Renderable.Enabled = false object.Renderable.Segments = 50 object.Renderable.Fade = 5 diff --git a/data/assets/scene/solarsystem/sssb/jupiter_trojan_asteroid.asset b/data/assets/scene/solarsystem/sssb/jupiter_trojan_asteroid.asset index ec6298b978..e52e4d863e 100644 --- a/data/assets/scene/solarsystem/sssb/jupiter_trojan_asteroid.asset +++ b/data/assets/scene/solarsystem/sssb/jupiter_trojan_asteroid.asset @@ -2,7 +2,7 @@ local assetHelper = asset.require('util/asset_helper') local sharedSssb = asset.require('./sssb_shared') local filepath = sharedSssb.downloadSssbDatabaseFile(asset, 'jupiter_trojan_asteroid', 'sssb_data_jupiter_trojan_asteroid') -local object = sharedSssb.createSssbGroupObject('sssb_data_jupiter_trojan_asteroid.csv', filepath, { 0.9, 0.3, 0.1 }) +local object = sharedSssb.createSssbGroupObject('sssb_data_jupiter_trojan_asteroid.csv', "Jupiter Trojan Asteroid", filepath, { 0.9, 0.3, 0.1 }) object.Renderable.Enabled = false object.Renderable.Segments = 50 object.Renderable.Fade = 5 diff --git a/data/assets/scene/solarsystem/sssb/main_belt_asteroid.asset b/data/assets/scene/solarsystem/sssb/main_belt_asteroid.asset index 318591bbfb..4bd90cd824 100644 --- a/data/assets/scene/solarsystem/sssb/main_belt_asteroid.asset +++ b/data/assets/scene/solarsystem/sssb/main_belt_asteroid.asset @@ -2,7 +2,7 @@ local assetHelper = asset.require('util/asset_helper') local sharedSssb = asset.require('./sssb_shared') local filepath = sharedSssb.downloadSssbDatabaseFile(asset, 'main_belt_asteroid', 'sssb_data_main_belt_asteroid') -local object = sharedSssb.createSssbGroupObject('sssb_data_main_belt_asteroid.csv', filepath, { 0.9, 0.3, 0.1 }) +local object = sharedSssb.createSssbGroupObject('sssb_data_main_belt_asteroid.csv', "Main Belt Asteroid", filepath, { 0.9, 0.3, 0.1 }) object.Renderable.Enabled = false object.Renderable.Segments = 50 object.Renderable.Fade = 5 diff --git a/data/assets/scene/solarsystem/sssb/mars-crossing_asteroid.asset b/data/assets/scene/solarsystem/sssb/mars-crossing_asteroid.asset index 8810ad535b..afd4e39721 100644 --- a/data/assets/scene/solarsystem/sssb/mars-crossing_asteroid.asset +++ b/data/assets/scene/solarsystem/sssb/mars-crossing_asteroid.asset @@ -2,7 +2,7 @@ local assetHelper = asset.require('util/asset_helper') local sharedSssb = asset.require('./sssb_shared') local filepath = sharedSssb.downloadSssbDatabaseFile(asset, 'mars-crossing_asteroid', 'sssb_data_mars-crossing_asteroid') -local object = sharedSssb.createSssbGroupObject('sssb_data_mars-crossing_asteroid.csv', filepath, { 0.9, 0.3, 0.1 }) +local object = sharedSssb.createSssbGroupObject('sssb_data_mars-crossing_asteroid.csv', "Mars-crossing Asteroid", filepath, { 0.9, 0.3, 0.1 }) object.Renderable.Enabled = false object.Renderable.Segments = 50 object.Renderable.Fade = 5 diff --git a/data/assets/scene/solarsystem/sssb/outer_main_belt_asteroid.asset b/data/assets/scene/solarsystem/sssb/outer_main_belt_asteroid.asset index a71c798ce4..ebe3185947 100644 --- a/data/assets/scene/solarsystem/sssb/outer_main_belt_asteroid.asset +++ b/data/assets/scene/solarsystem/sssb/outer_main_belt_asteroid.asset @@ -2,7 +2,7 @@ local assetHelper = asset.require('util/asset_helper') local sharedSssb = asset.require('./sssb_shared') local filepath = sharedSssb.downloadSssbDatabaseFile(asset, 'outer_main_belt_asteroid', 'sssb_data_outer_main_belt_asteroid') -local object = sharedSssb.createSssbGroupObject('sssb_data_outer_main_belt_asteroid.csv', filepath, { 0.9, 0.3, 0.1 }) +local object = sharedSssb.createSssbGroupObject('sssb_data_outer_main_belt_asteroid.csv', "Outer Main Belt Asteroid", filepath, { 0.9, 0.3, 0.1 }) object.Renderable.Enabled = false object.Renderable.Segments = 50 object.Renderable.Fade = 5 diff --git a/data/assets/scene/solarsystem/sssb/parabolic_asteroid.asset b/data/assets/scene/solarsystem/sssb/parabolic_asteroid.asset index 0bcd8381c9..e80ca51568 100644 --- a/data/assets/scene/solarsystem/sssb/parabolic_asteroid.asset +++ b/data/assets/scene/solarsystem/sssb/parabolic_asteroid.asset @@ -2,7 +2,7 @@ local assetHelper = asset.require('util/asset_helper') local sharedSssb = asset.require('./sssb_shared') local filepath = sharedSssb.downloadSssbDatabaseFile(asset, 'parabolic_asteroid', 'sssb_data_parabolic_asteroid') -local object = sharedSssb.createSssbGroupObject('sssb_data_parabolic_asteroid.csv', filepath, { 0.9, 0.3, 0.1 }) +local object = sharedSssb.createSssbGroupObject('sssb_data_parabolic_asteroid.csv', "Parabolic Asteroid", filepath, { 0.9, 0.3, 0.1 }) object.Renderable.Enabled = false object.Renderable.Segments = 50 object.Renderable.Fade = 5 diff --git a/data/assets/scene/solarsystem/sssb/sssb_shared.asset b/data/assets/scene/solarsystem/sssb/sssb_shared.asset index d67679baff..6a5325acbe 100644 --- a/data/assets/scene/solarsystem/sssb/sssb_shared.asset +++ b/data/assets/scene/solarsystem/sssb/sssb_shared.asset @@ -13,7 +13,7 @@ function downloadSssbDatabaseFile(sceneAsset, name, identifier) }) end -local createSssbGroupObject = function(filename, sssbFolder, trailColor) +local createSssbGroupObject = function(filename, guiName, sssbFolder, trailColor) assert(filename, "'filename' needs to be provided") assert(sssbFolder, "'sssbFolder' needs to be provided") trailColor = trailColor or { 0.75, 0.1, 0.1 } @@ -30,7 +30,8 @@ local createSssbGroupObject = function(filename, sssbFolder, trailColor) Fade = 0.5, }, GUI = { - Path = "/Solar System/Small Solar System Body" + Path = "/Solar System/Small Solar System Body", + Name = guiName } } end diff --git a/data/assets/scene/solarsystem/sssb/transneptunian_object_asteroid.asset b/data/assets/scene/solarsystem/sssb/transneptunian_object_asteroid.asset index ff43a1b296..a05340cd38 100644 --- a/data/assets/scene/solarsystem/sssb/transneptunian_object_asteroid.asset +++ b/data/assets/scene/solarsystem/sssb/transneptunian_object_asteroid.asset @@ -2,7 +2,7 @@ local assetHelper = asset.require('util/asset_helper') local sharedSssb = asset.require('./sssb_shared') local filepath = sharedSssb.downloadSssbDatabaseFile(asset, 'transneptunian_object_asteroid', 'sssb_data_transneptunian_object_asteroid') -local object = sharedSssb.createSssbGroupObject('sssb_data_transneptunian_object_asteroid.csv', filepath, { 0.9, 0.3, 0.1 }) +local object = sharedSssb.createSssbGroupObject('sssb_data_transneptunian_object_asteroid.csv', "Transneptunian Object Asteroid", filepath, { 0.9, 0.3, 0.1 }) object.Renderable.Enabled = false object.Renderable.Segments = 50 object.Renderable.Fade = 5 diff --git a/openspace.cfg b/openspace.cfg index c73d8154f3..cd8c6a8742 100644 --- a/openspace.cfg +++ b/openspace.cfg @@ -45,7 +45,8 @@ SGCTConfig = sgct.config.single{} -- Sets the scene that is to be loaded by OpenSpace. A scene file is a description -- of all entities that will be visible during an instance of OpenSpace -Asset = "default" +Asset = "asteroids" +-- Asset = "default" -- Asset = "default_full" -- Asset = "newhorizons" -- Asset = "rosetta"