added MOM and made some tweeks to cluster labels

This commit is contained in:
Agnes Heppich
2019-01-10 19:24:13 -05:00
parent 5646bdd63d
commit 1dcd069fb1
3 changed files with 44 additions and 9 deletions

View File

@@ -20,6 +20,7 @@ local MarsCubeSatBAsset = asset.require('scene/solarsystem/dsn/spacecrafts/marsc
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')
local MomAsset = asset.require('scene/solarsystem/dsn/spacecrafts/mom/mom')
local NewHorizonsAsset = asset.require('scene/solarsystem/dsn/spacecrafts/newHorizons/newhorizons')
local OpportunityAsset = asset.require('scene/solarsystem/dsn/spacecrafts/opportunity/opportunity')
local SohoAsset = asset.require('scene/solarsystem/dsn/spacecrafts/soho/soho')
@@ -51,6 +52,7 @@ local signalDataIdMap = {
MCOB = MarsCubeSatBAsset.spacecraftID,
MRE1 = OpportunityAsset.spacecraftID,
MRO = MarsRecOrbAsset.spacecraftID,
MOM = MomAsset.spacecraftID,
M010 = MarsOdysseyAsset.spacecraftID,
MSGR = MessengerAsset.spacecraftID,
NHPC = NewHorizonsAsset.spacecraftID,
@@ -85,6 +87,7 @@ asset.export("MarsCubeSatBAsset", MarsCubeSatBAsset)
asset.export("MarsRecOrbAsset", MarsRecOrbAsset)
asset.export("MarsOdysseyAsset", MarsOdysseyAsset)
asset.export("MessengerAsset", MessengerAsset)
asset.export("MomAsset", MomAsset)
asset.export("NewHorizonsAsset", NewHorizonsAsset)
asset.export("OpportunityAsset", OpportunityAsset)
asset.export("SohoAsset", SohoAsset)

View File

@@ -0,0 +1,29 @@
local assetHelper = asset.require('util/asset_helper')
local dataFolder = openspace.absPath("${SYNC}/http/dsn_data/1/positioning/MOM")
local models = asset.syncedResource({
Name = "Dsn models",
Type = "HttpSynchronization",
Identifier = "dsn_stations",
Version = 1
})
local spacecraftID = "MOM";
local MOM = {
Identifier = spacecraftID,
Transform = {
Translation = {
Type = "RadecTranslation",
DataFolder = dataFolder,
DataFileType = "json",
ObjectIdentifier = spacecraftID
}
},
GUI = {
Name = "MOM",
Path = "/Solar System/Missions/MOM"
}
}
asset.export("spacecraftID", spacecraftID)
assetHelper.registerSceneGraphNodesAndExport(asset, {MOM})

View File

@@ -101,6 +101,10 @@ local MessengerLabel = {
},
ObjectIdentifier = spacecrafts.MessengerAsset.spacecraftID
}
local MomLabel = {
LabelText = ".MOM",
ObjectIdentifier = spacecrafts.MomAsset.spacecraftID
}
local NewHorizonsLabel = {
LabelText = ".New Horizons",
ObjectIdentifier = spacecrafts.NewHorizonsAsset.spacecraftID
@@ -173,7 +177,7 @@ local WindLabel = {
--------------------------------------------------
local MarsClusterLabel = {
LabelText = "MarsOdyssey, \n Mars Recon Orbiter ",
LabelText = "MarsOdyssey, MRO, Opportunity, MOM",
ObjectIdentifier = "Mars"
}
@@ -182,8 +186,10 @@ local MarsClusterLabel = {
-----------------------------------------------
local labelMapMarsMissions = {
Label1 = MarsRecOrbLabel,
Label2 = MarsOdysseyLabel
Label2 = MarsOdysseyLabel,
label3 = OpportunityLabel,
label4 = MomLabel,
label5 = TraceGasOrbiterLabel
}
local labelMapOuterSpace = {
@@ -204,10 +210,9 @@ local labelMapInnerSpace = {
label8 = GenesisLabel,
label9 = Hayabusa2Label,
label10 = MessengerLabel,
label11 = TraceGasOrbiterLabel,
label12 = MarsCubeSatALabel,
label13 = MarsCubeSatBLabel,
label14 = OpportunityLabel
label13 = MarsCubeSatBLabel
}
local labelMapNearEarth = {
@@ -220,8 +225,6 @@ local labelMapNearEarth = {
label7 = IceLabel,
label8 = TessLabel,
label9 = GeotailLabel
}
local labelMapClusters = {
Label1 = MarsClusterLabel
@@ -332,7 +335,7 @@ local ClusteredLabels = {
Enabled = true,
ScaleFactor = 9.2,
LabelIdentifierMap = labelMapClusters,
TextColor = { 0.8, 0.7, 0.6, 1.0 },
TextColor = { 1.0, 0.7, 0.3, 1.0 },
DrawLabels = true,
LabelSizeRange = {5.5, 5.8},
SizeDistanceRange = {2, 100000000},