mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-25 13:38:35 -05:00
Code Issues Packages Projects Releases Wiki Activity

Address PR comments

Browse Source
This commit is contained in:
Malin E
2021-10-11 14:00:19 +02:00
parent 5152258c9a
commit 8992f983c6
12 changed files with 101 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/assets/scene/solarsystem/missions/jwst/image.asset
+2 -3
View File
@@ -1,5 +1,5 @@
local image = asset.syncedResource({
Name = "HUDF image",
Name = "HUDF Image",
Type = "HttpSynchronization",
Identifier = "hudf_image",
Version = 3
@@ -17,6 +17,5 @@ asset.meta = {
Original image by NASA, ESA, and S. Beckwith (STScI) and the HUDF Team,
white frame and red arrow added by OpenSpace Team.<br>
https://creativecommons.org/licenses/by/4.0/
]],
Identifiers = {"HUDFImage"}
]]
}
data/assets/scene/solarsystem/missions/jwst/jwst.asset
+1 -1
View File
@@ -44,7 +44,7 @@ local JWSTBand = {
Name = "JWST Safe Viewing Band",
Path = "/Solar System/Missions/JWST",
Description = [[
The Safe viewing band for the James Webb Space Telescope at its current position
The safe viewing band for the James Webb Space Telescope at its current position
]],
}
}
data/assets/scene/solarsystem/missions/jwst/timelaps.asset → data/assets/scene/solarsystem/missions/jwst/timelapse.asset
+12 -7
View File
@@ -1,7 +1,7 @@
local assetHelper = asset.require('util/asset_helper')
-- JWST timelaps timeline
local timelaps = [[
-- JWST timelapse timeline
local timelapse = [[
openspace.scriptScheduler.loadScheduledScript(
"2018 OCT 01 14:06:02",
"",
@@ -329,9 +329,9 @@ local playForwards = {
openspace.setPropertyValueSingle('Dashboard.JWSTStateText.Text', '');
openspace.time.setDeltaTime(1);
openspace.time.setTime('2018 OCT 01 14:06:03');
]] .. tostring(timelaps) .. [[
]] .. tostring(timelapse) .. [[
]],
Documentation = "Jump to the JWST launch time and play the timelaps of deployment forward",
Documentation = "Jump to the JWST launch time and play the timelapse of deployment forward",
GuiPath = "/JWST",
IsLocal = false
}
@@ -344,16 +344,16 @@ local playBackwards = {
openspace.setPropertyValueSingle('Dashboard.JWSTStateText.Text', '');
openspace.time.setDeltaTime(-1);
openspace.time.setTime('2018 OCT 16 09:06:04');
]] .. tostring(timelaps) .. [[
]] .. tostring(timelapse) .. [[
]],
Documentation = "Jump to the end of JWST deployment time and play the timelaps of deployment in reverse",
Documentation = "Jump to the end of JWST deployment time and play the timelapse of deployment in reverse",
GuiPath = "/JWST",
IsLocal = false
}
local clearPlay = {
Identifier = "jwst.play.clear",
Name = "Clear JWST timelaps",
Name = "Clear JWST timelapse",
Command = [[
openspace.scriptScheduler.clear(0);
openspace.setPropertyValueSingle('Dashboard.JWSTStateText.Text', '');
@@ -415,6 +415,11 @@ end)
asset.onDeinitialize(function ()
openspace.scriptScheduler.clear()
openspace.action.removeAction(playForwards.Identifier)
openspace.action.removeAction(playBackwards.Identifier)
openspace.action.removeAction(clearPlay.Identifier)
openspace.action.removeAction(togglePlayDirection.Identifier)
end)
assetHelper.registerDashboardItems(asset, {
data/assets/scene/solarsystem/missions/jwst/trail.asset
+4 -4
View File
@@ -8,7 +8,7 @@ asset.require("spice/base")
-- (malej 2021-10-04) In general, there is no trajectery data of JWST for the scheduled
-- launch in December 2021, no horizons and no SPICE. Instead data from the 2018 launch
-- is used, old data from an old launch time that never happende because of delays.
-- is used, old data from an old launch time that never happened because of delays.
-- If we can get our hands on the 2021 launch data, the jwst assets will be updated.
-- Trail of JWST relative the Earth for the first month after launch
@@ -36,7 +36,7 @@ local JWSTTrailLaunch = {
Name = "JWST Launch Trail",
Path = "/Solar System/Missions/JWST/Trails",
Description = [[
James Webb Space Telescope Laucnh Trail relative to Earth based on horizons data from the
James Webb Space Telescope Launch Trail relative to Earth based on Horizons data from the
2018 launch.
]],
}
@@ -66,7 +66,7 @@ local JWSTTrailOrbit = {
Name = "JWST Orbit Trail",
Path = "/Solar System/Missions/JWST/Trails",
Description = [[
James Webb Space Telescope Orbit Trail relative to L2 based on horizons data from the
James Webb Space Telescope Orbit Trail relative to L2 based on Horizons data from the
2018 launch.
]],
}
@@ -97,7 +97,7 @@ local JWSTSunTrail = {
Name = "JWST Sun Trail",
Path = "/Solar System/Missions/JWST/Trails",
Description = [[
James Webb Space Telescope Trail relative to the Sun based on horizons data from the
James Webb Space Telescope Trail relative to the Sun based on Horizons data from the
2018 launch.
]],
}
data/assets/scene/solarsystem/missions/jwst/transforms.asset
+1 -1
View File
@@ -28,7 +28,7 @@ local JWSTPosition = {
Path = "/Solar System/Missions/JWST",
Hidden = true,
Description = [[
James Webb Space Telescope Position relative to Earth based on horizons data from the
James Webb Space Telescope Position relative to Earth based on Horizons data from the
2018 launch.
]],
}
data/assets/scene/solarsystem/planets/earth/lagrange_points/L1.asset
+2 -2
View File
@@ -8,7 +8,7 @@ local L1 = {
Identifier = "L1",
Parent = transforms.SolarSystemBarycenter.Identifier,
Renderable = {
Enabled = false,
Enabled = true,
Type = "RenderablePlaneImageLocal",
RenderableType = "Opaque",
Billboard = true,
@@ -35,7 +35,7 @@ local L1Label = {
Identifier = "L1Label",
Parent = L1.Identifier,
Renderable = {
Enabled = false,
Enabled = true,
Type = "RenderableLabels",
Text = "L1",
FontSize = 20,
data/assets/scene/solarsystem/planets/earth/lagrange_points/L2.asset
+5 -5
View File
@@ -8,7 +8,7 @@ local L2Small = {
Identifier = "L2Small",
Parent = transforms.SolarSystemBarycenter.Identifier,
Renderable = {
Enabled = false,
Enabled = true,
Type = "RenderablePlaneImageLocal",
RenderableType = "Opaque",
Billboard = true,
@@ -35,7 +35,7 @@ local L2 = {
Identifier = "L2",
Parent = transforms.SolarSystemBarycenter.Identifier,
Renderable = {
Enabled = false,
Enabled = true,
Type = "RenderablePlaneImageLocal",
RenderableType = "Opaque",
Billboard = true,
@@ -62,7 +62,7 @@ local L2SmallLabel = {
Identifier = "L2SmallLabel",
Parent = L2.Identifier,
Renderable = {
Enabled = false,
Enabled = true,
Type = "RenderableLabels",
Text = "L2",
FontSize = 20.0,
@@ -84,7 +84,7 @@ local L2Label = {
Identifier = "L2Label",
Parent = L2.Identifier,
Renderable = {
Enabled = false,
Enabled = true,
Type = "RenderableLabels",
Text = "L2",
FontSize = 20,
@@ -106,7 +106,7 @@ local L2SunLine = {
Identifier = "L2SunLine",
Parent = transforms.SolarSystemBarycenter.Identifier,
Renderable = {
Enabled = false,
Enabled = true,
Type = "RenderableNodeLine",
StartNode = "Sun",
EndNode = "L2Small",
data/assets/scene/solarsystem/planets/earth/lagrange_points/L4.asset
+2 -2
View File
@@ -8,7 +8,7 @@ local L4 = {
Identifier = "L4",
Parent = transforms.SolarSystemBarycenter.Identifier,
Renderable = {
Enabled = false,
Enabled = true,
Type = "RenderablePlaneImageLocal",
RenderableType = "Opaque",
Billboard = true,
@@ -35,7 +35,7 @@ local L4Label = {
Identifier = "L4Label",
Parent = L4.Identifier,
Renderable = {
Enabled = false,
Enabled = true,
Type = "RenderableLabels",
Text = "L4",
FontSize = 20,
data/assets/scene/solarsystem/planets/earth/lagrange_points/L5.asset
+2 -2
View File
@@ -8,7 +8,7 @@ local L5 = {
Identifier = "L5",
Parent = transforms.SolarSystemBarycenter.Identifier,
Renderable = {
Enabled = false,
Enabled = true,
Type = "RenderablePlaneImageLocal",
RenderableType = "Opaque",
Billboard = true,
@@ -35,7 +35,7 @@ local L5Label = {
Identifier = "L5Label",
Parent = L5.Identifier,
Renderable = {
Enabled = false,
Enabled = true,
Type = "RenderableLabels",
Text = "L5",
FontSize = 20,
data/profiles/jwst.profile
+56 -1
View File
@@ -84,7 +84,7 @@
"scene/solarsystem/missions/jwst/jwst",
"scene/solarsystem/missions/jwst/trail",
"scene/solarsystem/missions/jwst/hudf",
"scene/solarsystem/missions/jwst/timelaps",
"scene/solarsystem/missions/jwst/timelapse",
"scene/digitaluniverse/hdf"
],
"camera": {
@@ -212,6 +212,61 @@
"name": "Scene.JWSTTrailLaunch.Renderable.Appearance.EnableFade",
"type": "setPropertyValueSingle",
"value": "false"
},
{
"name": "Scene.L1.Renderable.Enabled",
"type": "setPropertyValueSingle",
"value": "false"
},
{
"name": "Scene.L1Label.Renderable.Enabled",
"type": "setPropertyValueSingle",
"value": "false"
},
{
"name": "Scene.L2.Renderable.Enabled",
"type": "setPropertyValueSingle",
"value": "false"
},
{
"name": "Scene.L2Label.Renderable.Enabled",
"type": "setPropertyValueSingle",
"value": "false"
},
{
"name": "Scene.L4.Renderable.Enabled",
"type": "setPropertyValueSingle",
"value": "false"
},
{
"name": "Scene.L4Label.Renderable.Enabled",
"type": "setPropertyValueSingle",
"value": "false"
},
{
"name": "Scene.L5.Renderable.Enabled",
"type": "setPropertyValueSingle",
"value": "false"
},
{
"name": "Scene.L5Label.Renderable.Enabled",
"type": "setPropertyValueSingle",
"value": "false"
},
{
"name": "Scene.L2Small.Renderable.Enabled",
"type": "setPropertyValueSingle",
"value": "false"
},
{
"name": "Scene.L2SmallLabel.Renderable.Enabled",
"type": "setPropertyValueSingle",
"value": "false"
},
{
"name": "Scene.L2SunLine.Renderable.Enabled",
"type": "setPropertyValueSingle",
"value": "false"
}
],
"time": {