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

This commit is contained in:
Lovisa Hassler
2019-01-08 15:37:25 -05:00

View File

@@ -8,14 +8,14 @@ local InnerSpaceLabels = {
Enabled = true,
ScaleFactor = 9.0,
LabelIdentifierMap = maps.labelMapInnerSpace,
TextColor = { 0.0, 0.6, 0.2, 1.0 },
TextColor = { 0.8, 0.7, 0.6, 1.0 },
DrawLabels = true,
LabelSizeRange = {5.5, 6.0},
SizeDistanceRange = {2, 100000000},
SizeDistanceUnit = "km",
FadeOutDistanceRange = {2, 0.1},
FadeOutDistanceUnit = "km",
FadeInDistanceRange = {3,2},
FadeInDistanceRange = {2,1},
FadeInDistanceUnit = "lighthours",
},
GUI = {
@@ -31,15 +31,15 @@ local NearEarthLabels = {
Enabled = true,
ScaleFactor = 9.0,
LabelIdentifierMap = maps.labelMapNearEarth,
TextColor = { 1.0, 0.6, 0.2, 1.0 },
TextColor = { 1.0, 0.6, 0.4, 1.0 },
DrawLabels = true,
LabelSizeRange = {5.5, 6.0},
SizeDistanceRange = {2, 100000000},
SizeDistanceUnit = "km",
FadeOutDistanceRange = {15, 10},
FadeOutDistanceUnit = "m",
FadeInDistanceRange = {3,2},
FadeInDistanceUnit = "lightminutes"
FadeInDistanceRange = {20,25},
FadeInDistanceUnit = "lightseconds"
},
GUI = {
Name = "Near earth Labels",
@@ -54,7 +54,7 @@ local OuterSpaceLabels = {
Enabled = true,
ScaleFactor = 9.0,
LabelIdentifierMap = maps.labelMapOuterSpace,
TextColor = { 1.0, 0.6, 0.2, 1.0 },
TextColor = { 0.8, 0.7, 0.6, 1.0 },
DrawLabels = true,
LabelSizeRange = {5.5, 6.0},
SizeDistanceRange = {2, 100000000},
@@ -77,7 +77,7 @@ local MarsMissionsLabels = {
Enabled = true,
ScaleFactor = 7.5,
LabelIdentifierMap = maps.labelMapMarsMissions,
TextColor = { 0.96, 0.4, 0.4, 1.0 },
TextColor = { 0.8, 0.7, 0.6, 1.0 },
DrawLabels = true,
LabelSizeRange = {4.0, 4.5},
SizeDistanceRange = {2, 1000},
@@ -100,14 +100,14 @@ local ClusteredLabels = {
Enabled = true,
ScaleFactor = 9.0,
LabelIdentifierMap = maps.labelMapClusters,
TextColor = { 0.96, 0.4, 0.4, 1.0 },
TextColor = { 0.8, 0.7, 0.6, 1.0 },
DrawLabels = true,
LabelSizeRange = {5.5, 5.8},
SizeDistanceRange = {2, 100000000},
SizeDistanceUnit = "km",
FadeOutDistanceRange = {400000, 300000},
FadeOutDistanceUnit = "km",
FadeInDistanceRange = {3,2},
FadeInDistanceRange = {2,1},
FadeInDistanceUnit = "lighthours",
},