From e6b2ce37ce807751675df0157265d194dd1e2fda Mon Sep 17 00:00:00 2001 From: Lovisa Hassler Date: Fri, 25 Jan 2019 12:07:29 -0500 Subject: [PATCH] added new spacecrafts, maven, spil, ulysses, td11 --- .../scene/solarsystem/dsn/spacecrafts.asset | 14 +++- .../dsn/spacecrafts/{ch20 => ch2o}/ch2o.asset | 0 .../dsn/spacecrafts/maven/maven.asset | 29 ++++++++ .../dsn/spacecrafts/spil/spil.asset | 30 ++++++++ .../dsn/spacecrafts/td11/td11.asset | 29 ++++++++ .../dsn/spacecrafts/ulysses/ulysses.asset | 28 ++++++++ .../solarsystem/dsn/spacecraftslabels.asset | 68 ++++++++++++------- 7 files changed, 173 insertions(+), 25 deletions(-) rename data/assets/scene/solarsystem/dsn/spacecrafts/{ch20 => ch2o}/ch2o.asset (100%) create mode 100644 data/assets/scene/solarsystem/dsn/spacecrafts/maven/maven.asset create mode 100644 data/assets/scene/solarsystem/dsn/spacecrafts/spil/spil.asset create mode 100644 data/assets/scene/solarsystem/dsn/spacecrafts/td11/td11.asset create mode 100644 data/assets/scene/solarsystem/dsn/spacecrafts/ulysses/ulysses.asset diff --git a/data/assets/scene/solarsystem/dsn/spacecrafts.asset b/data/assets/scene/solarsystem/dsn/spacecrafts.asset index dab24f855b..a0ca961be4 100644 --- a/data/assets/scene/solarsystem/dsn/spacecrafts.asset +++ b/data/assets/scene/solarsystem/dsn/spacecrafts.asset @@ -9,7 +9,7 @@ local AceAsset = asset.require('scene/solarsystem/dsn/spacecrafts/ace/ace') local BepiAsset = asset.require('scene/solarsystem/dsn/spacecrafts/bepi/bepi') local CassiniAsset = asset.require('scene/solarsystem/dsn/spacecrafts/cassini/cassini') local ChandraAsset = asset.require('scene/solarsystem/dsn/spacecrafts/chandra/chandra') -local Ch2oAsset = asset.require('scene/solarsystem/dsn/spacecrafts/ch20/ch2o') +local Ch2oAsset = asset.require('scene/solarsystem/dsn/spacecrafts/ch2o/ch2o') local CuriosityAsset = asset.require('scene/solarsystem/dsn/spacecrafts/curiosity/curiosity') local CLU1Asset = asset.require('scene/solarsystem/dsn/spacecrafts/clu1/clu1') local CLU2Asset = asset.require('scene/solarsystem/dsn/spacecrafts/clu2/clu2') @@ -31,6 +31,7 @@ local MarCOAAsset = asset.require('scene/solarsystem/dsn/spacecrafts/marcoa/marc local MarCOBAsset = asset.require('scene/solarsystem/dsn/spacecrafts/marcob/marcob') local MarsRecOrbAsset = asset.require('scene/solarsystem/dsn/spacecrafts/mro/mro') local MarsOdysseyAsset = asset.require('scene/solarsystem/dsn/spacecrafts/marsodyssey/marsodyssey') +local MavenAsset = asset.require('scene/solarsystem/dsn/spacecrafts/maven/maven') local MessengerAsset = asset.require('scene/solarsystem/dsn/spacecrafts/messenger/messenger') local MMS1Asset = asset.require('scene/solarsystem/dsn/spacecrafts/mms1/mms1') local MMS2Asset = asset.require('scene/solarsystem/dsn/spacecrafts/mms2/mms2') @@ -44,11 +45,13 @@ local ParkerSolarProbeAsset = asset.require('scene/solarsystem/dsn/spacecrafts/p local PlanetCAsset = asset.require('scene/solarsystem/dsn/spacecrafts/planetc/planetc') local PRCNAsset = asset.require('scene/solarsystem/dsn/spacecrafts/prcn/prcn') local SohoAsset = asset.require('scene/solarsystem/dsn/spacecrafts/soho/soho') +local SpilAsset = asset.require('scene/solarsystem/dsn/spacecrafts/spil/spil') local SpitzerAsset = asset.require('scene/solarsystem/dsn/spacecrafts/spitzer/spitzer') local StereoAAsset = asset.require('scene/solarsystem/dsn/spacecrafts/stereoa/stereoa') local StereoBAsset = asset.require('scene/solarsystem/dsn/spacecrafts/stereob/stereob') local RosettaAsset = asset.require('scene/solarsystem/dsn/spacecrafts/rosetta/rosetta') local TD10Asset = asset.require('scene/solarsystem/dsn/spacecrafts/td10/td10') +local TD11Asset = asset.require('scene/solarsystem/dsn/spacecrafts/td11/td11') local TD12Asset = asset.require('scene/solarsystem/dsn/spacecrafts/td12/td12') local TD13Asset = asset.require('scene/solarsystem/dsn/spacecrafts/td13/td13') local TDR3Asset = asset.require('scene/solarsystem/dsn/spacecrafts/tdr3/tdr3') @@ -59,6 +62,7 @@ local TERRAsset = asset.require('scene/solarsystem/dsn/spacecrafts/terr/terr') local TessAsset = asset.require('scene/solarsystem/dsn/spacecrafts/transitexoplanetsurvey/transitexoplanetsurvey') local ThemisBAsset = asset.require('scene/solarsystem/dsn/spacecrafts/themisb/themisb') local ThemisCAsset = asset.require('scene/solarsystem/dsn/spacecrafts/themisc/themisc') +local UlyssesAsset = asset.require('scene/solarsystem/dsn/spacecrafts/ulysses/ulysses') local TraceGasOrbiterAsset = asset.require('scene/solarsystem/dsn/spacecrafts/tracegasorbiter/tracegasorbiter') local VenusExpressAsset = asset.require('scene/solarsystem/dsn/spacecrafts/venusexpress/venusexpress') local WindAsset = asset.require('scene/solarsystem/dsn/spacecrafts/wind/wind') @@ -101,18 +105,21 @@ local signalDataIdMap = { MRO = MarsRecOrbAsset.spacecraftID, MSGR = MessengerAsset.spacecraftID, MSL = CuriosityAsset.spacecraftID, + MVN = MavenAsset.spacecraftID, NHPC = NewHorizonsAsset.spacecraftID, NSYT = InSightAsset.spacecraftID, ORX = OsirisRexAsset.spacecraftID, PLC = PlanetCAsset.spacecraftID, PRCN = PRCNAsset.spacecraftID, SOHO = SohoAsset.spacecraftID, + SPIL = SpilAsset.spacecraftID, SPP = ParkerSolarProbeAsset.spacecraftID, STF = SpitzerAsset.spacecraftID, STA = StereoAAsset.spacecraftID, STB = StereoBAsset.spacecraftID, ROSE = RosettaAsset.spacecraftID, TD10 = TD10Asset.spacecraftID, + TD11 = TD11Asset.spacecraftID, TD12 = TD12Asset.spacecraftID, TD13 = TD13Asset.spacecraftID, TDR3 = TDR3Asset.spacecraftID, @@ -124,6 +131,7 @@ local signalDataIdMap = { THB = ThemisBAsset.spacecraftID, THC = ThemisCAsset.spacecraftID, TGO = TraceGasOrbiterAsset.spacecraftID, + ULYS = UlyssesAsset.spacecraftID, VEX = VenusExpressAsset.spacecraftID, VGR1 = Voyager1Asset.spacecraftID, VGR2 = Voyager2Asset.spacecraftID, @@ -160,6 +168,7 @@ asset.export("MarCOAAsset", MarCOAAsset) asset.export("MarCOBAsset", MarCOBAsset) asset.export("MarsRecOrbAsset", MarsRecOrbAsset) asset.export("MarsOdysseyAsset", MarsOdysseyAsset) +asset.export("MavenAsset", MavenAsset) asset.export("MessengerAsset", MessengerAsset) asset.export("MMS1Asset", MMS1Asset) asset.export("MMS2Asset", MMS2Asset) @@ -173,11 +182,13 @@ asset.export("ParkerSolarProbeAsset", ParkerSolarProbeAsset) asset.export("PlanetCAsset", PlanetCAsset) asset.export("PRCNAsset", PRCNAsset) asset.export("SohoAsset", SohoAsset) +asset.export("SpilAsset", SpilAsset) asset.export("SpitzerAsset", SpitzerAsset) asset.export("StereoAAsset", StereoAAsset) asset.export("StereoBAsset", StereoBAsset) asset.export("RosettaAsset", RosettaAsset) asset.export("TD10Asset", TD10Asset) +asset.export("TD11Asset", TD11Asset) asset.export("TD12Asset", TD12Asset) asset.export("TD13Asset", TD13Asset) asset.export("TDR3Asset", TDR3Asset) @@ -189,6 +200,7 @@ asset.export("TessAsset", TessAsset) asset.export("ThemisBAsset", ThemisBAsset) asset.export("ThemisCAsset", ThemisCAsset) asset.export("TraceGasOrbiterAsset", TraceGasOrbiterAsset) +asset.export("UlyssesAsset", UlyssesAsset) asset.export("VenusExpressAsset", VenusExpressAsset) asset.export("Voyager1Asset", Voyager1Asset) asset.export("Voyager2Asset", Voyager2Asset) diff --git a/data/assets/scene/solarsystem/dsn/spacecrafts/ch20/ch2o.asset b/data/assets/scene/solarsystem/dsn/spacecrafts/ch2o/ch2o.asset similarity index 100% rename from data/assets/scene/solarsystem/dsn/spacecrafts/ch20/ch2o.asset rename to data/assets/scene/solarsystem/dsn/spacecrafts/ch2o/ch2o.asset diff --git a/data/assets/scene/solarsystem/dsn/spacecrafts/maven/maven.asset b/data/assets/scene/solarsystem/dsn/spacecrafts/maven/maven.asset new file mode 100644 index 0000000000..f938efd9a6 --- /dev/null +++ b/data/assets/scene/solarsystem/dsn/spacecrafts/maven/maven.asset @@ -0,0 +1,29 @@ +local assetHelper = asset.require('util/asset_helper') +local dataFolder = openspace.absPath("${SYNC}/http/dsn_data/1/positioning/MVN") + +-- local models = asset.syncedResource({ +-- Name = "Dsn models", +-- Type = "HttpSynchronization", +-- Identifier = "dsn_stations", +-- Version = 1 +-- }) +local spacecraftID = "Maven"; + +local Maven = { + Identifier = spacecraftID, + Transform = { + Translation = { + Type = "RadecTranslation", + DataFolder = dataFolder, + DataFileType = "json", + ObjectIdentifier = spacecraftID + } + + }, + GUI = { + Name = "Maven", + Path = "/Solar System/Missions/Maven" + } +} +asset.export("spacecraftID", spacecraftID) +assetHelper.registerSceneGraphNodesAndExport(asset, {Maven}) \ No newline at end of file diff --git a/data/assets/scene/solarsystem/dsn/spacecrafts/spil/spil.asset b/data/assets/scene/solarsystem/dsn/spacecrafts/spil/spil.asset new file mode 100644 index 0000000000..52379da129 --- /dev/null +++ b/data/assets/scene/solarsystem/dsn/spacecrafts/spil/spil.asset @@ -0,0 +1,30 @@ +local assetHelper = asset.require('util/asset_helper') +local dataFolder = openspace.absPath("${SYNC}/http/dsn_data/1/positioning/SPIL") + +-- local models = asset.syncedResource({ +-- Name = "Dsn models", +-- Type = "HttpSynchronization", +-- Identifier = "dsn_data", +-- Version = 1 +-- }) + +local spacecraftID = "Spil"; + +local Spil = { + Identifier = spacecraftID, + Transform = { + Translation = { + Type = "RadecTranslation", + DataFolder = dataFolder, + DataFileType = "json", + ObjectIdentifier = spacecraftID + } + + }, + GUI = { + Name = "SPIL", + Path = "/Solar System/Missions/SPIL" + } +} +asset.export("spacecraftID", spacecraftID) +assetHelper.registerSceneGraphNodesAndExport(asset, {Spil}) \ No newline at end of file diff --git a/data/assets/scene/solarsystem/dsn/spacecrafts/td11/td11.asset b/data/assets/scene/solarsystem/dsn/spacecrafts/td11/td11.asset new file mode 100644 index 0000000000..1f48e01583 --- /dev/null +++ b/data/assets/scene/solarsystem/dsn/spacecrafts/td11/td11.asset @@ -0,0 +1,29 @@ +local assetHelper = asset.require('util/asset_helper') +local dataFolder = openspace.absPath("${SYNC}/http/dsn_data/1/positioning/TD11") + +-- local models = asset.syncedResource({ +-- Name = "Dsn models", +-- Type = "HttpSynchronization", +-- Identifier = "dsn_stations", +-- Version = 1 +-- }) +local spacecraftID = "TD11"; + +local TD11 = { + Identifier = spacecraftID, + Transform = { + Translation = { + Type = "RadecTranslation", + DataFolder = dataFolder, + DataFileType = "json", + ObjectIdentifier = spacecraftID + } + + }, + GUI = { + Name = "TD11", + Path = "/Solar System/Missions/TD11" + } +} +asset.export("spacecraftID", spacecraftID) +assetHelper.registerSceneGraphNodesAndExport(asset, {TD11}) \ No newline at end of file diff --git a/data/assets/scene/solarsystem/dsn/spacecrafts/ulysses/ulysses.asset b/data/assets/scene/solarsystem/dsn/spacecrafts/ulysses/ulysses.asset new file mode 100644 index 0000000000..023a56dbab --- /dev/null +++ b/data/assets/scene/solarsystem/dsn/spacecrafts/ulysses/ulysses.asset @@ -0,0 +1,28 @@ +local assetHelper = asset.require('util/asset_helper') +local dataFolder = openspace.absPath("${SYNC}/http/dsn_data/1/positioning/ULYS") + +-- local models = asset.syncedResource({ +-- Name = "Dsn models", +-- Type = "HttpSynchronization", +-- Identifier = "dsn_stations", +-- Version = 1 +-- }) +local spacecraftID = "Ulysses"; + +local Ulysses = { + Identifier = spacecraftID, + Transform = { + Translation = { + Type = "RadecTranslation", + DataFolder = dataFolder, + DataFileType = "json", + ObjectIdentifier = spacecraftID + } + }, + GUI = { + Name = "Ulysses", + Path = "/Solar System/Missions/Ulysses" + } +} +asset.export("spacecraftID", spacecraftID) +assetHelper.registerSceneGraphNodesAndExport(asset, {Ulysses}) \ No newline at end of file diff --git a/data/assets/scene/solarsystem/dsn/spacecraftslabels.asset b/data/assets/scene/solarsystem/dsn/spacecraftslabels.asset index e1ebac7dfd..2f37097fcb 100644 --- a/data/assets/scene/solarsystem/dsn/spacecraftslabels.asset +++ b/data/assets/scene/solarsystem/dsn/spacecraftslabels.asset @@ -21,7 +21,7 @@ local ChandraLabel = { ObjectIdentifier = spacecrafts.ChandraAsset.spacecraftID } local Ch2oLabel = { - LabelText = ".Ch2o", + LabelText = ".Ch2O", ObjectIdentifier = spacecrafts.Ch2oAsset.spacecraftID } local CLU1Label = { @@ -108,6 +108,10 @@ local MarsOdysseyLabel = { LabelText= ".Mars Odyssey", ObjectIdentifier = spacecrafts.MarsOdysseyAsset.spacecraftID } +local MavenLabel = { + LabelText = ".MAVEN", + ObjectIdentifier = spacecrafts.MavenAsset.spacecraftID +} local MessengerLabel = { LabelText = ".Messenger", ObjectIdentifier = spacecrafts.MessengerAsset.spacecraftID @@ -160,6 +164,10 @@ local SohoLabel = { LabelText = ".SOHO", ObjectIdentifier = spacecrafts.SohoAsset.spacecraftID } +local SpilLabel = { + LabelText = ".SPIL", + ObjectIdentifier = spacecrafts.SpilAsset.spacecraftID +} local SpitzerLabel = { LabelText = ".Spitzer", ObjectIdentifier = spacecrafts.SpitzerAsset.spacecraftID @@ -180,6 +188,10 @@ local TD10Label = { LabelText = ".TD10", ObjectIdentifier = spacecrafts.TD10Asset.spacecraftID } +local TD11Label = { + LabelText = ".TD11", + ObjectIdentifier = spacecrafts.TD10Asset.spacecraftID +} local TD12Label = { LabelText = ".TD12", ObjectIdentifier = spacecrafts.TD12Asset.spacecraftID @@ -225,6 +237,10 @@ local TraceGasOrbiterLabel = { LabelText = ".TGO", ObjectIdentifier = spacecrafts.TraceGasOrbiterAsset.spacecraftID } +local UlyssesLabel = { + LabelText = ".Ulysses", + ObjectIdentifier = spacecrafts.UlyssesAsset.spacecraftID +} local VenusExpressLabel = { LabelText = ".Venus Express", ObjectIdentifier = spacecrafts.VenusExpressAsset.spacecraftID @@ -272,7 +288,8 @@ local labelMapMarsMissions = { label6 = CuriosityLabel, label7 = MarCOALabel, label8 = MarCOBLabel, - label9 = InSightLabel + label9 = MavenLabel, + label10 = InSightLabel } @@ -300,7 +317,9 @@ local labelMapInnerSpace = { label18 = ParkerSolarProbeLabel, label19 = VenusExpressLabel, label20 = PRCNCLabel, - label21 = BepiLabel + label21 = BepiLabel, + label22 = SpilLabel, + label23 = UlyssesLabel } @@ -315,27 +334,28 @@ local labelMapNearEarth = { label8 = TessLabel, label9 = GeotailLabel, label10 = TD10Label, - label11 = TD12Label, - label12 = TD13Label, - label13 = TDR3Label, - label14 = TDR5Label, - label15 = TDR7Label, - label16 = TDR9Label, - label17 = XRayLabel, - label18 = ImageLabel, - label19 = CLU1Label, - label20 = CLU2Label, - label21 = CLU3Label, - label22 = CLU4Label, - label23 = MMS1Label, - label24 = MMS2Label, - label25 = MMS3Label, - label26 = MMS4Label, - label27 = TERRLabel, - label28 = AceLabel, - label29 = Ch2oLabel, - label30 = JwstLabel, - label31 = LadeLabel + label11 = TD11Label, + label12 = TD12Label, + label13 = TD13Label, + label14 = TDR3Label, + label15 = TDR5Label, + label16 = TDR7Label, + label17 = TDR9Label, + label18 = XRayLabel, + label19 = ImageLabel, + label20 = CLU1Label, + label21 = CLU2Label, + label22 = CLU3Label, + label23 = CLU4Label, + label24 = MMS1Label, + label25 = MMS2Label, + label26 = MMS3Label, + label27 = MMS4Label, + label28 = TERRLabel, + label29 = AceLabel, + label30 = Ch2oLabel, + label31 = JwstLabel, + label32 = LadeLabel }