mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-08 04:31:08 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'thesis/2018/dsn' of github.com:OpenSpace/OpenSpace into thesis/2018/dsn

Browse Source
This commit is contained in:
Agnes Heppich
2019-01-11 13:52:24 -05:00
parent bacb7f4478 4391843116
commit 798631f375
5 changed files with 40 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
data/assets/scene/solarsystem/dsn/spacecrafts.asset
View File

@@ -6,8 +6,8 @@ local Voyager2Asset = asset.require('scene/solarsystem/missions/voyager2/voyager
-- added specifically for dsn visualization
local CassiniAsset = asset.require('scene/solarsystem/dsn/spacecrafts/cassini/cassini')
local ChandraXrayAsset = asset.require('scene/solarsystem/dsn/spacecrafts/chandraxray/chandraxray')
local CuriosityAsset = asset.require('scene/solarsystem/dsn/spacecrafts/curiosity/curiosity')
local ChandraAsset = asset.require('scene/solarsystem/dsn/spacecrafts/chandra/chandra')
local DawnAsset = asset.require('scene/solarsystem/dsn/spacecrafts/dawn/dawn')
local GaiaAsset = asset.require('scene/solarsystem/dsn/spacecrafts/gaia/gaia')
local GenesisAsset = asset.require('scene/solarsystem/dsn/spacecrafts/genesis/genesis')
@@ -17,8 +17,8 @@ local IceAsset = asset.require('scene/solarsystem/dsn/spacecrafts/ice/ice')
local InSightAsset = asset.require('scene/solarsystem/dsn/spacecrafts/insight/insight')
local JunoAsset = asset.require('scene/solarsystem/dsn/spacecrafts/juno/juno')
local KeplerAsset = asset.require('scene/solarsystem/dsn/spacecrafts/kepler/kepler')
local MarsCubeSatAAsset = asset.require('scene/solarsystem/dsn/spacecrafts/marscubesata/marscubesata')
local MarsCubeSatBAsset = asset.require('scene/solarsystem/dsn/spacecrafts/marscubesatb/marscubesatb')
local MarCOAAsset = asset.require('scene/solarsystem/dsn/spacecrafts/marcoa/marcoa')
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 MessengerAsset = asset.require('scene/solarsystem/dsn/spacecrafts/messenger/messenger')
@@ -48,13 +48,13 @@ local signalDataIdMap = {
GTL = GeotailAsset.spacecraftID,
HYB2 = Hayabusa2Asset.spacecraftID,
ICE = IceAsset.spacecraftID,
CHDR = ChandraXrayAsset.spacecraftID,
CHDR = ChandraAsset.spacecraftID,
DAWN = DawnAsset.spacecraftID,
JNO = JunoAsset.spacecraftID,
KEPL = KeplerAsset.spacecraftID,
M010 = MarsOdysseyAsset.spacecraftID,
MCOA = MarsCubeSatAAsset.spacecraftID,
MCOB = MarsCubeSatBAsset.spacecraftID,
MCOA = MarCOAAsset.spacecraftID,
MCOB = MarCOBAsset.spacecraftID,
MRE1 = OpportunityAsset.spacecraftID,
MRO = MarsRecOrbAsset.spacecraftID,
MOM = MomAsset.spacecraftID,
@@ -79,10 +79,9 @@ local signalDataIdMap = {
asset.export("signalDataIdMap", signalDataIdMap)
asset.export("CassiniAsset", CassiniAsset)
asset.export("ChandraXrayAsset", ChandraXrayAsset)
asset.export("CuriosityAsset", CuriosityAsset)
asset.export("ChandraAsset", ChandraAsset)
asset.export("DawnAsset", DawnAsset)
asset.export("GaiaAsset", GaiaAsset)
asset.export("GenesisAsset", GenesisAsset)
@@ -92,8 +91,8 @@ asset.export("IceAsset", IceAsset)
asset.export("InSightAsset", InSightAsset)
asset.export("JunoAsset", JunoAsset)
asset.export("KeplerAsset", KeplerAsset)
asset.export("MarsCubeSatAAsset", MarsCubeSatAAsset)
asset.export("MarsCubeSatBAsset", MarsCubeSatBAsset)
asset.export("MarCOAAsset", MarCOAAsset)
asset.export("MarCOBAsset", MarCOBAsset)
asset.export("MarsRecOrbAsset", MarsRecOrbAsset)
asset.export("MarsOdysseyAsset", MarsOdysseyAsset)
asset.export("MessengerAsset", MessengerAsset)

10
data/assets/scene/solarsystem/dsn/spacecrafts/chandraxray/chandraxray.asset → data/assets/scene/solarsystem/dsn/spacecrafts/chandra/chandra.asset
View File

@@ -7,9 +7,9 @@ local models = asset.syncedResource({
Identifier = "dsn_stations",
Version = 1
})
local spacecraftID = "ChandraXray";
local spacecraftID = "Chandra";
local ChandraXray = {
local Chandra = {
Identifier = spacecraftID,
Transform = {
Translation = {
@@ -21,9 +21,9 @@ local ChandraXray = {
},
GUI = {
Name = "ChandraXray",
Path = "/Solar System/Missions/ChandraXray"
Name = "Chandra",
Path = "/Solar System/Missions/Chandra"
}
}
asset.export("spacecraftID", spacecraftID)
assetHelper.registerSceneGraphNodesAndExport(asset, {ChandraXray})
assetHelper.registerSceneGraphNodesAndExport(asset, {Chandra})

11
data/assets/scene/solarsystem/dsn/spacecrafts/marscubesata/marscubesata.asset → data/assets/scene/solarsystem/dsn/spacecrafts/marcoa/marcoa.asset
View File

@@ -1,3 +1,4 @@
-- Mars Cube One A
local assetHelper = asset.require('util/asset_helper')
local dataFolder = openspace.absPath("${SYNC}/http/dsn_data/1/positioning/MCOA")
@@ -7,9 +8,9 @@ local models = asset.syncedResource({
Identifier = "dsn_stations",
Version = 1
})
local spacecraftID = "MarsCubeSatA";
local spacecraftID = "MarCO A";
local MarsCubeSatA = {
local MarCOA = {
Identifier = spacecraftID,
Transform = {
Translation = {
@@ -21,9 +22,9 @@ local MarsCubeSatA = {
},
GUI = {
Name = "Mars Cubesat A",
Path = "/Solar System/Missions/MarsCubeSatA"
Name = "MarCO A",
Path = "/Solar System/Missions/MarCO A"
}
}
asset.export("spacecraftID", spacecraftID)
assetHelper.registerSceneGraphNodesAndExport(asset, {MarsCubeSatA})
assetHelper.registerSceneGraphNodesAndExport(asset, {MarCOA})

11
data/assets/scene/solarsystem/dsn/spacecrafts/marscubesatb/marscubesatb.asset → data/assets/scene/solarsystem/dsn/spacecrafts/marcob/marcob.asset
View File

@@ -1,3 +1,4 @@
-- Mars Cube One B
local assetHelper = asset.require('util/asset_helper')
local dataFolder = openspace.absPath("${SYNC}/http/dsn_data/1/positioning/MCOB")
@@ -7,9 +8,9 @@ local models = asset.syncedResource({
Identifier = "dsn_stations",
Version = 1
})
local spacecraftID = "MarsCubeSatB";
local spacecraftID = "MarCO B";
local MarsCubeSatB = {
local MarCOB = {
Identifier = spacecraftID,
Transform = {
Translation = {
@@ -21,9 +22,9 @@ local MarsCubeSatB = {
},
GUI = {
Name = "Mars Cubesat B",
Path = "/Solar System/Missions/MarsCubeSatB"
Name = "MarCO B",
Path = "/Solar System/Missions/MarCO B"
}
}
asset.export("spacecraftID", spacecraftID)
assetHelper.registerSceneGraphNodesAndExport(asset, {MarsCubeSatB})
assetHelper.registerSceneGraphNodesAndExport(asset, {MarCOB})

28
data/assets/scene/solarsystem/dsn/spacecraftslabels.asset
View File

@@ -13,9 +13,9 @@ local CassiniLabel = {
},
ObjectIdentifier = spacecrafts.CassiniAsset.spacecraftID
}
local ChandraXrayLabel = {
LabelText = ".Chandra Xray",
ObjectIdentifier = spacecrafts.ChandraXrayAsset.spacecraftID
local ChandraLabel = {
LabelText = ".Chandra",
ObjectIdentifier = spacecrafts.ChandraAsset.spacecraftID
}
local CuriosityLabel = {
LabelText = ".Curiosity",
@@ -81,21 +81,21 @@ local KeplerLabel = {
LabelText = ".Kepler",
ObjectIdentifier = spacecrafts.KeplerAsset.spacecraftID
}
local MarsCubeSatALabel = {
LabelText = ".MCO A",
local MarCOALabel = {
LabelText = ".MarCO A",
TimeFrame = {
Start = "2018-125T12:00:00",
End = "2018-365T19:00:00"
},
ObjectIdentifier = spacecrafts.MarsCubeSatAAsset.spacecraftID
ObjectIdentifier = spacecrafts.MarCOAAsset.spacecraftID
}
local MarsCubeSatBLabel = {
LabelText = ".MCO B",
local MarCOBLabel = {
LabelText = ".MarCO B",
TimeFrame = {
Start = "2018-125T12:00:00",
End = "2018-365T19:00:00"
},
ObjectIdentifier = spacecrafts.MarsCubeSatBAsset.spacecraftID
ObjectIdentifier = spacecrafts.MarCOBAsset.spacecraftID
}
local MarsRecOrbLabel = {
LabelText = ".Mars Recon Orbiter",
@@ -142,7 +142,7 @@ local PlanetCLabel = {
ObjectIdentifier = spacecrafts.PlanetCAsset.spacecraftID
}
local SohoLabel = {
LabelText = ".Soho",
LabelText = ".SOHO",
ObjectIdentifier = spacecrafts.SohoAsset.spacecraftID
}
local SpitzerLabel = {
@@ -163,7 +163,7 @@ local StereoBLabel = {
}
--Transit exoplanet Survey Satellite
local TessLabel = {
LabelText = ".Tess",
LabelText = ".TESS",
TimeFrame = {
Start = "2018-108T23:00:00",
End = "2019-001T01:00:00"
@@ -240,8 +240,8 @@ local labelMapInnerSpace = {
label8 = GenesisLabel,
label9 = Hayabusa2Label,
label10 = MessengerLabel,
label12 = MarsCubeSatALabel,
label13 = MarsCubeSatBLabel,
label12 = MarCOALabel,
label13 = MarCOBLabel,
label14 = InSightLabel,
label15 = OsirisRexLabel,
label16 = PlanetCLabel
@@ -250,7 +250,7 @@ local labelMapInnerSpace = {
local labelMapNearEarth = {
Label1 = GaiaLabel,
Label2 = ChandraXrayLabel,
Label2 = ChandraLabel,
label3 = ThemisBLabel,
label4 = ThemisCLabel,
label5 = WindLabel,