mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-05-07 20:09:58 -05:00
Code Issues Packages Projects Releases Wiki Activity

added labels for mars cluster

Browse Source
This commit is contained in:
Lovisa Hassler
2018-12-18 17:45:09 -05:00
parent be08f8cef4
commit bde764ce21
3 changed files with 58 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/assets/dsn.scene
+2 -1
View File
@@ -79,7 +79,8 @@ local Keybindings = {
{
Key = "l",
Command = propertyHelper.invert('Scene.OuterSpaceLabels.Renderable.Enabled') ..
propertyHelper.invert('Scene.MarsLabels.Renderable.Enabled'),
propertyHelper.invert('Scene.MarsMissionsLabels.Renderable.Enabled') ..
propertyHelper.invert('Scene.ClusteredLabels.Renderable.Enabled'),
Documentation = "Toggles visibility of the spacecraft labels",
Local = false
}
data/assets/scene/solarsystem/dsn/spacecraftslabels.asset
+55 -16
View File
@@ -1,5 +1,22 @@
local assetHelper = asset.require('util/asset_helper')
local spacecrafts = asset.require('scene/solarsystem/missions/dsn/spacecrafts')
--local spacecrafts = asset.require('scene/solarsystem/missions/dsn/spacecrafts')
-- label id maps
local labelMapMarsMissions = {
MarsRecOrbiter = "Mars Recon Orbiter",
MarsOdyssey = "MarsOdyssey",
}
local labelMapVoyagers = {
VGR1 = "Voyager 1",
VGR2 = "Voyager 2",
}
local labelMapClusters = {
Mars = "MarsOdyssey, \n Mars Recon Orbiter "
}
local OuterSpaceLabels = {
Identifier = "OuterSpaceLabels",
@@ -7,7 +24,7 @@ local OuterSpaceLabels = {
Type = "RenderableLabel",
Enabled = true,
ScaleFactor = 9.0,
LabelIdentifierMap = spacecrafts.labelMapVoyagers,
LabelIdentifierMap = labelMapVoyagers,
TextColor = { 1.0, 0.6, 0.2, 1.0 },
DrawLabels = true,
LabelSizeRange = {5.5, 6.0},
@@ -24,30 +41,52 @@ local OuterSpaceLabels = {
}
}
local MarsLabels = {
Identifier = "MarsLabels",
local MarsMissionsLabels = {
Identifier = "MarsMissionsLabels",
Renderable = {
Type = "RenderableLabel",
Enabled = true,
--ScaleFactor = 1.0,
LabelIdentifierMap = spacecrafts.labelMapMars,
TextColor = { 0.4, 0.4, 0.4, 1.0 },
ScaleFactor = 7.5,
LabelIdentifierMap = labelMapMarsMissions,
TextColor = { 0.96, 0.4, 0.4, 1.0 },
DrawLabels = true,
--LabelSize = 6.5,
LabelSizeRange = {5.8, 6.0},
LabelSizeRange = {4.0, 4.5},
SizeDistanceRange = {2, 1000},
SizeDistanceUnit = "kilometer",
FadeOutDistanceRange = {0.01, 0.5},
FadeOutDistanceUnit = "meter",
FadeInDistanceRange = {0.9, 1.0},
FadeInDistanceUnit = "lightminutes",
SizeDistanceUnit = "km",
FadeOutDistanceRange = {2, 0.1},
FadeOutDistanceUnit = "km",
FadeInDistanceRange = {4,400000},
FadeInDistanceUnit = "km",
},
GUI = {
Name = "Mars Labels",
Name = "Mars Missions Labels",
Path = "/Labels"
}
}
local ClusteredLabels = {
Identifier = "ClusteredLabels",
Renderable = {
Type = "RenderableLabel",
Enabled = true,
ScaleFactor = 9.0,
LabelIdentifierMap = labelMapClusters,
TextColor = { 0.96, 0.4, 0.4, 1.0 },
DrawLabels = true,
LabelSizeRange = {5.5, 5.8},
SizeDistanceRange = {2, 100000000},
SizeDistanceUnit = "km",
FadeOutDistanceRange = {400000, 300000},
FadeOutDistanceUnit = "km",
FadeInDistanceRange = {1.5,1.0},
FadeInDistanceUnit = "lightdays",
},
GUI = {
Name = "Clustered Labels",
Path = "/Labels"
}
}
assetHelper.registerSceneGraphNodesAndExport(asset, { OuterSpaceLabels, MarsLabels })
assetHelper.registerSceneGraphNodesAndExport(asset, { OuterSpaceLabels, MarsMissionsLabels, ClusteredLabels })
data/assets/scene/solarsystem/missions/dsn/spacecrafts.asset
+1 -15
View File
@@ -8,18 +8,4 @@ asset.require('scene/solarsystem/missions/voyager2/voyager2')
-- added specifically for dsn visualization
asset.require('scene/solarsystem/missions/dsn/mro/mro')
asset.require('scene/solarsystem/missions/dsn/marsodyssey/marsodyssey')
asset.require('scene/solarsystem/missions/dsn/stereoa/stereoa')
-- labels
local labelMapMars = {
MarsRecOrbiter = "Mars Recon Orbiter",
MarsOdyssey = "MarsOdyssey",
}
local labelMapVoyagers = {
VGR1 = "Voyager 1",
VGR2 = "Voyager 2",
}
asset.export("labelMapVoyagers", labelMapVoyagers)
asset.export("labelMapMars", labelMapMars)
asset.require('scene/solarsystem/missions/dsn/stereoa/stereoa')