diff --git a/data/assets/scene/solarsystem/dsn/spacecraftslabels.asset b/data/assets/scene/solarsystem/dsn/spacecraftslabels.asset index d8344566b6..f25185d0e4 100644 --- a/data/assets/scene/solarsystem/dsn/spacecraftslabels.asset +++ b/data/assets/scene/solarsystem/dsn/spacecraftslabels.asset @@ -61,7 +61,7 @@ local OuterSpaceLabels = { SizeDistanceUnit = "km", FadeOutDistanceRange = {2, 0.1}, FadeOutDistanceUnit = "km", - FadeInDistanceRange = {2,1}, + FadeInDistanceRange = {3,2}, FadeInDistanceUnit = "lightdays", }, GUI = { diff --git a/data/assets/scene/solarsystem/dsn/spacecraftsmaps.asset b/data/assets/scene/solarsystem/dsn/spacecraftsmaps.asset index 22e6ae4c7b..07faaf133a 100644 --- a/data/assets/scene/solarsystem/dsn/spacecraftsmaps.asset +++ b/data/assets/scene/solarsystem/dsn/spacecraftsmaps.asset @@ -8,19 +8,25 @@ local SpaceCrafts = asset.require('scene/solarsystem/missions/dsn/spacecrafts') local signalDataIdMap = { CAS = SpaceCrafts.CassiniAsset.spacecraftID, GAIA = SpaceCrafts.GaiaAsset.spacecraftID, + GNS = SpaceCrafts.GenesisAsset.spacecraftID, + HYB2 = SpaceCrafts.Hayabusa2Asset.spacecraftID, + ICE = SpaceCrafts.IceAsset.spacecraftID, CHDR = SpaceCrafts.ChandraXrayAsset.spacecraftID, DAWN = SpaceCrafts.DawnAsset.spacecraftID, JNO = SpaceCrafts.JunoAsset.spacecraftID, KEPL = SpaceCrafts.KeplerAsset.spacecraftID, MRO = SpaceCrafts.MarsRecOrbAsset.spacecraftID, M010 = SpaceCrafts.MarsOdysseyAsset.spacecraftID, + MSGR = SpaceCrafts.MessengerAsset.spacecraftID, NHPC = SpaceCrafts.NewHorizonsAsset.spacecraftID, SOHO = SpaceCrafts.SohoAsset.spacecraftID, STF = SpaceCrafts.SpitzerAsset.spacecraftID, STA = SpaceCrafts.StereoAAsset.spacecraftID, STB = SpaceCrafts.StereoBAsset.spacecraftID, + TESS = SpaceCrafts.TessAsset.spacecraftID, THB = SpaceCrafts.ThemisBAsset.spacecraftID, THC = SpaceCrafts.ThemisCAsset.spacecraftID, + TGO = SpaceCrafts.TraceGasOrbiterAsset.spacecraftID, VGR1 = SpaceCrafts.Voyager1Asset.spacecraftID, VGR2 = SpaceCrafts.Voyager2Asset.spacecraftID, WIND = SpaceCrafts.WindAsset.spacecraftID @@ -129,7 +135,12 @@ local labelMapInnerSpace = { Label4 = CassiniLabel, Label5 = KeplerLabel, label6 = DawnLabel, - label7 = SpitzerLabel + label7 = SpitzerLabel, + label8 = GenesisLabel, + label9 = Hayabusa2Label, + label10 = MessengerLabel, + label11 = TraceGasOrbiterLabel + } local labelMapNearEarth = { @@ -138,8 +149,10 @@ local labelMapNearEarth = { label3 = ThemisBLabel, label4 = ThemisCLabel, label5 = WindLabel, - label6 = SohoLabel - + label6 = SohoLabel, + label7 = IceLabel, + label8 = TessLabel + } local labelMapClusters = { Label1 = MarsClusterLabel diff --git a/data/assets/scene/solarsystem/missions/dsn/genesis/genesis.asset b/data/assets/scene/solarsystem/missions/dsn/genesis/genesis.asset new file mode 100644 index 0000000000..0b7da42987 --- /dev/null +++ b/data/assets/scene/solarsystem/missions/dsn/genesis/genesis.asset @@ -0,0 +1,29 @@ +local assetHelper = asset.require('util/asset_helper') +local dataFolder = openspace.absPath("../../../sync/http/dsn_data/1/positioning/GNS") + +local models = asset.syncedResource({ + Name = "Dsn models", + Type = "HttpSynchronization", + Identifier = "dsn_stations", + Version = 1 +}) +local spacecraftID = "Genesis"; + +local Genesis = { + Identifier = spacecraftID, + Transform = { + Translation = { + Type = "RadecTranslation", + DataFolder = dataFolder, + DataFileType = "json", + ObjectIdentifier = spacecraftID + } + + }, + GUI = { + Name = "Genesis", + Path = "/Solar System/Genesis" + } +} +asset.export("spacecraftID", spacecraftID) +assetHelper.registerSceneGraphNodesAndExport(asset, {Genesis}) \ No newline at end of file diff --git a/data/assets/scene/solarsystem/missions/dsn/hayabusa2/hayabusa2.asset b/data/assets/scene/solarsystem/missions/dsn/hayabusa2/hayabusa2.asset new file mode 100644 index 0000000000..0e52663fb7 --- /dev/null +++ b/data/assets/scene/solarsystem/missions/dsn/hayabusa2/hayabusa2.asset @@ -0,0 +1,29 @@ +local assetHelper = asset.require('util/asset_helper') +local dataFolder = openspace.absPath("../../../sync/http/dsn_data/1/positioning/HYB2") + +local models = asset.syncedResource({ + Name = "Dsn models", + Type = "HttpSynchronization", + Identifier = "dsn_stations", + Version = 1 +}) +local spacecraftID = "Hayabusa2"; + +local Hayabusa2 = { + Identifier = spacecraftID, + Transform = { + Translation = { + Type = "RadecTranslation", + DataFolder = dataFolder, + DataFileType = "json", + ObjectIdentifier = spacecraftID + } + + }, + GUI = { + Name = "Hayabusa2", + Path = "/Solar System/Hayabusa2" + } +} +asset.export("spacecraftID", spacecraftID) +assetHelper.registerSceneGraphNodesAndExport(asset, {Hayabusa2}) \ No newline at end of file diff --git a/data/assets/scene/solarsystem/missions/dsn/ice/ice.asset b/data/assets/scene/solarsystem/missions/dsn/ice/ice.asset new file mode 100644 index 0000000000..73e720eea6 --- /dev/null +++ b/data/assets/scene/solarsystem/missions/dsn/ice/ice.asset @@ -0,0 +1,29 @@ +local assetHelper = asset.require('util/asset_helper') +local dataFolder = openspace.absPath("../../../sync/http/dsn_data/1/positioning/ICE") + +local models = asset.syncedResource({ + Name = "Dsn models", + Type = "HttpSynchronization", + Identifier = "dsn_stations", + Version = 1 +}) +local spacecraftID = "Ice"; + +local Ice = { + Identifier = spacecraftID, + Transform = { + Translation = { + Type = "RadecTranslation", + DataFolder = dataFolder, + DataFileType = "json", + ObjectIdentifier = spacecraftID + } + + }, + GUI = { + Name = "Ice", + Path = "/Solar System/Ice" + } +} +asset.export("spacecraftID", spacecraftID) +assetHelper.registerSceneGraphNodesAndExport(asset, {Ice}) \ No newline at end of file diff --git a/data/assets/scene/solarsystem/missions/dsn/messenger/messenger.asset b/data/assets/scene/solarsystem/missions/dsn/messenger/messenger.asset new file mode 100644 index 0000000000..a7c00721f5 --- /dev/null +++ b/data/assets/scene/solarsystem/missions/dsn/messenger/messenger.asset @@ -0,0 +1,29 @@ +local assetHelper = asset.require('util/asset_helper') +local dataFolder = openspace.absPath("../../../sync/http/dsn_data/1/positioning/MSGR") + +local models = asset.syncedResource({ + Name = "Dsn models", + Type = "HttpSynchronization", + Identifier = "dsn_stations", + Version = 1 +}) +local spacecraftID = "Messenger"; + +local Messenger = { + Identifier = spacecraftID, + Transform = { + Translation = { + Type = "RadecTranslation", + DataFolder = dataFolder, + DataFileType = "json", + ObjectIdentifier = spacecraftID + } + + }, + GUI = { + Name = "Messenger", + Path = "/Solar System/Messenger" + } +} +asset.export("spacecraftID", spacecraftID) +assetHelper.registerSceneGraphNodesAndExport(asset, {Messenger}) \ No newline at end of file diff --git a/data/assets/scene/solarsystem/missions/dsn/spacecrafts.asset b/data/assets/scene/solarsystem/missions/dsn/spacecrafts.asset index 03a379502c..769c360fbe 100644 --- a/data/assets/scene/solarsystem/missions/dsn/spacecrafts.asset +++ b/data/assets/scene/solarsystem/missions/dsn/spacecrafts.asset @@ -9,17 +9,23 @@ local CassiniAsset = asset.require('scene/solarsystem/missions/dsn/cassini/cassi local ChandraXrayAsset = asset.require('scene/solarsystem/missions/dsn/chandraxray/chandraxray') local DawnAsset = asset.require('scene/solarsystem/missions/dsn/dawn/dawn') local GaiaAsset = asset.require('scene/solarsystem/missions/dsn/gaia/gaia') +local GenesisAsset = asset.require('scene/solarsystem/missions/dsn/genesis/genesis') +local Hayabusa2Asset = asset.require('scene/solarsystem/missions/dsn/hayabusa2/hayabusa2') +local IceAsset = asset.require('scene/solarsystem/missions/dsn/ice/ice') local JunoAsset = asset.require('scene/solarsystem/missions/dsn/juno/juno') local KeplerAsset = asset.require('scene/solarsystem/missions/dsn/kepler/kepler') local MarsRecOrbAsset = asset.require('scene/solarsystem/missions/dsn/mro/mro') local MarsOdysseyAsset = asset.require('scene/solarsystem/missions/dsn/marsodyssey/marsodyssey') +local MessengerAsset = asset.require('scene/solarsystem/missions/dsn/messenger/messenger') local NewHorizonsAsset = asset.require('scene/solarsystem/missions/dsn/newHorizons/newhorizons') local SohoAsset = asset.require('scene/solarsystem/missions/dsn/soho/soho') local SpitzerAsset = asset.require('scene/solarsystem/missions/dsn/spitzer/spitzer') local StereoAAsset = asset.require('scene/solarsystem/missions/dsn/stereoa/stereoa') local StereoBAsset = asset.require('scene/solarsystem/missions/dsn/stereob/stereob') +local TessAsset = asset.require('scene/solarsystem/missions/dsn/transitexoplanetsurvey/transitexoplanetsurvey') local ThemisBAsset = asset.require('scene/solarsystem/missions/dsn/themisb/themisb') local ThemisCAsset = asset.require('scene/solarsystem/missions/dsn/themisc/themisc') +local TraceGasOrbiterAsset = asset.require('scene/solarsystem/missions/dsn/tracegasorbiter/tracegasorbiter') local WindAsset = asset.require('scene/solarsystem/missions/dsn/wind/wind') @@ -27,17 +33,23 @@ asset.export("CassiniAsset", CassiniAsset) asset.export("ChandraXrayAsset", ChandraXrayAsset) asset.export("DawnAsset", DawnAsset) asset.export("GaiaAsset", GaiaAsset) +asset.export("GenesisAsset", GenesisAsset) +asset.export("Hayabusa2Asset", Hayabusa2Asset) +asset.export("IceAsset", IceAsset) asset.export("JunoAsset", JunoAsset) asset.export("KeplerAsset", KeplerAsset) asset.export("MarsRecOrbAsset", MarsRecOrbAsset) asset.export("MarsOdysseyAsset", MarsOdysseyAsset) +asset.export("MessengerAsset", MessengerAsset) asset.export("NewHorizonsAsset", NewHorizonsAsset) asset.export("SohoAsset", SohoAsset) asset.export("SpitzerAsset", SpitzerAsset) asset.export("StereoAAsset", StereoAAsset) asset.export("StereoBAsset", StereoBAsset) +asset.export("TessAsset", TessAsset) asset.export("ThemisBAsset", ThemisBAsset) asset.export("ThemisCAsset", ThemisCAsset) +asset.export("TraceGasOrbiterAsset", TraceGasOrbiterAsset) asset.export("Voyager1Asset", Voyager1Asset) asset.export("Voyager2Asset", Voyager2Asset) asset.export("WindAsset", WindAsset) diff --git a/data/assets/scene/solarsystem/missions/dsn/tracegasorbiter/tracegasorbiter.asset b/data/assets/scene/solarsystem/missions/dsn/tracegasorbiter/tracegasorbiter.asset new file mode 100644 index 0000000000..bebb777bed --- /dev/null +++ b/data/assets/scene/solarsystem/missions/dsn/tracegasorbiter/tracegasorbiter.asset @@ -0,0 +1,29 @@ +local assetHelper = asset.require('util/asset_helper') +local dataFolder = openspace.absPath("../../../sync/http/dsn_data/1/positioning/TGO") + +local models = asset.syncedResource({ + Name = "Dsn models", + Type = "HttpSynchronization", + Identifier = "dsn_stations", + Version = 1 +}) +local spacecraftID = "TraceGasOrbiter"; + +local TraceGasOrbiter = { + Identifier = spacecraftID, + Transform = { + Translation = { + Type = "RadecTranslation", + DataFolder = dataFolder, + DataFileType = "json", + ObjectIdentifier = spacecraftID + } + + }, + GUI = { + Name = "TraceGasOrbiter", + Path = "/Solar System/TraceGasOrbiter" + } +} +asset.export("spacecraftID", spacecraftID) +assetHelper.registerSceneGraphNodesAndExport(asset, {TraceGasOrbiter}) \ No newline at end of file diff --git a/data/assets/scene/solarsystem/missions/dsn/transitexoplanetsurvey/transitexoplanetsurvey.asset b/data/assets/scene/solarsystem/missions/dsn/transitexoplanetsurvey/transitexoplanetsurvey.asset new file mode 100644 index 0000000000..e617528648 --- /dev/null +++ b/data/assets/scene/solarsystem/missions/dsn/transitexoplanetsurvey/transitexoplanetsurvey.asset @@ -0,0 +1,29 @@ +local assetHelper = asset.require('util/asset_helper') +local dataFolder = openspace.absPath("../../../sync/http/dsn_data/1/positioning/TESS") + +local models = asset.syncedResource({ + Name = "Dsn models", + Type = "HttpSynchronization", + Identifier = "dsn_stations", + Version = 1 +}) +local spacecraftID = "TransitExoplanetSurvey"; + +local TransitExoplanetSurvey = { + Identifier = spacecraftID, + Transform = { + Translation = { + Type = "RadecTranslation", + DataFolder = dataFolder, + DataFileType = "json", + ObjectIdentifier = spacecraftID + } + + }, + GUI = { + Name = "TransitExoplanetSurvey", + Path = "/Solar System/TransitExoplanetSurvey" + } +} +asset.export("spacecraftID", spacecraftID) +assetHelper.registerSceneGraphNodesAndExport(asset, {TransitExoplanetSurvey}) \ No newline at end of file