diff --git a/data/assets/base.asset b/data/assets/base.asset index e89a6a74c9..d80f40934f 100644 --- a/data/assets/base.asset +++ b/data/assets/base.asset @@ -67,7 +67,7 @@ asset.require('scene/digitaluniverse/voids') asset.require('customization/globebrowsing') asset.onInitialize(function () - openspace.globebrowsing.loadWMSServersFromFile( - openspace.absPath("${DATA}/globebrowsing_servers.lua") - ) -end) \ No newline at end of file + openspace.globebrowsing.loadWMSServersFromFile( + openspace.absPath("${DATA}/globebrowsing_servers.lua") + ) +end) diff --git a/data/assets/base_blank.asset b/data/assets/base_blank.asset index 41720dc915..571724ac09 100644 --- a/data/assets/base_blank.asset +++ b/data/assets/base_blank.asset @@ -17,34 +17,34 @@ local webGui = asset.require('util/webgui') -- Keybindings that are specific for this scene local Keybindings = { - { - Key = "h", - Name="Toggle Trails", - Command = "local list = openspace.getProperty('{planetTrail_solarSystem}.Renderable.Enabled'); for _,v in pairs(list) do openspace.setPropertyValueSingle(v, not openspace.getPropertyValue(v)) end\n" .. - "local moonlist = openspace.getProperty('{moonTrail_solarSystem}.Renderable.Enabled'); for _,v in pairs(moonlist) do openspace.setPropertyValueSingle(v, not openspace.getPropertyValue(v)) end", - Documentation = "Toggles the visibility of planet and moon trails", - GuiPath = "/Rendering", - Local = false - }, - { - Key = "l", - Name = "Toggle planet labels", - Command = "local list = openspace.getProperty('{solarsystem_labels}.Renderable.Enabled'); for _,v in pairs(list) do openspace.setPropertyValueSingle(v, not openspace.getPropertyValue(v)) end", - Documentation = "Turns on visibility for all solar system labels", - GuiPath = "/Rendering", - Local = false - } + { + Key = "h", + Name="Toggle Trails", + Command = "local list = openspace.getProperty('{planetTrail_solarSystem}.Renderable.Enabled'); for _,v in pairs(list) do openspace.setPropertyValueSingle(v, not openspace.getPropertyValue(v)) end\n" .. + "local moonlist = openspace.getProperty('{moonTrail_solarSystem}.Renderable.Enabled'); for _,v in pairs(moonlist) do openspace.setPropertyValueSingle(v, not openspace.getPropertyValue(v)) end", + Documentation = "Toggles the visibility of planet and moon trails", + GuiPath = "/Rendering", + Local = false + }, + { + Key = "l", + Name = "Toggle planet labels", + Command = "local list = openspace.getProperty('{solarsystem_labels}.Renderable.Enabled'); for _,v in pairs(list) do openspace.setPropertyValueSingle(v, not openspace.getPropertyValue(v)) end", + Documentation = "Turns on visibility for all solar system labels", + GuiPath = "/Rendering", + Local = false + } } asset.onInitialize(function () - webGui.setCefRoute("onscreen") + webGui.setCefRoute("onscreen") - sceneHelper.bindKeys(Keybindings) - openspace.setDefaultGuiSorting() + sceneHelper.bindKeys(Keybindings) + openspace.setDefaultGuiSorting() - openspace.setPropertyValueSingle("RenderEngine.VerticalLogOffset", 0.100000) + openspace.setPropertyValueSingle("RenderEngine.VerticalLogOffset", 0.100000) end) asset.onDeinitialize(function () - sceneHelper.unbindKeys(Keybindings) + sceneHelper.unbindKeys(Keybindings) end) diff --git a/data/assets/customization/globebrowsing.asset b/data/assets/customization/globebrowsing.asset index ae89b790de..f5ad4193cd 100644 --- a/data/assets/customization/globebrowsing.asset +++ b/data/assets/customization/globebrowsing.asset @@ -15,74 +15,74 @@ local AddMercuryLayers = true -- sequences -- For example: C:/OpenSpace or C:\\OpenSpace rather than C:\OpenSpace local vrt_folders = { - Mars = { - -- Add folders here whose contents will be automatically added to the Mars globe - -- If multiple folders are added, the results will be added sequentially, meaning that - -- if areas overlap (for example CTX and HiRISE) and CTX is specified *after* HiRISE, - -- CTX will stomp over the HiRISE. + Mars = { + -- Add folders here whose contents will be automatically added to the Mars globe + -- If multiple folders are added, the results will be added sequentially, meaning that + -- if areas overlap (for example CTX and HiRISE) and CTX is specified *after* HiRISE, + -- CTX will stomp over the HiRISE. - -- tl;dr: Specify CTX folders first, then HiRISE - -- example: 'C:/OpenSpace/GlobeBrowsingData/Mars/CTX' + -- tl;dr: Specify CTX folders first, then HiRISE + -- example: 'C:/OpenSpace/GlobeBrowsingData/Mars/CTX' - -- We recommend using this folder for CTX - openspace.absPath('${BASE}/../OpenSpaceData/Mars/CTX'), - -- if not and you have a custom path for CTX layers, enter it below - '', - -- We recommend using this folder for HiRISE - openspace.absPath('${BASE}/../OpenSpaceData/Mars/HiRISE'), - -- if not and you have a custom path for HiRISE layers, enter it below - '' - }, - Moon = { - -- Add folders here whose contents will be automatically added to the Moon globe - -- If multiple folders are added, the results will be added sequentially, meaning that - -- if areas overlap, images from the lower results will overwrite the images from former - -- results - -- example: 'C:/OpenSpace/GlobeBrowsingData/Moon' - openspace.absPath('${BASE}/../OpenSpaceData/Moon'), - openspace.absPath('${BASE}/../OpenSpaceData/Apollo'), - '' - }, - Mercury = { - -- Add folders here whose contents will be automatically added to the Mercury globe - -- If multiple folders are added, the results will be added sequentially, meaning that - -- if areas overlap, images from the lower results will overwrite the images from former - -- results - -- example: 'C:/OpenSpace/GlobeBrowsingData/Mercury' - openspace.absPath('${BASE}/../OpenSpaceData/Mercury'), - '' - } + -- We recommend using this folder for CTX + openspace.absPath('${BASE}/../OpenSpaceData/Mars/CTX'), + -- if not and you have a custom path for CTX layers, enter it below + '', + -- We recommend using this folder for HiRISE + openspace.absPath('${BASE}/../OpenSpaceData/Mars/HiRISE'), + -- if not and you have a custom path for HiRISE layers, enter it below + '' + }, + Moon = { + -- Add folders here whose contents will be automatically added to the Moon globe + -- If multiple folders are added, the results will be added sequentially, meaning that + -- if areas overlap, images from the lower results will overwrite the images from former + -- results + -- example: 'C:/OpenSpace/GlobeBrowsingData/Moon' + openspace.absPath('${BASE}/../OpenSpaceData/Moon'), + openspace.absPath('${BASE}/../OpenSpaceData/Apollo'), + '' + }, + Mercury = { + -- Add folders here whose contents will be automatically added to the Mercury globe + -- If multiple folders are added, the results will be added sequentially, meaning that + -- if areas overlap, images from the lower results will overwrite the images from former + -- results + -- example: 'C:/OpenSpace/GlobeBrowsingData/Mercury' + openspace.absPath('${BASE}/../OpenSpaceData/Mercury'), + '' + } } -- Add require statements for assets exporting the neccessary globes -- here we add Mars, Moon and Mercury: if AddMarsLayers then - asset.require('../scene/solarsystem/planets/mars/mars') + asset.require('../scene/solarsystem/planets/mars/mars') else - vrt_folders['Mars'] = nil + vrt_folders['Mars'] = nil end if AddMoonLayers then - asset.require('../scene/solarsystem/planets/earth/moon/moon') + asset.require('../scene/solarsystem/planets/earth/moon/moon') else - vrt_folders['Moon'] = nil + vrt_folders['Moon'] = nil end if AddMercuryLayers then - asset.require('../scene/solarsystem/planets/mercury/mercury') + asset.require('../scene/solarsystem/planets/mercury/mercury') else - vrt_folders['Mercury'] = nil + vrt_folders['Mercury'] = nil end asset.onInitialize(function () - -- Add local patches described at the top of this file - for obj, list in pairs(vrt_folders) do - for _, dir in pairs(list) do - if (dir ~= '') then - openspace.globebrowsing.addBlendingLayersFromDirectory(dir, obj) + -- Add local patches described at the top of this file + for obj, list in pairs(vrt_folders) do + for _, dir in pairs(list) do + if (dir ~= '') then + openspace.globebrowsing.addBlendingLayersFromDirectory(dir, obj) - if CreateFocusNodes then - openspace.globebrowsing.addFocusNodesFromDirectory(dir, obj) - end - end + if CreateFocusNodes then + openspace.globebrowsing.addFocusNodesFromDirectory(dir, obj) end + end end + end end) diff --git a/data/assets/dashboard/date.asset b/data/assets/dashboard/date.asset index d92dec9632..01ada33be2 100644 --- a/data/assets/dashboard/date.asset +++ b/data/assets/dashboard/date.asset @@ -1,13 +1,13 @@ local item = { - Type = "DashboardItemDate", - Identifier = "Date", - GuiName = "Date" + Type = "DashboardItemDate", + Identifier = "Date", + GuiName = "Date" } asset.onInitialize(function() - openspace.dashboard.addDashboardItem(item) + openspace.dashboard.addDashboardItem(item) end) asset.onDeinitialize(function() - openspace.dashboard.removeDashboardItem(item.Identifier) + openspace.dashboard.removeDashboardItem(item.Identifier) end) diff --git a/data/assets/dashboard/distance.asset b/data/assets/dashboard/distance.asset index b05f79520d..6316a79948 100644 --- a/data/assets/dashboard/distance.asset +++ b/data/assets/dashboard/distance.asset @@ -1,13 +1,13 @@ local item = { - Type = "DashboardItemDistance", - Identifier = "Distance", - GuiName = "Distance" + Type = "DashboardItemDistance", + Identifier = "Distance", + GuiName = "Distance" } asset.onInitialize(function() - openspace.dashboard.addDashboardItem(item) + openspace.dashboard.addDashboardItem(item) end) asset.onDeinitialize(function() - openspace.dashboard.removeDashboardItem(item.Identifier) + openspace.dashboard.removeDashboardItem(item.Identifier) end) diff --git a/data/assets/dashboard/framerate.asset b/data/assets/dashboard/framerate.asset index ea95484f7d..1c28a17674 100644 --- a/data/assets/dashboard/framerate.asset +++ b/data/assets/dashboard/framerate.asset @@ -1,13 +1,13 @@ local item = { - Type = "DashboardItemFramerate", - Identifier = "Framerate", - GuiName = "Framerate" + Type = "DashboardItemFramerate", + Identifier = "Framerate", + GuiName = "Framerate" } asset.onInitialize(function() - openspace.dashboard.addDashboardItem(item) + openspace.dashboard.addDashboardItem(item) end) asset.onDeinitialize(function() - openspace.dashboard.removeDashboardItem(item.Identifier) + openspace.dashboard.removeDashboardItem(item.Identifier) end) diff --git a/data/assets/dashboard/globelocation.asset b/data/assets/dashboard/globelocation.asset index da36c97a46..268e2593f7 100644 --- a/data/assets/dashboard/globelocation.asset +++ b/data/assets/dashboard/globelocation.asset @@ -1,13 +1,13 @@ local item = { - Type = "DashboardItemGlobeLocation", - Identifier = "GlobeLocation", - GuiName = "Globe Location" + Type = "DashboardItemGlobeLocation", + Identifier = "GlobeLocation", + GuiName = "Globe Location" } asset.onInitialize(function() - openspace.dashboard.addDashboardItem(item) + openspace.dashboard.addDashboardItem(item) end) asset.onDeinitialize(function() - openspace.dashboard.removeDashboardItem(item.Identifier) + openspace.dashboard.removeDashboardItem(item.Identifier) end) diff --git a/data/assets/dashboard/parallelconnection.asset b/data/assets/dashboard/parallelconnection.asset index 6bc13dc818..2ee8bd6307 100644 --- a/data/assets/dashboard/parallelconnection.asset +++ b/data/assets/dashboard/parallelconnection.asset @@ -1,13 +1,13 @@ local item = { - Type = "DashboardItemParallelConnection", - Identifier = "ParallelConnection", - GuiName = "Parallel Connection" + Type = "DashboardItemParallelConnection", + Identifier = "ParallelConnection", + GuiName = "Parallel Connection" } asset.onInitialize(function() - openspace.dashboard.addDashboardItem(item) + openspace.dashboard.addDashboardItem(item) end) asset.onDeinitialize(function() - openspace.dashboard.removeDashboardItem(item.Identifier) + openspace.dashboard.removeDashboardItem(item.Identifier) end) diff --git a/data/assets/dashboard/simulationincrement.asset b/data/assets/dashboard/simulationincrement.asset index 6431e403bd..1ced58eed5 100644 --- a/data/assets/dashboard/simulationincrement.asset +++ b/data/assets/dashboard/simulationincrement.asset @@ -1,13 +1,13 @@ local item = { - Type = "DashboardItemSimulationIncrement", - Identifier = "SimulationIncrement", - GuiName = "Simulation Increment" + Type = "DashboardItemSimulationIncrement", + Identifier = "SimulationIncrement", + GuiName = "Simulation Increment" } asset.onInitialize(function() - openspace.dashboard.addDashboardItem(item) + openspace.dashboard.addDashboardItem(item) end) asset.onDeinitialize(function() - openspace.dashboard.removeDashboardItem(item.Identifier) + openspace.dashboard.removeDashboardItem(item.Identifier) end) diff --git a/data/assets/dashboard/velocity.asset b/data/assets/dashboard/velocity.asset index 89655ce60f..5373ee315c 100644 --- a/data/assets/dashboard/velocity.asset +++ b/data/assets/dashboard/velocity.asset @@ -1,14 +1,14 @@ local item = { - Type = "DashboardItemVelocity", - Identifier = "GlobeLocation", - Simplification = true, - GuiName = "Velocity" + Type = "DashboardItemVelocity", + Identifier = "GlobeLocation", + Simplification = true, + GuiName = "Velocity" } asset.onInitialize(function() - openspace.dashboard.addDashboardItem(item) + openspace.dashboard.addDashboardItem(item) end) asset.onDeinitialize(function() - openspace.dashboard.removeDashboardItem(item.Identifier) + openspace.dashboard.removeDashboardItem(item.Identifier) end) diff --git a/data/assets/examples/basic.scene b/data/assets/examples/basic.scene index ec17991a57..71fdb1b98a 100644 --- a/data/assets/examples/basic.scene +++ b/data/assets/examples/basic.scene @@ -14,14 +14,14 @@ asset.require('util/webgui') local spheres = asset.require('examples/spheres') debugHelper.registerCartesianAxes(asset, { - Parent = "Root", - Scale = 10 + Parent = "Root", + Scale = 10 }) asset.onInitialize(function () - openspace.navigation.setNavigationState({ - Anchor = "Root", - Position = { 20, 20, 20 }, - Up = {0, 1, 0}, - }) + openspace.navigation.setNavigationState({ + Anchor = "Root", + Position = { 20, 20, 20 }, + Up = {0, 1, 0}, + }) end) diff --git a/data/assets/examples/dashboarditems.asset b/data/assets/examples/dashboarditems.asset index 7928758004..f76fe2e7a0 100644 --- a/data/assets/examples/dashboarditems.asset +++ b/data/assets/examples/dashboarditems.asset @@ -1,50 +1,50 @@ local assetHelper = asset.require('util/asset_helper') assetHelper.registerDashboardItems(asset, { - { - Type = "DashboardItemAngle", - Identifier = "Angle", - GuiName = "Angle", - ReferenceType = "Node", - ReferenceNodeName = "Earth", - DestinationType = "Node", - DestinationNodeName = "Moon" - }, - { - Type = "DashboardItemDate", - Identifier = "Date", - GuiName = "Date" - }, - { - Type = "DashboardItemSimulationIncrement", - Identifier = "SimulationIncrement", - GuiName = "Simulation Increment" - }, - { - Type = "DashboardItemDistance", - Identifier = "Distance", - GuiName = "Distance" - }, - { - Type = "DashboardItemFramerate", - Identifier = "Framerate", - GuiName = "Framerate" - }, - { - Type = "DashboardItemParallelConnection", - Identifier = "ParallelConnection", - GuiName = "Parallel Connection" - }, - { - Type = "DashboardItemMission", - Identifier = "Mission", - GuiName = "Mission" - }, - { - Type = "DashboardItemPropertyValue", - Identifier = "asd", - GuiName = "adasd", - URI = "Scene.Earth.Renderable.Enabled", - DisplayString = "Earth is enabled: {}" - } + { + Type = "DashboardItemAngle", + Identifier = "Angle", + GuiName = "Angle", + ReferenceType = "Node", + ReferenceNodeName = "Earth", + DestinationType = "Node", + DestinationNodeName = "Moon" + }, + { + Type = "DashboardItemDate", + Identifier = "Date", + GuiName = "Date" + }, + { + Type = "DashboardItemSimulationIncrement", + Identifier = "SimulationIncrement", + GuiName = "Simulation Increment" + }, + { + Type = "DashboardItemDistance", + Identifier = "Distance", + GuiName = "Distance" + }, + { + Type = "DashboardItemFramerate", + Identifier = "Framerate", + GuiName = "Framerate" + }, + { + Type = "DashboardItemParallelConnection", + Identifier = "ParallelConnection", + GuiName = "Parallel Connection" + }, + { + Type = "DashboardItemMission", + Identifier = "Mission", + GuiName = "Mission" + }, + { + Type = "DashboardItemPropertyValue", + Identifier = "asd", + GuiName = "adasd", + URI = "Scene.Earth.Renderable.Enabled", + DisplayString = "Earth is enabled: {}" + } }) diff --git a/data/assets/examples/debugcoordinateaxes.asset b/data/assets/examples/debugcoordinateaxes.asset index e975e1b526..8ccf4bcff5 100644 --- a/data/assets/examples/debugcoordinateaxes.asset +++ b/data/assets/examples/debugcoordinateaxes.asset @@ -4,16 +4,16 @@ local debugHelper = asset.require('util/debug_helper') local earthRadius = 6.371E6 debugHelper.registerCartesianAxes(asset, { - Parent = transforms.EarthBarycenter.Identifier, - Scale = earthRadius * 3.5 + Parent = transforms.EarthBarycenter.Identifier, + Scale = earthRadius * 3.5 }) debugHelper.registerCartesianAxes(asset, { - Parent = transforms.EarthInertial.Identifier, - Scale = earthRadius * 2.5 + Parent = transforms.EarthInertial.Identifier, + Scale = earthRadius * 2.5 }) debugHelper.registerCartesianAxes(asset, { - Parent = transforms.EarthIAU.Identifier, - Scale = earthRadius * 1.5 + Parent = transforms.EarthIAU.Identifier, + Scale = earthRadius * 1.5 }) diff --git a/data/assets/examples/discs.asset b/data/assets/examples/discs.asset index e719330586..5dcdbc8924 100644 --- a/data/assets/examples/discs.asset +++ b/data/assets/examples/discs.asset @@ -5,42 +5,42 @@ local cyanTexture = openspace.createSingeColorImage("example_disc_color1", {0.0, local purpleTexture = openspace.createSingeColorImage("example_disc_color2", {0.5, 0.0, 0.5}) local BasicDisc = { - Identifier = "BasicDisc", - Renderable = { - Type = "RenderableDisc", - Texture = cyanTexture, - Size = 1e10, - Width = 0.5 - }, - GUI = { - Name = "Basic Disc", - Path = "/Examples/Discs" - } + Identifier = "BasicDisc", + Renderable = { + Type = "RenderableDisc", + Texture = cyanTexture, + Size = 1e10, + Width = 0.5 + }, + GUI = { + Name = "Basic Disc", + Path = "/Examples/Discs" + } } -- Elliptic discs can be created using a non-uniform scaling -- For a full disc, use a width of 1.0 local FullEllipticDisc = { - Identifier = "FullEllipticDisc", - Transform = { - Scale = { - Type = "NonUniformStaticScale", - Scale = {2.0, 1.0, 1.0} - } - }, - Renderable = { - Type = "RenderableDisc", - Texture = purpleTexture, - Size = 2e10, - Width = 1.0 - }, - GUI = { - Name = "Full Elliptic Disc", - Path = "/Examples/Discs" + Identifier = "FullEllipticDisc", + Transform = { + Scale = { + Type = "NonUniformStaticScale", + Scale = {2.0, 1.0, 1.0} } + }, + Renderable = { + Type = "RenderableDisc", + Texture = purpleTexture, + Size = 2e10, + Width = 1.0 + }, + GUI = { + Name = "Full Elliptic Disc", + Path = "/Examples/Discs" + } } assetHelper.registerSceneGraphNodesAndExport(asset, { - BasicDisc, - FullEllipticDisc + BasicDisc, + FullEllipticDisc }) diff --git a/data/assets/examples/globetranslation.asset b/data/assets/examples/globetranslation.asset index 3345e68fe7..aedc5f5901 100644 --- a/data/assets/examples/globetranslation.asset +++ b/data/assets/examples/globetranslation.asset @@ -4,71 +4,71 @@ local sunTransforms = asset.require('scene/solarsystem/sun/transforms') local textures = asset.syncedResource({ - Name = "New Horizons Textures", - Type = "HttpSynchronization", - Identifier = "newhorizons_textures", - Version = 3 + Name = "New Horizons Textures", + Type = "HttpSynchronization", + Identifier = "newhorizons_textures", + Version = 3 }) local models = asset.syncedResource({ - Name = "New Horizons Model", - Type = "HttpSynchronization", - Identifier = "newhorizons_model", - Version = 1 + Name = "New Horizons Model", + Type = "HttpSynchronization", + Identifier = "newhorizons_model", + Version = 1 }) local Example_Fixed_Height = { - Identifier = "Example_Fixed_Height", - Parent = earth.Earth.Identifier, - Transform = { - Translation = { - Type = "GlobeTranslation", - Globe = earth.Earth.Identifier, - Longitude = 0.0, - Latitude = 0.0, - FixedAltitude = 10000000.0 - } - }, - Renderable = { - Type = "RenderableModel", - Body = "NEW HORIZONS", - Geometry = {{ - Type = "MultiModelGeometry", - GeometryFile = models .. "/NewHorizonsCleanModel.obj", - ColorTexture = textures .. "/NHTexture.jpg" - }} - }, - GUI = { - Path = "/Example" + Identifier = "Example_Fixed_Height", + Parent = earth.Earth.Identifier, + Transform = { + Translation = { + Type = "GlobeTranslation", + Globe = earth.Earth.Identifier, + Longitude = 0.0, + Latitude = 0.0, + FixedAltitude = 10000000.0 } + }, + Renderable = { + Type = "RenderableModel", + Body = "NEW HORIZONS", + Geometry = {{ + Type = "MultiModelGeometry", + GeometryFile = models .. "/NewHorizonsCleanModel.obj", + ColorTexture = textures .. "/NHTexture.jpg" + }} + }, + GUI = { + Path = "/Example" + } } local Example_Adaptive_Height = { - Identifier = "Example_Adaptive_Height", - Parent = earth.Earth.Identifier, - Transform = { - Translation = { - Type = "GlobeTranslation", - Globe = earth.Earth.Identifier, - Longitude = -74.006, - Latitude = 40.7128 - } - }, - Renderable = { - Type = "RenderableModel", - Body = "NEW HORIZONS", - Geometry = {{ - Type = "MultiModelGeometry", - GeometryFile = models .. "/NewHorizonsCleanModel.obj", - ColorTexture = textures .. "/NHTexture.jpg" - }} - }, - GUI = { - Path = "/Example" + Identifier = "Example_Adaptive_Height", + Parent = earth.Earth.Identifier, + Transform = { + Translation = { + Type = "GlobeTranslation", + Globe = earth.Earth.Identifier, + Longitude = -74.006, + Latitude = 40.7128 } + }, + Renderable = { + Type = "RenderableModel", + Body = "NEW HORIZONS", + Geometry = {{ + Type = "MultiModelGeometry", + GeometryFile = models .. "/NewHorizonsCleanModel.obj", + ColorTexture = textures .. "/NHTexture.jpg" + }} + }, + GUI = { + Path = "/Example" + } } assetHelper.registerSceneGraphNodesAndExport(asset, { - Example_Fixed_Height, - Example_Adaptive_Height + Example_Fixed_Height, + Example_Adaptive_Height }) diff --git a/data/assets/examples/grids.asset b/data/assets/examples/grids.asset index 9e59f31f0c..55468bd399 100644 --- a/data/assets/examples/grids.asset +++ b/data/assets/examples/grids.asset @@ -3,97 +3,97 @@ local assetHelper = asset.require('util/asset_helper') local scale = 149597870700 -- 1 AU local radialGrid = { - Identifier = "ExampleRadialGrid", - Parent = "Root", - Transform = { - Scale = { - Type = "StaticScale", - Scale = scale - } - }, - Renderable = { - Type = "RenderableRadialGrid", - Opacity = 0.8, - Color = { 0.6, 1.0, 0.7 }, - LineWidth = 3.0, - GridSegments = { 3, 4 }, - OuterRadius = 1.0, - InnerRadius = 0.2, - Enabled = false - }, - GUI = { - Name = "Example Radial Grid", - Path = "/Examples/Grids" + Identifier = "ExampleRadialGrid", + Parent = "Root", + Transform = { + Scale = { + Type = "StaticScale", + Scale = scale } + }, + Renderable = { + Type = "RenderableRadialGrid", + Opacity = 0.8, + Color = { 0.6, 1.0, 0.7 }, + LineWidth = 3.0, + GridSegments = { 3, 4 }, + OuterRadius = 1.0, + InnerRadius = 0.2, + Enabled = false + }, + GUI = { + Name = "Example Radial Grid", + Path = "/Examples/Grids" + } } local planarGrid = { - Identifier = "ExampleGrid", - Transform = { - Scale = { - Type = "StaticScale", - Scale = scale - } - }, - Renderable = { - Type = "RenderableGrid", - Color = { 0.0, 1.0, 0.8 }, - LineWidth = 2.0, - Segments = { 5, 10 }, - Size = { 1, 2 }, - Enabled = false - }, - GUI = { - Name = "Example Grid", - Path = "/Examples/Grids" + Identifier = "ExampleGrid", + Transform = { + Scale = { + Type = "StaticScale", + Scale = scale } + }, + Renderable = { + Type = "RenderableGrid", + Color = { 0.0, 1.0, 0.8 }, + LineWidth = 2.0, + Segments = { 5, 10 }, + Size = { 1, 2 }, + Enabled = false + }, + GUI = { + Name = "Example Grid", + Path = "/Examples/Grids" + } } local sphericalGrid = { - Identifier = "ExampleSphericalGrid", - Transform = { - Scale = { - Type = "StaticScale", - Scale = scale - } - }, - Renderable = { - Type = "RenderableSphericalGrid", - Color = { 1.0, 0.5, 0.2 }, - LineWidth = 2.0, - Segments = 40, - Enabled = false - }, - GUI = { - Name = "Example Spherical Grid", - Path = "/Examples/Grids" + Identifier = "ExampleSphericalGrid", + Transform = { + Scale = { + Type = "StaticScale", + Scale = scale } + }, + Renderable = { + Type = "RenderableSphericalGrid", + Color = { 1.0, 0.5, 0.2 }, + LineWidth = 2.0, + Segments = 40, + Enabled = false + }, + GUI = { + Name = "Example Spherical Grid", + Path = "/Examples/Grids" + } } local boxGrid = { - Identifier = "ExampleBoxGrid", - Transform = { - Scale = { - Type = "StaticScale", - Scale = scale - } - }, - Renderable = { - Type = "RenderableBoxGrid", - Color = { 0.5, 0.0, 1.0 }, - LineWidth = 2.0, - Size = { 2, 2, 2 }, - Enabled = false - }, - GUI = { - Name = "Example Box Grid", - Path = "/Examples/Grids" + Identifier = "ExampleBoxGrid", + Transform = { + Scale = { + Type = "StaticScale", + Scale = scale } + }, + Renderable = { + Type = "RenderableBoxGrid", + Color = { 0.5, 0.0, 1.0 }, + LineWidth = 2.0, + Size = { 2, 2, 2 }, + Enabled = false + }, + GUI = { + Name = "Example Box Grid", + Path = "/Examples/Grids" + } } assetHelper.registerSceneGraphNodesAndExport(asset, { - radialGrid, - planarGrid, - sphericalGrid, - boxGrid + radialGrid, + planarGrid, + sphericalGrid, + boxGrid }) diff --git a/data/assets/examples/primitives.asset b/data/assets/examples/primitives.asset index e0b9a78098..d30014306d 100644 --- a/data/assets/examples/primitives.asset +++ b/data/assets/examples/primitives.asset @@ -3,50 +3,50 @@ local assetHelper = asset.require('util/asset_helper') local scale = 149597870700 -- 1 AU local circle = { - Identifier = "ExampleCircle", - Transform = { - Scale = { - Type = "StaticScale", - Scale = scale - } - }, - Renderable = { - Type = "RenderableRadialGrid", - Color = { 0.6, 0.6, 0.8 }, - LineWidth = 3.0, - GridSegments = { 1, 1 }, - CircleSegments = 64, - OuterRadius = 1.0 - }, - GUI = { - Name = "Example Circle", - Path = "/Examples/Primitives" + Identifier = "ExampleCircle", + Transform = { + Scale = { + Type = "StaticScale", + Scale = scale } + }, + Renderable = { + Type = "RenderableRadialGrid", + Color = { 0.6, 0.6, 0.8 }, + LineWidth = 3.0, + GridSegments = { 1, 1 }, + CircleSegments = 64, + OuterRadius = 1.0 + }, + GUI = { + Name = "Example Circle", + Path = "/Examples/Primitives" + } } local ellipse = { - Identifier = "ExampleEllipse", - Transform = { - Scale = { - Type = "NonUniformStaticScale", - Scale = {1.5, 1.0, 1.0} - } - }, - Renderable = { - Type = "RenderableRadialGrid", - Color = { 0.6, 0.8, 0.6 }, - LineWidth = 3.0, - GridSegments = { 1, 1 }, - CircleSegments = 64, - OuterRadius = scale - }, - GUI = { - Name = "Example Ellipse", - Path = "/Examples/Primitives" + Identifier = "ExampleEllipse", + Transform = { + Scale = { + Type = "NonUniformStaticScale", + Scale = {1.5, 1.0, 1.0} } + }, + Renderable = { + Type = "RenderableRadialGrid", + Color = { 0.6, 0.8, 0.6 }, + LineWidth = 3.0, + GridSegments = { 1, 1 }, + CircleSegments = 64, + OuterRadius = scale + }, + GUI = { + Name = "Example Ellipse", + Path = "/Examples/Primitives" + } } assetHelper.registerSceneGraphNodesAndExport(asset, { - circle, - ellipse + circle, + ellipse }) diff --git a/data/assets/examples/renderableplaneimageonline.asset b/data/assets/examples/renderableplaneimageonline.asset index a4ac8f9831..bfff9da591 100644 --- a/data/assets/examples/renderableplaneimageonline.asset +++ b/data/assets/examples/renderableplaneimageonline.asset @@ -6,18 +6,18 @@ local transforms = asset.require("scene/solarsystem/sun/transforms") local RenderablePlaneImageOnline = { - Identifier = "RenderablePlaneImageOnline", - Parent = transforms.SolarSystemBarycenter.Identifier, - Renderable = { - Type = "RenderablePlaneImageOnline", - Size = 3.0E11, - Origin = "Center", - Billboard = true, - URL = "http://data.openspaceproject.com/examples/renderableplaneimageonline.jpg" - }, - GUI = { - Path = "/Examples" - } + Identifier = "RenderablePlaneImageOnline", + Parent = transforms.SolarSystemBarycenter.Identifier, + Renderable = { + Type = "RenderablePlaneImageOnline", + Size = 3.0E11, + Origin = "Center", + Billboard = true, + URL = "http://data.openspaceproject.com/examples/renderableplaneimageonline.jpg" + }, + GUI = { + Path = "/Examples" + } } diff --git a/data/assets/examples/screenspacebrowser.asset b/data/assets/examples/screenspacebrowser.asset index f10350749e..282465848c 100644 --- a/data/assets/examples/screenspacebrowser.asset +++ b/data/assets/examples/screenspacebrowser.asset @@ -1,10 +1,10 @@ local assetHelper = asset.require('util/asset_helper') local spec = { - Type = "ScreenSpaceBrowser", - Identifier = "ScreenSpaceBrowserExample", - Name = "Screen Space Browser Example", - Url = "https://www.openspaceproject.com/" + Type = "ScreenSpaceBrowser", + Identifier = "ScreenSpaceBrowserExample", + Name = "Screen Space Browser Example", + Url = "https://www.openspaceproject.com/" }; assetHelper.registerScreenSpaceRenderables(asset, { spec }) diff --git a/data/assets/examples/screenspacespout.asset b/data/assets/examples/screenspacespout.asset index 54319351f8..5ca810ec42 100644 --- a/data/assets/examples/screenspacespout.asset +++ b/data/assets/examples/screenspacespout.asset @@ -6,17 +6,17 @@ local transforms = asset.require("scene/solarsystem/sun/transforms") local Spout = { - Identifier = "Spouty", - Parent = transforms.SolarSystemBarycenter.Identifier, - Renderable = { - Type = "RenderablePlaneSpout", - Size = 3.0E11, - Origin = "Center", - Billboard = true - }, - GUI = { - Path = "/Examples" - } + Identifier = "Spouty", + Parent = transforms.SolarSystemBarycenter.Identifier, + Renderable = { + Type = "RenderablePlaneSpout", + Size = 3.0E11, + Origin = "Center", + Billboard = true + }, + GUI = { + Path = "/Examples" + } } diff --git a/data/assets/examples/slidedeck.asset b/data/assets/examples/slidedeck.asset index 74068d52ee..fdd3756450 100644 --- a/data/assets/examples/slidedeck.asset +++ b/data/assets/examples/slidedeck.asset @@ -2,42 +2,41 @@ local helper = asset.require('util/slide_deck_helper') local deck = nil asset.onInitialize(function () - deck = helper.createDeck("example", { - UseRadiusAzimuthElevation = true, - RadiusAzimuthElevation = {1.0, 0.0, 0.0}, -- use for dome - UsePerspectiveProjection = true, - FaceCamera = true, - Scale = 0.7 - }) + deck = helper.createDeck("example", { + UseRadiusAzimuthElevation = true, + RadiusAzimuthElevation = {1.0, 0.0, 0.0}, -- use for dome + UsePerspectiveProjection = true, + FaceCamera = true, + Scale = 0.7 + }) - helper.addSlide(deck, "${DATA}/test2.jpg") - helper.addSlide(deck, "${DATA}/test3.jpg") + helper.addSlide(deck, "${DATA}/test2.jpg") + helper.addSlide(deck, "${DATA}/test3.jpg") - local interpolationDuration = 0.5 + local interpolationDuration = 0.5 - function nextSlide() - helper.goToNextSlide(deck, interpolationDuration) - end + function nextSlide() + helper.goToNextSlide(deck, interpolationDuration) + end - function previousSlide() - helper.goToPreviousSlide(deck, interpolationDuration) - end + function previousSlide() + helper.goToPreviousSlide(deck, interpolationDuration) + end - function toggleSlides() - helper.toggleSlides(deck, interpolationDuration) - end - - helper.setCurrentSlide(deck, 1) - openspace.bindKey("KP_6", "nextSlide()", "Next slide", "Next slide", "/Slides") - openspace.bindKey("KP_4", "previousSlide()", "Previous slide", "Previous slide", "/Slides") - openspace.bindKey("KP_0", "toggleSlides()", "Toggle slides", "Toggle slides", "/Slides") + function toggleSlides() + helper.toggleSlides(deck, interpolationDuration) + end + helper.setCurrentSlide(deck, 1) + openspace.bindKey("KP_6", "nextSlide()", "Next slide", "Next slide", "/Slides") + openspace.bindKey("KP_4", "previousSlide()", "Previous slide", "Previous slide", "/Slides") + openspace.bindKey("KP_0", "toggleSlides()", "Toggle slides", "Toggle slides", "/Slides") end) asset.onDeinitialize(function() - openspace.clearKey("KP_6") - openspace.clearKey("KP_4") - openspace.clearKey("KP_0") - helper.removeDeck(deck) + openspace.clearKey("KP_6") + openspace.clearKey("KP_4") + openspace.clearKey("KP_0") + helper.removeDeck(deck) end) diff --git a/data/assets/examples/spheres.asset b/data/assets/examples/spheres.asset index f19458eacd..c3734d8d75 100644 --- a/data/assets/examples/spheres.asset +++ b/data/assets/examples/spheres.asset @@ -2,33 +2,32 @@ local assetHelper = asset.require('util/asset_helper') local i = 1 for z=1,3 do - for y=1,3 do - for x=1,3 do - local sphere = { - Identifier = "ExampleSphere" .. i, - Transform = { - Translation = { - Type = "StaticTranslation", - Position = {x, y, z} - } - }, - Renderable = { - Type = "RenderableSphere", - Enabled = true, - Size = 0.20 + i * 0.01, - Segments = 80, - Opacity = 1, - Texture = openspace.absPath("${DATA}/test2.jpg"), - Orientation = "Both", - }, - GUI = { - Name = "Test Sphere " .. i, - Path = "/Other/Spheres" - } - } - assetHelper.registerSceneGraphNodesAndExport(asset, { sphere }) - i = i + 1 - end + for y=1,3 do + for x=1,3 do + local sphere = { + Identifier = "ExampleSphere" .. i, + Transform = { + Translation = { + Type = "StaticTranslation", + Position = {x, y, z} + } + }, + Renderable = { + Type = "RenderableSphere", + Enabled = true, + Size = 0.20 + i * 0.01, + Segments = 80, + Opacity = 1, + Texture = openspace.absPath("${DATA}/test2.jpg"), + Orientation = "Both", + }, + GUI = { + Name = "Test Sphere " .. i, + Path = "/Other/Spheres" + } + } + assetHelper.registerSceneGraphNodesAndExport(asset, { sphere }) + i = i + 1 end + end end - diff --git a/data/assets/examples/statemachine.asset b/data/assets/examples/statemachine.asset index 6658aca647..e97213011c 100644 --- a/data/assets/examples/statemachine.asset +++ b/data/assets/examples/statemachine.asset @@ -1,48 +1,47 @@ local stateMachineHelper = asset.require('util/state_machine_helper') states = { - { - Title = "Highlight EarthTrail", - Play = function () - openspace.setPropertyValue("Scene.EarthTrail.Renderable.LineWidth", 10, 1) - end, - Rewind = function () - openspace.setPropertyValue("Scene.EarthTrail.Renderable.LineWidth", 2, 1) - end - }, - { - Title = "Highlight MarsTrail", - Play = function () - openspace.setPropertyValue("Scene.EarthTrail.Renderable.LineWidth", 2, 1) - openspace.setPropertyValue("Scene.MarsTrail.Renderable.LineWidth", 10, 1) - end, - Rewind = function () - openspace.setPropertyValue("Scene.MarsTrail.Renderable.LineWidth", 2, 1) - openspace.setPropertyValue("Scene.EarthTrail.Renderable.LineWidth", 10, 1) - end - } + { + Title = "Highlight EarthTrail", + Play = function () + openspace.setPropertyValue("Scene.EarthTrail.Renderable.LineWidth", 10, 1) + end, + Rewind = function () + openspace.setPropertyValue("Scene.EarthTrail.Renderable.LineWidth", 2, 1) + end + }, + { + Title = "Highlight MarsTrail", + Play = function () + openspace.setPropertyValue("Scene.EarthTrail.Renderable.LineWidth", 2, 1) + openspace.setPropertyValue("Scene.MarsTrail.Renderable.LineWidth", 10, 1) + end, + Rewind = function () + openspace.setPropertyValue("Scene.MarsTrail.Renderable.LineWidth", 2, 1) + openspace.setPropertyValue("Scene.EarthTrail.Renderable.LineWidth", 10, 1) + end + } } local stateMachine function next() - stateMachine.goToNextState() + stateMachine.goToNextState() end function previous() - stateMachine.goToPreviousState() + stateMachine.goToPreviousState() end asset.onInitialize(function () - stateMachine = stateMachineHelper.createStateMachine(states) - openspace.bindKey('RIGHT', 'next()') - openspace.bindKey('LEFT', 'previous()') + stateMachine = stateMachineHelper.createStateMachine(states) + openspace.bindKey('RIGHT', 'next()') + openspace.bindKey('LEFT', 'previous()') end) asset.onDeinitialize(function () - stateMachine = nil - openspace.clearKey('RIGHT') - openspace.clearKey('LEFT') + stateMachine = nil + openspace.clearKey('RIGHT') + openspace.clearKey('LEFT') end) - diff --git a/data/assets/examples/urlsynchronization.asset b/data/assets/examples/urlsynchronization.asset index 9f0a0eafca..de55aaaf82 100644 --- a/data/assets/examples/urlsynchronization.asset +++ b/data/assets/examples/urlsynchronization.asset @@ -3,48 +3,48 @@ local assetHelper = asset.require("util/asset_helper") asset.syncedResource({ - Name = "Example Single", - Type = "UrlSynchronization", - Identifier = "example_single", - Url = "http://celestrak.com/NORAD/elements/geo.txt" + Name = "Example Single", + Type = "UrlSynchronization", + Identifier = "example_single", + Url = "http://celestrak.com/NORAD/elements/geo.txt" }) asset.syncedResource({ - Name = "Example Multiple", - Type = "UrlSynchronization", - Identifier = "example_multiple", - Url = { - "http://celestrak.com/NORAD/elements/stations.txt", - "http://celestrak.com/NORAD/elements/gps-ops.txt", - } + Name = "Example Multiple", + Type = "UrlSynchronization", + Identifier = "example_multiple", + Url = { + "http://celestrak.com/NORAD/elements/stations.txt", + "http://celestrak.com/NORAD/elements/gps-ops.txt", + } }) asset.syncedResource({ - Name = "Example Large", - Type = "UrlSynchronization", - Identifier = "example_large", - Url = "http://ipv4.download.thinkbroadband.com/100MB.zip", - Override = true + Name = "Example Large", + Type = "UrlSynchronization", + Identifier = "example_large", + Url = "http://ipv4.download.thinkbroadband.com/100MB.zip", + Override = true }) asset.syncedResource({ - Name = "Example Medium", - Type = "UrlSynchronization", - Identifier = "example_medium", - Url = "http://ipv4.download.thinkbroadband.com/5MB.zip", - Override = true + Name = "Example Medium", + Type = "UrlSynchronization", + Identifier = "example_medium", + Url = "http://ipv4.download.thinkbroadband.com/5MB.zip", + Override = true }) asset.syncedResource({ - Name = "Example No ident", - Type = "UrlSynchronization", - Url = "http://ipv4.download.thinkbroadband.com/5MB.zip" + Name = "Example No ident", + Type = "UrlSynchronization", + Url = "http://ipv4.download.thinkbroadband.com/5MB.zip" }) asset.syncedResource({ - Name = "Example No Hash", - Type = "UrlSynchronization", - Identifier = "no_hash", - Url = "http://wms.itn.liu.se/Mercury/Messenger_Mosaic/Messenger_Mosaic.wms", - UseHash = false + Name = "Example No Hash", + Type = "UrlSynchronization", + Identifier = "no_hash", + Url = "http://wms.itn.liu.se/Mercury/Messenger_Mosaic/Messenger_Mosaic.wms", + UseHash = false }) diff --git a/data/assets/examples/volume/toyvolume.asset b/data/assets/examples/volume/toyvolume.asset index a52f4d879d..713b69fff7 100644 --- a/data/assets/examples/volume/toyvolume.asset +++ b/data/assets/examples/volume/toyvolume.asset @@ -4,18 +4,18 @@ local assetHelper = asset.require("util/asset_helper") local transforms = asset.require("scene/solarsystem/sun/transforms") local ToyVolume = { - Identifier = "RenderableToyVolume", - Parent = transforms.SolarSystemBarycenter.Identifier, - Renderable = { - Type = "RenderableToyVolume", - Size = { 5, 5, 5 }, - ScalingExponent = 11, - StepSize = 0.01, - Color = { 1, 0, 0 } - }, - GUI = { - Path = "/Examples" - } + Identifier = "RenderableToyVolume", + Parent = transforms.SolarSystemBarycenter.Identifier, + Renderable = { + Type = "RenderableToyVolume", + Size = { 5, 5, 5 }, + ScalingExponent = 11, + StepSize = 0.01, + Color = { 1, 0, 0 } + }, + GUI = { + Path = "/Examples" + } } local objects = { ToyVolume } diff --git a/data/assets/global/openspacebookmarks.asset b/data/assets/global/openspacebookmarks.asset index 8075929c44..1f6e91e96f 100644 --- a/data/assets/global/openspacebookmarks.asset +++ b/data/assets/global/openspacebookmarks.asset @@ -4,12 +4,12 @@ local bookmarkHelper = asset.require('util/generate_bookmarks') local dataProvider = 'http://data.openspaceproject.com/files/bookmarks/v1/bookmarks.csv' local bookmarksCSV = asset.syncedResource({ - Identifier = 'openspace_bookmarks', - Name = 'OpenSpace Bookmarks', - Type = 'UrlSynchronization', - UseHash = false, - Override = true, - Url = dataProvider + Identifier = 'openspace_bookmarks', + Name = 'OpenSpace Bookmarks', + Type = 'UrlSynchronization', + UseHash = false, + Override = true, + Url = dataProvider }) local nodes = {} diff --git a/data/assets/gui/images.asset b/data/assets/gui/images.asset index abb6bee4b9..7f55b59f0e 100644 --- a/data/assets/gui/images.asset +++ b/data/assets/gui/images.asset @@ -3,46 +3,46 @@ local assetHelper = asset.require("util/asset_helper") asset.syncedResource({ - Type = "UrlSynchronization", - Name = "Icons", - Identifier = "planet_icons", - Url = { - "http://data.openspaceproject.com/files/webgui/assets/icons/solarsystem/earth.png", - "http://data.openspaceproject.com/files/webgui/assets/icons/solarsystem/moon.png", - "http://data.openspaceproject.com/files/webgui/assets/icons/solarsystem/jupiter.png", - "http://data.openspaceproject.com/files/webgui/assets/icons/solarsystem/mars.png", - "http://data.openspaceproject.com/files/webgui/assets/icons/solarsystem/mercury.png", - "http://data.openspaceproject.com/files/webgui/assets/icons/solarsystem/neptune.png", - "http://data.openspaceproject.com/files/webgui/assets/icons/solarsystem/saturn.png", - "http://data.openspaceproject.com/files/webgui/assets/icons/solarsystem/uranus.png", - "http://data.openspaceproject.com/files/webgui/assets/icons/solarsystem/venus.png", - "http://data.openspaceproject.com/files/webgui/assets/icons/solarsystem/callisto.png", - "http://data.openspaceproject.com/files/webgui/assets/icons/solarsystem/europa.png", - "http://data.openspaceproject.com/files/webgui/assets/icons/solarsystem/ganymede.png", - "http://data.openspaceproject.com/files/webgui/assets/icons/solarsystem/io.png", - }, - UseHash = false + Type = "UrlSynchronization", + Name = "Icons", + Identifier = "planet_icons", + Url = { + "http://data.openspaceproject.com/files/webgui/assets/icons/solarsystem/earth.png", + "http://data.openspaceproject.com/files/webgui/assets/icons/solarsystem/moon.png", + "http://data.openspaceproject.com/files/webgui/assets/icons/solarsystem/jupiter.png", + "http://data.openspaceproject.com/files/webgui/assets/icons/solarsystem/mars.png", + "http://data.openspaceproject.com/files/webgui/assets/icons/solarsystem/mercury.png", + "http://data.openspaceproject.com/files/webgui/assets/icons/solarsystem/neptune.png", + "http://data.openspaceproject.com/files/webgui/assets/icons/solarsystem/saturn.png", + "http://data.openspaceproject.com/files/webgui/assets/icons/solarsystem/uranus.png", + "http://data.openspaceproject.com/files/webgui/assets/icons/solarsystem/venus.png", + "http://data.openspaceproject.com/files/webgui/assets/icons/solarsystem/callisto.png", + "http://data.openspaceproject.com/files/webgui/assets/icons/solarsystem/europa.png", + "http://data.openspaceproject.com/files/webgui/assets/icons/solarsystem/ganymede.png", + "http://data.openspaceproject.com/files/webgui/assets/icons/solarsystem/io.png", + }, + UseHash = false }) asset.syncedResource({ - Type = "UrlSynchronization", - Name = "Stories", - Identifier = "story_images", - Url = { - "http://data.openspaceproject.com/files/webgui/assets/images/stories/story_solarsystem.png", - "http://data.openspaceproject.com/files/webgui/assets/images/stories/story_jupitermoons.png", - "http://data.openspaceproject.com/files/webgui/assets/images/stories/story_earthweather.png", - "http://data.openspaceproject.com/files/webgui/assets/images/stories/story_mars.png", - "http://data.openspaceproject.com/files/webgui/assets/images/stories/story_galaxies.png", - "http://data.openspaceproject.com/files/webgui/assets/images/stories/story_example.png", - }, - UseHash = false + Type = "UrlSynchronization", + Name = "Stories", + Identifier = "story_images", + Url = { + "http://data.openspaceproject.com/files/webgui/assets/images/stories/story_solarsystem.png", + "http://data.openspaceproject.com/files/webgui/assets/images/stories/story_jupitermoons.png", + "http://data.openspaceproject.com/files/webgui/assets/images/stories/story_earthweather.png", + "http://data.openspaceproject.com/files/webgui/assets/images/stories/story_mars.png", + "http://data.openspaceproject.com/files/webgui/assets/images/stories/story_galaxies.png", + "http://data.openspaceproject.com/files/webgui/assets/images/stories/story_example.png", + }, + UseHash = false }) asset.syncedResource({ - Type = "UrlSynchronization", - Name = "Instructions", - Identifier = "images", - Url = "http://data.openspaceproject.com/files/webgui/assets/images/instructions.png", - UseHash = false + Type = "UrlSynchronization", + Name = "Instructions", + Identifier = "images", + Url = "http://data.openspaceproject.com/files/webgui/assets/images/instructions.png", + UseHash = false }) diff --git a/data/assets/scene/digitaluniverse/2dF.asset b/data/assets/scene/digitaluniverse/2dF.asset index 0e8c025a53..23f44a447c 100644 --- a/data/assets/scene/digitaluniverse/2dF.asset +++ b/data/assets/scene/digitaluniverse/2dF.asset @@ -3,54 +3,53 @@ local assetHelper = asset.require('util/asset_helper') local textures = asset.syncedResource({ - Name = "2dF Textures", - Type = "HttpSynchronization", - Identifier = "digitaluniverse_2dF_textures", - Version = 2 + Name = "2dF Textures", + Type = "HttpSynchronization", + Identifier = "digitaluniverse_2dF_textures", + Version = 2 }) local speck = asset.syncedResource({ - Name = "2dF Speck Files", - Type = "HttpSynchronization", - Identifier = "digitaluniverse_2dF_speck", - Version = 2 + Name = "2dF Speck Files", + Type = "HttpSynchronization", + Identifier = "digitaluniverse_2dF_speck", + Version = 2 }) local object = { - Identifier = "2dF", - Renderable = { - Type = "RenderableBillboardsCloud", - Enabled = false, - Color = { 1.0, 1.0, 1.0 }, - Opacity = 1.0, - File = speck .. "/2dF.speck", - Texture = textures .. "/point3A.png", - ColorMap = speck .. "/2dF.cmap", - ColorOption = { "redshift", "proximity" }, - ColorRange = { { 0.0, 0.075 }, { 1.0, 25.0 } }, - Unit = "Mpc", - ScaleFactor = 520.0, - BillboardMaxSize = 4.7, - EnablePixelSizeControl = true - }, - GUI = { - Name = "2dF Galaxies", - Path = "/Universe/Galaxies", - Description = [[Census 229,293 galaxies. DU Version 1.7.
- The Two-degree Field (2dF) Survey was a project designed to map portions of the - extragalactic universe. The 2dF instrument was mounted on the 3.9-meter - (12.8-foot) Anglo-Australian Telescope (AAT), located 450 km (280 miles) - northwest of Sydney. The telescope has a two-degree field of view on the sky, - enabling large parts of the sky to be observed at one time. For each pointing of - the telescope, the instrument can acquire up to 400 spectra simultaneously via - optical fibers that feed into two spectrographs. Each spectrograph sees light - that is between 350 nm and 800 nm, spanning the visible spectrum.

The - 2dF survey has three main components: the North Galactic Pole strip, the South - Galactic Pole strip, and the random fields that surround the South Galactic Pole - strip. The galaxy survey is composed of about 230,000 galaxies with brightness and - redshift measurements. (Description from URL)

Data Reference: 2dF Galaxy - Redshift Survey (2dFGRS Team, 1998-2003)]] - } + Identifier = "2dF", + Renderable = { + Type = "RenderableBillboardsCloud", + Enabled = false, + Color = { 1.0, 1.0, 1.0 }, + Opacity = 1.0, + File = speck .. "/2dF.speck", + Texture = textures .. "/point3A.png", + ColorMap = speck .. "/2dF.cmap", + ColorOption = { "redshift", "proximity" }, + ColorRange = { { 0.0, 0.075 }, { 1.0, 25.0 } }, + Unit = "Mpc", + ScaleFactor = 520.0, + BillboardMaxSize = 4.7, + EnablePixelSizeControl = true + }, + GUI = { + Name = "2dF Galaxies", + Path = "/Universe/Galaxies", + Description = [[Census 229,293 galaxies. DU Version 1.7.
The Two-degree Field + (2dF) Survey was a project designed to map portions of the extragalactic universe. The + 2dF instrument was mounted on the 3.9-meter (12.8-foot) Anglo-Australian Telescope + (AAT), located 450 km (280 miles) northwest of Sydney. The telescope has a two-degree + field of view on the sky, enabling large parts of the sky to be observed at one time. + For each pointing of the telescope, the instrument can acquire up to 400 spectra + simultaneously via optical fibers that feed into two spectrographs. Each spectrograph + sees light that is between 350 nm and 800 nm, spanning the visible spectrum.

+ The 2dF survey has three main components: the North Galactic Pole strip, the South + Galactic Pole strip, and the random fields that surround the South Galactic Pole + strip. The galaxy survey is composed of about 230,000 galaxies with brightness and + redshift measurements. (Description from URL)

Data Reference: 2dF Galaxy + Redshift Survey (2dFGRS Team, 1998-2003)]] + } } @@ -58,11 +57,11 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { - Name = "2dF Galaxies", - Version = "2.0", - Description = [[Digital Universe asset for the The Two-degree Field (2dF) Survey.]], - Author = "Brian Abbott (AMNH), Eric Gawiser (Rutgers U)", - URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", - License = "AMNH Digital Universe", - Identifiers = {"2dF"} + Name = "2dF Galaxies", + Version = "2.0", + Description = [[Digital Universe asset for the The Two-degree Field (2dF) Survey.]], + Author = "Brian Abbott (AMNH), Eric Gawiser (Rutgers U)", + URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", + License = "AMNH Digital Universe", + Identifiers = {"2dF"} } diff --git a/data/assets/scene/digitaluniverse/2mass.asset b/data/assets/scene/digitaluniverse/2mass.asset index d2a0b53a42..f69905f48c 100644 --- a/data/assets/scene/digitaluniverse/2mass.asset +++ b/data/assets/scene/digitaluniverse/2mass.asset @@ -3,49 +3,49 @@ local assetHelper = asset.require('util/asset_helper') local textures = asset.syncedResource({ - Name = "2MASS Textures", - Type = "HttpSynchronization", - Identifier = "digitaluniverse_2mass_textures", - Version = 2 + Name = "2MASS Textures", + Type = "HttpSynchronization", + Identifier = "digitaluniverse_2mass_textures", + Version = 2 }) local speck = asset.syncedResource({ - Name = "2MASS Speck Files", - Type = "HttpSynchronization", - Identifier = "digitaluniverse_2mass_speck", - Version = 1 + Name = "2MASS Speck Files", + Type = "HttpSynchronization", + Identifier = "digitaluniverse_2mass_speck", + Version = 1 }) local object = { - Identifier = "2MASS", - Renderable = { - Type = "RenderableBillboardsCloud", - Enabled = false, - Color = { 1.0, 0.4, 0.2 }, - Opacity = 1.0, - File = speck .. "/2MASS.speck", - Texture = textures .. "/point3A.png", - ColorMap = speck .. "/lss.cmap", - ColorOption = { "redshift", "prox5Mpc" }, - ColorRange = { { 0.0, 0.075 }, { 1.0, 50.0 } }, - Unit = "Mpc", - CorrectionSizeEndDistance = 20.6, - CorrectionSizeFactor = 15.0, - ScaleFactor = 510.78, - BillboardMaxSize = 11.15, - EnablePixelSizeControl = true - }, - GUI = { - Name = "2MASS Galaxies", - Path = "/Universe/Galaxies", - Description = [[ The Two Micron All-Sky Survey (2MASS) is an infrared survey - of the sky published in 2003. Because it is looking in the infrared, and - this is a composite of the 2MASS point-source catalog, most of the light - from this survey is starlight. In visible light, clouds of gas and dust - obscure our view. However, in infrared, the longer wavelengths of light can - penetrate these clouds without being scattered, thereby revealing stars - that would normally be hidden to our eye. (Description from URL)]], - } + Identifier = "2MASS", + Renderable = { + Type = "RenderableBillboardsCloud", + Enabled = false, + Color = { 1.0, 0.4, 0.2 }, + Opacity = 1.0, + File = speck .. "/2MASS.speck", + Texture = textures .. "/point3A.png", + ColorMap = speck .. "/lss.cmap", + ColorOption = { "redshift", "prox5Mpc" }, + ColorRange = { { 0.0, 0.075 }, { 1.0, 50.0 } }, + Unit = "Mpc", + CorrectionSizeEndDistance = 20.6, + CorrectionSizeFactor = 15.0, + ScaleFactor = 510.78, + BillboardMaxSize = 11.15, + EnablePixelSizeControl = true + }, + GUI = { + Name = "2MASS Galaxies", + Path = "/Universe/Galaxies", + Description = [[ The Two Micron All-Sky Survey (2MASS) is an infrared survey of the + sky published in 2003. Because it is looking in the infrared, and this is a composite + of the 2MASS point-source catalog, most of the light from this survey is starlight. In + visible light, clouds of gas and dust obscure our view. However, in infrared, the + longer wavelengths of light can penetrate these clouds without being scattered, + thereby revealing stars that would normally be hidden to our eye. + (Description from URL)]] + } } @@ -53,12 +53,12 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { - Name = "2MASS Galaxies", - Version = "1.0", - Description = [[ Digital Universe asset for the Two Micron All-Sky Survey (2MASS) - survey]], - Author = "Brian Abbott (AMNH)", - URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", - License = "AMNH Digital Universe", - Identifiers = {"2MASS"} + Name = "2MASS Galaxies", + Version = "1.0", + Description = [[ Digital Universe asset for the Two Micron All-Sky Survey (2MASS) + survey]], + Author = "Brian Abbott (AMNH)", + URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", + License = "AMNH Digital Universe", + Identifiers = {"2MASS"} } diff --git a/data/assets/scene/digitaluniverse/6dF.asset b/data/assets/scene/digitaluniverse/6dF.asset index c7871b5e69..8e45fad8b5 100644 --- a/data/assets/scene/digitaluniverse/6dF.asset +++ b/data/assets/scene/digitaluniverse/6dF.asset @@ -3,51 +3,51 @@ local assetHelper = asset.require('util/asset_helper') local textures = asset.syncedResource({ - Name = "6dF Textures", - Type = "HttpSynchronization", - Identifier = "digitaluniverse_6dF_textures", - Version = 2 + Name = "6dF Textures", + Type = "HttpSynchronization", + Identifier = "digitaluniverse_6dF_textures", + Version = 2 }) local speck = asset.syncedResource({ - Name = "6dF Speck Files", - Type = "HttpSynchronization", - Identifier = "digitaluniverse_6dF_speck", - Version = 2 + Name = "6dF Speck Files", + Type = "HttpSynchronization", + Identifier = "digitaluniverse_6dF_speck", + Version = 2 }) local object = { - Identifier = "6dF", - Renderable = { - Type = "RenderableBillboardsCloud", - Enabled = false, - Color = { 1.0, 1.0, 0.0 }, - Opacity = 1.0, - File = speck .. "/6dF.speck", - Texture = textures .. "/point3A.png", - ColorMap = speck .. "/6dF.cmap", - ColorOption = { "redshift", "proximity" }, - ColorRange = { { 0.0, 0.075 }, { 1.0, 10.0 } }, - Unit = "Mpc", - ScaleFactor = 534.0, - BillboardMaxSize = 9.0, - EnablePixelSizeControl = true, - }, - GUI = { - Name = "6dF Galaxies", - Path = "/Universe/Galaxies", - Description = [[Census 109,569 galaxies. DU Version 1.4.
The Six-degree Field - (6dF) Galaxy Survey mapped nearly half the sky from the Anglo-Australian - Observatory. Unlike previous datasets, this one is not all-sky, meaning there - are patches of sky that are not covered. In this case, the entire northern - hemisphere has no coverage at all. This catalog overlaps with the Tully - dataset, and there is a noticeable difference in the quality of these - datasets. Tully is much tighter and the structure is more apparent, while the - 6dF data are more spread out. This is because of local motions within galaxy - clusters have not been corrected in these data. (Description from URL) -

Data Reference: The 6dF Galaxy Survey Redshift Catalogue - (Jones+, 2009)]] - } + Identifier = "6dF", + Renderable = { + Type = "RenderableBillboardsCloud", + Enabled = false, + Color = { 1.0, 1.0, 0.0 }, + Opacity = 1.0, + File = speck .. "/6dF.speck", + Texture = textures .. "/point3A.png", + ColorMap = speck .. "/6dF.cmap", + ColorOption = { "redshift", "proximity" }, + ColorRange = { { 0.0, 0.075 }, { 1.0, 10.0 } }, + Unit = "Mpc", + ScaleFactor = 534.0, + BillboardMaxSize = 9.0, + EnablePixelSizeControl = true, + }, + GUI = { + Name = "6dF Galaxies", + Path = "/Universe/Galaxies", + Description = [[Census 109,569 galaxies. DU Version 1.4.
The Six-degree Field + (6dF) Galaxy Survey mapped nearly half the sky from the Anglo-Australian + Observatory. Unlike previous datasets, this one is not all-sky, meaning there + are patches of sky that are not covered. In this case, the entire northern + hemisphere has no coverage at all. This catalog overlaps with the Tully + dataset, and there is a noticeable difference in the quality of these + datasets. Tully is much tighter and the structure is more apparent, while the + 6dF data are more spread out. This is because of local motions within galaxy + clusters have not been corrected in these data. (Description from URL) +

Data Reference: The 6dF Galaxy Survey Redshift Catalogue + (Jones+, 2009)]] + } } @@ -55,11 +55,11 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { - Name = "6dF Galaxies", - Version = "2.0", - Description = [[Digital Universe asset for The Six-degree Field (6dF) Galaxy Survey]], - Author = "Brian Abbott (AMNH)", - URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", - License = "AMNH Digital Universe", - Identifiers = {"6dF"} + Name = "6dF Galaxies", + Version = "2.0", + Description = [[Digital Universe asset for The Six-degree Field (6dF) Galaxy Survey]], + Author = "Brian Abbott (AMNH)", + URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", + License = "AMNH Digital Universe", + Identifiers = {"6dF"} } diff --git a/data/assets/scene/digitaluniverse/abell.asset b/data/assets/scene/digitaluniverse/abell.asset index a40bf8e1f9..da0a05fd02 100644 --- a/data/assets/scene/digitaluniverse/abell.asset +++ b/data/assets/scene/digitaluniverse/abell.asset @@ -3,60 +3,60 @@ local assetHelper = asset.require('util/asset_helper') local textures = asset.syncedResource({ - Name = "Abell Textures", - Type = "HttpSynchronization", - Identifier = "digitaluniverse_abell_textures", - Version = 2 + Name = "Abell Textures", + Type = "HttpSynchronization", + Identifier = "digitaluniverse_abell_textures", + Version = 2 }) local speck = asset.syncedResource({ - Name = "Abell Speck Files", - Type = "HttpSynchronization", - Identifier = "digitaluniverse_abell_speck", - Version = 2 + Name = "Abell Speck Files", + Type = "HttpSynchronization", + Identifier = "digitaluniverse_abell_speck", + Version = 2 }) local object = { - Identifier = "Abell", - Renderable = { - Type = "RenderableBillboardsCloud", - Enabled = false, - Color = { 1.0, 0.4, 0.2 }, - Opacity = 1.0, - --ColorMap = speck .. "/abell.cmap", - File = speck .. "/abell.speck", - Texture = textures .. "/point3A.png", - LabelFile = speck .. "/abell.label", - TextColor = { 0.0, 0.8, 0.0 }, - TextSize = 22, - TextMinSize = 10.0, - Unit = "Mpc", - TransformationMatrix = { - -0.7357425748, 0.67726129641, 0.0, 0.0, - -0.074553778365, -0.080991471307, 0.9939225904, 0.0, - 0.67314530211, 0.73127116582, 0.11008126223, 0.0, - 0.0, 0.0, 0.0, 1.0 - }, - ScaleFactor = 520.0, - BillboardMaxSize = 7.0, - EnablePixelSizeControl = true + Identifier = "Abell", + Renderable = { + Type = "RenderableBillboardsCloud", + Enabled = false, + Color = { 1.0, 0.4, 0.2 }, + Opacity = 1.0, + --ColorMap = speck .. "/abell.cmap", + File = speck .. "/abell.speck", + Texture = textures .. "/point3A.png", + LabelFile = speck .. "/abell.label", + TextColor = { 0.0, 0.8, 0.0 }, + TextSize = 22, + TextMinSize = 10.0, + Unit = "Mpc", + TransformationMatrix = { + -0.7357425748, 0.67726129641, 0.0, 0.0, + -0.074553778365, -0.080991471307, 0.9939225904, 0.0, + 0.67314530211, 0.73127116582, 0.11008126223, 0.0, + 0.0, 0.0, 0.0, 1.0 }, - GUI = { - Name = "Abell Galaxy Clusters", - Path = "/Universe/Galaxies", - Description = [[Census 2,246 galaxies. DU Version 1.4.
The Abell catalog - includes all the nearby, and not so nearby, galaxy clusters. The northern - hemisphere survey, published in 1958, was compiled by George Abell (1927–1983) - from the Palomar Sky Survey plates. A subsequent southern hemisphere catalog - was published posthumously in 1989. Further analysis by Brent Tully determined - their distance and three-dimensional distribution. Each point in this data set - represents a cluster of tens to hundreds (possibly even thousands) of - galaxies, similar to the Virgo or Fornax Clusters. You will notice some points - are assigned colors while most are gray. The data set also has an arbitrary - cut-off for completeness, resulting in the rectangular shape of the data set. - (Description from URL)

Data Reference: Abell Clusters of Rich - Galaxies, Brent Tully (U Hawaii), Stuart Levy (NCSA/UIUC)]], - } + ScaleFactor = 520.0, + BillboardMaxSize = 7.0, + EnablePixelSizeControl = true + }, + GUI = { + Name = "Abell Galaxy Clusters", + Path = "/Universe/Galaxies", + Description = [[Census 2,246 galaxies. DU Version 1.4.
The Abell catalog + includes all the nearby, and not so nearby, galaxy clusters. The northern + hemisphere survey, published in 1958, was compiled by George Abell (1927–1983) + from the Palomar Sky Survey plates. A subsequent southern hemisphere catalog + was published posthumously in 1989. Further analysis by Brent Tully determined + their distance and three-dimensional distribution. Each point in this data set + represents a cluster of tens to hundreds (possibly even thousands) of + galaxies, similar to the Virgo or Fornax Clusters. You will notice some points + are assigned colors while most are gray. The data set also has an arbitrary + cut-off for completeness, resulting in the rectangular shape of the data set. + (Description from URL)

Data Reference: Abell Clusters of Rich + Galaxies, Brent Tully (U Hawaii), Stuart Levy (NCSA/UIUC)]], + } } @@ -64,11 +64,11 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { - Name = "Abell Galaxy Clusters", - Version = "2.0", - Description = [[Digital Universe asset for The Abell catalog]], - Author = "Stuart Levy (NCSA/UIUC), Brian Abbott (AMNH)", - URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", - License = "AMNH Digital Universe", - Identifiers = {"Abell"} + Name = "Abell Galaxy Clusters", + Version = "2.0", + Description = [[Digital Universe asset for The Abell catalog]], + Author = "Stuart Levy (NCSA/UIUC), Brian Abbott (AMNH)", + URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", + License = "AMNH Digital Universe", + Identifiers = {"Abell"} } diff --git a/data/assets/scene/digitaluniverse/alternatestarlabels.asset b/data/assets/scene/digitaluniverse/alternatestarlabels.asset index 2ba0ff4eb9..2a58510736 100644 --- a/data/assets/scene/digitaluniverse/alternatestarlabels.asset +++ b/data/assets/scene/digitaluniverse/alternatestarlabels.asset @@ -3,48 +3,48 @@ local assetHelper = asset.require('util/asset_helper') local speck = asset.syncedResource({ - Name = "Alternate Star Labels Speck Files", - Type = "HttpSynchronization", - Identifier = "digitaluniverse_alternatestarlabels_speck", - Version = 1 + Name = "Alternate Star Labels Speck Files", + Type = "HttpSynchronization", + Identifier = "digitaluniverse_alternatestarlabels_speck", + Version = 1 }) local object = { - Identifier = "StarLabelsAlternate", - Renderable = { - Type = "RenderableBillboardsCloud", - Enabled = false, - Color = { 1.0, 1.0, 1.0 }, - Opacity = 0.65, - LabelFile = speck .. "/stars-altlbl.label", - TextColor = { 0.4, 0.4, 0.4 }, - DrawLabels = true, - TextSize = 14.7, - TextMinSize = 6.0, - Unit = "pc" - }, - GUI = { - Name = "Stars Labels - Alternate", - Path = "/Milky Way/Stars", - Description = [[Census 3,550 star names. DU Version 1.7.
The main star data - identify the accepted IAU star names for the brightest stars. However, astronomers - have long cataloged thousands of stars beyond the brightest ones we see. Several - attempts over thousands of years to name all the visible stars have led to two - main catalogs: Johann Bayer's Catalog from 1603 and John Flamsteed's Catalog - published in 1725. (Description from URL)

Data Reference: Various - sources]], - } + Identifier = "StarLabelsAlternate", + Renderable = { + Type = "RenderableBillboardsCloud", + Enabled = false, + Color = { 1.0, 1.0, 1.0 }, + Opacity = 0.65, + LabelFile = speck .. "/stars-altlbl.label", + TextColor = { 0.4, 0.4, 0.4 }, + DrawLabels = true, + TextSize = 14.7, + TextMinSize = 6.0, + Unit = "pc" + }, + GUI = { + Name = "Stars Labels - Alternate", + Path = "/Milky Way/Stars", + Description = [[Census 3,550 star names. DU Version 1.7.
The main star data + identify the accepted IAU star names for the brightest stars. However, astronomers + have long cataloged thousands of stars beyond the brightest ones we see. Several + attempts over thousands of years to name all the visible stars have led to two + main catalogs: Johann Bayer's Catalog from 1603 and John Flamsteed's Catalog + published in 1725. (Description from URL)

Data Reference: Various + sources]], + } } asset.meta = { - Name = "Stars Labels - Alternate", - Version = "1.0", - Description = [[Digital Universe asset for alternate start labels]], - Author = "Brian Abbott (AMNH)", - URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", - License = "AMNH Digital Universe", - Identifiers = {"StarLabelsAlternate"} + Name = "Stars Labels - Alternate", + Version = "1.0", + Description = [[Digital Universe asset for alternate start labels]], + Author = "Brian Abbott (AMNH)", + URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", + License = "AMNH Digital Universe", + Identifiers = {"StarLabelsAlternate"} } assetHelper.registerSceneGraphNodesAndExport(asset, { object }) diff --git a/data/assets/scene/digitaluniverse/backgroundradiation.asset b/data/assets/scene/digitaluniverse/backgroundradiation.asset index fbe1002e5e..b2f6908637 100644 --- a/data/assets/scene/digitaluniverse/backgroundradiation.asset +++ b/data/assets/scene/digitaluniverse/backgroundradiation.asset @@ -2,134 +2,134 @@ local assetHelper = asset.require('util/asset_helper') local textures = asset.require('./backgroundradiation_textures').textures local speck = asset.syncedResource({ - Name = "Background Radiation Speck Files", - Type = "HttpSynchronization", - Identifier = "digitaluniverse_backgroundradiation_speck", - Version = 1 + Name = "Background Radiation Speck Files", + Type = "HttpSynchronization", + Identifier = "digitaluniverse_backgroundradiation_speck", + Version = 1 }) local wmap = { - Identifier = "WMAP", - Transform = { - Rotation = { - Type = "StaticRotation", - Rotation = { 0, 0, 3.14159265359 } - } - }, - Renderable = { - Type = "RenderableSphere", - Enabled = false, - Size = 3975.41417036064E23, - Segments = 80, - Opacity = 0.5, - Texture = textures .. "/wmap_ilc_7yr_v4_200uK_RGB_sos.png", - Orientation = "Both", - MirrorTexture = true, - UseAdditiveBlending = true, - FadeInThreshold = 0.4 - }, - GUI = { - Name = "Wilkinson Microwave Anisotropy Probe (WMAP)", - Path = "/Universe/Cosmic Microwave Background" + Identifier = "WMAP", + Transform = { + Rotation = { + Type = "StaticRotation", + Rotation = { 0, 0, 3.14159265359 } } + }, + Renderable = { + Type = "RenderableSphere", + Enabled = false, + Size = 3975.41417036064E23, + Segments = 80, + Opacity = 0.5, + Texture = textures .. "/wmap_ilc_7yr_v4_200uK_RGB_sos.png", + Orientation = "Both", + MirrorTexture = true, + UseAdditiveBlending = true, + FadeInThreshold = 0.4 + }, + GUI = { + Name = "Wilkinson Microwave Anisotropy Probe (WMAP)", + Path = "/Universe/Cosmic Microwave Background" + } } local cbe = { - Identifier = "CBE", - Transform = { - Rotation = { - Type = "StaticRotation", - Rotation = { 0, 0, 3.14159265359 } - } - }, - Renderable = { - Type = "RenderableSphere", - Enabled = false, - Size = 3975.41417036064E23, - Segments = 80, - Opacity = 0.5, - Texture = textures .. "/COBErect.png", - Orientation = "Both", - MirrorTexture = true, - UseAdditiveBlending = true, - FadeInThreshold = 0.4 - }, - GUI = { - Name = "Cosmic Background Explorer", - Path = "/Universe/Cosmic Microwave Background" + Identifier = "CBE", + Transform = { + Rotation = { + Type = "StaticRotation", + Rotation = { 0, 0, 3.14159265359 } } + }, + Renderable = { + Type = "RenderableSphere", + Enabled = false, + Size = 3975.41417036064E23, + Segments = 80, + Opacity = 0.5, + Texture = textures .. "/COBErect.png", + Orientation = "Both", + MirrorTexture = true, + UseAdditiveBlending = true, + FadeInThreshold = 0.4 + }, + GUI = { + Name = "Cosmic Background Explorer", + Path = "/Universe/Cosmic Microwave Background" + } } local planck = { - Identifier = "Planck", - Transform = { - Rotation = { - Type = "StaticRotation", - Rotation = { 0, 0, 3.14159265359 } - } - }, - Renderable = { - Type = "RenderableSphere", - Enabled = true, - Size = 3975.41417036064E23, - Segments = 80, - Opacity = 0.3, - Texture = textures .. "/cmb4k.jpg", - Orientation = "Both", - MirrorTexture = true, - UseAdditiveBlending = true, - FadeInThreshold = 0.4 - }, - GUI = { - Name = "Planck", - Path = "/Universe/Cosmic Microwave Background" + Identifier = "Planck", + Transform = { + Rotation = { + Type = "StaticRotation", + Rotation = { 0, 0, 3.14159265359 } } + }, + Renderable = { + Type = "RenderableSphere", + Enabled = true, + Size = 3975.41417036064E23, + Segments = 80, + Opacity = 0.3, + Texture = textures .. "/cmb4k.jpg", + Orientation = "Both", + MirrorTexture = true, + UseAdditiveBlending = true, + FadeInThreshold = 0.4 + }, + GUI = { + Name = "Planck", + Path = "/Universe/Cosmic Microwave Background" + } } local Halpha = { - Identifier = "HAlpha", - Transform = { - Rotation = { - Type = "StaticRotation", - Rotation = {0, 0, 3.14159265359} - } - }, - Renderable = { - Type = "RenderableSphere", - Enabled = false, - Size = 9.2E21, - Segments = 40, - Opacity = 0.4, - Texture = textures .. "/mwHalpha-f.png", - Orientation = "Inside", - UseAdditiveBlending = true, - MirrorTexture = true, - FadeOutThreshold = 0.025, - Background = true - }, - GUI = { - Name = "H Alpha", - Path = "/Milky Way/All Sky Images" + Identifier = "HAlpha", + Transform = { + Rotation = { + Type = "StaticRotation", + Rotation = {0, 0, 3.14159265359} } + }, + Renderable = { + Type = "RenderableSphere", + Enabled = false, + Size = 9.2E21, + Segments = 40, + Opacity = 0.4, + Texture = textures .. "/mwHalpha-f.png", + Orientation = "Inside", + UseAdditiveBlending = true, + MirrorTexture = true, + FadeOutThreshold = 0.025, + Background = true + }, + GUI = { + Name = "H Alpha", + Path = "/Milky Way/All Sky Images" + } } assetHelper.registerSceneGraphNodesAndExport(asset, { - wmap, cbe, planck, Halpha + wmap, cbe, planck, Halpha }) asset.meta = { - Name = "Background Radiation", - Version = "2.0", - Description = [[Various AllSky images for the Milky Way and observable Universe. - Included: Wilkinson Microwave Anisotropy Probe (WMAP), Cosmic Background Explorer, - Planck, and H Alpha

Data Reference: Planck/ESA and the Planck - Collaboration, Wilkinson Microwave Anisotropy Probe/NASA, Doug - Finkbeiner (Princeton)]], - Author = "Brian Abbott (AMNH), OpenSpace Team", - URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", - License = "AMNH Digital Universe", - Identifiers = {"WMAP", "CBE", "Planck", "HAlpha"} + Name = "Background Radiation", + Version = "2.0", + Description = [[Various AllSky images for the Milky Way and observable Universe. + Included: Wilkinson Microwave Anisotropy Probe (WMAP), Cosmic Background Explorer, + Planck, and H Alpha

Data Reference: Planck/ESA and the Planck + Collaboration, Wilkinson Microwave Anisotropy Probe/NASA, Doug + Finkbeiner (Princeton)]], + Author = "Brian Abbott (AMNH), OpenSpace Team", + URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", + License = "AMNH Digital Universe", + Identifiers = {"WMAP", "CBE", "Planck", "HAlpha"} } diff --git a/data/assets/scene/digitaluniverse/backgroundradiation_multiverse.asset b/data/assets/scene/digitaluniverse/backgroundradiation_multiverse.asset index 69cbb46808..bc54679e0b 100644 --- a/data/assets/scene/digitaluniverse/backgroundradiation_multiverse.asset +++ b/data/assets/scene/digitaluniverse/backgroundradiation_multiverse.asset @@ -2,140 +2,140 @@ local assetHelper = asset.require('util/asset_helper') local textures = asset.require('./backgroundradiation_textures').textures local multiverse_planck_1 = { - Identifier = "PlanckMultiverse1", - Transform = { - Translation = { - Type = "StaticTranslation", - Position = { 0.0, 0.0, 2000E23} - }, - Rotation = { - Type = "StaticRotation", - Rotation = { 0, 0, 3.14159265359 } - } + Identifier = "PlanckMultiverse1", + Transform = { + Translation = { + Type = "StaticTranslation", + Position = { 0.0, 0.0, 2000E23} }, - Renderable = { - Type = "RenderableSphere", - Enabled = false, - Size = 3975.41417036064E23, - Segments = 80, - Opacity = 0.3, - Texture = textures .. "/cmb4k.jpg", - Orientation = "Both", - MirrorTexture = true, - UseAdditiveBlending = true, - FadeInThreshold = 0.4 - }, - GUI = { - Name = "Planck Multiverse 1", - Path = "/Universe/Cosmic Microwave Background" + Rotation = { + Type = "StaticRotation", + Rotation = { 0, 0, 3.14159265359 } } + }, + Renderable = { + Type = "RenderableSphere", + Enabled = false, + Size = 3975.41417036064E23, + Segments = 80, + Opacity = 0.3, + Texture = textures .. "/cmb4k.jpg", + Orientation = "Both", + MirrorTexture = true, + UseAdditiveBlending = true, + FadeInThreshold = 0.4 + }, + GUI = { + Name = "Planck Multiverse 1", + Path = "/Universe/Cosmic Microwave Background" + } } local multiverse_planck_2 = { - Identifier = "PlanckMultiverse2", - Transform = { - Translation = { - Type = "StaticTranslation", - Position = { 2500E23, 0.0, 2000E23} - }, - Rotation = { - Type = "StaticRotation", - Rotation = { 0, 0, 3.14159265359 } - } + Identifier = "PlanckMultiverse2", + Transform = { + Translation = { + Type = "StaticTranslation", + Position = { 2500E23, 0.0, 2000E23} }, - Renderable = { - Type = "RenderableSphere", - Enabled = false, - Size = 3975.41417036064E23, - Segments = 80, - Opacity = 0.3, - Texture = textures .. "/cmb4k.jpg", - Orientation = "Both", - MirrorTexture = true, - UseAdditiveBlending = true, - FadeInThreshold = 0.4 - }, - GUI = { - Name = "Planck Multiverse 2", - Path = "/Universe/Cosmic Microwave Background" + Rotation = { + Type = "StaticRotation", + Rotation = { 0, 0, 3.14159265359 } } + }, + Renderable = { + Type = "RenderableSphere", + Enabled = false, + Size = 3975.41417036064E23, + Segments = 80, + Opacity = 0.3, + Texture = textures .. "/cmb4k.jpg", + Orientation = "Both", + MirrorTexture = true, + UseAdditiveBlending = true, + FadeInThreshold = 0.4 + }, + GUI = { + Name = "Planck Multiverse 2", + Path = "/Universe/Cosmic Microwave Background" + } } local multiverse_planck_3 = { - Identifier = "PlanckMultiverse3", - Transform = { - Translation = { - Type = "StaticTranslation", - Position = { 2500E23, 5000E23, 2000E23} - }, - Rotation = { - Type = "StaticRotation", - Rotation = { 0, 0, 3.14159265359 } - } + Identifier = "PlanckMultiverse3", + Transform = { + Translation = { + Type = "StaticTranslation", + Position = { 2500E23, 5000E23, 2000E23} }, - Renderable = { - Type = "RenderableSphere", - Enabled = false, - Size = 3975.41417036064E23, - Segments = 80, - Opacity = 0.3, - Texture = textures .. "/cmb4k.jpg", - Orientation = "Both", - MirrorTexture = true, - UseAdditiveBlending = true, - FadeInThreshold = 0.4 - }, - GUI = { - Name = "Planck Multiverse 3", - Path = "/Universe/Cosmic Microwave Background" + Rotation = { + Type = "StaticRotation", + Rotation = { 0, 0, 3.14159265359 } } + }, + Renderable = { + Type = "RenderableSphere", + Enabled = false, + Size = 3975.41417036064E23, + Segments = 80, + Opacity = 0.3, + Texture = textures .. "/cmb4k.jpg", + Orientation = "Both", + MirrorTexture = true, + UseAdditiveBlending = true, + FadeInThreshold = 0.4 + }, + GUI = { + Name = "Planck Multiverse 3", + Path = "/Universe/Cosmic Microwave Background" + } } local multiverse_planck_4 = { - Identifier = "PlanckMultiverse4", - Transform = { - Translation = { - Type = "StaticTranslation", - Position = { 0.0, 10000E23, 0.0 } - }, - Rotation = { - Type = "StaticRotation", - Rotation = { 0, 0, 3.14159265359 } - } + Identifier = "PlanckMultiverse4", + Transform = { + Translation = { + Type = "StaticTranslation", + Position = { 0.0, 10000E23, 0.0 } }, - Renderable = { - Type = "RenderableSphere", - Enabled = false, - Size = 3975.41417036064E23, - Segments = 80, - Opacity = 0.3, - Texture = textures .. "/cmb4k.jpg", - Orientation = "Both", - MirrorTexture = true, - UseAdditiveBlending = true, - FadeInThreshold = 0.4 - }, - GUI = { - Name = "Planck Multiverse 4", - Path = "/Universe/Cosmic Microwave Background" + Rotation = { + Type = "StaticRotation", + Rotation = { 0, 0, 3.14159265359 } } + }, + Renderable = { + Type = "RenderableSphere", + Enabled = false, + Size = 3975.41417036064E23, + Segments = 80, + Opacity = 0.3, + Texture = textures .. "/cmb4k.jpg", + Orientation = "Both", + MirrorTexture = true, + UseAdditiveBlending = true, + FadeInThreshold = 0.4 + }, + GUI = { + Name = "Planck Multiverse 4", + Path = "/Universe/Cosmic Microwave Background" + } } assetHelper.registerSceneGraphNodesAndExport(asset, { - multiverse_planck_1, multiverse_planck_2, multiverse_planck_3, multiverse_planck_4 + multiverse_planck_1, multiverse_planck_2, multiverse_planck_3, multiverse_planck_4 }) asset.meta = { - Name = "Multiverse Background Radiation", - Version = "2.0", - Description = [[ Non-physical representation of the location of hypothetical - cosmic microwave background radiation images how they would be observed from other - locations in the universe.
This is not a measured dataset!]], - Author = "Brian Abbott (AMNH), OpenSpace Team", - URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", - License = "AMNH Digital Universe", - Identifiers = { "PlanckMultiverse1", "PlanckMultiverse2", - "PlanckMultiverse3", "PlanckMultiverse4" } + Name = "Multiverse Background Radiation", + Version = "2.0", + Description = [[ Non-physical representation of the location of hypothetical + cosmic microwave background radiation images how they would be observed from other + locations in the universe.
This is not a measured dataset!]], + Author = "Brian Abbott (AMNH), OpenSpace Team", + URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", + License = "AMNH Digital Universe", + Identifiers = { "PlanckMultiverse1", "PlanckMultiverse2", + "PlanckMultiverse3", "PlanckMultiverse4" } } diff --git a/data/assets/scene/digitaluniverse/backgroundradiation_textures.asset b/data/assets/scene/digitaluniverse/backgroundradiation_textures.asset index e58983b118..dd268d2165 100644 --- a/data/assets/scene/digitaluniverse/backgroundradiation_textures.asset +++ b/data/assets/scene/digitaluniverse/backgroundradiation_textures.asset @@ -1,8 +1,8 @@ local textures = asset.syncedResource({ - Name = "Background Radiation Textures", - Type = "HttpSynchronization", - Identifier = "digitaluniverse_backgroundradiation_textures", - Version = 2 + Name = "Background Radiation Textures", + Type = "HttpSynchronization", + Identifier = "digitaluniverse_backgroundradiation_textures", + Version = 2 }) asset.export('textures', textures) diff --git a/data/assets/scene/digitaluniverse/clusters.asset b/data/assets/scene/digitaluniverse/clusters.asset index e4f0121334..6b8ef0e794 100644 --- a/data/assets/scene/digitaluniverse/clusters.asset +++ b/data/assets/scene/digitaluniverse/clusters.asset @@ -3,52 +3,52 @@ local assetHelper = asset.require('util/asset_helper') local speck = asset.syncedResource({ - Name = "Clusters Speck Files", - Type = "HttpSynchronization", - Identifier = "digitaluniverse_clusters_speck", - Version = 2 + Name = "Clusters Speck Files", + Type = "HttpSynchronization", + Identifier = "digitaluniverse_clusters_speck", + Version = 2 }) local object = { - Identifier = "GalaxyClusterLabels", - Renderable = { - Type = "RenderableBillboardsCloud", - Enabled = false, - Color = { 1.0, 1.0, 1.0 }, - Opacity = 0.65, - LabelFile = speck .. "/galclust.label", - TextColor = { 1.0, 0.44, 0.0 }, - DrawLabels = true, - TextSize = 22, - TextMinSize = 8.0, - Unit = "Mpc", - TransformationMatrix = { - -0.7357425748, 0.67726129641, 0.0, 0.0, - -0.074553778365, -0.080991471307, 0.9939225904, 0.0, - 0.67314530211, 0.73127116582, 0.11008126223, 0.0, - 0.0, 0.0, 0.0, 1.0 - }, + Identifier = "GalaxyClusterLabels", + Renderable = { + Type = "RenderableBillboardsCloud", + Enabled = false, + Color = { 1.0, 1.0, 1.0 }, + Opacity = 0.65, + LabelFile = speck .. "/galclust.label", + TextColor = { 1.0, 0.44, 0.0 }, + DrawLabels = true, + TextSize = 22, + TextMinSize = 8.0, + Unit = "Mpc", + TransformationMatrix = { + -0.7357425748, 0.67726129641, 0.0, 0.0, + -0.074553778365, -0.080991471307, 0.9939225904, 0.0, + 0.67314530211, 0.73127116582, 0.11008126223, 0.0, + 0.0, 0.0, 0.0, 1.0 }, - GUI = { - Name = "Galaxy Cluster Labels", - Path = "/Universe/Galaxies", - Description = [[Census 15 galaxy cluster labels. DU Version 1.2.
The Galaxy - clusters dataset is a series of labels that mark where the large clusters of - galaxies are in the nearby universe. These labels must be used in conjunction - with the Tully galaxy group.(Description from URL)

Data Reference: - Brian Abbott (AMNH)]], - } + }, + GUI = { + Name = "Galaxy Cluster Labels", + Path = "/Universe/Galaxies", + Description = [[Census 15 galaxy cluster labels. DU Version 1.2.
The Galaxy + clusters dataset is a series of labels that mark where the large clusters of + galaxies are in the nearby universe. These labels must be used in conjunction + with the Tully galaxy group.(Description from URL)

Data Reference: + Brian Abbott (AMNH)]], + } } assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { - Name = "Galaxy Clusters Labels", - Version = "1.0", - Description = [[Digital Universe asset for Galaxy Clusters]], - Author = "Brian Abbott (AMNH)", - URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", - License = "AMNH Digital Universe", - Identifiers = {"GalaxyClusterLabels"} + Name = "Galaxy Clusters Labels", + Version = "1.0", + Description = [[Digital Universe asset for Galaxy Clusters]], + Author = "Brian Abbott (AMNH)", + URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", + License = "AMNH Digital Universe", + Identifiers = {"GalaxyClusterLabels"} } diff --git a/data/assets/scene/digitaluniverse/constellationbounds.asset b/data/assets/scene/digitaluniverse/constellationbounds.asset index 6da4fce20b..8987fd2407 100644 --- a/data/assets/scene/digitaluniverse/constellationbounds.asset +++ b/data/assets/scene/digitaluniverse/constellationbounds.asset @@ -3,55 +3,55 @@ local assetHelper = asset.require('util/asset_helper') local data = asset.syncedResource({ - Name = "Constellation Bounds Data", - Type = "HttpSynchronization", - Identifier = "digitaluniverse_constellationbounds_data", - Version = 1 + Name = "Constellation Bounds Data", + Type = "HttpSynchronization", + Identifier = "digitaluniverse_constellationbounds_data", + Version = 1 }) local zodiacs = { - "Cancer", "Taurus", "Pisces", "Aries", "Libra", "Aquarius", "Capricornus", "Scorpius", - "Virgo", "Sagittarius", "Gemini", "Leo" + "Cancer", "Taurus", "Pisces", "Aries", "Libra", "Aquarius", "Capricornus", "Scorpius", + "Virgo", "Sagittarius", "Gemini", "Leo" } local object = { - Identifier = "ConstellationBounds", - Renderable = { - Type = "RenderableConstellationBounds", - Enabled = false, - File = data .. "/bound_20.dat", - ConstellationFile = data .. "/constellations.dat" - -- ConstellationSelection = zodiacs + Identifier = "ConstellationBounds", + Renderable = { + Type = "RenderableConstellationBounds", + Enabled = false, + File = data .. "/bound_20.dat", + ConstellationFile = data .. "/constellations.dat" + -- ConstellationSelection = zodiacs + }, + Transform = { + Rotation = { + Type = "SpiceRotation", + SourceFrame = "J2000", + DestinationFrame = "GALACTIC" }, - Transform = { - Rotation = { - Type = "SpiceRotation", - SourceFrame = "J2000", - DestinationFrame = "GALACTIC" - }, - Scale = { - Type = "StaticScale", - Scale = 10e17 - } - }, - GUI = { - Name = "Constellation Bounds", - Path = "/Milky Way/Constellations", - Description = [[A Spherical mesh dividing the sky into regions that fit the - constellations.]], + Scale = { + Type = "StaticScale", + Scale = 10e17 } + }, + GUI = { + Name = "Constellation Bounds", + Path = "/Milky Way/Constellations", + Description = [[A Spherical mesh dividing the sky into regions that fit the + constellations.]], + } } assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { - Name = "Constellation Bounds", - Version = "1.0", - Description = [[DU asset providing a Spherical mesh dividing the sky into regions that - fit the constellations.]], - Author = "Brian Abbott (AMNH)", - URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", - License = "AMNH Digital Universe", - Identifiers = {"ConstellationBounds"} + Name = "Constellation Bounds", + Version = "1.0", + Description = [[DU asset providing a Spherical mesh dividing the sky into regions that + fit the constellations.]], + Author = "Brian Abbott (AMNH)", + URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", + License = "AMNH Digital Universe", + Identifiers = {"ConstellationBounds"} } diff --git a/data/assets/scene/digitaluniverse/constellations.asset b/data/assets/scene/digitaluniverse/constellations.asset index 52add17d18..e043c1734e 100644 --- a/data/assets/scene/digitaluniverse/constellations.asset +++ b/data/assets/scene/digitaluniverse/constellations.asset @@ -3,74 +3,74 @@ local assetHelper = asset.require('util/asset_helper') local speck = asset.syncedResource({ - Name = "Constellation Speck Files", - Type = "HttpSynchronization", - Identifier = "digitaluniverse_constellations_speck", - Version = 2 + Name = "Constellation Speck Files", + Type = "HttpSynchronization", + Identifier = "digitaluniverse_constellations_speck", + Version = 2 }) local constellationsExtragalactic = { - Identifier = "ConstellationsExtragalactic", - Renderable = { - Type = "RenderableDUMeshes", - Enabled = false, - Opacity = 0.4, - File = speck .. "/constellationsEXGAL.speck", - LabelFile = speck .. "/constellationsEXGAL.label", - TextColor = { 0.8, 0.8, 0.8 }, - TextOpacity = 0.4, - TextSize = 20.0, - TextMinSize = 20.0, - TextMaxSize = 30.0, - MeshColor = { { 0.6, 0.4, 0.4 }, { 0.8, 0.0, 0.0 }, { 0.0, 0.3, 0.8 } }, - Unit = "Mpc" - }, - GUI = { - Name = "Constellations (Extragalactic)", - Path = "/Milky Way/Constellations" - } + Identifier = "ConstellationsExtragalactic", + Renderable = { + Type = "RenderableDUMeshes", + Enabled = false, + Opacity = 0.4, + File = speck .. "/constellationsEXGAL.speck", + LabelFile = speck .. "/constellationsEXGAL.label", + TextColor = { 0.8, 0.8, 0.8 }, + TextOpacity = 0.4, + TextSize = 20.0, + TextMinSize = 20.0, + TextMaxSize = 30.0, + MeshColor = { { 0.6, 0.4, 0.4 }, { 0.8, 0.0, 0.0 }, { 0.0, 0.3, 0.8 } }, + Unit = "Mpc" + }, + GUI = { + Name = "Constellations (Extragalactic)", + Path = "/Milky Way/Constellations" + } } local constellations = { - Identifier = "Constellations", - Renderable = { - Type = "RenderableDUMeshes", - Enabled = false, - Opacity = 0.3, - File = speck .. "/constellations.speck", - LabelFile = speck .. "/constellations.label", - TextColor = { 0.8, 0.8, 0.8 }, - TextOpacity = 0.3, - TextSize = 14.5, - TextMaxSize = 170.0, - TextMinSize = 8.0, - MeshColor = { { 0.6, 0.4, 0.4 }, { 0.8, 0.0, 0.0 }, { 0.0, 0.3, 0.8 } }, - Unit = "pc" - }, - GUI = { - Name = "Constellations", - Path = "/Milky Way/Constellations", - Description = [[Census 88 constellations and labels. DU Version 2.3.
These - modern constellations are largely based on those of the Babylonians and - Greeks; however, most cultures have their own figures and stories of the sky. - More than half the official constellations adopted by scientists in 1930 were - known to the ancients over 2,000 years ago. Each star falls into one of these - 88 regions. Of course, today we know the stars in any given constellation do - not necessarily have any physical relationship with one another. One star may - be nearby, while an adjacent star in the sky may be far away.(Description - from URL)

Data Reference: various]], - } + Identifier = "Constellations", + Renderable = { + Type = "RenderableDUMeshes", + Enabled = false, + Opacity = 0.3, + File = speck .. "/constellations.speck", + LabelFile = speck .. "/constellations.label", + TextColor = { 0.8, 0.8, 0.8 }, + TextOpacity = 0.3, + TextSize = 14.5, + TextMaxSize = 170.0, + TextMinSize = 8.0, + MeshColor = { { 0.6, 0.4, 0.4 }, { 0.8, 0.0, 0.0 }, { 0.0, 0.3, 0.8 } }, + Unit = "pc" + }, + GUI = { + Name = "Constellations", + Path = "/Milky Way/Constellations", + Description = [[Census 88 constellations and labels. DU Version 2.3.
These + modern constellations are largely based on those of the Babylonians and + Greeks; however, most cultures have their own figures and stories of the sky. + More than half the official constellations adopted by scientists in 1930 were + known to the ancients over 2,000 years ago. Each star falls into one of these + 88 regions. Of course, today we know the stars in any given constellation do + not necessarily have any physical relationship with one another. One star may + be nearby, while an adjacent star in the sky may be far away.(Description + from URL)

Data Reference: various]], + } } assetHelper.registerSceneGraphNodesAndExport(asset, { constellationsExtragalactic, constellations }) asset.meta = { - Name = "Constellations", - Version = "1.0", - Description = [[Digital Universe asset for constellation lines]], - Author = "Brian Abbott (AMNH)", - URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", - License = "AMNH Digital Universe", - Identifiers = {"Constellations", "ConstellationsExtragalactic"} + Name = "Constellations", + Version = "1.0", + Description = [[Digital Universe asset for constellation lines]], + Author = "Brian Abbott (AMNH)", + URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", + License = "AMNH Digital Universe", + Identifiers = {"Constellations", "ConstellationsExtragalactic"} } diff --git a/data/assets/scene/digitaluniverse/deepsky.asset b/data/assets/scene/digitaluniverse/deepsky.asset index 3c16db2cbb..7272af3a06 100644 --- a/data/assets/scene/digitaluniverse/deepsky.asset +++ b/data/assets/scene/digitaluniverse/deepsky.asset @@ -1,110 +1,109 @@ local assetHelper = asset.require('util/asset_helper') local textures = asset.syncedResource({ - Name = "Deep Sky Objects Textures", - Type = "HttpSynchronization", - Identifier = "digitaluniverse_deepsky_textures", - Version = 1 + Name = "Deep Sky Objects Textures", + Type = "HttpSynchronization", + Identifier = "digitaluniverse_deepsky_textures", + Version = 1 }) local speck = asset.syncedResource({ - Name = "Deep Sky Objects Speck Files", - Type = "HttpSynchronization", - Identifier = "digitaluniverse_deepsky_speck", - Version = 1 + Name = "Deep Sky Objects Speck Files", + Type = "HttpSynchronization", + Identifier = "digitaluniverse_deepsky_speck", + Version = 1 }) local deepSkyPoints = { - Identifier = "DeepSkyObjects", - Renderable = { - Type = "RenderableBillboardsCloud", - Enabled = false, - Color = { 1.0, 1.0, 0.0 }, - Opacity = 0.99, - ScaleFactor = 500.0, - File = speck .. "/dso.speck", - Texture = textures .. "/point3.png", - --ColorMap = speck .. "/tully.cmap", - --ColorMap = speck .. "/lss.cmap", - --ColorOption = { "proximity" }, - --ColorOption = { "prox5Mpc" }, - --ColorRange = { { 1.0, 30.0 } }, - LabelFile = speck .. "/dso.label", - TextColor = { 0.1, 0.4, 0.6 }, - TextSize = 20.50, - TextMinSize = 16.0, - Unit = "pc", - -- Fade in value in the same unit as "Unit" - --FadeInDistances = { 0.05, 1.0 }, - -- Max size in pixels - BillboardMaxSize = 8.22, - BillboardMinSize = 0.0, - --CorrectionSizeEndDistance = 22.0, - --CorrectionSizeFactor = 10.45 - EnablePixelSizeControl = true - }, - Transform = { - Rotation = { - Type = "StaticRotation", - Rotation = { 0, 0, 3.14159265359 } - } - }, - GUI = { - Name = "Deep Sky Objects Points", - Path = "/Universe/Galaxies", - Description = [[Point cloud and labels for Deep Sky Objects]] + Identifier = "DeepSkyObjects", + Renderable = { + Type = "RenderableBillboardsCloud", + Enabled = false, + Color = { 1.0, 1.0, 0.0 }, + Opacity = 0.99, + ScaleFactor = 500.0, + File = speck .. "/dso.speck", + Texture = textures .. "/point3.png", + --ColorMap = speck .. "/tully.cmap", + --ColorMap = speck .. "/lss.cmap", + --ColorOption = { "proximity" }, + --ColorOption = { "prox5Mpc" }, + --ColorRange = { { 1.0, 30.0 } }, + LabelFile = speck .. "/dso.label", + TextColor = { 0.1, 0.4, 0.6 }, + TextSize = 20.50, + TextMinSize = 16.0, + Unit = "pc", + -- Fade in value in the same unit as "Unit" + --FadeInDistances = { 0.05, 1.0 }, + -- Max size in pixels + BillboardMaxSize = 8.22, + BillboardMinSize = 0.0, + --CorrectionSizeEndDistance = 22.0, + --CorrectionSizeFactor = 10.45 + EnablePixelSizeControl = true + }, + Transform = { + Rotation = { + Type = "StaticRotation", + Rotation = { 0, 0, 3.14159265359 } } + }, + GUI = { + Name = "Deep Sky Objects Points", + Path = "/Universe/Galaxies", + Description = [[Point cloud and labels for Deep Sky Objects]] + } } local deepSkyImages = { - Identifier = "DeepSkyObjectsImages", - Renderable = { - Type = "RenderablePlanesCloud", - Enabled = false, - Color = { 1.0, 1.0, 1.0 }, - Opacity = 0.99, - ScaleFactor = 1.0, - File = speck .. "/dso.speck", - TexturePath = textures, - Luminosity = "radius", - ScaleLuminosity = 0.001, - Unit = "pc", - -- Fade in value in the same unit as "Unit" - --FadeInDistances = {0.001, 0.05010}, - PlaneMinSize = 5.0 - }, - Transform = { - Rotation = { - Type = "StaticRotation", - Rotation = {3.14159265359, 3.14159265359, 0 } - } - }, - GUI = { - Name = "Deep Sky Objects Images", - Path = "/Universe/Galaxies", - Description = [[Census: 63 images and labels. DU Version 1.3.
These data are - 2-D images of Messier objects placed in 3-D space. Not only do we place these - images at the proper location and give them the correct orientation, we also - size them accurately so that you can fly to the globular cluster M13, for - example, and see just how small the cluster of hundreds of thousands of stars - is relative to the rest of the Galaxy. Included Messier Objects by number are: - 6, 7, 11, 16, 18, 21, 23-26, 29, 34-39, 41, 46-48, 50, 52, 67, 93, 103, 2-5, - 9, 10, 12-15, 19, 22, 28, 30, 53-56, 68-72, 75, 79, 80, 92, 107, 27, 57, 76, - 97, 8, 17, 20, 78, 1 (Description from URL)

Data Reference: Largely - NOAO and various other sources (each image has a ref)]], + Identifier = "DeepSkyObjectsImages", + Renderable = { + Type = "RenderablePlanesCloud", + Enabled = false, + Color = { 1.0, 1.0, 1.0 }, + Opacity = 0.99, + ScaleFactor = 1.0, + File = speck .. "/dso.speck", + TexturePath = textures, + Luminosity = "radius", + ScaleLuminosity = 0.001, + Unit = "pc", + -- Fade in value in the same unit as "Unit" + --FadeInDistances = {0.001, 0.05010}, + PlaneMinSize = 5.0 + }, + Transform = { + Rotation = { + Type = "StaticRotation", + Rotation = {3.14159265359, 3.14159265359, 0 } } + }, + GUI = { + Name = "Deep Sky Objects Images", + Path = "/Universe/Galaxies", + Description = [[Census: 63 images and labels. DU Version 1.3.
These data are + 2-D images of Messier objects placed in 3-D space. Not only do we place these + images at the proper location and give them the correct orientation, we also + size them accurately so that you can fly to the globular cluster M13, for + example, and see just how small the cluster of hundreds of thousands of stars + is relative to the rest of the Galaxy. Included Messier Objects by number are: + 6, 7, 11, 16, 18, 21, 23-26, 29, 34-39, 41, 46-48, 50, 52, 67, 93, 103, 2-5, + 9, 10, 12-15, 19, 22, 28, 30, 53-56, 68-72, 75, 79, 80, 92, 107, 27, 57, 76, + 97, 8, 17, 20, 78, 1 (Description from URL)

Data Reference: Largely + NOAO and various other sources (each image has a ref)]], + } } assetHelper.registerSceneGraphNodesAndExport(asset, { deepSkyPoints, deepSkyImages }) asset.meta = { - Name = "Deep Sky Objects Images", - Version = "1.0", - Description = [[Digital Universe asset for Deep Sky Objects and their Images]], - Author = "Nate Greenstein, Matt Everhart, Brian Abbott (AMNH)", - URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", - License = "AMNH Digital Universe", - Identifiers = {"DeepSkyObjects", "DeepSkyObjectsImages"} + Name = "Deep Sky Objects Images", + Version = "1.0", + Description = [[Digital Universe asset for Deep Sky Objects and their Images]], + Author = "Nate Greenstein, Matt Everhart, Brian Abbott (AMNH)", + URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", + License = "AMNH Digital Universe", + Identifiers = {"DeepSkyObjects", "DeepSkyObjectsImages"} } - diff --git a/data/assets/scene/digitaluniverse/dwarfs.asset b/data/assets/scene/digitaluniverse/dwarfs.asset index 8641e25771..7919dc2038 100644 --- a/data/assets/scene/digitaluniverse/dwarfs.asset +++ b/data/assets/scene/digitaluniverse/dwarfs.asset @@ -3,74 +3,74 @@ local assetHelper = asset.require('util/asset_helper') local textures = asset.syncedResource({ - Name = "Brown Dwarf Textures", - Type = "HttpSynchronization", - Identifier = "digitaluniverse_dwarfs_textures", - Version = 1 + Name = "Brown Dwarf Textures", + Type = "HttpSynchronization", + Identifier = "digitaluniverse_dwarfs_textures", + Version = 1 }) local speck = asset.syncedResource({ - Name = "Brown Dwarf Speck Files", - Type = "HttpSynchronization", - Identifier = "digitaluniverse_dwarfs_speck", - Version = 2 + Name = "Brown Dwarf Speck Files", + Type = "HttpSynchronization", + Identifier = "digitaluniverse_dwarfs_speck", + Version = 2 }) local object = { - Identifier = "Dwarfs", - Renderable = { - Type = "RenderableBillboardsCloud", - Enabled = false, - Color = { 0.4, 0.0, 0.1 }, - Opacity = 1.0, - File = speck .. "/dwarfs.speck", - Texture = textures .. "/point3.png", - LabelFile = speck .. "/dwarfs.label", - ColorMap = speck .. "/dwarfs.cmap", - ColorOption = { "typeindex" }, - --ColorRange = { { 1.0, 4.0} }, - TextColor = { 0.5, 0.1, 0.2 }, - TextSize = 14.6, - TextMinSize = 10.0, - ScaleFactor = 372.1, - --CorrectionSizeEndDistance = 16.1, - --CorrectionSizeFactor = 7.75, - BillboardMaxSize = 20.0, - EnablePixelSizeControl = true, - Unit = "pc" - }, - GUI = { - Name = "Brown Dwarfs", - Path = "/Milky Way", - Description = [[Census: 785 L dwarfs, 101 T dwarfs, 17 Y dwarfs. DU Version 6.4. -
In astronomy, there are dwarf stars-red, white, and brown-dwarf novae, - and even dwarf galaxies. As you might imagine, astronomers use the term dwarf - when they refer to the smaller objects in any given class. For decades it was - believed that M stars were the coolest stars in the Galaxy. Some M stars, - called red dwarfs, make up 70% of the stars in the Galaxy, including our - nearest known neighbor, Proxima Centauri. However, a new class of objects, - even cooler than M stars, was recently discovered and given a spectral type - of L. L-type objects straddle the boundary between red dwarfs and brown - dwarfs, the latter of which are not massive enough to ignite the nuclear - processes necessary for it to shine as a star. L-type objects are typically - very dim stars or brown dwarfs. Even cooler than L-type objects are T-type - objects. These are mostly brown dwarfs and resemble large, massive, - Jupiter-like objects, too large to be planets and typically too small to be - stars. Beyond the T dwarfs are the Y-type objects, which are even more - dim.(Description from URL)

Data Reference: The Brown Dwarf Kinematics - Project (Faherty+ 2019)]] - } + Identifier = "Dwarfs", + Renderable = { + Type = "RenderableBillboardsCloud", + Enabled = false, + Color = { 0.4, 0.0, 0.1 }, + Opacity = 1.0, + File = speck .. "/dwarfs.speck", + Texture = textures .. "/point3.png", + LabelFile = speck .. "/dwarfs.label", + ColorMap = speck .. "/dwarfs.cmap", + ColorOption = { "typeindex" }, + --ColorRange = { { 1.0, 4.0} }, + TextColor = { 0.5, 0.1, 0.2 }, + TextSize = 14.6, + TextMinSize = 10.0, + ScaleFactor = 372.1, + --CorrectionSizeEndDistance = 16.1, + --CorrectionSizeFactor = 7.75, + BillboardMaxSize = 20.0, + EnablePixelSizeControl = true, + Unit = "pc" + }, + GUI = { + Name = "Brown Dwarfs", + Path = "/Milky Way", + Description = [[Census: 785 L dwarfs, 101 T dwarfs, 17 Y dwarfs. DU Version 6.4. +
In astronomy, there are dwarf stars-red, white, and brown-dwarf novae, + and even dwarf galaxies. As you might imagine, astronomers use the term dwarf + when they refer to the smaller objects in any given class. For decades it was + believed that M stars were the coolest stars in the Galaxy. Some M stars, + called red dwarfs, make up 70% of the stars in the Galaxy, including our + nearest known neighbor, Proxima Centauri. However, a new class of objects, + even cooler than M stars, was recently discovered and given a spectral type + of L. L-type objects straddle the boundary between red dwarfs and brown + dwarfs, the latter of which are not massive enough to ignite the nuclear + processes necessary for it to shine as a star. L-type objects are typically + very dim stars or brown dwarfs. Even cooler than L-type objects are T-type + objects. These are mostly brown dwarfs and resemble large, massive, + Jupiter-like objects, too large to be planets and typically too small to be + stars. Beyond the T dwarfs are the Y-type objects, which are even more + dim.(Description from URL)

Data Reference: The Brown Dwarf Kinematics + Project (Faherty+ 2019)]] + } } assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { - Name = "Brown Dwarfs", - Version = "2.0", - Description = [[Digital Universe asset for Brown Dwarfs]], - Author = "Brian Abbott (AMNH)", - URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", - License = "AMNH Digital Universe", - Identifiers = {"Dwarfs"} + Name = "Brown Dwarfs", + Version = "2.0", + Description = [[Digital Universe asset for Brown Dwarfs]], + Author = "Brian Abbott (AMNH)", + URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", + License = "AMNH Digital Universe", + Identifiers = {"Dwarfs"} } diff --git a/data/assets/scene/digitaluniverse/exoplanets.asset b/data/assets/scene/digitaluniverse/exoplanets.asset index ec4e7e1c3a..4fb990c4e4 100644 --- a/data/assets/scene/digitaluniverse/exoplanets.asset +++ b/data/assets/scene/digitaluniverse/exoplanets.asset @@ -3,63 +3,63 @@ local assetHelper = asset.require('util/asset_helper') local textures = asset.syncedResource({ - Name = "Exoplanets Textures", - Type = "HttpSynchronization", - Identifier = "digitaluniverse_exoplanets_textures", - Version = 1 + Name = "Exoplanets Textures", + Type = "HttpSynchronization", + Identifier = "digitaluniverse_exoplanets_textures", + Version = 1 }) local speck = asset.syncedResource({ - Name = "Exoplanets Speck Files", - Type = "HttpSynchronization", - Identifier = "digitaluniverse_exoplanets_speck", - Version = 2 + Name = "Exoplanets Speck Files", + Type = "HttpSynchronization", + Identifier = "digitaluniverse_exoplanets_speck", + Version = 2 }) local object = { - Identifier = "Exoplanets", - Renderable = { - Type = "RenderableBillboardsCloud", - Enabled = false, - Color = { 1.0, 1.0, 1.0 }, - Opacity = 1.0, - ScaleFactor = 10.0, - Texture = textures .. "/target-blue.png", - File = speck .. "/expl.speck", - LabelFile = speck .. "/expl.label", - ScaleFactor = 388.67923, - TextColor = { 0.3, 0.3, 0.8 }, - TextSize = 14.8, - TextMaxSize = 200.0, - TextMinSize = 10.0, - CorrectionSizeEndDistance = 15.23, - CorrectionSizeFactor = 13.3, - Unit = "pc", - BillboardMaxSize = 75.0, - EnablePixelSizeControl = true, - }, - GUI = { - Name = "Exoplanets", - Path = "/Milky Way/Exoplanets", - Description = [[Census: 4,055 planets in 3,023 systems. DU Version 20.11.
- Extrasolar planets, or exoplanets, are a relatively new phenomenon in - astronomy. While many astronomers believed in their existence, no - observational evidence was available until 1995. Since that time, scientists - have discovered thousands of systems consisting of one or more planets around - a host star.(Description from URL)

Data Reference: NASA Exoplanet - Archive (CalTech/NASA)]], - } + Identifier = "Exoplanets", + Renderable = { + Type = "RenderableBillboardsCloud", + Enabled = false, + Color = { 1.0, 1.0, 1.0 }, + Opacity = 1.0, + ScaleFactor = 10.0, + Texture = textures .. "/target-blue.png", + File = speck .. "/expl.speck", + LabelFile = speck .. "/expl.label", + ScaleFactor = 388.67923, + TextColor = { 0.3, 0.3, 0.8 }, + TextSize = 14.8, + TextMaxSize = 200.0, + TextMinSize = 10.0, + CorrectionSizeEndDistance = 15.23, + CorrectionSizeFactor = 13.3, + Unit = "pc", + BillboardMaxSize = 75.0, + EnablePixelSizeControl = true, + }, + GUI = { + Name = "Exoplanets", + Path = "/Milky Way/Exoplanets", + Description = [[Census: 4,055 planets in 3,023 systems. DU Version 20.11.
+ Extrasolar planets, or exoplanets, are a relatively new phenomenon in + astronomy. While many astronomers believed in their existence, no + observational evidence was available until 1995. Since that time, scientists + have discovered thousands of systems consisting of one or more planets around + a host star.(Description from URL)

Data Reference: NASA Exoplanet + Archive (CalTech/NASA)]], + } } assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { - Name = "Exoplanets", - Version = "1.0", - Description = [[Digital Universe asset for Exoplanets]], - Author = "Brian Abbott (AMNH)", - URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", - License = "AMNH Digital Universe", - Identifiers = {"Exoplanets"} + Name = "Exoplanets", + Version = "1.0", + Description = [[Digital Universe asset for Exoplanets]], + Author = "Brian Abbott (AMNH)", + URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", + License = "AMNH Digital Universe", + Identifiers = {"Exoplanets"} } diff --git a/data/assets/scene/digitaluniverse/globularclusters.asset b/data/assets/scene/digitaluniverse/globularclusters.asset index ea516aac13..179fe2cbc9 100644 --- a/data/assets/scene/digitaluniverse/globularclusters.asset +++ b/data/assets/scene/digitaluniverse/globularclusters.asset @@ -3,77 +3,77 @@ local assetHelper = asset.require('util/asset_helper') local textures = asset.syncedResource({ - Name = "Globular Clusters Textures", - Type = "HttpSynchronization", - Identifier = "digitaluniverse_globularclusters_textures", - Version = 1 + Name = "Globular Clusters Textures", + Type = "HttpSynchronization", + Identifier = "digitaluniverse_globularclusters_textures", + Version = 1 }) local speck = asset.syncedResource({ - Name = "Globular Clusters Speck Files", - Type = "HttpSynchronization", - Identifier = "digitaluniverse_globularclusters_speck", - Version = 2 + Name = "Globular Clusters Speck Files", + Type = "HttpSynchronization", + Identifier = "digitaluniverse_globularclusters_speck", + Version = 2 }) local object = { - Identifier = "GlobularClusters", - Renderable = { - Type = "RenderableBillboardsCloud", - Enabled = false, - Color = { 0.8, 0.8, 0.0 }, - Opacity = 0.4, - File = speck .. "/gc.speck", - Texture = textures .. "/point4.png", - PolygonSides = 5, - LabelFile = speck .. "/gc.label", - TextColor = { 0.5, 0.5, 0.0 }, - ScaleFactor = 431.0, - TextSize = 16.7, - TextMinSize = 4.0, - TextMaxSize = 20, - Unit = "pc", - BillboardMaxSize = 500, - EnablePixelSizeControl = true, - }, - GUI = { - Name = "Globular Clusters", - Path = "/Milky Way", - Description = [[Census: 157 globular clusters. DU Version 2.6.
Globular star - clusters are gravitationally bound groups of 100,000 to 1 million stars. They - are compact, spherical “balls” of stars with very high stellar densities in - their centers (stars near their center are within a light year of one - another). These clusters are typically 30 to 100 light years in diameter. If - Earth were located inside one of these clusters, our sky would be lit by an - abundance of stars brighter than the Sun. The globular clusters form one of - the most complete data sets in the Atlas. Data for the clusters represent - almost all the clusters in our Galaxy—several on the opposite side of Galactic - center may be invisible to us. The clusters orbit the Milky Way in random - orientations, as comets orbit the Sun.(Description from URL)

Data - Reference: Properties of Galactic Globular Clusters, C. Francis+ - (U Cambridge)]], - } + Identifier = "GlobularClusters", + Renderable = { + Type = "RenderableBillboardsCloud", + Enabled = false, + Color = { 0.8, 0.8, 0.0 }, + Opacity = 0.4, + File = speck .. "/gc.speck", + Texture = textures .. "/point4.png", + PolygonSides = 5, + LabelFile = speck .. "/gc.label", + TextColor = { 0.5, 0.5, 0.0 }, + ScaleFactor = 431.0, + TextSize = 16.7, + TextMinSize = 4.0, + TextMaxSize = 20, + Unit = "pc", + BillboardMaxSize = 500, + EnablePixelSizeControl = true, + }, + GUI = { + Name = "Globular Clusters", + Path = "/Milky Way", + Description = [[Census: 157 globular clusters. DU Version 2.6.
Globular star + clusters are gravitationally bound groups of 100,000 to 1 million stars. They + are compact, spherical “balls” of stars with very high stellar densities in + their centers (stars near their center are within a light year of one + another). These clusters are typically 30 to 100 light years in diameter. If + Earth were located inside one of these clusters, our sky would be lit by an + abundance of stars brighter than the Sun. The globular clusters form one of + the most complete data sets in the Atlas. Data for the clusters represent + almost all the clusters in our Galaxy—several on the opposite side of Galactic + center may be invisible to us. The clusters orbit the Milky Way in random + orientations, as comets orbit the Sun.(Description from URL)

Data + Reference: Properties of Galactic Globular Clusters, C. Francis+ + (U Cambridge)]], + } } assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { - Name = "Globular Clusters", - Version = "2.0", - Description = [[Census: 157 globular clusters. DU Version 2.6. Globular star clusters - are gravitationally bound groups of 100,000 to 1 million stars. They are compact, - spherical “balls” of stars with very high stellar densities in their centers (stars - near their center are within a light year of one another). These clusters are - typically 30 to 100 light years in diameter. If Earth were located inside one of these - clusters, our sky would be lit by an abundance of stars brighter than the Sun. The - globular clusters form one of the most complete data sets in the Atlas. Data for the - clusters represent almost all the clusters in our Galaxy—several on the opposite side - of Galactic center may be invisible to us. The clusters orbit the Milky Way in random - orientations, as comets orbit the Sun.(Description from URL)

Data Reference: - Properties of Galactic Globular Clusters, C. Francis+ (U Cambridge)]], - Author = "Brian Abbott (AMNH)", - URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", - License = "AMNH Digital Universe", - Identifiers = {"GlobularClusters"} + Name = "Globular Clusters", + Version = "2.0", + Description = [[Census: 157 globular clusters. DU Version 2.6. Globular star clusters + are gravitationally bound groups of 100,000 to 1 million stars. They are compact, + spherical “balls” of stars with very high stellar densities in their centers (stars + near their center are within a light year of one another). These clusters are + typically 30 to 100 light years in diameter. If Earth were located inside one of these + clusters, our sky would be lit by an abundance of stars brighter than the Sun. The + globular clusters form one of the most complete data sets in the Atlas. Data for the + clusters represent almost all the clusters in our Galaxy—several on the opposite side + of Galactic center may be invisible to us. The clusters orbit the Milky Way in random + orientations, as comets orbit the Sun.(Description from URL)

Data Reference: + Properties of Galactic Globular Clusters, C. Francis+ (U Cambridge)]], + Author = "Brian Abbott (AMNH)", + URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", + License = "AMNH Digital Universe", + Identifiers = {"GlobularClusters"} } diff --git a/data/assets/scene/digitaluniverse/grids.asset b/data/assets/scene/digitaluniverse/grids.asset index 55dc314238..56caaca447 100644 --- a/data/assets/scene/digitaluniverse/grids.asset +++ b/data/assets/scene/digitaluniverse/grids.asset @@ -3,553 +3,553 @@ local transforms = asset.require('scene/solarsystem/sun/transforms') local earth_transforms = asset.require('scene/solarsystem/planets/earth/transforms') local equatorialRotationMatrix = { - -0.05487554, 0.4941095, -0.8676661, - -0.8734371 , -0.4448296, -0.1980764, - -0.483835 , 0.7469823, 0.4559838 + -0.05487554, 0.4941095, -0.8676661, + -0.8734371 , -0.4448296, -0.1980764, + -0.483835 , 0.7469823, 0.4559838 } local eclipticRotationMatrix = { - -0.05487554, 0.4941095, -0.8676661, - -0.9938214 , -0.1109906, -0.0003515167, - -0.09647644, 0.8622859, 0.4971472 + -0.05487554, 0.4941095, -0.8676661, + -0.9938214 , -0.1109906, -0.0003515167, + -0.09647644, 0.8622859, 0.4971472 } local speck = asset.syncedResource({ - Name = "Grids Speck Files", - Type = "HttpSynchronization", - Identifier = "digitaluniverse_grids_speck", - Version = 2 + Name = "Grids Speck Files", + Type = "HttpSynchronization", + Identifier = "digitaluniverse_grids_speck", + Version = 2 }) local radio = { - Identifier = "RadioSphere", - Parent = earth_transforms.EarthBarycenter.Identifier, - Transform = { - Scale = { - Type = "TimeDependentScale", - -- First TV signals strong enough to leave the ionosphere - ReferenceDate = "1936 AUG 01 12:00:00", - Speed = 299792458 -- c - }, - Rotation = { - Type = "StaticRotation", - Rotation = equatorialRotationMatrix - } - }, - Renderable = { - Type = "RenderableSphericalGrid", - Enabled = false, - Opacity = 1.0, - Color = { 0.3, 0.84, 1.0 }, - LineWidth = 2.0 - }, - GUI = { - Name = "Radio Sphere", - Path = "/Other/Grids" + Identifier = "RadioSphere", + Parent = earth_transforms.EarthBarycenter.Identifier, + Transform = { + Scale = { + Type = "TimeDependentScale", + -- First TV signals strong enough to leave the ionosphere + ReferenceDate = "1936 AUG 01 12:00:00", + Speed = 299792458 -- c + }, + Rotation = { + Type = "StaticRotation", + Rotation = equatorialRotationMatrix } + }, + Renderable = { + Type = "RenderableSphericalGrid", + Enabled = false, + Opacity = 1.0, + Color = { 0.3, 0.84, 1.0 }, + LineWidth = 2.0 + }, + GUI = { + Name = "Radio Sphere", + Path = "/Other/Grids" + } } local oort = { - Identifier = "OortSphere", - Parent = transforms.SolarSystemBarycenter.Name, - Transform = { - Scale = { - Type = "StaticScale", - Scale = 7.47989845E15 - }, - Rotation = { - Type = "StaticRotation", - Rotation = eclipticRotationMatrix - } - }, - Renderable = { - Type = "RenderableSphericalGrid", - Enabled = false, - Opacity = 0.8, - Color = { 0.8, 0.4, 0.4 }, - LineWidth = 2.0 - }, - GUI = { - Name = "Oort Sphere", - Path = "/Other/Grids" + Identifier = "OortSphere", + Parent = transforms.SolarSystemBarycenter.Name, + Transform = { + Scale = { + Type = "StaticScale", + Scale = 7.47989845E15 + }, + Rotation = { + Type = "StaticRotation", + Rotation = eclipticRotationMatrix } + }, + Renderable = { + Type = "RenderableSphericalGrid", + Enabled = false, + Opacity = 0.8, + Color = { 0.8, 0.4, 0.4 }, + LineWidth = 2.0 + }, + GUI = { + Name = "Oort Sphere", + Path = "/Other/Grids" + } } local ecliptic = { - Identifier = "EclipticSphere", - Parent = transforms.SolarSystemBarycenter.Name, - Transform = { - Scale = { - Type = "StaticScale", - Scale = 9.46377307652E17 - }, - Rotation = { - Type = "StaticRotation", - Rotation = eclipticRotationMatrix - } - }, - Renderable = { - Type = "RenderableSphericalGrid", - Enabled = false, - Opacity = 1.0, - Color = { 0.74, 0.26, 0.26 }, - LineWidth = 2.0 - }, - GUI = { - Name = "Ecliptic Sphere", - Path = "/Other/Grids" + Identifier = "EclipticSphere", + Parent = transforms.SolarSystemBarycenter.Name, + Transform = { + Scale = { + Type = "StaticScale", + Scale = 9.46377307652E17 + }, + Rotation = { + Type = "StaticRotation", + Rotation = eclipticRotationMatrix } + }, + Renderable = { + Type = "RenderableSphericalGrid", + Enabled = false, + Opacity = 1.0, + Color = { 0.74, 0.26, 0.26 }, + LineWidth = 2.0 + }, + GUI = { + Name = "Ecliptic Sphere", + Path = "/Other/Grids" + } } local eclipticLabels = { - Identifier = "EclipticSphereLabels", - Parent = transforms.SolarSystemBarycenter.Name, - Renderable = { - Type = "RenderableBillboardsCloud", - Enabled = false, - Color = { 1.0, 1.0, 1.0 }, - Opacity = 0.65, - LabelFile = speck .. "/eclip.label", - DrawLabels = true, - TextColor = { 0.5, 0.5, 0.5 }, - TextSize = 14.75, - TextMinSize = 1.3, - TextMaxSize = 50.0, - Unit = "pc", - TransformationMatrix = { - -0.05487554, 0.4941095, -0.8676661, 0.0, - -0.9938214 , -0.1109906, -0.0003515167, 0.0, - -0.09647644, 0.8622859, 0.4971472, 0.0, - 0.0, 0.0, 0.0, 1.0 - } - }, - GUI = { - Name = "Ecliptic Sphere Labels", - Path = "/Other/Grids" + Identifier = "EclipticSphereLabels", + Parent = transforms.SolarSystemBarycenter.Name, + Renderable = { + Type = "RenderableBillboardsCloud", + Enabled = false, + Color = { 1.0, 1.0, 1.0 }, + Opacity = 0.65, + LabelFile = speck .. "/eclip.label", + DrawLabels = true, + TextColor = { 0.5, 0.5, 0.5 }, + TextSize = 14.75, + TextMinSize = 1.3, + TextMaxSize = 50.0, + Unit = "pc", + TransformationMatrix = { + -0.05487554, 0.4941095, -0.8676661, 0.0, + -0.9938214 , -0.1109906, -0.0003515167, 0.0, + -0.09647644, 0.8622859, 0.4971472, 0.0, + 0.0, 0.0, 0.0, 1.0 } + }, + GUI = { + Name = "Ecliptic Sphere Labels", + Path = "/Other/Grids" + } } local equatorial = { - Identifier = "EquatorialSphere", - Parent = transforms.SolarSystemBarycenter.Name, - Transform = { - Scale = { - Type = "StaticScale", - Scale = 4.28601E17; - }, - Rotation = { - Type = "StaticRotation", - Rotation = equatorialRotationMatrix - } - }, - Renderable = { - Type = "RenderableSphericalGrid", - Enabled = false, - Opacity = 0.8, - Color = { 0.69, 0.68, 0.29 }, - LineWidth = 2.0 - }, - GUI = { - Name = "Equatorial Sphere", - Path = "/Other/Grids" + Identifier = "EquatorialSphere", + Parent = transforms.SolarSystemBarycenter.Name, + Transform = { + Scale = { + Type = "StaticScale", + Scale = 4.28601E17; + }, + Rotation = { + Type = "StaticRotation", + Rotation = equatorialRotationMatrix } + }, + Renderable = { + Type = "RenderableSphericalGrid", + Enabled = false, + Opacity = 0.8, + Color = { 0.69, 0.68, 0.29 }, + LineWidth = 2.0 + }, + GUI = { + Name = "Equatorial Sphere", + Path = "/Other/Grids" + } } local equatorialLabels = { - Identifier = "EquatorialSphereLabels", - Parent = transforms.SolarSystemBarycenter.Name, - Renderable = { - Type = "RenderableBillboardsCloud", - Enabled = false, - Color = { 1.0, 1.0, 1.0 }, - Opacity = 0.65, - LabelFile = speck .. "/radec.label", - DrawLabels = true, - TextColor = { 0.5, 0.5, 0.5 }, - TextSize = 14.5, - TextMinSize = 1.7, - TextMaxSize = 70.0, - Unit = "pc", - TransformationMatrix = { - -0.05487554, 0.4941095, -0.8676661, 0.0, - -0.8734371 , -0.4448296, -0.1980764, 0.0, - -0.483835 , 0.7469823, 0.4559838, 0.0, - 0.0 , 0.0 , 0.0 , 1.0 - } - }, - GUI = { - Name = "Equatorial Sphere Labels", - Path = "/Other/Grids" + Identifier = "EquatorialSphereLabels", + Parent = transforms.SolarSystemBarycenter.Name, + Renderable = { + Type = "RenderableBillboardsCloud", + Enabled = false, + Color = { 1.0, 1.0, 1.0 }, + Opacity = 0.65, + LabelFile = speck .. "/radec.label", + DrawLabels = true, + TextColor = { 0.5, 0.5, 0.5 }, + TextSize = 14.5, + TextMinSize = 1.7, + TextMaxSize = 70.0, + Unit = "pc", + TransformationMatrix = { + -0.05487554, 0.4941095, -0.8676661, 0.0, + -0.8734371 , -0.4448296, -0.1980764, 0.0, + -0.483835 , 0.7469823, 0.4559838, 0.0, + 0.0 , 0.0 , 0.0 , 1.0 } + }, + GUI = { + Name = "Equatorial Sphere Labels", + Path = "/Other/Grids" + } } local galactic = { - Identifier = "GalacticSphere", - Parent = transforms.SolarSystemBarycenter.Name, - Transform = { - Scale = { - Type = "StaticScale", - Scale = 9.46377307652E18; - } - }, - Renderable = { - Type = "RenderableSphericalGrid", - Enabled = false, - LineWidth = 2.0, - Opacity = 1.0, - Color = { 0.0, 0.6, 0.6 } - }, - GUI = { - Name = "Galactic Sphere", - Path = "/Other/Grids" + Identifier = "GalacticSphere", + Parent = transforms.SolarSystemBarycenter.Name, + Transform = { + Scale = { + Type = "StaticScale", + Scale = 9.46377307652E18; } + }, + Renderable = { + Type = "RenderableSphericalGrid", + Enabled = false, + LineWidth = 2.0, + Opacity = 1.0, + Color = { 0.0, 0.6, 0.6 } + }, + GUI = { + Name = "Galactic Sphere", + Path = "/Other/Grids" + } } local galacticLabels = { - Identifier = "GalacticSphereLabels", - Parent = transforms.SolarSystemBarycenter.Name, - Renderable = { - Type = "RenderableBillboardsCloud", - Enabled = false, - Color = { 1.0, 1.0, 1.0 }, - Opacity = 0.65, - LabelFile = speck .. "/galac.label", - DrawLabels = true, - TextColor = { 0.5, 0.5, 0.5 }, - TextSize = 15.8, - TextMinSize = 0.5, - TextMaxSize = 100.0, - Unit = "pc" - }, - GUI = { - Name = "Galactic Sphere Labels", - Path = "/Other/Grids" - } + Identifier = "GalacticSphereLabels", + Parent = transforms.SolarSystemBarycenter.Name, + Renderable = { + Type = "RenderableBillboardsCloud", + Enabled = false, + Color = { 1.0, 1.0, 1.0 }, + Opacity = 0.65, + LabelFile = speck .. "/galac.label", + DrawLabels = true, + TextColor = { 0.5, 0.5, 0.5 }, + TextSize = 15.8, + TextMinSize = 0.5, + TextMaxSize = 100.0, + Unit = "pc" + }, + GUI = { + Name = "Galactic Sphere Labels", + Path = "/Other/Grids" + } } local plane1ld = { - Identifier = "1ldGrid", - Parent = transforms.SolarSystemBarycenter.Name, - Transform = { - Rotation = { - Type = "StaticRotation", - Rotation = eclipticRotationMatrix - } - }, - Renderable = { - Type = "RenderableDUMeshes", - Enabled = false, - Opacity = 0.4, - File = speck .. "/1ld.speck", - MeshColor = {{ 0.1, 0.5, 0.6 }}, - LabelFile = speck .. "/1ld.label", - TextColor = { 0.0, 0.2, 0.5 }, - TextSize = 10.3, - TextMinSize = 0.5, - TextMaxSize = 30.0, - Unit = "Km" - }, - GUI = { - Name = "1ld Grid", - Path = "/Other/Grids" + Identifier = "1ldGrid", + Parent = transforms.SolarSystemBarycenter.Name, + Transform = { + Rotation = { + Type = "StaticRotation", + Rotation = eclipticRotationMatrix } + }, + Renderable = { + Type = "RenderableDUMeshes", + Enabled = false, + Opacity = 0.4, + File = speck .. "/1ld.speck", + MeshColor = {{ 0.1, 0.5, 0.6 }}, + LabelFile = speck .. "/1ld.label", + TextColor = { 0.0, 0.2, 0.5 }, + TextSize = 10.3, + TextMinSize = 0.5, + TextMaxSize = 30.0, + Unit = "Km" + }, + GUI = { + Name = "1ld Grid", + Path = "/Other/Grids" + } } local plane1lm = { - Identifier = "1lmGrid", - Parent = transforms.SolarSystemBarycenter.Name, - Transform = { - Rotation = { - Type = "StaticRotation", - Rotation = eclipticRotationMatrix - } - }, - Renderable = { - Type = "RenderableDUMeshes", - Enabled = false, - Opacity = 0.4, - File = speck .. "/1lm.speck", - MeshColor = {{ 0.1, 0.5, 0.6 }}, - LabelFile = speck .. "/1lm.label", - TextColor = { 0.0, 0.2, 0.5 }, - TextSize = 11.8, - TextMinSize = 0.5, - TextMaxSize = 30.0, - Unit = "pc" - }, - GUI = { - Name = "1lm Grid", - Path = "/Other/Grids" + Identifier = "1lmGrid", + Parent = transforms.SolarSystemBarycenter.Name, + Transform = { + Rotation = { + Type = "StaticRotation", + Rotation = eclipticRotationMatrix } + }, + Renderable = { + Type = "RenderableDUMeshes", + Enabled = false, + Opacity = 0.4, + File = speck .. "/1lm.speck", + MeshColor = {{ 0.1, 0.5, 0.6 }}, + LabelFile = speck .. "/1lm.label", + TextColor = { 0.0, 0.2, 0.5 }, + TextSize = 11.8, + TextMinSize = 0.5, + TextMaxSize = 30.0, + Unit = "pc" + }, + GUI = { + Name = "1lm Grid", + Path = "/Other/Grids" + } } local plane1ly = { - Identifier = "1lyGrid", - Parent = transforms.SolarSystemBarycenter.Name, - Transform = { - Rotation = { - Type = "StaticRotation", - Rotation = eclipticRotationMatrix - } - }, - Renderable = { - Type = "RenderableDUMeshes", - Enabled = false, - Opacity = 0.4, - File = speck .. "/1ly.speck", - MeshColor = {{ 0.1, 0.5, 0.6 }}, - LabelFile = speck .. "/1ly.label", - TextColor = { 0.0, 0.2, 0.5 }, - TextSize = 13.0, - TextMinSize = 0.5, - TextMaxSize = 30.0, - Unit = "pc" - }, - GUI = { - Name = "1ly Grid", - Path = "/Other/Grids" + Identifier = "1lyGrid", + Parent = transforms.SolarSystemBarycenter.Name, + Transform = { + Rotation = { + Type = "StaticRotation", + Rotation = eclipticRotationMatrix } + }, + Renderable = { + Type = "RenderableDUMeshes", + Enabled = false, + Opacity = 0.4, + File = speck .. "/1ly.speck", + MeshColor = {{ 0.1, 0.5, 0.6 }}, + LabelFile = speck .. "/1ly.label", + TextColor = { 0.0, 0.2, 0.5 }, + TextSize = 13.0, + TextMinSize = 0.5, + TextMaxSize = 30.0, + Unit = "pc" + }, + GUI = { + Name = "1ly Grid", + Path = "/Other/Grids" + } } local plane10ly = { - Identifier = "10lyGrid", - Parent = transforms.SolarSystemBarycenter.Name, - Transform = { - Rotation = { - Type = "StaticRotation", - Rotation = eclipticRotationMatrix - } - }, - Renderable = { - Type = "RenderableDUMeshes", - Enabled = false, - Opacity = 0.4, - File = speck .. "/10ly.speck", - MeshColor = {{ 0.1, 0.5, 0.6 }}, - LabelFile = speck .. "/10ly.label", - TextColor = { 0.0, 0.2, 0.5 }, - TextSize = 14.17, - TextMinSize = 0.5, - TextMaxSize = 30.0, - Unit = "pc" - }, - GUI = { - Name = "10ly Grid", - Path = "/Other/Grids" + Identifier = "10lyGrid", + Parent = transforms.SolarSystemBarycenter.Name, + Transform = { + Rotation = { + Type = "StaticRotation", + Rotation = eclipticRotationMatrix } + }, + Renderable = { + Type = "RenderableDUMeshes", + Enabled = false, + Opacity = 0.4, + File = speck .. "/10ly.speck", + MeshColor = {{ 0.1, 0.5, 0.6 }}, + LabelFile = speck .. "/10ly.label", + TextColor = { 0.0, 0.2, 0.5 }, + TextSize = 14.17, + TextMinSize = 0.5, + TextMaxSize = 30.0, + Unit = "pc" + }, + GUI = { + Name = "10ly Grid", + Path = "/Other/Grids" + } } local plane100ly = { - Identifier = "100lyGrid", - Parent = transforms.SolarSystemBarycenter.Name, - Transform = { - Rotation = { - Type = "StaticRotation", - Rotation = eclipticRotationMatrix - } - }, - Renderable = { - Type = "RenderableDUMeshes", - Enabled = false, - Opacity = 0.4, - File = speck .. "/100ly.speck", - MeshColor = {{ 0.1, 0.5, 0.6 }}, - LabelFile = speck .. "/100ly.label", - TextColor = { 0.0, 0.2, 0.5 }, - TextSize = 15.0, - TextMinSize = 0.5, - TextMaxSize = 30.0, - Unit = "pc" - }, - GUI = { - Name = "100ly Grid", - Path = "/Other/Grids" + Identifier = "100lyGrid", + Parent = transforms.SolarSystemBarycenter.Name, + Transform = { + Rotation = { + Type = "StaticRotation", + Rotation = eclipticRotationMatrix } + }, + Renderable = { + Type = "RenderableDUMeshes", + Enabled = false, + Opacity = 0.4, + File = speck .. "/100ly.speck", + MeshColor = {{ 0.1, 0.5, 0.6 }}, + LabelFile = speck .. "/100ly.label", + TextColor = { 0.0, 0.2, 0.5 }, + TextSize = 15.0, + TextMinSize = 0.5, + TextMaxSize = 30.0, + Unit = "pc" + }, + GUI = { + Name = "100ly Grid", + Path = "/Other/Grids" + } } local plane1kly = { - Identifier = "1klyGrid", - Parent = transforms.SolarSystemBarycenter.Name, - Transform = { - Rotation = { - Type = "StaticRotation", - Rotation = eclipticRotationMatrix - } - }, - Renderable = { - Type = "RenderableDUMeshes", - Enabled = false, - Opacity = 0.4, - File = speck .. "/1kly.speck", - MeshColor = {{ 0.1, 0.5, 0.6 }}, - LabelFile = speck .. "/1kly.label", - TextColor = { 0.0, 0.2, 0.5 }, - TextSize = 16.0, - TextMinSize = 0.5, - TextMaxSize = 30.0, - Unit = "pc" - }, - GUI = { - Name = "1kly Grid", - Path = "/Other/Grids" + Identifier = "1klyGrid", + Parent = transforms.SolarSystemBarycenter.Name, + Transform = { + Rotation = { + Type = "StaticRotation", + Rotation = eclipticRotationMatrix } + }, + Renderable = { + Type = "RenderableDUMeshes", + Enabled = false, + Opacity = 0.4, + File = speck .. "/1kly.speck", + MeshColor = {{ 0.1, 0.5, 0.6 }}, + LabelFile = speck .. "/1kly.label", + TextColor = { 0.0, 0.2, 0.5 }, + TextSize = 16.0, + TextMinSize = 0.5, + TextMaxSize = 30.0, + Unit = "pc" + }, + GUI = { + Name = "1kly Grid", + Path = "/Other/Grids" + } } local plane10kly = { - Identifier = "10klyGrid", - Parent = transforms.SolarSystemBarycenter.Name, - Transform = { - Rotation = { - Type = "StaticRotation", - Rotation = eclipticRotationMatrix - } - }, - Renderable = { - Type = "RenderableDUMeshes", - Enabled = false, - Opacity = 0.4, - File = speck .. "/10kly.speck", - MeshColor = {{ 0.1, 0.5, 0.6 }}, - LabelFile = speck .. "/10kly.label", - TextColor = { 0.0, 0.2, 0.5 }, - TextSize = 17.25, - TextMinSize = 0.5, - TextMaxSize = 30.0, - Unit = "pc" - }, - GUI = { - Name = "10kly Grid", - Path = "/Other/Grids" + Identifier = "10klyGrid", + Parent = transforms.SolarSystemBarycenter.Name, + Transform = { + Rotation = { + Type = "StaticRotation", + Rotation = eclipticRotationMatrix } + }, + Renderable = { + Type = "RenderableDUMeshes", + Enabled = false, + Opacity = 0.4, + File = speck .. "/10kly.speck", + MeshColor = {{ 0.1, 0.5, 0.6 }}, + LabelFile = speck .. "/10kly.label", + TextColor = { 0.0, 0.2, 0.5 }, + TextSize = 17.25, + TextMinSize = 0.5, + TextMaxSize = 30.0, + Unit = "pc" + }, + GUI = { + Name = "10kly Grid", + Path = "/Other/Grids" + } } local plane100kly = { - Identifier = "100klyGrid", - Renderable = { - Type = "RenderableDUMeshes", - Enabled = false, - Opacity = 0.4, - File = speck .. "/100kly.speck", - MeshColor = {{ 0.1, 0.5, 0.6 }}, - LabelFile = speck .. "/100kly.label", - TextColor = { 0.0, 0.2, 0.5 }, - TextSize = 18.6, - TextMinSize = 0.5, - TextMaxSize = 30.0, - Unit = "Mpc" - }, - GUI = { - Name = "100kly Grid", - Path = "/Other/Grids" - } + Identifier = "100klyGrid", + Renderable = { + Type = "RenderableDUMeshes", + Enabled = false, + Opacity = 0.4, + File = speck .. "/100kly.speck", + MeshColor = {{ 0.1, 0.5, 0.6 }}, + LabelFile = speck .. "/100kly.label", + TextColor = { 0.0, 0.2, 0.5 }, + TextSize = 18.6, + TextMinSize = 0.5, + TextMaxSize = 30.0, + Unit = "Mpc" + }, + GUI = { + Name = "100kly Grid", + Path = "/Other/Grids" + } } local plane1Mly = { - Identifier = "1MlyGrid", - Renderable = { - Type = "RenderableDUMeshes", - Enabled = false, - Opacity = 0.4, - File = speck .. "/1Mly.speck", - MeshColor = {{ 0.1, 0.5, 0.6 }}, - LabelFile = speck .. "/1Mly.label", - TextColor = { 0.0, 0.2, 0.5 }, - TextSize = 19.6, - TextMinSize = 0.5, - TextMaxSize = 30.0, - Unit = "Mpc" - }, - GUI = { - Name = "1Mly Grid", - Path = "/Other/Grids" - } + Identifier = "1MlyGrid", + Renderable = { + Type = "RenderableDUMeshes", + Enabled = false, + Opacity = 0.4, + File = speck .. "/1Mly.speck", + MeshColor = {{ 0.1, 0.5, 0.6 }}, + LabelFile = speck .. "/1Mly.label", + TextColor = { 0.0, 0.2, 0.5 }, + TextSize = 19.6, + TextMinSize = 0.5, + TextMaxSize = 30.0, + Unit = "Mpc" + }, + GUI = { + Name = "1Mly Grid", + Path = "/Other/Grids" + } } local plane10Mly = { - Identifier = "10MlyGrid", - Renderable = { - Type = "RenderableDUMeshes", - Enabled = false, - Opacity = 0.4, - File = speck .. "/10Mly.speck", - MeshColor = {{ 0.1, 0.5, 0.6 }}, - LabelFile = speck .. "/10Mly.label", - TextColor = { 0.0, 0.2, 0.5 }, - TextSize = 20.6, - TextMinSize = 0.5, - TextMaxSize = 30.0, - Unit = "Mpc" - }, - GUI = { - Name = "10Mly Grid", - Path = "/Other/Grids" - } + Identifier = "10MlyGrid", + Renderable = { + Type = "RenderableDUMeshes", + Enabled = false, + Opacity = 0.4, + File = speck .. "/10Mly.speck", + MeshColor = {{ 0.1, 0.5, 0.6 }}, + LabelFile = speck .. "/10Mly.label", + TextColor = { 0.0, 0.2, 0.5 }, + TextSize = 20.6, + TextMinSize = 0.5, + TextMaxSize = 30.0, + Unit = "Mpc" + }, + GUI = { + Name = "10Mly Grid", + Path = "/Other/Grids" + } } local plane100Mly = { - Identifier = "100MlyGrid", - Renderable = { - Type = "RenderableDUMeshes", - Enabled = false, - Opacity = 0.4, - File = speck .. "/100Mly.speck", - MeshColor = {{ 0.1, 0.5, 0.6 }}, - LabelFile = speck .. "/100Mly.label", - TextColor = { 0.0, 0.2, 0.5 }, - TextSize = 21.6, - TextMinSize = 0.5, - TextMaxSize = 30.0, - Unit = "Mpc" - }, - GUI = { - Name = "100Mly Grid", - Path = "/Other/Grids" - } + Identifier = "100MlyGrid", + Renderable = { + Type = "RenderableDUMeshes", + Enabled = false, + Opacity = 0.4, + File = speck .. "/100Mly.speck", + MeshColor = {{ 0.1, 0.5, 0.6 }}, + LabelFile = speck .. "/100Mly.label", + TextColor = { 0.0, 0.2, 0.5 }, + TextSize = 21.6, + TextMinSize = 0.5, + TextMaxSize = 30.0, + Unit = "Mpc" + }, + GUI = { + Name = "100Mly Grid", + Path = "/Other/Grids" + } } local plane20Gly = { - Identifier = "20GlyGrid", - Renderable = { - Type = "RenderableDUMeshes", - Enabled = false, - Opacity = 0.4, - File = speck .. "/20Gly.speck", - MeshColor = {{ 0.1, 0.5, 0.6 }}, - LabelFile = speck .. "/20Gly.label", - TextColor = { 0.0, 0.2, 0.5 }, - TextSize = 23.6, - TextMinSize = 0.5, - TextMaxSize = 30.0, - Unit = "Mpc" - }, - GUI = { - Name = "20Gly Grid", - Path = "/Other/Grids" - } + Identifier = "20GlyGrid", + Renderable = { + Type = "RenderableDUMeshes", + Enabled = false, + Opacity = 0.4, + File = speck .. "/20Gly.speck", + MeshColor = {{ 0.1, 0.5, 0.6 }}, + LabelFile = speck .. "/20Gly.label", + TextColor = { 0.0, 0.2, 0.5 }, + TextSize = 23.6, + TextMinSize = 0.5, + TextMaxSize = 30.0, + Unit = "Mpc" + }, + GUI = { + Name = "20Gly Grid", + Path = "/Other/Grids" + } } assetHelper.registerSceneGraphNodesAndExport(asset, { - radio, oort, ecliptic, eclipticLabels, equatorial, equatorialLabels, galactic, - galacticLabels, plane1ld, plane1lm, plane1ly, plane10ly, plane100ly, plane1kly, - plane10kly, plane100kly, plane1Mly, plane10Mly, plane100Mly, plane20Gly + radio, oort, ecliptic, eclipticLabels, equatorial, equatorialLabels, galactic, + galacticLabels, plane1ld, plane1lm, plane1ly, plane10ly, plane100ly, plane1kly, + plane10kly, plane100kly, plane1Mly, plane10Mly, plane100Mly, plane20Gly }) asset.meta = { - Name = "Grids", - Version = "2.0", - Description = [[Various grids for showing size reference. Included: 10,000 light year - grid, 10 light year grid, 20 billion light year grid, 10 million light year grid, - 100 light year grid, 100 million light year grid, Ecliptic Coordinate Sphere - (500-light-year radius), Galactic Coordinate Sphere (1000-light-year radius), - Galaxy Coordinate Grid, Celestial Coordinates / Radio Sphere (dynamic radius), 1 - billion light year grid, Celestial Coordinate Sphere (1000000-light-year radius), - 1,000 light year grid, 1 million light year grid, 1 light year grid]], - Author = "Brian Abbott (AMNH)", - URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", - License = "AMNH Digital Universe", - Identifiers = {"RadioSphere", "OortSphere", "EclipticSphere", "EclipticSphereLabels", - "Equatorial", "EquatorialSphereLabels", "GalacticSphere", "GalacticSphereLabels", - "1ldGrid", "1lmGrid", "1lyGrid", "10lyGrid", "100lyGrid", "1klyGrid", "10klyGrid", - "100klyGrid", "1MlyGrid", "10MlyGrid", "100MlyGrid", "20GlyGrid"} + Name = "Grids", + Version = "2.0", + Description = [[Various grids for showing size reference. Included: 10,000 light year + grid, 10 light year grid, 20 billion light year grid, 10 million light year grid, + 100 light year grid, 100 million light year grid, Ecliptic Coordinate Sphere + (500-light-year radius), Galactic Coordinate Sphere (1000-light-year radius), + Galaxy Coordinate Grid, Celestial Coordinates / Radio Sphere (dynamic radius), 1 + billion light year grid, Celestial Coordinate Sphere (1000000-light-year radius), + 1,000 light year grid, 1 million light year grid, 1 light year grid]], + Author = "Brian Abbott (AMNH)", + URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", + License = "AMNH Digital Universe", + Identifiers = {"RadioSphere", "OortSphere", "EclipticSphere", "EclipticSphereLabels", + "Equatorial", "EquatorialSphereLabels", "GalacticSphere", "GalacticSphereLabels", + "1ldGrid", "1lmGrid", "1lyGrid", "10lyGrid", "100lyGrid", "1klyGrid", "10klyGrid", + "100klyGrid", "1MlyGrid", "10MlyGrid", "100MlyGrid", "20GlyGrid"} } diff --git a/data/assets/scene/digitaluniverse/groups.asset b/data/assets/scene/digitaluniverse/groups.asset index 5d9586e3ce..3653225819 100644 --- a/data/assets/scene/digitaluniverse/groups.asset +++ b/data/assets/scene/digitaluniverse/groups.asset @@ -3,52 +3,52 @@ local assetHelper = asset.require('util/asset_helper') local speck = asset.syncedResource({ - Name = "Galaxy Groups Speck Files", - Type = "HttpSynchronization", - Identifier = "digitaluniverse_groups_speck", - Version = 1 + Name = "Galaxy Groups Speck Files", + Type = "HttpSynchronization", + Identifier = "digitaluniverse_groups_speck", + Version = 1 }) local object = { - Identifier = "NearbyGalaxyGroups", - Renderable = { - Type = "RenderableBillboardsCloud", - Enabled = false, - Color = { 1.0, 1.0, 1.0 }, - Opacity = 0.65, - --ScaleFactor = 10.0, - LabelFile = speck .. "/groups.label", - TextColor = { 0.1, 0.6, 0.2 }, - TextSize = 21.5, - TextMinSize = 8.0, - Unit = "Mpc", - DrawLabels = true, - TransformationMatrix = { - -0.7357425748, 0.67726129641, 0.0, 0.0, - -0.074553778365, -0.080991471307, 0.9939225904, 0.0, - 0.67314530211, 0.73127116582, 0.11008126223, 0.0, - 0.0, 0.0, 0.0, 1.0 - }, - }, - GUI = { - Name = "Galaxy Group Labels", - Path = "/Universe/Galaxies", - Description = [[Census: 62 galaxy group labels. DU Version 1.2.
The Galaxy - Groups data are a set of labels that mark the nearby galaxy groups. The Milky Way - is in the Local Group, and we are surrounded by many other groups.(Description - from URL)

Data Reference: Brian Abbott (AMNH)]] + Identifier = "NearbyGalaxyGroups", + Renderable = { + Type = "RenderableBillboardsCloud", + Enabled = false, + Color = { 1.0, 1.0, 1.0 }, + Opacity = 0.65, + --ScaleFactor = 10.0, + LabelFile = speck .. "/groups.label", + TextColor = { 0.1, 0.6, 0.2 }, + TextSize = 21.5, + TextMinSize = 8.0, + Unit = "Mpc", + DrawLabels = true, + TransformationMatrix = { + -0.7357425748, 0.67726129641, 0.0, 0.0, + -0.074553778365, -0.080991471307, 0.9939225904, 0.0, + 0.67314530211, 0.73127116582, 0.11008126223, 0.0, + 0.0, 0.0, 0.0, 1.0 } + }, + GUI = { + Name = "Galaxy Group Labels", + Path = "/Universe/Galaxies", + Description = [[Census: 62 galaxy group labels. DU Version 1.2.
The Galaxy + Groups data are a set of labels that mark the nearby galaxy groups. The Milky Way + is in the Local Group, and we are surrounded by many other groups.(Description + from URL)

Data Reference: Brian Abbott (AMNH)]] + } } assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { - Name = "Galaxy Group Labels", - Version = "1.0", - Author = "Brian Abbott (AMNH)", - Description = [[Digital Universe asset for Galaxy Groups]], - URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", - License = "AMNH Digital Universe", - Identifiers = {"NearbyGalaxyGroups"} + Name = "Galaxy Group Labels", + Version = "1.0", + Author = "Brian Abbott (AMNH)", + Description = [[Digital Universe asset for Galaxy Groups]], + URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", + License = "AMNH Digital Universe", + Identifiers = {"NearbyGalaxyGroups"} } diff --git a/data/assets/scene/digitaluniverse/h2regions.asset b/data/assets/scene/digitaluniverse/h2regions.asset index 470c5e7146..946c1fb9ca 100644 --- a/data/assets/scene/digitaluniverse/h2regions.asset +++ b/data/assets/scene/digitaluniverse/h2regions.asset @@ -3,65 +3,65 @@ local assetHelper = asset.require('util/asset_helper') local textures = asset.syncedResource({ - Name = "HII Regions Textures", - Type = "HttpSynchronization", - Identifier = "digitaluniverse_h2regions_textures", - Version = 1 + Name = "HII Regions Textures", + Type = "HttpSynchronization", + Identifier = "digitaluniverse_h2regions_textures", + Version = 1 }) local speck = asset.syncedResource({ - Name = "HII Regions Speck Files", - Type = "HttpSynchronization", - Identifier = "digitaluniverse_h2regions_speck", - Version = 3 + Name = "HII Regions Speck Files", + Type = "HttpSynchronization", + Identifier = "digitaluniverse_h2regions_speck", + Version = 3 }) local object = { - Identifier = "HIIRegions", - Renderable = { - Type = "RenderableBillboardsCloud", - Enabled = false, - Color = { 0.0, 0.5, 1.0 }, - Opacity = 0.70, - File = speck .. "/h2.speck", - Texture = textures .."/point4.png", - PolygonSides = 6, - LabelFile = speck .. "/h2.label", - TextColor = { 0.5, 0.5, 0.5 }, - ScaleFactor = 420, - TextSize = 16.24, - TextMinSize = 4.0, - TextMaxSize = 20.0, - Unit = "pc", - BillboardMaxSize = 300.0, - EnablePixelSizeControl = false - }, - GUI = { - Name = "HII Regions", - Path = "/Milky Way", - Description = [[Census: 1,271 nebulae. DU Version 4.6.
H ii (pronounced - H-two) regions are stellar nurseries for newborn stars. Stars are born from - condensing clouds of hydrogen gas. As these clouds condense, the densities - become high enough to form stars. From Earth's perspective, you'll notice that - the H ii regions all lie close to the Galactic plane. This is not an accident - of nature. These star-forming regions lie in the plane of the Galaxy because - that is where star formation occurs in spiral galaxies such as our Milky Way. - Because of this, they are great tracers of the spiral arms of the Galaxy, and - were instrumental in our understanding of the Galaxy's overall structure - (Description from URL)

Data Reference: The WISE catalog of Galactic - HII Regions (Anderson+, 2014)]], - } + Identifier = "HIIRegions", + Renderable = { + Type = "RenderableBillboardsCloud", + Enabled = false, + Color = { 0.0, 0.5, 1.0 }, + Opacity = 0.70, + File = speck .. "/h2.speck", + Texture = textures .."/point4.png", + PolygonSides = 6, + LabelFile = speck .. "/h2.label", + TextColor = { 0.5, 0.5, 0.5 }, + ScaleFactor = 420, + TextSize = 16.24, + TextMinSize = 4.0, + TextMaxSize = 20.0, + Unit = "pc", + BillboardMaxSize = 300.0, + EnablePixelSizeControl = false + }, + GUI = { + Name = "HII Regions", + Path = "/Milky Way", + Description = [[Census: 1,271 nebulae. DU Version 4.6.
H ii (pronounced + H-two) regions are stellar nurseries for newborn stars. Stars are born from + condensing clouds of hydrogen gas. As these clouds condense, the densities + become high enough to form stars. From Earth's perspective, you'll notice that + the H ii regions all lie close to the Galactic plane. This is not an accident + of nature. These star-forming regions lie in the plane of the Galaxy because + that is where star formation occurs in spiral galaxies such as our Milky Way. + Because of this, they are great tracers of the spiral arms of the Galaxy, and + were instrumental in our understanding of the Galaxy's overall structure + (Description from URL)

Data Reference: The WISE catalog of Galactic + HII Regions (Anderson+, 2014)]], + } } assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { - Name = "HII Regions", - Version = "1.0", - Description = [[Digital Universe asset for HII Regions]], - Author = "Carter Emmart, Brian Abbott (AMNH)", - URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", - License = "AMNH Digital Universe", - Identifiers = {"HIIRegions"} + Name = "HII Regions", + Version = "1.0", + Description = [[Digital Universe asset for HII Regions]], + Author = "Carter Emmart, Brian Abbott (AMNH)", + URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", + License = "AMNH Digital Universe", + Identifiers = {"HIIRegions"} } diff --git a/data/assets/scene/digitaluniverse/kepler.asset b/data/assets/scene/digitaluniverse/kepler.asset index 1d5834487a..38ce9309a9 100644 --- a/data/assets/scene/digitaluniverse/kepler.asset +++ b/data/assets/scene/digitaluniverse/kepler.asset @@ -10,53 +10,53 @@ local textures = asset.syncedResource({ }) local speck = asset.syncedResource({ - Name = "Kepler Speck Files", - Type = "HttpSynchronization", - Identifier = "digitaluniverse_kepler_speck", - Version = 3 + Name = "Kepler Speck Files", + Type = "HttpSynchronization", + Identifier = "digitaluniverse_kepler_speck", + Version = 3 }) local object = { - Identifier = "KeplerPlanetaryCandidates", - Renderable = { - Type = "RenderableBillboardsCloud", - Enabled = false, - Color = { 1.0, 1.0, 0.0 }, - Opacity = 0.99, - ScaleFactor = 410.0, - File = speck .. "/kepler.speck", - Texture = textures .. "/halo.png", - CorrectionSizeEndDistance = 15.86, - CorrectionSizeFactor = 8.59, - Unit = "pc", - BillboardMaxSize = 30.0, - EnablePixelSizeControl = true - }, - GUI = { - Name = "Kepler Planetary Candidates", - Path = "/Milky Way/Exoplanets", - Description = [[Census: 3,254 stars. DU Version 9.3.
The exoplanet candidate - stars are likely hosts for exoplanets. These are stars plucked from NASA's Kepler - and TESS space telescopes. The Kepler mission was designed to stare at one spot, - roughly twelve degrees across, in the constellation Cygnus. By staring at one - spot, the spacecraft could monitor over 500,000 stars in that field for subtle - variations in brightness.The data included here are the stars that are considered - good candidates to host planets. Rather than represent them photo-realistically, - with accurate colors, we choose to visualize them as generic, pure yellow stars. - (Description from URL)

Data Reference: NASA Exoplanet Archive - (CalTech/NASA)]], - } + Identifier = "KeplerPlanetaryCandidates", + Renderable = { + Type = "RenderableBillboardsCloud", + Enabled = false, + Color = { 1.0, 1.0, 0.0 }, + Opacity = 0.99, + ScaleFactor = 410.0, + File = speck .. "/kepler.speck", + Texture = textures .. "/halo.png", + CorrectionSizeEndDistance = 15.86, + CorrectionSizeFactor = 8.59, + Unit = "pc", + BillboardMaxSize = 30.0, + EnablePixelSizeControl = true + }, + GUI = { + Name = "Kepler Planetary Candidates", + Path = "/Milky Way/Exoplanets", + Description = [[Census: 3,254 stars. DU Version 9.3.
The exoplanet candidate + stars are likely hosts for exoplanets. These are stars plucked from NASA's Kepler + and TESS space telescopes. The Kepler mission was designed to stare at one spot, + roughly twelve degrees across, in the constellation Cygnus. By staring at one + spot, the spacecraft could monitor over 500,000 stars in that field for subtle + variations in brightness.The data included here are the stars that are considered + good candidates to host planets. Rather than represent them photo-realistically, + with accurate colors, we choose to visualize them as generic, pure yellow stars. + (Description from URL)

Data Reference: NASA Exoplanet Archive + (CalTech/NASA)]], + } } assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { - Name = "Kepler Planetary Candidates", - Version = "2.0", - Description = [[Digital Universe asset for Kepler Planetary Candidates]], - Author = "Brian Abbott, Emily Rice, and Jason No (AMNH)", - URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", - License = "AMNH Digital Universe", - Identifiers = {"KeplerPlanetaryCandidates"} + Name = "Kepler Planetary Candidates", + Version = "2.0", + Description = [[Digital Universe asset for Kepler Planetary Candidates]], + Author = "Brian Abbott, Emily Rice, and Jason No (AMNH)", + URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", + License = "AMNH Digital Universe", + Identifiers = {"KeplerPlanetaryCandidates"} } diff --git a/data/assets/scene/digitaluniverse/localdwarfs.asset b/data/assets/scene/digitaluniverse/localdwarfs.asset index 034d27a491..8bd7fddce6 100644 --- a/data/assets/scene/digitaluniverse/localdwarfs.asset +++ b/data/assets/scene/digitaluniverse/localdwarfs.asset @@ -3,66 +3,66 @@ local assetHelper = asset.require('util/asset_helper') local textures = asset.syncedResource({ - Name = "Local Dwarfs Textures", - Type = "HttpSynchronization", - Identifier = "digitaluniverse_localdwarfs_textures", - Version = 1 + Name = "Local Dwarfs Textures", + Type = "HttpSynchronization", + Identifier = "digitaluniverse_localdwarfs_textures", + Version = 1 }) local speck = asset.syncedResource({ - Name = "Local Dwarfs Speck Files", - Type = "HttpSynchronization", - Identifier = "digitaluniverse_localdwarfs_speck", - Version = 2 + Name = "Local Dwarfs Speck Files", + Type = "HttpSynchronization", + Identifier = "digitaluniverse_localdwarfs_speck", + Version = 2 }) local object = { - Identifier = "LocalDwarfGalaxies", - Renderable = { - Type = "RenderableBillboardsCloud", - Enabled = false, - Color = { 0.5, 1.0, 0.2 }, - ColorMap = speck .. "/localgroup.cmap", - ColorOption = { "association" }, - Opacity = 0.3, - File = speck .. "/localgroup.speck", - Texture = textures .. "/point4.png", - PolygonSides = 12, - LabelFile = speck .. "/localgroup.label", - TextColor = { 0.3, 0.3, 1.0 }, - ScaleFactor = 465, - TextSize = 18.3, - TextMinSize = 7.3, - Unit = "Mpc", - BillboardMaxSize = 20.0, - EnablePixelSizeControl = true - }, - GUI = { - Name = "Local Group", - Path = "/Universe/Galaxies", - Description = [[Census: 102 galaxies. DU Version 6.4.
A group of galaxies is - a small number of large galaxies that are typically surrounded by a large - number of small galaxies. The Milky Way belongs to the Local Group, and is one - of roughly 100 galaxies in that group. The Milky Way, the Andromeda Galaxy - (also known as Messier 31, or M31), and the Triangulum Galaxy (M33) are three - of the largest galaxies in the Local Group. Each is a spiral galaxy containing - hundreds of billions of stars. Surrounding the Milky Way and Andromeda are a - bevy of dwarf galaxies-smaller, often irregular galaxies, that contain - hundreds of millions to a few billion stars. (Description from URL)

- Data Reference: Properties of dwarf galaxies in the Local Group - (McConnachie+, 2012)]], - } + Identifier = "LocalDwarfGalaxies", + Renderable = { + Type = "RenderableBillboardsCloud", + Enabled = false, + Color = { 0.5, 1.0, 0.2 }, + ColorMap = speck .. "/localgroup.cmap", + ColorOption = { "association" }, + Opacity = 0.3, + File = speck .. "/localgroup.speck", + Texture = textures .. "/point4.png", + PolygonSides = 12, + LabelFile = speck .. "/localgroup.label", + TextColor = { 0.3, 0.3, 1.0 }, + ScaleFactor = 465, + TextSize = 18.3, + TextMinSize = 7.3, + Unit = "Mpc", + BillboardMaxSize = 20.0, + EnablePixelSizeControl = true + }, + GUI = { + Name = "Local Group", + Path = "/Universe/Galaxies", + Description = [[Census: 102 galaxies. DU Version 6.4.
A group of galaxies is + a small number of large galaxies that are typically surrounded by a large + number of small galaxies. The Milky Way belongs to the Local Group, and is one + of roughly 100 galaxies in that group. The Milky Way, the Andromeda Galaxy + (also known as Messier 31, or M31), and the Triangulum Galaxy (M33) are three + of the largest galaxies in the Local Group. Each is a spiral galaxy containing + hundreds of billions of stars. Surrounding the Milky Way and Andromeda are a + bevy of dwarf galaxies-smaller, often irregular galaxies, that contain + hundreds of millions to a few billion stars. (Description from URL)

+ Data Reference: Properties of dwarf galaxies in the Local Group + (McConnachie+, 2012)]], + } } assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { - Name = "Local Group", - Version = "2.0", - Description = [[Digital Universe asset for the Local Goup]], - Author = "Brian Abbott (AMNH)", - URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", - License = "AMNH Digital Universe", - Identifiers = {"LocalDwarfGalaxies"} + Name = "Local Group", + Version = "2.0", + Description = [[Digital Universe asset for the Local Goup]], + Author = "Brian Abbott (AMNH)", + URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", + License = "AMNH Digital Universe", + Identifiers = {"LocalDwarfGalaxies"} } diff --git a/data/assets/scene/digitaluniverse/milkyway.asset b/data/assets/scene/digitaluniverse/milkyway.asset index 168fbf61ad..444c2614ad 100644 --- a/data/assets/scene/digitaluniverse/milkyway.asset +++ b/data/assets/scene/digitaluniverse/milkyway.asset @@ -6,30 +6,30 @@ local plane = { Identifier = "MilkyWayGalaxyImage", Parent = "Root", Renderable = { - Type = "RenderablePlanesCloud", - Enabled = true, - Color = { 1.0, 1.0, 1.0 }, - Opacity = 0.99, - ScaleFactor = 2.8, - File = dataPaths.SpeckPath .. "/galaxy.speck", - TexturePath = dataPaths.TexturesPath, - Luminosity = "size", - ScaleLuminosity = 1.0, - FadeInDistances = { 3000.0, 50000.0 }, - PlaneMinSize = 5.0, - Unit = "pc" + Type = "RenderablePlanesCloud", + Enabled = true, + Color = { 1.0, 1.0, 1.0 }, + Opacity = 0.99, + ScaleFactor = 2.8, + File = dataPaths.SpeckPath .. "/galaxy.speck", + TexturePath = dataPaths.TexturesPath, + Luminosity = "size", + ScaleLuminosity = 1.0, + FadeInDistances = { 3000.0, 50000.0 }, + PlaneMinSize = 5.0, + Unit = "pc" }, GUI = { - Name = "Milky Way Galaxy Image", - Path = "/Universe/Galaxies", - Description = [[Census: 1 image. DU Version 2.2.
The exterior view of the - Milky Way is simply a two-dimensional image. The image is that of NGC 1232, a - galaxy thought to resemble our Milky Way. The image has been properly sized - and approximately oriented to function as a placeholder, allowing one to see - the context of the Galaxy relative to other data in the atlas. The features - you see in the image, of course, do not represent our Galaxy, per se, but - resemble similar features found in our Galaxy.(Description from URL) -

Data Reference: European Southern Observatory]] + Name = "Milky Way Galaxy Image", + Path = "/Universe/Galaxies", + Description = [[Census: 1 image. DU Version 2.2.
The exterior view of the + Milky Way is simply a two-dimensional image. The image is that of NGC 1232, a + galaxy thought to resemble our Milky Way. The image has been properly sized + and approximately oriented to function as a placeholder, allowing one to see + the context of the Galaxy relative to other data in the atlas. The features + you see in the image, of course, do not represent our Galaxy, per se, but + resemble similar features found in our Galaxy.(Description from URL) +

Data Reference: European Southern Observatory]] } } @@ -37,12 +37,12 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { plane }) asset.meta = { - Name = "MilkyWay Galaxy", - Version = "2.0", - Description = [[Digital Universe asset containt 2D image of the MilkyWay. For - extragalactic viewing]], - Author = "Brian Abbott, Carter Emmart (AMNH)", - URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", - License = "AMNH Digital Universe", - Identifiers = {"MilkyWayGalaxyImage"} + Name = "MilkyWay Galaxy", + Version = "2.0", + Description = [[Digital Universe asset containt 2D image of the MilkyWay. For + extragalactic viewing]], + Author = "Brian Abbott, Carter Emmart (AMNH)", + URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", + License = "AMNH Digital Universe", + Identifiers = {"MilkyWayGalaxyImage"} } diff --git a/data/assets/scene/digitaluniverse/milkyway_arm_labels.asset b/data/assets/scene/digitaluniverse/milkyway_arm_labels.asset index 8228de7a36..fb5f1fa761 100644 --- a/data/assets/scene/digitaluniverse/milkyway_arm_labels.asset +++ b/data/assets/scene/digitaluniverse/milkyway_arm_labels.asset @@ -3,61 +3,61 @@ local assetHelper = asset.require('util/asset_helper') local dataPaths = asset.require("scene/digitaluniverse/milkyway_data") local plane = { - Identifier = "MilkyWayGalaxyArmLabelsImage", - Parent = "Root", - Renderable = { - Type = "RenderablePlanesCloud", - Enabled = false, - Color = { 1.0, 1.0, 1.0 }, - Opacity = 0.99, - ScaleFactor = 2.8, - File = dataPaths.SpeckPath .. "/galaxyArmLabels.speck", - TexturePath = dataPaths.TexturesPath, - Luminosity = "size", - ScaleLuminosity = 1.0, - FadeInDistances = { 3000.0, 50000.0 }, - PlaneMinSize = 5.0, - Unit = "pc" - }, - GUI = { - Name = "Milky Way Arms Labels", - Path = "/Universe/Galaxies", - Description = [[ Census: 1 image. DU Version: 1.2. This image contains labels for - the Milky Way's spiral arms. We label them in this manner ("hard coding" the - labels into an image rather than having native labels) so that they can retain - their size, shape, and location as they overlay the galaxy. (Description from - Digital Universe Data Profiles)]], - } + Identifier = "MilkyWayGalaxyArmLabelsImage", + Parent = "Root", + Renderable = { + Type = "RenderablePlanesCloud", + Enabled = false, + Color = { 1.0, 1.0, 1.0 }, + Opacity = 0.99, + ScaleFactor = 2.8, + File = dataPaths.SpeckPath .. "/galaxyArmLabels.speck", + TexturePath = dataPaths.TexturesPath, + Luminosity = "size", + ScaleLuminosity = 1.0, + FadeInDistances = { 3000.0, 50000.0 }, + PlaneMinSize = 5.0, + Unit = "pc" + }, + GUI = { + Name = "Milky Way Arms Labels", + Path = "/Universe/Galaxies", + Description = [[ Census: 1 image. DU Version: 1.2. This image contains labels for + the Milky Way's spiral arms. We label them in this manner ("hard coding" the + labels into an image rather than having native labels) so that they can retain + their size, shape, and location as they overlay the galaxy. (Description from + Digital Universe Data Profiles)]], + } } assetHelper.registerSceneGraphNodesAndExport(asset, { plane }) asset.meta = { - Name = "Milky Way Arms Labels", - Version = "1.0", - Description = [[ Image with arm labels for the Milky Way galaxy]], - Author = "Brian Abbott (AMNH)", - URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", - License = [[ Copyright © American Museum of Natural History. All rights reserved. -

Downloading the Atlas: AMNH offers the Atlas free of charge via our - website, http://www.haydenplanetarium.org/. The User is free to download and/or - duplicate verbatim copies of the Atlas provided this license and copyright - information accompany the Atlas.

Modifying the Atlas: The user is free to - modify the Atlas by either adding data or altering existing data, provided it is - for personal use only. Once the user modifies the Atlas, it is no longer part of - AMNH's Atlas and cannot be used publicly alongside or within the Atlas without - written permission from AMNH.

Distributing the Atlas: The user is - forbidden to distribute and use the Atlas for profit, as part of a software and/or - production system that will subsequently be redistributed, or for public - consumption (via print, electronic media, or broadcast/produced pieces) without - written permission from AMNH.

Neither the names of American Museum of - Natural History and Hayden Planetarium nor the names of their contributors may be - used to endorse or promote products derived from this Atlas without specific, - prior written permission.

The Atlas is free but is offered WITHOUT ANY - WARRANTY of any kind. We provide the Atlas as is and take no responsibility for - any damage resulting from the use of this Atlas. The entire risk as to the quality - and performance of this product is with the user.

For more information, - please visit http://www.haydenplanetarium.org/universe]], - Identifiers = {"MilkyWayGalaxyArmLabelsImage"} + Name = "Milky Way Arms Labels", + Version = "1.0", + Description = [[ Image with arm labels for the Milky Way galaxy]], + Author = "Brian Abbott (AMNH)", + URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", + License = [[ Copyright © American Museum of Natural History. All rights reserved. +

Downloading the Atlas: AMNH offers the Atlas free of charge via our + website, http://www.haydenplanetarium.org/. The User is free to download and/or + duplicate verbatim copies of the Atlas provided this license and copyright + information accompany the Atlas.

Modifying the Atlas: The user is free to + modify the Atlas by either adding data or altering existing data, provided it is + for personal use only. Once the user modifies the Atlas, it is no longer part of + AMNH's Atlas and cannot be used publicly alongside or within the Atlas without + written permission from AMNH.

Distributing the Atlas: The user is + forbidden to distribute and use the Atlas for profit, as part of a software and/or + production system that will subsequently be redistributed, or for public + consumption (via print, electronic media, or broadcast/produced pieces) without + written permission from AMNH.

Neither the names of American Museum of + Natural History and Hayden Planetarium nor the names of their contributors may be + used to endorse or promote products derived from this Atlas without specific, + prior written permission.

The Atlas is free but is offered WITHOUT ANY + WARRANTY of any kind. We provide the Atlas as is and take no responsibility for + any damage resulting from the use of this Atlas. The entire risk as to the quality + and performance of this product is with the user.

For more information, + please visit http://www.haydenplanetarium.org/universe]], + Identifiers = {"MilkyWayGalaxyArmLabelsImage"} } diff --git a/data/assets/scene/digitaluniverse/milkyway_data.asset b/data/assets/scene/digitaluniverse/milkyway_data.asset index 855ebcc48f..90f93e7a29 100644 --- a/data/assets/scene/digitaluniverse/milkyway_data.asset +++ b/data/assets/scene/digitaluniverse/milkyway_data.asset @@ -1,15 +1,15 @@ local planeTextures = asset.syncedResource({ - Name = "Milky Way Plane Textures", - Type = "HttpSynchronization", - Identifier = "digitaluniverse_milkyway_textures", - Version = 2 + Name = "Milky Way Plane Textures", + Type = "HttpSynchronization", + Identifier = "digitaluniverse_milkyway_textures", + Version = 2 }) local planeSpeck = asset.syncedResource({ - Name = "Milky Way Plane Speck", - Type = "HttpSynchronization", - Identifier = "digitaluniverse_milkyway_speck", - Version = 1 + Name = "Milky Way Plane Speck", + Type = "HttpSynchronization", + Identifier = "digitaluniverse_milkyway_speck", + Version = 1 }) asset.export("TexturesPath", planeTextures) diff --git a/data/assets/scene/digitaluniverse/milkyway_label.asset b/data/assets/scene/digitaluniverse/milkyway_label.asset index f2e2046717..20fb25276e 100644 --- a/data/assets/scene/digitaluniverse/milkyway_label.asset +++ b/data/assets/scene/digitaluniverse/milkyway_label.asset @@ -4,54 +4,53 @@ local assetHelper = asset.require('util/asset_helper') local homespeck = asset.syncedResource({ - Name = "Home Speck File", - Type = "HttpSynchronization", - Identifier = "digitaluniverse_home_speck", - Version = 1 + Name = "Home Speck File", + Type = "HttpSynchronization", + Identifier = "digitaluniverse_home_speck", + Version = 1 }) local homeLabel = { - Identifier = "HomeLabel", - Renderable = { - Type = "RenderableBillboardsCloud", - Enabled = false, - Color = { 1.0, 0.4, 0.2 }, - Opacity = 0.99, - ScaleFactor = 500.0, - DrawLabels = true, - LabelFile = homespeck .. "/home.label", - TextColor = { 0.8, 0.8, 0.8 }, - TextSize = 20.50, - TextMinSize = 16.0, - TransformationMatrix = { - -0.7357425748, 0.67726129641, 0.0, 0.0, - -0.074553778365, -0.080991471307, 0.9939225904, 0.0, - 0.67314530211, 0.73127116582, 0.11008126223, 0.0, - 0.0, 0.0, 0.0, 1.0 - }, - Unit = "Mpc", - FadeInDistances = { 0.05, 1.0 }, - BillboardMaxSize = 8.22, - BillboardMinSize = 0.0, - EnablePixelSizeControl = true + Identifier = "HomeLabel", + Renderable = { + Type = "RenderableBillboardsCloud", + Enabled = false, + Color = { 1.0, 0.4, 0.2 }, + Opacity = 0.99, + ScaleFactor = 500.0, + DrawLabels = true, + LabelFile = homespeck .. "/home.label", + TextColor = { 0.8, 0.8, 0.8 }, + TextSize = 20.50, + TextMinSize = 16.0, + TransformationMatrix = { + -0.7357425748, 0.67726129641, 0.0, 0.0, + -0.074553778365, -0.080991471307, 0.9939225904, 0.0, + 0.67314530211, 0.73127116582, 0.11008126223, 0.0, + 0.0, 0.0, 0.0, 1.0 }, - GUI = { - Name = "Home Label", - Path = "/Universe/Galaxies", - Description = [[Label for the Milky Way titled "Home", sided for the galactic - level]], - } + Unit = "Mpc", + FadeInDistances = { 0.05, 1.0 }, + BillboardMaxSize = 8.22, + BillboardMinSize = 0.0, + EnablePixelSizeControl = true + }, + GUI = { + Name = "Home Label", + Path = "/Universe/Galaxies", + Description = [[Label for the Milky Way titled "Home", sided for the galactic level]], + } } assetHelper.registerSceneGraphNodesAndExport(asset, { homeLabel }) asset.meta = { - Name = "Home Label", - Version = "1.0", - Description = [[Label for the Milky Way titled "Home", sided for the galactic level]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"HomeLabel"} + Name = "Home Label", + Version = "1.0", + Description = [[Label for the Milky Way titled "Home", sided for the galactic level]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license", + Identifiers = {"HomeLabel"} } diff --git a/data/assets/scene/digitaluniverse/milkyway_sphere.asset b/data/assets/scene/digitaluniverse/milkyway_sphere.asset index e3843e8faa..2857777793 100644 --- a/data/assets/scene/digitaluniverse/milkyway_sphere.asset +++ b/data/assets/scene/digitaluniverse/milkyway_sphere.asset @@ -3,50 +3,50 @@ local assetHelper = asset.require('util/asset_helper') local sphereTextures = asset.syncedResource({ - Name = "Milky Way Sphere Textures", - Type = "HttpSynchronization", - Identifier = "milkyway_textures", - Version = 2 + Name = "Milky Way Sphere Textures", + Type = "HttpSynchronization", + Identifier = "milkyway_textures", + Version = 2 }) local sphere = { - Identifier = "MilkyWay", - Transform = { - Rotation = { - Type = "StaticRotation", - Rotation = {0, 0, 3.14159265359} - } - }, - Renderable = { - Type = "RenderableSphere", - Size = 9.2E21, - Segments = 40, - Opacity = 0.35, - Texture = sphereTextures .. "/DarkUniverse_mellinger_4k.jpg", - Orientation = "Inside", - UseAdditiveBlending = true, - MirrorTexture = true, - FadeOutThreshold = 0.0015, - Background = true - }, - GUI = { - Name = "Milky Way Sphere", - Path = "/Milky Way", - Description = [[All sky image of the Milky Way that is visible when inside. Fades - out when zooming away from the Milky Way]], + Identifier = "MilkyWay", + Transform = { + Rotation = { + Type = "StaticRotation", + Rotation = {0, 0, 3.14159265359} } + }, + Renderable = { + Type = "RenderableSphere", + Size = 9.2E21, + Segments = 40, + Opacity = 0.35, + Texture = sphereTextures .. "/DarkUniverse_mellinger_4k.jpg", + Orientation = "Inside", + UseAdditiveBlending = true, + MirrorTexture = true, + FadeOutThreshold = 0.0015, + Background = true + }, + GUI = { + Name = "Milky Way Sphere", + Path = "/Milky Way", + Description = [[All sky image of the Milky Way that is visible when inside. Fades + out when zooming away from the Milky Way]], + } } assetHelper.registerSceneGraphNodesAndExport(asset, { sphere }) asset.meta = { - Name = "Milky Way Galaxy Sphere", - Version = "2.0", - Description = [[All sky image of the Milky Way]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"MilkyWay"} + Name = "Milky Way Galaxy Sphere", + Version = "2.0", + Description = [[All sky image of the Milky Way]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license", + Identifiers = {"MilkyWay"} } diff --git a/data/assets/scene/digitaluniverse/obassociations.asset b/data/assets/scene/digitaluniverse/obassociations.asset index e357d498e9..3814638db9 100644 --- a/data/assets/scene/digitaluniverse/obassociations.asset +++ b/data/assets/scene/digitaluniverse/obassociations.asset @@ -3,69 +3,69 @@ local assetHelper = asset.require('util/asset_helper') local textures = asset.syncedResource({ - Name = "OB Associations Textures", - Type = "HttpSynchronization", - Identifier = "digitaluniverse_obassociations_textures", - Version = 1 + Name = "OB Associations Textures", + Type = "HttpSynchronization", + Identifier = "digitaluniverse_obassociations_textures", + Version = 1 }) local speck = asset.syncedResource({ - Name = "OB Associations Speck Files", - Type = "HttpSynchronization", - Identifier = "digitaluniverse_obassociations_speck", - Version = 3 + Name = "OB Associations Speck Files", + Type = "HttpSynchronization", + Identifier = "digitaluniverse_obassociations_speck", + Version = 3 }) local object = { - Identifier = "OBAssociations", - Renderable = { - Type = "RenderableBillboardsCloud", - Enabled = false, - Color = { 1.0, 1.0, 1.0 }, - ColorMap = speck .. "/ob.cmap", - ColorOption = { "arm" }, - SizeOption = {"diameter"}, - ExactColorMap = true, - Opacity = 0.7, - File = speck .. "/ob.speck", - Texture = textures .. "/point4.png", - PolygonSides = 7, - LabelFile = speck .. "/ob.label", - TextColor = { 0.4, 0.5, 1.0 }, - ScaleFactor = 390.0, - TextSize = 16.24, - TextMinSize = 4.50, - TextMaxSize = 25, - Unit = "pc", - BillboardMaxSize = 450.0, - EnablePixelSizeControl = true - }, - GUI = { - Name = "OB Associations", - Path = "/Milky Way", - Description = [[Census: 61 OB associations. DU Version 2.4.
OB associations - are young groups of stars that were formed within a giant molecular cloud, but - have dispersed after the original gas and dust from the cloud was blown away - by the star's radiation pressure. Although an association's stars are no - longer gravitationally bound to one another, they share a common motion in - space because they were formed from the same cloud. This allows astronomers to - easily determine OB association membership stars. These objects are color - coded by their spiral arm membership. Blue associations trace the Sagittarius - Arm. Purple associations are in the local Orion Spur. Orange associations are - in the Perseus Arm (Description from URL)

Data Reference: New List of - OB Associations (Melnik+)]], - } + Identifier = "OBAssociations", + Renderable = { + Type = "RenderableBillboardsCloud", + Enabled = false, + Color = { 1.0, 1.0, 1.0 }, + ColorMap = speck .. "/ob.cmap", + ColorOption = { "arm" }, + SizeOption = {"diameter"}, + ExactColorMap = true, + Opacity = 0.7, + File = speck .. "/ob.speck", + Texture = textures .. "/point4.png", + PolygonSides = 7, + LabelFile = speck .. "/ob.label", + TextColor = { 0.4, 0.5, 1.0 }, + ScaleFactor = 390.0, + TextSize = 16.24, + TextMinSize = 4.50, + TextMaxSize = 25, + Unit = "pc", + BillboardMaxSize = 450.0, + EnablePixelSizeControl = true + }, + GUI = { + Name = "OB Associations", + Path = "/Milky Way", + Description = [[Census: 61 OB associations. DU Version 2.4.
OB associations + are young groups of stars that were formed within a giant molecular cloud, but + have dispersed after the original gas and dust from the cloud was blown away + by the star's radiation pressure. Although an association's stars are no + longer gravitationally bound to one another, they share a common motion in + space because they were formed from the same cloud. This allows astronomers to + easily determine OB association membership stars. These objects are color + coded by their spiral arm membership. Blue associations trace the Sagittarius + Arm. Purple associations are in the local Orion Spur. Orange associations are + in the Perseus Arm (Description from URL)

Data Reference: New List of + OB Associations (Melnik+)]], + } } assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { - Name = "OB Associations", - Version = "2.0", - Description = [[Digital Universe asset for OB Associations]], - Author = "Brian Abbott (AMNH)", - URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", - License = "AMNH Digital Universe", - Identifiers = {"OBAssociations"} + Name = "OB Associations", + Version = "2.0", + Description = [[Digital Universe asset for OB Associations]], + Author = "Brian Abbott (AMNH)", + URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", + License = "AMNH Digital Universe", + Identifiers = {"OBAssociations"} } diff --git a/data/assets/scene/digitaluniverse/openclusters.asset b/data/assets/scene/digitaluniverse/openclusters.asset index 1a40b4834b..86bbc5b5c9 100644 --- a/data/assets/scene/digitaluniverse/openclusters.asset +++ b/data/assets/scene/digitaluniverse/openclusters.asset @@ -3,65 +3,65 @@ local assetHelper = asset.require('util/asset_helper') local textures = asset.syncedResource({ - Name = "Open Clusters Textures", - Type = "HttpSynchronization", - Identifier = "digitaluniverse_openclusters_textures", - Version = 1 + Name = "Open Clusters Textures", + Type = "HttpSynchronization", + Identifier = "digitaluniverse_openclusters_textures", + Version = 1 }) local speck = asset.syncedResource({ - Name = "Open Clusters Speck Files", - Type = "HttpSynchronization", - Identifier = "digitaluniverse_openclusters_speck", - Version = 2 + Name = "Open Clusters Speck Files", + Type = "HttpSynchronization", + Identifier = "digitaluniverse_openclusters_speck", + Version = 2 }) local object = { - Identifier = "OpenStarClusters", - Renderable = { - Type = "RenderableBillboardsCloud", - Enabled = false, - Color = { 0.1, 0.8, 0.4 }, - Opacity = 0.5, - File = speck .. "/oc.speck", - Texture = textures .. "/point4.png", - PolygonSides = 12, - TextColor = { 0.05, 0.4, 0.2 }, - LabelFile = speck .. "/oc.label", - ScaleFactor = 405.75, - TextSize = 15.5, - TextMinSize = 4.5, - TextMaxSize = 30.0, - Unit = "pc", - BillboardMaxSize = 604, - EnablePixelSizeControl = true - }, - GUI = { - Name = "Open Star Clusters", - Path = "/Milky Way", - Description = [[Census: 2,040 clusters. DU Version 5.7.
OB associations are - young groups of stars that were formed within a giant molecular cloud, but - have dispersed after the original gas and dust from the cloud was blown away - by the star's radiation pressure. Although an association's stars are no - longer gravitationally bound to one another, they share a common motion in - space because they were formed from the same cloud. This allows astronomers to - easily determine OB association membership stars. These objects are color - coded by their spiral arm membership. Blue associations trace the Sagittarius - Arm. Purple associations are in the local Orion Spur. Orange associations are - in the Perseus Arm (Description from URL)

Data Reference: Optically - visible open clusters and Candidates (Dias+ 2002-2015)]], - } + Identifier = "OpenStarClusters", + Renderable = { + Type = "RenderableBillboardsCloud", + Enabled = false, + Color = { 0.1, 0.8, 0.4 }, + Opacity = 0.5, + File = speck .. "/oc.speck", + Texture = textures .. "/point4.png", + PolygonSides = 12, + TextColor = { 0.05, 0.4, 0.2 }, + LabelFile = speck .. "/oc.label", + ScaleFactor = 405.75, + TextSize = 15.5, + TextMinSize = 4.5, + TextMaxSize = 30.0, + Unit = "pc", + BillboardMaxSize = 604, + EnablePixelSizeControl = true + }, + GUI = { + Name = "Open Star Clusters", + Path = "/Milky Way", + Description = [[Census: 2,040 clusters. DU Version 5.7.
OB associations are + young groups of stars that were formed within a giant molecular cloud, but + have dispersed after the original gas and dust from the cloud was blown away + by the star's radiation pressure. Although an association's stars are no + longer gravitationally bound to one another, they share a common motion in + space because they were formed from the same cloud. This allows astronomers to + easily determine OB association membership stars. These objects are color + coded by their spiral arm membership. Blue associations trace the Sagittarius + Arm. Purple associations are in the local Orion Spur. Orange associations are + in the Perseus Arm (Description from URL)

Data Reference: Optically + visible open clusters and Candidates (Dias+ 2002-2015)]], + } } assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { - Name = "Open Star Clusters", - Version = "2.0", - Description = [[Digital Universe asset for Open Star Clusters]], - Author = "Brian Abbott (AMNH)", - URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", - License = "AMNH Digital Universe", - Identifiers = {"OpenStarClusters"} + Name = "Open Star Clusters", + Version = "2.0", + Description = [[Digital Universe asset for Open Star Clusters]], + Author = "Brian Abbott (AMNH)", + URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", + License = "AMNH Digital Universe", + Identifiers = {"OpenStarClusters"} } diff --git a/data/assets/scene/digitaluniverse/planetarynebulae.asset b/data/assets/scene/digitaluniverse/planetarynebulae.asset index 7415c85657..7fb7d217ad 100644 --- a/data/assets/scene/digitaluniverse/planetarynebulae.asset +++ b/data/assets/scene/digitaluniverse/planetarynebulae.asset @@ -3,62 +3,62 @@ local assetHelper = asset.require('util/asset_helper') local textures = asset.syncedResource({ - Name = "Planetary Nebulae Textures", - Type = "HttpSynchronization", - Identifier = "digitaluniverse_planetarynebulae_textures", - Version = 1 + Name = "Planetary Nebulae Textures", + Type = "HttpSynchronization", + Identifier = "digitaluniverse_planetarynebulae_textures", + Version = 1 }) local speck = asset.syncedResource({ - Name = "Planetary Nebulae Speck Files", - Type = "HttpSynchronization", - Identifier = "digitaluniverse_planetarynebulae_speck", - Version = 2 + Name = "Planetary Nebulae Speck Files", + Type = "HttpSynchronization", + Identifier = "digitaluniverse_planetarynebulae_speck", + Version = 2 }) local object = { - Identifier = "PlanetaryNebulae", - Renderable = { - Type = "RenderableBillboardsCloud", - Enabled = false, - Color = { 0.4, 0.4, 0.9 }, - Opacity = 0.65, - File = speck .. "/pn.speck", - Texture = textures .. "/point4.png", - PolygonSides = 3, - LabelFile = speck .. "/pn.label", - TextColor = { 0.25, 0.25, 0.65 }, - ScaleFactor = 425.0, - TextSize = 16.24, - TextMinSize = 4.5, - TextMaxSize = 25.0, - Unit = "pc", - BillboardMaxSize = 500, - EnablePixelSizeControl = true - }, - GUI = { - Name = "Planetary Nebulae", - Path = "/Milky Way", - Description = [[Census: 283 nebulae. DU Version 2.8.
A planetary nebula is an - expanding shell of gas ejected from a star late in its life cycle. Appearing - like greenish disks to a telescopic observer, planetary nebulae received their - name from their resemblance to the gaseous planets of our solar system. In no - way are they related to planets, rather, they are products of dying stars. - (Description from URL)

Data Reference: Planetary Nebulae distances - in Gaia DR2 (Kimeswenger+, 2018), Strasbourg-ESO Catalog of Planetary Nebulae - (Acker+ 1992)]], - } + Identifier = "PlanetaryNebulae", + Renderable = { + Type = "RenderableBillboardsCloud", + Enabled = false, + Color = { 0.4, 0.4, 0.9 }, + Opacity = 0.65, + File = speck .. "/pn.speck", + Texture = textures .. "/point4.png", + PolygonSides = 3, + LabelFile = speck .. "/pn.label", + TextColor = { 0.25, 0.25, 0.65 }, + ScaleFactor = 425.0, + TextSize = 16.24, + TextMinSize = 4.5, + TextMaxSize = 25.0, + Unit = "pc", + BillboardMaxSize = 500, + EnablePixelSizeControl = true + }, + GUI = { + Name = "Planetary Nebulae", + Path = "/Milky Way", + Description = [[Census: 283 nebulae. DU Version 2.8.
A planetary nebula is an + expanding shell of gas ejected from a star late in its life cycle. Appearing + like greenish disks to a telescopic observer, planetary nebulae received their + name from their resemblance to the gaseous planets of our solar system. In no + way are they related to planets, rather, they are products of dying stars. + (Description from URL)

Data Reference: Planetary Nebulae distances + in Gaia DR2 (Kimeswenger+, 2018), Strasbourg-ESO Catalog of Planetary Nebulae + (Acker+ 1992)]], + } } assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { - Name = "Planetary Nebulae", - Version = "2.0", - Description = [[Digital Universe asset for Planetary Nebulae]], - Author = "Brian Abbott (AMNH)", - URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", - License = "AMNH Digital Universe", - Identifiers = {"PlanetaryNebulae"} + Name = "Planetary Nebulae", + Version = "2.0", + Description = [[Digital Universe asset for Planetary Nebulae]], + Author = "Brian Abbott (AMNH)", + URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", + License = "AMNH Digital Universe", + Identifiers = {"PlanetaryNebulae"} } diff --git a/data/assets/scene/digitaluniverse/pulsars.asset b/data/assets/scene/digitaluniverse/pulsars.asset index ad2bd6a438..8defe08274 100644 --- a/data/assets/scene/digitaluniverse/pulsars.asset +++ b/data/assets/scene/digitaluniverse/pulsars.asset @@ -3,66 +3,66 @@ local assetHelper = asset.require('util/asset_helper') local textures = asset.syncedResource({ - Name = "Pulsars Textures", - Type = "HttpSynchronization", - Identifier = "digitaluniverse_pulsars_textures", - Version = 1 + Name = "Pulsars Textures", + Type = "HttpSynchronization", + Identifier = "digitaluniverse_pulsars_textures", + Version = 1 }) local speck = asset.syncedResource({ - Name = "Pulsars Speck Files", - Type = "HttpSynchronization", - Identifier = "digitaluniverse_pulsars_speck", - Version = 2 + Name = "Pulsars Speck Files", + Type = "HttpSynchronization", + Identifier = "digitaluniverse_pulsars_speck", + Version = 2 }) local object = { - Identifier = "Pulsars", - Renderable = { - Type = "RenderableBillboardsCloud", - Enabled = false, - Color = { 0.7, 0.0, 0.0 }, - Opacity = 1.0, - File = speck .. "/pulsar.speck", - Texture = textures .. "/point4.png", - PolygonSides = 4, - LabelFile = speck .. "/pulsar.label", - TextColor = { 0.7, 0.2, 0.2 }, - ScaleFactor = 424, - TextSize = 15.77, - TextMinSize = 4, - TextMaxSize = 20.0, - Unit = "pc", - BillboardMaxSize = 500, - EnablePixelSizeControl = false - }, - GUI = { - Name = "Pulsars", - Path = "/Milky Way", - Description = [[Census: 2,498 pulsars. DU Version 5.6.
Upon death, stars - leave behind one of three possible remnants: a white dwarf, a neutron star, or - a black hole. Stars that are more massive than the sun will often become - neutron stars in a violent explosion called a supernova. During a supernova, - the core of the star collapses under such high pressure that the electrons, - which normally remain outside the atomic nucleus, are forced to combine with - the protons in the nucleus. Atomic nuclei break apart, producing what is - called a degenerate state of matter. The collapse is halted when the material - cannot be packed any tighter. At this point, the star has a radius of about - 10-15 kilometers. The density of this material is so high that a teaspoonful - would weigh about 100 million tons on Earth. (Description from URL)

- Data Reference: ATNF Pulsar Catalogue, (Manchester+, 2005)]], - } + Identifier = "Pulsars", + Renderable = { + Type = "RenderableBillboardsCloud", + Enabled = false, + Color = { 0.7, 0.0, 0.0 }, + Opacity = 1.0, + File = speck .. "/pulsar.speck", + Texture = textures .. "/point4.png", + PolygonSides = 4, + LabelFile = speck .. "/pulsar.label", + TextColor = { 0.7, 0.2, 0.2 }, + ScaleFactor = 424, + TextSize = 15.77, + TextMinSize = 4, + TextMaxSize = 20.0, + Unit = "pc", + BillboardMaxSize = 500, + EnablePixelSizeControl = false + }, + GUI = { + Name = "Pulsars", + Path = "/Milky Way", + Description = [[Census: 2,498 pulsars. DU Version 5.6.
Upon death, stars + leave behind one of three possible remnants: a white dwarf, a neutron star, or + a black hole. Stars that are more massive than the sun will often become + neutron stars in a violent explosion called a supernova. During a supernova, + the core of the star collapses under such high pressure that the electrons, + which normally remain outside the atomic nucleus, are forced to combine with + the protons in the nucleus. Atomic nuclei break apart, producing what is + called a degenerate state of matter. The collapse is halted when the material + cannot be packed any tighter. At this point, the star has a radius of about + 10-15 kilometers. The density of this material is so high that a teaspoonful + would weigh about 100 million tons on Earth. (Description from URL)

+ Data Reference: ATNF Pulsar Catalogue, (Manchester+, 2005)]], + } } assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { - Name = "Pulsars", - Version = "2.0", - Description = [[Digital Universe asset for Pulsars.]], - Author = "Brian Abbott (AMNH)", - URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", - License = "AMNH Digital Universe", - Identifiers = {"Pulsars"} + Name = "Pulsars", + Version = "2.0", + Description = [[Digital Universe asset for Pulsars.]], + Author = "Brian Abbott (AMNH)", + URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", + License = "AMNH Digital Universe", + Identifiers = {"Pulsars"} } diff --git a/data/assets/scene/digitaluniverse/quasars.asset b/data/assets/scene/digitaluniverse/quasars.asset index cf880b62fa..69336ed468 100644 --- a/data/assets/scene/digitaluniverse/quasars.asset +++ b/data/assets/scene/digitaluniverse/quasars.asset @@ -3,60 +3,60 @@ local assetHelper = asset.require('util/asset_helper') local textures = asset.syncedResource({ - Name = "Quasars Textures", - Type = "HttpSynchronization", - Identifier = "digitaluniverse_quasars_textures", - Version = 2 + Name = "Quasars Textures", + Type = "HttpSynchronization", + Identifier = "digitaluniverse_quasars_textures", + Version = 2 }) local speck = asset.syncedResource({ - Name = "Quasars Speck Files", - Type = "HttpSynchronization", - Identifier = "digitaluniverse_quasars_speck", - Version = 2 + Name = "Quasars Speck Files", + Type = "HttpSynchronization", + Identifier = "digitaluniverse_quasars_speck", + Version = 2 }) local object = { - Identifier = "Quasars", - Renderable = { - Type = "RenderableBillboardsCloud", - Enabled = true, - Color = { 1.0, 0.4, 0.2 }, - Opacity = 0.95, - File = speck .. "/quasars.speck", - Texture = textures .. "/point3A.png", - Unit = "Mpc", - ScaleFactor = 540.9, - -- Fade in value in the same unit as "Unit" - FadeInDistances = { 1000.0, 10000.0 }, - BillboardMaxSize = 30.0, - BillboardMinSize = 0.0, - BillboardMaxSize = 11.1, - EnablePixelSizeControl = true - }, - GUI = { - Name = "Quasars", - Path = "/Universe", - Description = [[Census: 569,442 quasars. DU Version 2.2.
- Quasars are the most distant objects we can see. They are extremely active - galaxies that contain supermassive black holes which are gobbling up material - at a furious rate. The Million Quasars Catalogue is an aggregate catalog of - several surveys, including 2dF and Sloan. So, it should not be surprising that - the shape of these data mimic the shape of the Sloan and 2dF galaxy surveys, - with large parts of the sky unobserved.(Description from URL)

Data - Reference: The Million Quasars catalog (Flesch, 2017)]] - } + Identifier = "Quasars", + Renderable = { + Type = "RenderableBillboardsCloud", + Enabled = true, + Color = { 1.0, 0.4, 0.2 }, + Opacity = 0.95, + File = speck .. "/quasars.speck", + Texture = textures .. "/point3A.png", + Unit = "Mpc", + ScaleFactor = 540.9, + -- Fade in value in the same unit as "Unit" + FadeInDistances = { 1000.0, 10000.0 }, + BillboardMaxSize = 30.0, + BillboardMinSize = 0.0, + BillboardMaxSize = 11.1, + EnablePixelSizeControl = true + }, + GUI = { + Name = "Quasars", + Path = "/Universe", + Description = [[Census: 569,442 quasars. DU Version 2.2.
+ Quasars are the most distant objects we can see. They are extremely active + galaxies that contain supermassive black holes which are gobbling up material + at a furious rate. The Million Quasars Catalogue is an aggregate catalog of + several surveys, including 2dF and Sloan. So, it should not be surprising that + the shape of these data mimic the shape of the Sloan and 2dF galaxy surveys, + with large parts of the sky unobserved.(Description from URL)

Data + Reference: The Million Quasars catalog (Flesch, 2017)]] + } } assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { - Name = "Quasars", - Version = "2.0", - Description = [[Digital Universe asset for Quasars.]], - Author = "Brian Abbott (AMNH)", - URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", - License = "AMNH Digital Universe", - Identifiers = {"Quasars"} + Name = "Quasars", + Version = "2.0", + Description = [[Digital Universe asset for Quasars.]], + Author = "Brian Abbott (AMNH)", + URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", + License = "AMNH Digital Universe", + Identifiers = {"Quasars"} } diff --git a/data/assets/scene/digitaluniverse/sdss.asset b/data/assets/scene/digitaluniverse/sdss.asset index b0bc956351..61914b1951 100644 --- a/data/assets/scene/digitaluniverse/sdss.asset +++ b/data/assets/scene/digitaluniverse/sdss.asset @@ -3,75 +3,75 @@ local assetHelper = asset.require('util/asset_helper') local textures = asset.syncedResource({ - Name = "Sloan Digital Sky Survey Textures", - Type = "HttpSynchronization", - Identifier = "digitaluniverse_sloandss_textures", - Version = 2 + Name = "Sloan Digital Sky Survey Textures", + Type = "HttpSynchronization", + Identifier = "digitaluniverse_sloandss_textures", + Version = 2 }) local speck = asset.syncedResource({ - Name = "Sloan Digital Sky Survey Speck Files", - Type = "HttpSynchronization", - Identifier = "digitaluniverse_sloandss_speck", - Version = 2 + Name = "Sloan Digital Sky Survey Speck Files", + Type = "HttpSynchronization", + Identifier = "digitaluniverse_sloandss_speck", + Version = 2 }) local object = { - Identifier = "SloanDigitalSkySurvey", - Renderable = { - Type = "RenderableBillboardsCloud", - Enabled = true, - Color = { 0.8, 0.8, 1.0 }, - Opacity = 0.8, - ScaleFactor = 520.0, - File = speck .. "/SDSSgals.speck", - ColorMap = speck .. "/SDSSgals.cmap", - ColorOption = { "redshift", "proximity" }, - ColorRange = { { 0.0, 0.075 }, { 1.0, 50.0 } }, - Texture = textures .. "/point3A.png", - Unit = "Mpc", - -- Fade in value in the same unit as "Unit" - FadeInDistances = { 220.0, 650.0 }, - BillboardMaxSize = 50.0, - BillboardMinSize = 0.0, - CorrectionSizeEndDistance = 20.65, - CorrectionSizeFactor = 10.41, - TextSize = 14.8, - TextMinSize = 10.0, - TextMaxSize = 50.0, - BillboardMaxSize = 5.5, - EnablePixelSizeControl = true - }, - GUI = { - Name = "Sloan Digital Sky Survey", - Path = "/Universe/Galaxies", - Description = [[Census: 2,600,258 galaxies. DU Version 10.6.
The Sloan Digital - Sky Survey (SDSS) is an ambitious project to image about 35% of the sky, deep - into the universe. The survey measured the position and brightness of almost 1 - billion objects, and obtained spectra to more than 4 million objects. This is - not an all-sky survey, so there are large parts of the sky that remain - unobserved, which produces the bow tie distribution and the black areas where - there surely are galaxies, but we have yet to observe them. These galaxies - appear to extend beyond the 2dF survey to distances that exceed 5 billion - light years. However, the weblike structure of clusters, filaments, and voids - seems to fade by about 2 billion light years. Beyond this distance, the - completeness of the survey drops so that only the intrinsically bright - galaxies are visible. The weblike cosmic structure is echoed in these data, - with orange clusters standing out among the less dense aqua-colored galaxies - and the less dense regions of green-colored galaxies. (Description from URL) -

Data Reference: Sloan Digital Sky Survey (http://www.sdss.org/)]] - } + Identifier = "SloanDigitalSkySurvey", + Renderable = { + Type = "RenderableBillboardsCloud", + Enabled = true, + Color = { 0.8, 0.8, 1.0 }, + Opacity = 0.8, + ScaleFactor = 520.0, + File = speck .. "/SDSSgals.speck", + ColorMap = speck .. "/SDSSgals.cmap", + ColorOption = { "redshift", "proximity" }, + ColorRange = { { 0.0, 0.075 }, { 1.0, 50.0 } }, + Texture = textures .. "/point3A.png", + Unit = "Mpc", + -- Fade in value in the same unit as "Unit" + FadeInDistances = { 220.0, 650.0 }, + BillboardMaxSize = 50.0, + BillboardMinSize = 0.0, + CorrectionSizeEndDistance = 20.65, + CorrectionSizeFactor = 10.41, + TextSize = 14.8, + TextMinSize = 10.0, + TextMaxSize = 50.0, + BillboardMaxSize = 5.5, + EnablePixelSizeControl = true + }, + GUI = { + Name = "Sloan Digital Sky Survey", + Path = "/Universe/Galaxies", + Description = [[Census: 2,600,258 galaxies. DU Version 10.6.
The Sloan Digital + Sky Survey (SDSS) is an ambitious project to image about 35% of the sky, deep + into the universe. The survey measured the position and brightness of almost 1 + billion objects, and obtained spectra to more than 4 million objects. This is + not an all-sky survey, so there are large parts of the sky that remain + unobserved, which produces the bow tie distribution and the black areas where + there surely are galaxies, but we have yet to observe them. These galaxies + appear to extend beyond the 2dF survey to distances that exceed 5 billion + light years. However, the weblike structure of clusters, filaments, and voids + seems to fade by about 2 billion light years. Beyond this distance, the + completeness of the survey drops so that only the intrinsically bright + galaxies are visible. The weblike cosmic structure is echoed in these data, + with orange clusters standing out among the less dense aqua-colored galaxies + and the less dense regions of green-colored galaxies. (Description from URL) +

Data Reference: Sloan Digital Sky Survey (http://www.sdss.org/)]] + } } assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { - Name = "Sloan Digital Sky Survey", - Version = "2.0", - Description = [[Digital Universe asset for The Sloan Digital Sky Survey (SDSS).]], - Author = "Brian Abbott (AMNH)", - URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", - License = "AMNH Digital Universe", - Identifiers = {"SloanDigitalSkySurvey"} + Name = "Sloan Digital Sky Survey", + Version = "2.0", + Description = [[Digital Universe asset for The Sloan Digital Sky Survey (SDSS).]], + Author = "Brian Abbott (AMNH)", + URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", + License = "AMNH Digital Universe", + Identifiers = {"SloanDigitalSkySurvey"} } diff --git a/data/assets/scene/digitaluniverse/starlabels.asset b/data/assets/scene/digitaluniverse/starlabels.asset index 5b68512e81..8a8c99105f 100644 --- a/data/assets/scene/digitaluniverse/starlabels.asset +++ b/data/assets/scene/digitaluniverse/starlabels.asset @@ -3,44 +3,43 @@ local assetHelper = asset.require('util/asset_helper') local speck = asset.syncedResource({ - Name = "Star Labels Speck Files", - Type = "HttpSynchronization", - Identifier = "digitaluniverse_starlabels_speck", - Version = 2 + Name = "Star Labels Speck Files", + Type = "HttpSynchronization", + Identifier = "digitaluniverse_starlabels_speck", + Version = 2 }) local object = { - Identifier = "StarsLabels", - Renderable = { - Type = "RenderableBillboardsCloud", - Enabled = false, - Color = { 1.0, 1.0, 1.0 }, - Opacity = 0.65, - LabelFile = speck .. "/stars.label", - TextColor = { 0.4, 0.4, 0.4 }, - DrawLabels = true, - TextSize = 14.7, - TextMinSize = 6.0, - TextMaxSize = 50.0, - Unit = "pc" - }, - GUI = { - Name = "Stars Labels", - Path = "/Milky Way/Stars", - Description = [[Labels for stars in the Milky Way. See 'Stars' for more - info.]], - } + Identifier = "StarsLabels", + Renderable = { + Type = "RenderableBillboardsCloud", + Enabled = false, + Color = { 1.0, 1.0, 1.0 }, + Opacity = 0.65, + LabelFile = speck .. "/stars.label", + TextColor = { 0.4, 0.4, 0.4 }, + DrawLabels = true, + TextSize = 14.7, + TextMinSize = 6.0, + TextMaxSize = 50.0, + Unit = "pc" + }, + GUI = { + Name = "Stars Labels", + Path = "/Milky Way/Stars", + Description = [[Labels for stars in the Milky Way. See 'Stars' for more info.]], + } } assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { - Name = "Star Labels", - Version = "2.0", - Description = [[Digital Universe asset for labels of the stars.]], - Author = "Brian Abbott (AMNH)", - URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", - License = "AMNH Digital Universe", - Identifiers = {"StarsLabels"} + Name = "Star Labels", + Version = "2.0", + Description = [[Digital Universe asset for labels of the stars.]], + Author = "Brian Abbott (AMNH)", + URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", + License = "AMNH Digital Universe", + Identifiers = {"StarsLabels"} } diff --git a/data/assets/scene/digitaluniverse/starorbits.asset b/data/assets/scene/digitaluniverse/starorbits.asset index 46e4ec8018..4287107301 100644 --- a/data/assets/scene/digitaluniverse/starorbits.asset +++ b/data/assets/scene/digitaluniverse/starorbits.asset @@ -4,189 +4,189 @@ local earth_transforms = asset.require('scene/solarsystem/planets/earth/transfor local speck = asset.syncedResource({ - Name = "Grids Speck Files", - Type = "HttpSynchronization", - Identifier = "digitaluniverse_starorbits_speck", - Version = 1 + Name = "Grids Speck Files", + Type = "HttpSynchronization", + Identifier = "digitaluniverse_starorbits_speck", + Version = 1 }) local sunOrbit = { - Identifier = "SunOrbit", - --Parent = transforms.SolarSystemBarycenter.Name, - Renderable = { - Type = "RenderableDUMeshes", - Enabled = false, - Opacity = 1.0, - File = speck .. "/starorbits-Sun.speck", - MeshColor = {{ 1.0, 0.65, 0.0 }}, - --LabelFile = speck .. "/1ld.label", - TextColor = { 0.0, 0.2, 0.5 }, - TextSize = 10.3, - TextMinSize = 0.5, - TextMaxSize = 30.0, - Unit = "pc" - }, - GUI = { - Name = "Sun Orbit", - Path = "/Milky Way/Stars/Stars Orbits", - Description = [["Orbits of the Sun around the Milky Way"]] - } + Identifier = "SunOrbit", + --Parent = transforms.SolarSystemBarycenter.Name, + Renderable = { + Type = "RenderableDUMeshes", + Enabled = false, + Opacity = 1.0, + File = speck .. "/starorbits-Sun.speck", + MeshColor = {{ 1.0, 0.65, 0.0 }}, + --LabelFile = speck .. "/1ld.label", + TextColor = { 0.0, 0.2, 0.5 }, + TextSize = 10.3, + TextMinSize = 0.5, + TextMaxSize = 30.0, + Unit = "pc" + }, + GUI = { + Name = "Sun Orbit", + Path = "/Milky Way/Stars/Stars Orbits", + Description = [["Orbits of the Sun around the Milky Way"]] + } } local barnardsOrbit = { - Identifier = "BarnardsOrbit", - --Parent = transforms.SolarSystemBarycenter.Name, - Renderable = { - Type = "RenderableDUMeshes", - Enabled = false, - Opacity = 1.0, - File = speck .. "/starorbits-BarnardsStar.speck", - MeshColor = {{0.39, 0.58, 0.93}}, - --LabelFile = speck .. "/1ld.label", - TextColor = { 0.0, 0.2, 0.5 }, - TextSize = 10.3, - TextMinSize = 0.5, - TextMaxSize = 30.0, - Unit = "pc" - }, - GUI = { - Name = "Barnards Orbit", - Path = "/Milky Way/Stars/Stars Orbits", - Description = [["Orbits of Barnard's Star around the Milky Way"]] - } + Identifier = "BarnardsOrbit", + --Parent = transforms.SolarSystemBarycenter.Name, + Renderable = { + Type = "RenderableDUMeshes", + Enabled = false, + Opacity = 1.0, + File = speck .. "/starorbits-BarnardsStar.speck", + MeshColor = {{0.39, 0.58, 0.93}}, + --LabelFile = speck .. "/1ld.label", + TextColor = { 0.0, 0.2, 0.5 }, + TextSize = 10.3, + TextMinSize = 0.5, + TextMaxSize = 30.0, + Unit = "pc" + }, + GUI = { + Name = "Barnards Orbit", + Path = "/Milky Way/Stars/Stars Orbits", + Description = [["Orbits of Barnard's Star around the Milky Way"]] + } } local kapteynsOrbit = { - Identifier = "KapteynsOrbit", - --Parent = transforms.SolarSystemBarycenter.Name, - Renderable = { - Type = "RenderableDUMeshes", - Enabled = false, - Opacity = 1.0, - File = speck .. "/starorbits-KapteynsStar.speck", - MeshColor = {{0.6, 0.6, 0.6}}, - --LabelFile = speck .. "/1ld.label", - TextColor = { 0.0, 0.2, 0.5 }, - TextSize = 10.3, - TextMinSize = 0.5, - TextMaxSize = 30.0, - Unit = "pc" - }, - GUI = { - Name = "Kapteyns Orbit", - Path = "/Milky Way/Stars/Stars Orbits", - Description = [["Orbits of Kapteyn's Star around the Milky Way"]] - } + Identifier = "KapteynsOrbit", + --Parent = transforms.SolarSystemBarycenter.Name, + Renderable = { + Type = "RenderableDUMeshes", + Enabled = false, + Opacity = 1.0, + File = speck .. "/starorbits-KapteynsStar.speck", + MeshColor = {{0.6, 0.6, 0.6}}, + --LabelFile = speck .. "/1ld.label", + TextColor = { 0.0, 0.2, 0.5 }, + TextSize = 10.3, + TextMinSize = 0.5, + TextMaxSize = 30.0, + Unit = "pc" + }, + GUI = { + Name = "Kapteyns Orbit", + Path = "/Milky Way/Stars/Stars Orbits", + Description = [["Orbits of Kapteyn's Star around the Milky Way"]] + } } local lacaille9352Orbit = { - Identifier = "Lacaille9352Orbit", - --Parent = transforms.SolarSystemBarycenter.Name, - Renderable = { - Type = "RenderableDUMeshes", - Enabled = false, - Opacity = 1.0, - File = speck .. "/starorbits-Lacaille9352.speck", - MeshColor = {{0.58, 0.0, 0.83}}, - --LabelFile = speck .. "/1ld.label", - TextColor = { 0.0, 0.2, 0.5 }, - TextSize = 10.3, - TextMinSize = 0.5, - TextMaxSize = 30.0, - Unit = "pc" - }, - GUI = { - Name = "Lacaille 9352 Orbit", - Path = "/Milky Way/Stars/Stars Orbits", - Description = [["Orbits of Lacaille9352 around the Milky Way"]] - } + Identifier = "Lacaille9352Orbit", + --Parent = transforms.SolarSystemBarycenter.Name, + Renderable = { + Type = "RenderableDUMeshes", + Enabled = false, + Opacity = 1.0, + File = speck .. "/starorbits-Lacaille9352.speck", + MeshColor = {{0.58, 0.0, 0.83}}, + --LabelFile = speck .. "/1ld.label", + TextColor = { 0.0, 0.2, 0.5 }, + TextSize = 10.3, + TextMinSize = 0.5, + TextMaxSize = 30.0, + Unit = "pc" + }, + GUI = { + Name = "Lacaille 9352 Orbit", + Path = "/Milky Way/Stars/Stars Orbits", + Description = [["Orbits of Lacaille9352 around the Milky Way"]] + } } local lSR1826Orbit = { - Identifier = "LSR1826Orbit", - --Parent = transforms.SolarSystemBarycenter.Name, - Renderable = { - Type = "RenderableDUMeshes", - Enabled = false, - Opacity = 1.0, - File = speck .. "/starorbits-LSR1826+3014.speck", - MeshColor = {{0.0, 0.39, 0.0}}, - --LabelFile = speck .. "/1ld.label", - TextColor = { 0.0, 0.2, 0.5 }, - TextSize = 10.3, - TextMinSize = 0.5, - TextMaxSize = 30.0, - Unit = "pc" - }, - GUI = { - Name = "LSR1826+3014 Orbit", - Path = "/Milky Way/Stars/Stars Orbits", - Description = [["Orbits of LSR1826+3014 around the Milky Way"]] - } + Identifier = "LSR1826Orbit", + --Parent = transforms.SolarSystemBarycenter.Name, + Renderable = { + Type = "RenderableDUMeshes", + Enabled = false, + Opacity = 1.0, + File = speck .. "/starorbits-LSR1826+3014.speck", + MeshColor = {{0.0, 0.39, 0.0}}, + --LabelFile = speck .. "/1ld.label", + TextColor = { 0.0, 0.2, 0.5 }, + TextSize = 10.3, + TextMinSize = 0.5, + TextMaxSize = 30.0, + Unit = "pc" + }, + GUI = { + Name = "LSR1826+3014 Orbit", + Path = "/Milky Way/Stars/Stars Orbits", + Description = [["Orbits of LSR1826+3014 around the Milky Way"]] + } } local lSRJ0822Orbit = { - Identifier = "LSRJ0822Orbit", - --Parent = transforms.SolarSystemBarycenter.Name, - Renderable = { - Type = "RenderableDUMeshes", - Enabled = false, - Opacity = 1.0, - File = speck .. "/starorbits-LSRJ0822+1700.speck", - MeshColor = {{0.5, 1.0, 0.0}}, - --LabelFile = speck .. "/1ld.label", - TextColor = { 0.0, 0.2, 0.5 }, - TextSize = 10.3, - TextMinSize = 0.5, - TextMaxSize = 30.0, - Unit = "pc" - }, - GUI = { - Name = "LSRJ0822+1700 Orbit", - Path = "/Milky Way/Stars/Stars Orbits", - Description = [["Orbits of LSRJ0822+1700 around the Milky Way"]] - } + Identifier = "LSRJ0822Orbit", + --Parent = transforms.SolarSystemBarycenter.Name, + Renderable = { + Type = "RenderableDUMeshes", + Enabled = false, + Opacity = 1.0, + File = speck .. "/starorbits-LSRJ0822+1700.speck", + MeshColor = {{0.5, 1.0, 0.0}}, + --LabelFile = speck .. "/1ld.label", + TextColor = { 0.0, 0.2, 0.5 }, + TextSize = 10.3, + TextMinSize = 0.5, + TextMaxSize = 30.0, + Unit = "pc" + }, + GUI = { + Name = "LSRJ0822+1700 Orbit", + Path = "/Milky Way/Stars/Stars Orbits", + Description = [["Orbits of LSRJ0822+1700 around the Milky Way"]] + } } local pM_J13420Orbit = { - Identifier = "PM_J13420Orbit", - --Parent = transforms.SolarSystemBarycenter.Name, - Renderable = { - Type = "RenderableDUMeshes", - Enabled = false, - Opacity = 1.0, - File = speck .. "/starorbits-PM_J13420-3415.speck", - MeshColor = {{0.70, 0.13, 0.13}}, - --LabelFile = speck .. "/1ld.label", - TextColor = { 0.0, 0.2, 0.5 }, - TextSize = 10.3, - TextMinSize = 0.5, - TextMaxSize = 30.0, - Unit = "pc" - }, - GUI = { - Name = "PM_J13420-3415 Orbit", - Path = "/Milky Way/Stars/Stars Orbits", - Description = [["Orbits of PM_J13420-3415 around the Milky Way"]] - } + Identifier = "PM_J13420Orbit", + --Parent = transforms.SolarSystemBarycenter.Name, + Renderable = { + Type = "RenderableDUMeshes", + Enabled = false, + Opacity = 1.0, + File = speck .. "/starorbits-PM_J13420-3415.speck", + MeshColor = {{0.70, 0.13, 0.13}}, + --LabelFile = speck .. "/1ld.label", + TextColor = { 0.0, 0.2, 0.5 }, + TextSize = 10.3, + TextMinSize = 0.5, + TextMaxSize = 30.0, + Unit = "pc" + }, + GUI = { + Name = "PM_J13420-3415 Orbit", + Path = "/Milky Way/Stars/Stars Orbits", + Description = [["Orbits of PM_J13420-3415 around the Milky Way"]] + } } assetHelper.registerSceneGraphNodesAndExport(asset, { - sunOrbit, barnardsOrbit, pM_J13420Orbit, lSRJ0822Orbit, lSR1826Orbit, - lacaille9352Orbit, kapteynsOrbit + sunOrbit, barnardsOrbit, pM_J13420Orbit, lSRJ0822Orbit, lSR1826Orbit, + lacaille9352Orbit, kapteynsOrbit }) asset.meta = { - Name = "Star Orbits", - Version = "1.0", - Description = [[Select Star Orbital paths that delineate their trajectory around the - Milky Way over 1 billion years into the future. Included: Sun, Barnards, Kapteyns, - Lacaille 9352, LSR1826+3014, LSRJ0822+1700, PM_J13420-3415.

Data - Reference: Sebastien Lepine (AMNH)]], - Author = "Brian Abbott (AMNH)", - URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", - License = "AMNH Digital Universe", - Identifiers = {"SunOrbit", "BarnardsOrbit", "KapteynsOrbit", "pM_J13420Orbit", - "LSR1826Orbit", "LSRJ0822Orbit", "lacaille9352Orbit"} + Name = "Star Orbits", + Version = "1.0", + Description = [[Select Star Orbital paths that delineate their trajectory around the + Milky Way over 1 billion years into the future. Included: Sun, Barnards, Kapteyns, + Lacaille 9352, LSR1826+3014, LSRJ0822+1700, PM_J13420-3415.

Data + Reference: Sebastien Lepine (AMNH)]], + Author = "Brian Abbott (AMNH)", + URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", + License = "AMNH Digital Universe", + Identifiers = {"SunOrbit", "BarnardsOrbit", "KapteynsOrbit", "pM_J13420Orbit", + "LSR1826Orbit", "LSRJ0822Orbit", "lacaille9352Orbit"} } diff --git a/data/assets/scene/digitaluniverse/stars.asset b/data/assets/scene/digitaluniverse/stars.asset index d4b114322e..3103cd6c9a 100644 --- a/data/assets/scene/digitaluniverse/stars.asset +++ b/data/assets/scene/digitaluniverse/stars.asset @@ -3,82 +3,82 @@ local assetHelper = asset.require('util/asset_helper') local colorLUT = asset.require('./stars_colormap').BvColorLUT local textures = asset.syncedResource({ - Name = "Stars Textures", - Type = "HttpSynchronization", - Identifier = "stars_textures", - Version = 1 + Name = "Stars Textures", + Type = "HttpSynchronization", + Identifier = "stars_textures", + Version = 1 }) local speck = asset.syncedResource({ - Name = "Stars Speck Files", - Type = "HttpSynchronization", - Identifier = "stars_du", - Version = 4 + Name = "Stars Speck Files", + Type = "HttpSynchronization", + Identifier = "stars_du", + Version = 4 }) local sunspeck = asset.syncedResource({ - Name = "Stars Speck Files", - Type = "HttpSynchronization", - Identifier = "digitaluniverse_sunstar_speck", - Version = 1 + Name = "Stars Speck Files", + Type = "HttpSynchronization", + Identifier = "digitaluniverse_sunstar_speck", + Version = 1 }) local stars = { - Identifier = "Stars", - Renderable = { - Type = "RenderableStars", - File = speck .. "/stars.speck", - Texture = textures .. "/halo.png", - --ShapeTexture = textures .. "/disc.png", - ColorMap = colorLUT .. "/colorbv.cmap", - MagnitudeExponent = 6.2, - SizeComposition = "Distance Modulus", - RenderMethod = "Texture Based" -- or PSF - }, - GUI = { - Name = "Stars", - Path = "/Milky Way/Stars", - Description = [[Census: 117,003 stars with 321 labels.
DU Version 7.8. This - star catalog is a combination of all available star catalogs, wherein we - choose the best distance available to place the stars around the Sun as - accurately as is possible. (Description from URL)

Data Reference: - XHIP: An Extended Hipparcos Compilation (Anderson E., Francis C. 2012); - Hipparcos Catalog (European Space Agency 1997); Gliese Catalog (Gliese and - Jahriess 1991)]], - } + Identifier = "Stars", + Renderable = { + Type = "RenderableStars", + File = speck .. "/stars.speck", + Texture = textures .. "/halo.png", + --ShapeTexture = textures .. "/disc.png", + ColorMap = colorLUT .. "/colorbv.cmap", + MagnitudeExponent = 6.2, + SizeComposition = "Distance Modulus", + RenderMethod = "Texture Based" -- or PSF + }, + GUI = { + Name = "Stars", + Path = "/Milky Way/Stars", + Description = [[Census: 117,003 stars with 321 labels.
DU Version 7.8. This + star catalog is a combination of all available star catalogs, wherein we + choose the best distance available to place the stars around the Sun as + accurately as is possible. (Description from URL)

Data Reference: + XHIP: An Extended Hipparcos Compilation (Anderson E., Francis C. 2012); + Hipparcos Catalog (European Space Agency 1997); Gliese Catalog (Gliese and + Jahriess 1991)]], + } } local sunstar = { - Identifier = "SunStar", - Renderable = { - Type = "RenderableStars", - File = sunspeck .. "/sunstar.speck", - Texture = textures .. "/halo.png", - --ShapeTexture = textures .. "/disc.png", - ColorMap = colorLUT .. "/colorbv.cmap", - MagnitudeExponent = 6.2, - SizeComposition = "Distance Modulus", - RenderMethod = "Texture Based", -- or PSF - FadeInDistances = { 0.0001, 0.1 }, - RenderableType = "PostDeferredTransparent" - }, - GUI = { - Name = "Sun", - Path = "/Milky Way/Stars", - Description = [[Individual star to represent the sun when outside of the solar - system]] - } + Identifier = "SunStar", + Renderable = { + Type = "RenderableStars", + File = sunspeck .. "/sunstar.speck", + Texture = textures .. "/halo.png", + --ShapeTexture = textures .. "/disc.png", + ColorMap = colorLUT .. "/colorbv.cmap", + MagnitudeExponent = 6.2, + SizeComposition = "Distance Modulus", + RenderMethod = "Texture Based", -- or PSF + FadeInDistances = { 0.0001, 0.1 }, + RenderableType = "PostDeferredTransparent" + }, + GUI = { + Name = "Sun", + Path = "/Milky Way/Stars", + Description = [[Individual star to represent the sun when outside of the solar + system]] + } } assetHelper.registerSceneGraphNodesAndExport(asset, { stars, sunstar }) asset.meta = { - Name = "Stars", - Version = "2.0", - Description = [[Digital Universe asset for the stars.]], - Author = "Brian Abbott (AMNH)", - URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", - License = "AMNH Digital Universe", - Identifiers = {"Stars"} + Name = "Stars", + Version = "2.0", + Description = [[Digital Universe asset for the stars.]], + Author = "Brian Abbott (AMNH)", + URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", + License = "AMNH Digital Universe", + Identifiers = {"Stars"} } diff --git a/data/assets/scene/digitaluniverse/stars_colormap.asset b/data/assets/scene/digitaluniverse/stars_colormap.asset index f7f6432f7d..eb4cbc22e3 100644 --- a/data/assets/scene/digitaluniverse/stars_colormap.asset +++ b/data/assets/scene/digitaluniverse/stars_colormap.asset @@ -1,22 +1,22 @@ local assetHelper = asset.require('util/asset_helper') local BvColorLUT = asset.syncedResource({ - Name = "Stars Color Table", - Type = "HttpSynchronization", - Identifier = "stars_colormap", - Version = 2 + Name = "Stars Color Table", + Type = "HttpSynchronization", + Identifier = "stars_colormap", + Version = 2 }) asset.export("BvColorLUT", BvColorLUT) asset.meta = { - Name = "Stars B-V Colormap", - Version = "2.0", - Description = [[A lookup table that maps a B-V color index to an RGB color. - The B-V values are in the range (-0.4, 2.0) and each line maps a value - in that range to a color]], - Author = "OpenSpace Team", - URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", - License = "AMNH Digital Universe" + Name = "Stars B-V Colormap", + Version = "2.0", + Description = [[A lookup table that maps a B-V color index to an RGB color. + The B-V values are in the range (-0.4, 2.0) and each line maps a value + in that range to a color]], + Author = "OpenSpace Team", + URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", + License = "AMNH Digital Universe" } diff --git a/data/assets/scene/digitaluniverse/superclusters.asset b/data/assets/scene/digitaluniverse/superclusters.asset index c5c688640d..85546e608e 100644 --- a/data/assets/scene/digitaluniverse/superclusters.asset +++ b/data/assets/scene/digitaluniverse/superclusters.asset @@ -3,60 +3,60 @@ local assetHelper = asset.require('util/asset_helper') local textures = asset.syncedResource({ - Name = "Galaxy Superclusters Textures", - Type = "HttpSynchronization", - Identifier = "digitaluniverse_superclusters_textures", - Version = 2 + Name = "Galaxy Superclusters Textures", + Type = "HttpSynchronization", + Identifier = "digitaluniverse_superclusters_textures", + Version = 2 }) local speck = asset.syncedResource({ - Name = "Galaxy Superclusters Speck Files", - Type = "HttpSynchronization", - Identifier = "digitaluniverse_superclusters_speck", - Version = 2 + Name = "Galaxy Superclusters Speck Files", + Type = "HttpSynchronization", + Identifier = "digitaluniverse_superclusters_speck", + Version = 2 }) local object = { - Identifier = "GalaxySuperclusters", - Renderable = { - Type = "RenderableBillboardsCloud", - Enabled = false, - DrawElements = false, - Color = { 1.0, 1.0, 1.0 }, - Opacity = 0.65, - File = speck .. "/superclust.speck", - Texture = textures .. "/point3A.png", - LabelFile = speck .. "/superclust.label", - TextColor = { 0.9, 0.9, 0.9 }, - ScaleFactor = 531.0, - TextSize = 22.44, - TextMinSize = 8.0, - Unit = "Mpc", - DrawLabels = true, - --BillboardMaxSize = 7.2, - EnablePixelSizeControl = true - }, - GUI = { - Name = "Galaxy Superclusters", - Path = "/Universe/Galaxies", - Description = [[Census: 33 labels. DU Version 1.3.
The superclusters dataset - is a set of labels that mark the major galaxy superclusters in the local universe. - They correspond to, and should be viewed with, the Abell clusters. Astronomers - estimate there are 10 million superclusters in the observable universe. - (Description from URL)

Data Reference: Superclusters of Abell and X-ray - clusters (Einasto+, 2001)]] - } + Identifier = "GalaxySuperclusters", + Renderable = { + Type = "RenderableBillboardsCloud", + Enabled = false, + DrawElements = false, + Color = { 1.0, 1.0, 1.0 }, + Opacity = 0.65, + File = speck .. "/superclust.speck", + Texture = textures .. "/point3A.png", + LabelFile = speck .. "/superclust.label", + TextColor = { 0.9, 0.9, 0.9 }, + ScaleFactor = 531.0, + TextSize = 22.44, + TextMinSize = 8.0, + Unit = "Mpc", + DrawLabels = true, + --BillboardMaxSize = 7.2, + EnablePixelSizeControl = true + }, + GUI = { + Name = "Galaxy Superclusters", + Path = "/Universe/Galaxies", + Description = [[Census: 33 labels. DU Version 1.3.
The superclusters dataset + is a set of labels that mark the major galaxy superclusters in the local universe. + They correspond to, and should be viewed with, the Abell clusters. Astronomers + estimate there are 10 million superclusters in the observable universe. + (Description from URL)

Data Reference: Superclusters of Abell and X-ray + clusters (Einasto+, 2001)]] + } } assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { - Name = "Galaxy Superclusters", - Version = "2.0", - Description = [[Digital Universe asset for Galaxy Superclusters.]], - Author = "Brian Abbott (AMNH)", - URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", - License = "AMNH Digital Universe", - Identifiers = {"GalaxySuperclusters"} + Name = "Galaxy Superclusters", + Version = "2.0", + Description = [[Digital Universe asset for Galaxy Superclusters.]], + Author = "Brian Abbott (AMNH)", + URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", + License = "AMNH Digital Universe", + Identifiers = {"GalaxySuperclusters"} } diff --git a/data/assets/scene/digitaluniverse/supernovaremnants.asset b/data/assets/scene/digitaluniverse/supernovaremnants.asset index d3b19093a3..20a4f8f557 100644 --- a/data/assets/scene/digitaluniverse/supernovaremnants.asset +++ b/data/assets/scene/digitaluniverse/supernovaremnants.asset @@ -3,61 +3,61 @@ local assetHelper = asset.require('util/asset_helper') local textures = asset.syncedResource({ - Name = "Supernova Remnants Textures", - Type = "HttpSynchronization", - Identifier = "digitaluniverse_supernovaremnants_textures", - Version = 1 + Name = "Supernova Remnants Textures", + Type = "HttpSynchronization", + Identifier = "digitaluniverse_supernovaremnants_textures", + Version = 1 }) local speck = asset.syncedResource({ - Name = "Supernova Remnants Speck Files", - Type = "HttpSynchronization", - Identifier = "digitaluniverse_supernovaremnants_speck", - Version = 2 + Name = "Supernova Remnants Speck Files", + Type = "HttpSynchronization", + Identifier = "digitaluniverse_supernovaremnants_speck", + Version = 2 }) local object = { - Identifier = "SupernovaRemnants", - Renderable = { - Type = "RenderableBillboardsCloud", - Enabled = false, - Color = { 1.0, 0.5, 0.0 }, - Opacity = 0.32, - File = speck .. "/snr.speck", - Texture = textures .. "/point4.png", - PolygonSides = 7, - LabelFile = speck .. "/snr.label", - TextColor = { 0.6, 0.46, 0.0 }, - ScaleFactor = 424, - TextSize = 16.44, - TextMinSize = 4.0, - TextMaxSize = 200.0, - --CorrectionSizeEndDistance = 17.5, - --CorrectionSizeFactor = 13.96, - Unit = "pc", - BillboardMaxSize = 500, - EnablePixelSizeControl = true - }, - GUI = { - Name = "Supernova Remnants", - Path = "/Milky Way", - Description = [[Census: 112 supernova remnants.
DU Version 3.7. A supernova - remnant is the ejected gas that results from a supernova. It glows for a - cosmically short period of time before mixing with the interstellar medium. - (Description from URL)

Data Reference: The First Fermi LAT SNR - Catalog (Acero+, 2016)]], - } + Identifier = "SupernovaRemnants", + Renderable = { + Type = "RenderableBillboardsCloud", + Enabled = false, + Color = { 1.0, 0.5, 0.0 }, + Opacity = 0.32, + File = speck .. "/snr.speck", + Texture = textures .. "/point4.png", + PolygonSides = 7, + LabelFile = speck .. "/snr.label", + TextColor = { 0.6, 0.46, 0.0 }, + ScaleFactor = 424, + TextSize = 16.44, + TextMinSize = 4.0, + TextMaxSize = 200.0, + --CorrectionSizeEndDistance = 17.5, + --CorrectionSizeFactor = 13.96, + Unit = "pc", + BillboardMaxSize = 500, + EnablePixelSizeControl = true + }, + GUI = { + Name = "Supernova Remnants", + Path = "/Milky Way", + Description = [[Census: 112 supernova remnants.
DU Version 3.7. A supernova + remnant is the ejected gas that results from a supernova. It glows for a + cosmically short period of time before mixing with the interstellar medium. + (Description from URL)

Data Reference: The First Fermi LAT SNR + Catalog (Acero+, 2016)]], + } } assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { - Name = "Supernova Remnants", - Version = "2.0", - Description = [[Digital Universe asset for Supernova Remnants.]], - Author = "Brian Abbott (AMNH)", - URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", - License = "AMNH Digital Universe", - Identifiers = {"SupernovaRemnants"} + Name = "Supernova Remnants", + Version = "2.0", + Description = [[Digital Universe asset for Supernova Remnants.]], + Author = "Brian Abbott (AMNH)", + URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", + License = "AMNH Digital Universe", + Identifiers = {"SupernovaRemnants"} } diff --git a/data/assets/scene/digitaluniverse/tully.asset b/data/assets/scene/digitaluniverse/tully.asset index 42438baa5e..21e65f5ed5 100644 --- a/data/assets/scene/digitaluniverse/tully.asset +++ b/data/assets/scene/digitaluniverse/tully.asset @@ -3,126 +3,126 @@ local assetHelper = asset.require('util/asset_helper') local textures = asset.syncedResource({ - Name = "Tully Textures", - Type = "HttpSynchronization", - Identifier = "digitaluniverse_tully_textures", - Version = 3 + Name = "Tully Textures", + Type = "HttpSynchronization", + Identifier = "digitaluniverse_tully_textures", + Version = 3 }) local speck = asset.syncedResource({ - Name = "Tully Speck Files", - Type = "HttpSynchronization", - Identifier = "digitaluniverse_tully_speck", - Version = 2 + Name = "Tully Speck Files", + Type = "HttpSynchronization", + Identifier = "digitaluniverse_tully_speck", + Version = 2 }) local tullyPoints = { - Identifier = "TullyGalaxies", - Renderable = { - Type = "RenderableBillboardsCloud", - Enabled = true, - Color = { 1.0, 0.4, 0.2 }, - Opacity = 0.99, - ScaleFactor = 504.0, - File = speck .. "/tully.speck", - Texture = textures .. "/point3A.png", - --ColorMap = speck .. "/tully.cmap", - ColorMap = speck .. "/lss.cmap", - --ColorOption = { "proximity" }, - ColorOption = { "prox5Mpc" }, - ColorRange = { { 1.0, 30.0 } }, - LabelFile = speck .. "/tully.label", - DrawLabels = false, - TextColor = { 0.7, 0.7, 0.7 }, - TextSize = 19.36, - TextMinSize = 8.2, - TransformationMatrix = { - -0.7357425748, 0.67726129641, 0.0, 0.0, - -0.074553778365, -0.080991471307, 0.9939225904, 0.0, - 0.67314530211, 0.73127116582, 0.11008126223, 0.0, - 0.0, 0.0, 0.0, 1.0 - }, - Unit = "Mpc", - -- Fade in value in the same unit as "Unit" - FadeInDistances = { 0.001, 1.0 }, - -- Max size in pixels - BillboardMaxSize = 7, - BillboardMinSize = 0, - --CorrectionSizeEndDistance = 22.0, - --CorrectionSizeFactor = 10.45 - EnablePixelSizeControl = true + Identifier = "TullyGalaxies", + Renderable = { + Type = "RenderableBillboardsCloud", + Enabled = true, + Color = { 1.0, 0.4, 0.2 }, + Opacity = 0.99, + ScaleFactor = 504.0, + File = speck .. "/tully.speck", + Texture = textures .. "/point3A.png", + --ColorMap = speck .. "/tully.cmap", + ColorMap = speck .. "/lss.cmap", + --ColorOption = { "proximity" }, + ColorOption = { "prox5Mpc" }, + ColorRange = { { 1.0, 30.0 } }, + LabelFile = speck .. "/tully.label", + DrawLabels = false, + TextColor = { 0.7, 0.7, 0.7 }, + TextSize = 19.36, + TextMinSize = 8.2, + TransformationMatrix = { + -0.7357425748, 0.67726129641, 0.0, 0.0, + -0.074553778365, -0.080991471307, 0.9939225904, 0.0, + 0.67314530211, 0.73127116582, 0.11008126223, 0.0, + 0.0, 0.0, 0.0, 1.0 }, - GUI = { - Name = "Tully Galaxies", - Path = "/Universe/Galaxies", - Description = [[Census: 30,059 galaxies. DU Version 1.5.
The Tully Catalog is - the most polished, accurate catalog of nearby galaxies. It includes over 30,000 - galaxies in the local universe that surround the Milky Way. This catalog - demonstrates the large-scale structure of the universe exceptionally well. And, - each galaxy has a representative image reflecting its morphological type, and is - properly sized and inclined. Size and shape. The data form a cube, which is an - arbitrary cutoff based on the completeness of these data. Beyond this, data from - these sources are not as reliable, so effort is made to show a complete picture, - albeit limited by observations (for example, we cannot see dwarf galaxies much - beyond the Local Group). The size of the cube is roughly 1 billion light years on - a diagonal (so the farthest galaxies in the dataset are about 1 billion light - years from the Milky Way), or about 700 million light years per side. -

Colors. Orange denotes more dense regions of the local universe, aqua is - given to galaxies in an intermediate-density area, and green is given to lower - density regions.(Description from URL)

Data Reference: Tully Galaxy - Catalog: Brent Tully (U Hawaii), Stuart Levy (NCSA/UIUC)]] - } + Unit = "Mpc", + -- Fade in value in the same unit as "Unit" + FadeInDistances = { 0.001, 1.0 }, + -- Max size in pixels + BillboardMaxSize = 7, + BillboardMinSize = 0, + --CorrectionSizeEndDistance = 22.0, + --CorrectionSizeFactor = 10.45 + EnablePixelSizeControl = true + }, + GUI = { + Name = "Tully Galaxies", + Path = "/Universe/Galaxies", + Description = [[Census: 30,059 galaxies. DU Version 1.5.
The Tully Catalog is + the most polished, accurate catalog of nearby galaxies. It includes over 30,000 + galaxies in the local universe that surround the Milky Way. This catalog + demonstrates the large-scale structure of the universe exceptionally well. And, + each galaxy has a representative image reflecting its morphological type, and is + properly sized and inclined. Size and shape. The data form a cube, which is an + arbitrary cutoff based on the completeness of these data. Beyond this, data from + these sources are not as reliable, so effort is made to show a complete picture, + albeit limited by observations (for example, we cannot see dwarf galaxies much + beyond the Local Group). The size of the cube is roughly 1 billion light years on + a diagonal (so the farthest galaxies in the dataset are about 1 billion light + years from the Milky Way), or about 700 million light years per side. +

Colors. Orange denotes more dense regions of the local universe, aqua is + given to galaxies in an intermediate-density area, and green is given to lower + density regions.(Description from URL)

Data Reference: Tully Galaxy + Catalog: Brent Tully (U Hawaii), Stuart Levy (NCSA/UIUC)]] + } } local tullyImages = { - Identifier = "TullyGalaxiesImages", - Renderable = { - Type = "RenderablePlanesCloud", - Enabled = true, - Color = { 1.0, 1.0, 1.0 }, - Opacity = 0.99, - ScaleFactor = 1.0, - File = speck .. "/tully.speck", - TexturePath = textures, - Luminosity = "diamkpc", - ScaleLuminosity = 0.001, - TransformationMatrix = { - -0.7357425748, 0.67726129641, 0.0, 0.0, - -0.074553778365, -0.080991471307, 0.9939225904, 0.0, - 0.67314530211, 0.73127116582, 0.11008126223, 0.0, - 0.0, 0.0, 0.0, 1.0 - }, - Unit = "Mpc", - -- Fade in value in the same unit as "Unit" - FadeInDistances = {0.0005, 0.003}, - PlaneMinSize = 1.0 + Identifier = "TullyGalaxiesImages", + Renderable = { + Type = "RenderablePlanesCloud", + Enabled = true, + Color = { 1.0, 1.0, 1.0 }, + Opacity = 0.99, + ScaleFactor = 1.0, + File = speck .. "/tully.speck", + TexturePath = textures, + Luminosity = "diamkpc", + ScaleLuminosity = 0.001, + TransformationMatrix = { + -0.7357425748, 0.67726129641, 0.0, 0.0, + -0.074553778365, -0.080991471307, 0.9939225904, 0.0, + 0.67314530211, 0.73127116582, 0.11008126223, 0.0, + 0.0, 0.0, 0.0, 1.0 }, - GUI = { - Name = "Tully Galaxies Images", - Path = "/Universe/Galaxies", - Description = [[Each galaxy is represented by an image - that represents its morphological type (spiral, elliptical, etc.). Most of these - come from The Galaxy Catalog. A handful of nearby galaxies are represented by - their actual images, which come mostly from the National Optical Astronomy - Observatory (NOAO). Each of these images has been altered from its original state. - These images were taken from Earth on some of the world’s largest telescopes, so - foreground stars from our own Galaxy appear in each image. We are representing - galaxies in extragalactic space, so we have removed the stars from each image. - (Description from URL)

Data Reference: Tully Galaxy Catalog: Brent Tully - (U Hawaii), Stuart Levy (NCSA/UIUC)]] - } + Unit = "Mpc", + -- Fade in value in the same unit as "Unit" + FadeInDistances = {0.0005, 0.003}, + PlaneMinSize = 1.0 + }, + GUI = { + Name = "Tully Galaxies Images", + Path = "/Universe/Galaxies", + Description = [[Each galaxy is represented by an image + that represents its morphological type (spiral, elliptical, etc.). Most of these + come from The Galaxy Catalog. A handful of nearby galaxies are represented by + their actual images, which come mostly from the National Optical Astronomy + Observatory (NOAO). Each of these images has been altered from its original state. + These images were taken from Earth on some of the world’s largest telescopes, so + foreground stars from our own Galaxy appear in each image. We are representing + galaxies in extragalactic space, so we have removed the stars from each image. + (Description from URL)

Data Reference: Tully Galaxy Catalog: Brent Tully + (U Hawaii), Stuart Levy (NCSA/UIUC)]] + } } assetHelper.registerSceneGraphNodesAndExport(asset, { tullyPoints, tullyImages }) asset.meta = { - Name = "Tully Galaxies", - Version = "3.0", - Description = [[Digital Universe asset for Tully Galaxies, including point cloud and - images.]], - Author = "Stuart Levy (NCSA/UIUC), Brian Abbott (AMNH)", - URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", - License = "AMNH Digital Universe", - Identifiers = {"TullyGalaxies" , "TullyGalaxiesImages"} + Name = "Tully Galaxies", + Version = "3.0", + Description = [[Digital Universe asset for Tully Galaxies, including point cloud and + images.]], + Author = "Stuart Levy (NCSA/UIUC), Brian Abbott (AMNH)", + URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", + License = "AMNH Digital Universe", + Identifiers = {"TullyGalaxies" , "TullyGalaxiesImages"} } diff --git a/data/assets/scene/digitaluniverse/voids.asset b/data/assets/scene/digitaluniverse/voids.asset index dbc7eac25a..20538ee161 100644 --- a/data/assets/scene/digitaluniverse/voids.asset +++ b/data/assets/scene/digitaluniverse/voids.asset @@ -3,52 +3,52 @@ local assetHelper = asset.require('util/asset_helper') local speck = asset.syncedResource({ - Name = "Voids Speck Files", - Type = "HttpSynchronization", - Identifier = "digitaluniverse_voids_speck", - Version = 2 + Name = "Voids Speck Files", + Type = "HttpSynchronization", + Identifier = "digitaluniverse_voids_speck", + Version = 2 }) local object = { - Identifier = "Voids", - Renderable = { - Type = "RenderableBillboardsCloud", - Enabled = false, - DrawElements = false, - DrawLabels = true, - Color = { 1.0, 1.0, 1.0 }, - Opacity = 0.65, - LabelFile = speck .. "/voids.label", - TextColor = { 0.296, 0.629, 1.0 }, - TextSize = 20.9, - TextMinSize = 8.0, - Unit = "Mpc" - }, - GUI = { - Name = "Voids", - Path = "/Universe/Galaxies", - Description = [[ Census: 24 cosmic voids. DU Version 1.2.
Cosmic voids are - vast, empty spaces where there are either no galaxies, or very few galaxies. - They are associated with cold spots in the cosmic microwave background (CMB) - light, the earliest picture we have of the universe (see page 58). Those cold - spots in the CMB evolved into large voids, some as much as 300 million light - years in diameter. Labels roughly denote the location of cosmic voids in the - Tully galaxies. Voids are only visible with motion cuing as you spin around - these data. The labels help to guide the eye and provide sign posts for the - largest voids in our cosmic neighborhood. (Description from URL)

Data - Reference: various sources]] - } + Identifier = "Voids", + Renderable = { + Type = "RenderableBillboardsCloud", + Enabled = false, + DrawElements = false, + DrawLabels = true, + Color = { 1.0, 1.0, 1.0 }, + Opacity = 0.65, + LabelFile = speck .. "/voids.label", + TextColor = { 0.296, 0.629, 1.0 }, + TextSize = 20.9, + TextMinSize = 8.0, + Unit = "Mpc" + }, + GUI = { + Name = "Voids", + Path = "/Universe/Galaxies", + Description = [[ Census: 24 cosmic voids. DU Version 1.2.
Cosmic voids are + vast, empty spaces where there are either no galaxies, or very few galaxies. + They are associated with cold spots in the cosmic microwave background (CMB) + light, the earliest picture we have of the universe (see page 58). Those cold + spots in the CMB evolved into large voids, some as much as 300 million light + years in diameter. Labels roughly denote the location of cosmic voids in the + Tully galaxies. Voids are only visible with motion cuing as you spin around + these data. The labels help to guide the eye and provide sign posts for the + largest voids in our cosmic neighborhood. (Description from URL)

Data + Reference: various sources]] + } } assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { - Name = "Voids", - Version = "2.0", - Author = "Brian Abbott (AMNH)", - Description = [[Digital Universe asset for Cosmic voids.]], - URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", - License = "AMNH Digital Universe", - Identifiers = {"Voids"} + Name = "Voids", + Version = "2.0", + Author = "Brian Abbott (AMNH)", + Description = [[Digital Universe asset for Cosmic voids.]], + URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", + License = "AMNH Digital Universe", + Identifiers = {"Voids"} } diff --git a/data/assets/scene/milkyway/constellations/constellation_art.asset b/data/assets/scene/milkyway/constellations/constellation_art.asset index cc0db4c8d9..8df89c7658 100644 --- a/data/assets/scene/milkyway/constellations/constellation_art.asset +++ b/data/assets/scene/milkyway/constellations/constellation_art.asset @@ -21,59 +21,58 @@ local createConstellations = function (baseIdentifier, guiPath, constellationfil local distanceMultiplier = 3.2; local baseScale = 1e17; for line in io.lines(openspace.absPath(constellationfile)) do - if (notFirstLine) then - -- describes the data - local matchstring = '(.-),(.-),(.-),(.-),(.-),(.-),(.-),(.-),(.-),(.-),(.-),(.-)$' - local group, abbreviation, name, x, y, z, scale, imageName, rotX, rotY, rotZ, centerStar = line:match(matchstring) - local magVec = math.sqrt(x*x + y*y + z*z) - local normx = x/magVec - local normy = y/magVec - local normz = z/magVec + if (notFirstLine) then + -- describes the data + local matchstring = '(.-),(.-),(.-),(.-),(.-),(.-),(.-),(.-),(.-),(.-),(.-),(.-)$' + local group, abbreviation, name, x, y, z, scale, imageName, rotX, rotY, rotZ, centerStar = line:match(matchstring) + local magVec = math.sqrt(x*x + y*y + z*z) + local normx = x/magVec + local normy = y/magVec + local normz = z/magVec - group = (group == '' and globe or group) - - local aconstellation = { - -- Identifier = guiPath .. '-' .. name, - Identifier = baseIdentifier .. '-' .. abbreviation, - Parent = transforms.SolarSystemBarycenter.Identifier, - Transform = { - Translation = { - Type = "StaticTranslation", - -- position is in parsecs from the SolarSystemBarycenter, so convert to meters - Position = { - normx * PARSEC_CONSTANT * distanceMultiplier, - normy * PARSEC_CONSTANT * distanceMultiplier, - normz * PARSEC_CONSTANT * distanceMultiplier - } - }, - Rotation = { - Type = "StaticRotation", - Rotation = { tonumber(rotX), tonumber(rotY), tonumber(rotZ) } - } + group = (group == '' and globe or group) + local aconstellation = { + -- Identifier = guiPath .. '-' .. name, + Identifier = baseIdentifier .. '-' .. abbreviation, + Parent = transforms.SolarSystemBarycenter.Identifier, + Transform = { + Translation = { + Type = "StaticTranslation", + -- position is in parsecs from the SolarSystemBarycenter, so convert to meters + Position = { + normx * PARSEC_CONSTANT * distanceMultiplier, + normy * PARSEC_CONSTANT * distanceMultiplier, + normz * PARSEC_CONSTANT * distanceMultiplier + } }, - Renderable = { - Type = "RenderablePlaneImageLocal", - Size = tonumber(baseScale * scale * distanceMultiplier / 10), - Enabled = false, - Origin = "Center", - Billboard = false, - LazyLoading = true, - Texture = images .. "/" .. imageName, - BlendMode = "Additive", - Opacity = 0.1 - }, - Tag = { "ConstellationArtImage", group }, - GUI = { - Name = name .. ' Image', - Path = '/Milky Way/' .. guiPath + Rotation = { + Type = "StaticRotation", + Rotation = { tonumber(rotX), tonumber(rotY), tonumber(rotZ) } } + }, + Renderable = { + Type = "RenderablePlaneImageLocal", + Size = tonumber(baseScale * scale * distanceMultiplier / 10), + Enabled = false, + Origin = "Center", + Billboard = false, + LazyLoading = true, + Texture = images .. "/" .. imageName, + BlendMode = "Additive", + Opacity = 0.1 + }, + Tag = { "ConstellationArtImage", group }, + GUI = { + Name = name .. ' Image', + Path = '/Milky Way/' .. guiPath } - table.insert(genConstellations, aconstellation); + } + table.insert(genConstellations, aconstellation); - else - notFirstLine = true - end + else + notFirstLine = true + end end return genConstellations end @@ -98,10 +97,10 @@ end) asset.meta = { - Name = "Constellation Images", - Version = "1.0", - Description = "Artistic images depicting the constellations", - Author = "James Hedberg", - URL = "http://jameshedberg.com", - License = "CC-BY" + Name = "Constellation Images", + Version = "1.0", + Description = "Artistic images depicting the constellations", + Author = "James Hedberg", + URL = "http://jameshedberg.com", + License = "CC-BY" } diff --git a/data/assets/scene/milkyway/constellations/constellation_extrakeybinds.asset b/data/assets/scene/milkyway/constellations/constellation_extrakeybinds.asset index 35ea29873f..383a82b0ea 100644 --- a/data/assets/scene/milkyway/constellations/constellation_extrakeybinds.asset +++ b/data/assets/scene/milkyway/constellations/constellation_extrakeybinds.asset @@ -1,7 +1,6 @@ local scene_helper = asset.require('util/scene_helper') local Keybindings = { - { Key = "v", Name = "Show Constellation Art", diff --git a/data/assets/scene/milkyway/exoplanets/exoplanets_data.asset b/data/assets/scene/milkyway/exoplanets/exoplanets_data.asset index 76d4cddbdc..73d4f033a5 100644 --- a/data/assets/scene/milkyway/exoplanets/exoplanets_data.asset +++ b/data/assets/scene/milkyway/exoplanets/exoplanets_data.asset @@ -1,33 +1,33 @@ local bvColorLUT = asset.require('scene/digitaluniverse/stars_colormap').BvColorLUT local DataPath = asset.syncedResource({ - Name = "Exoplanet Data Files", - Type = "HttpSynchronization", - Identifier = "exoplanets_data", - Version = 2 + Name = "Exoplanet Data Files", + Type = "HttpSynchronization", + Identifier = "exoplanets_data", + Version = 2 }) asset.onInitialize(function () - local p = "Modules.Exoplanets.DataFolder"; - if (openspace.getPropertyValue(p) == "") then - openspace.setPropertyValueSingle(p, DataPath) - end + local p = "Modules.Exoplanets.DataFolder"; + if (openspace.getPropertyValue(p) == "") then + openspace.setPropertyValueSingle(p, DataPath) + end - p = "Modules.Exoplanets.BvColormap"; - if (openspace.getPropertyValue(p) == "") then - openspace.setPropertyValueSingle(p, bvColorLUT .. "/colorbv.cmap") - end + p = "Modules.Exoplanets.BvColormap"; + if (openspace.getPropertyValue(p) == "") then + openspace.setPropertyValueSingle(p, bvColorLUT .. "/colorbv.cmap") + end end) asset.export("DataPath", DataPath) asset.meta = { - Name = "Exoplanet Data", - Version = "2.0", - Description = [[ The data that is used for the exoplanet systems. The data has been - derived from the 'Planetary Systems Composite Data' dataset from the NASA Exoplanet - Archive]], - Author = "OpenSpace Team", - URL = "https://exoplanetarchive.ipac.caltech.edu/docs/data.html", - License = "MIT license" + Name = "Exoplanet Data", + Version = "2.0", + Description = [[ The data that is used for the exoplanet systems. The data has been + derived from the 'Planetary Systems Composite Data' dataset from the NASA Exoplanet + Archive]], + Author = "OpenSpace Team", + URL = "https://exoplanetarchive.ipac.caltech.edu/docs/data.html", + License = "MIT license" } diff --git a/data/assets/scene/milkyway/exoplanets/exoplanets_textures.asset b/data/assets/scene/milkyway/exoplanets/exoplanets_textures.asset index e86d14c73d..dd80929b3d 100644 --- a/data/assets/scene/milkyway/exoplanets/exoplanets_textures.asset +++ b/data/assets/scene/milkyway/exoplanets/exoplanets_textures.asset @@ -4,57 +4,57 @@ local habitableZoneTextures = local sunTextures = asset.require('scene/solarsystem/sun/sun_textures').TexturesPath local TexturesPath = asset.syncedResource({ - Name = "Exoplanet Textures", - Type = "HttpSynchronization", - Identifier = "exoplanets_textures", - Version = 2 + Name = "Exoplanet Textures", + Type = "HttpSynchronization", + Identifier = "exoplanets_textures", + Version = 2 }) asset.onInitialize(function () - local starTexture = TexturesPath .. "/sun.jpg" - local noDataTexture = TexturesPath .. "/grid-32.png" - local discTexture = TexturesPath .. "/disc_bw_texture.png" + local starTexture = TexturesPath .. "/sun.jpg" + local noDataTexture = TexturesPath .. "/grid-32.png" + local discTexture = TexturesPath .. "/disc_bw_texture.png" - local starGlareTexture = sunTextures .. "/halo.png" + local starGlareTexture = sunTextures .. "/halo.png" - local hzTexture = habitableZoneTextures .. "/hot_to_cold_faded.png" + local hzTexture = habitableZoneTextures .. "/hot_to_cold_faded.png" - -- Set the default textures used for the exoplanet system creation - -- (Check if already set, to not override value in config file) - local p = "Modules.Exoplanets.StarTexture"; - if (openspace.getPropertyValue(p) == "") then - openspace.setPropertyValueSingle(p, starTexture) - end + -- Set the default textures used for the exoplanet system creation + -- (Check if already set, to not override value in config file) + local p = "Modules.Exoplanets.StarTexture"; + if (openspace.getPropertyValue(p) == "") then + openspace.setPropertyValueSingle(p, starTexture) + end - local p = "Modules.Exoplanets.StarGlareTexture"; - if (openspace.getPropertyValue(p) == "") then - openspace.setPropertyValueSingle(p, starGlareTexture) - end + local p = "Modules.Exoplanets.StarGlareTexture"; + if (openspace.getPropertyValue(p) == "") then + openspace.setPropertyValueSingle(p, starGlareTexture) + end - p = "Modules.Exoplanets.NoDataTexture"; - if (openspace.getPropertyValue(p) == "") then - openspace.setPropertyValueSingle(p, noDataTexture) - end + p = "Modules.Exoplanets.NoDataTexture"; + if (openspace.getPropertyValue(p) == "") then + openspace.setPropertyValueSingle(p, noDataTexture) + end - p = "Modules.Exoplanets.OrbitDiscTexture"; - if (openspace.getPropertyValue(p) == "") then - openspace.setPropertyValueSingle(p, discTexture) - end + p = "Modules.Exoplanets.OrbitDiscTexture"; + if (openspace.getPropertyValue(p) == "") then + openspace.setPropertyValueSingle(p, discTexture) + end - p = "Modules.Exoplanets.HabitableZoneTexture"; - if (openspace.getPropertyValue(p) == "") then - openspace.setPropertyValueSingle(p, hzTexture) - end + p = "Modules.Exoplanets.HabitableZoneTexture"; + if (openspace.getPropertyValue(p) == "") then + openspace.setPropertyValueSingle(p, hzTexture) + end end) asset.export("TexturesPath", TexturesPath) asset.meta = { - Name = "Exoplanet Textures", - Version = "2.0", - Description = [[ Adds all textures that are required for the exoplanet system - visualizations]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license", + Name = "Exoplanet Textures", + Version = "2.0", + Description = [[ Adds all textures that are required for the exoplanet system + visualizations]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license", } diff --git a/data/assets/scene/milkyway/gaia/apogee.asset b/data/assets/scene/milkyway/gaia/apogee.asset index 1b1bdccd80..efa58038ff 100644 --- a/data/assets/scene/milkyway/gaia/apogee.asset +++ b/data/assets/scene/milkyway/gaia/apogee.asset @@ -3,47 +3,47 @@ local assetHelper = asset.require('util/asset_helper') local textures = asset.syncedResource({ - Name = "Stars Textures", - Type = "HttpSynchronization", - Identifier = "stars_textures", - Version = 1 + Name = "Stars Textures", + Type = "HttpSynchronization", + Identifier = "stars_textures", + Version = 1 }) local speck = asset.syncedResource({ - Name = "Apogee Speck Files", - Type = "HttpSynchronization", - Identifier = "gaia_apogee", - Version = 1 + Name = "Apogee Speck Files", + Type = "HttpSynchronization", + Identifier = "gaia_apogee", + Version = 1 }) local colorLUT = asset.syncedResource({ - Name = "Stars Color Table", - Type = "HttpSynchronization", - Identifier = "stars_colormap", - Version = 2 + Name = "Stars Color Table", + Type = "HttpSynchronization", + Identifier = "stars_colormap", + Version = 2 }) local gaia_abundance_apogee = { - Identifier = "Gaia Abundance Apogee", - Renderable = { - Type = "RenderableStars", - Enabled = false, - File = speck .. "/GaiaAbundApogee.speck", - ColorOption = "Other Data", - OtherData = "FeH", - MagnitudeExponent = 6.2, - SizeComposition = "Distance Modulus", - RenderMethod = "Texture Based", - Texture = textures .. "/halo.png", - -- ShapeTexture = textures .. "/disc.png", - ColorMap = colorLUT .. "/colorbv.cmap", - OtherDataColorMap = colorLUT .. "/viridis.cmap", - StaticFilter = -9999, - StaticFilterReplacement = 0.0 - }, - GUI = { - Path = "/Milky Way/Gaia" - } + Identifier = "Gaia Abundance Apogee", + Renderable = { + Type = "RenderableStars", + Enabled = false, + File = speck .. "/GaiaAbundApogee.speck", + ColorOption = "Other Data", + OtherData = "FeH", + MagnitudeExponent = 6.2, + SizeComposition = "Distance Modulus", + RenderMethod = "Texture Based", + Texture = textures .. "/halo.png", + -- ShapeTexture = textures .. "/disc.png", + ColorMap = colorLUT .. "/colorbv.cmap", + OtherDataColorMap = colorLUT .. "/viridis.cmap", + StaticFilter = -9999, + StaticFilterReplacement = 0.0 + }, + GUI = { + Path = "/Milky Way/Gaia" + } } assetHelper.registerSceneGraphNodesAndExport(asset, { gaia_abundance_apogee }) diff --git a/data/assets/scene/milkyway/gaia/gaia_dr2_download_stars.asset b/data/assets/scene/milkyway/gaia/gaia_dr2_download_stars.asset index d80419ac78..410a6b42b8 100644 --- a/data/assets/scene/milkyway/gaia/gaia_dr2_download_stars.asset +++ b/data/assets/scene/milkyway/gaia/gaia_dr2_download_stars.asset @@ -2,10 +2,10 @@ -- The octree was generated from the full DR2 by filtering away all stars with a parallax error higher than 0.5 -- Max Star Per Node = 50,000 and max distance = 500kpc local gaia618Destination = asset.syncedResource({ - Name = "Gaia DR2 618M Octree", - Type = "HttpSynchronization", - Identifier = "gaia_stars_618M_octree", - Version = 1 + Name = "Gaia DR2 618M Octree", + Type = "HttpSynchronization", + Identifier = "gaia_stars_618M_octree", + Version = 1 }) local gaia618DestinationExtracted = gaia618Destination + '/data'; @@ -13,17 +13,17 @@ local gaia618DestinationExtracted = gaia618Destination + '/data'; -- From these files new subsets can be created with the ConstructOctreeTask (gaia_octree.task). -- Total size of download is 151 GB. local gaiaFull = asset.syncedResource({ - Name = "Gaia DR2 Full Raw", - Type = "HttpSynchronization", - Identifier = "gaia_stars_dr2_raw", - Version = 1 + Name = "Gaia DR2 Full Raw", + Type = "HttpSynchronization", + Identifier = "gaia_stars_dr2_raw", + Version = 1 }) asset.onInitialize(function() - if not openspace.directoryExists(gaia618DestinationExtracted) then - openspace.printInfo("Extracted Gaia dataset") - openspace.unzipFile(gaia618Destination .. '/DR2_full_Octree[50kSPN,500dist]_50,50.zip', gaia618DestinationExtracted, true) - end + if not openspace.directoryExists(gaia618DestinationExtracted) then + openspace.printInfo("Extracted Gaia dataset") + openspace.unzipFile(gaia618Destination .. '/DR2_full_Octree[50kSPN,500dist]_50,50.zip', gaia618DestinationExtracted, true) + end end) asset.export('GaiaDR2_618M', gaia618DestinationExtracted) diff --git a/data/assets/scene/milkyway/gaia/gaiastars.asset b/data/assets/scene/milkyway/gaia/gaiastars.asset index 2dd3a0083f..997eaa55e5 100644 --- a/data/assets/scene/milkyway/gaia/gaiastars.asset +++ b/data/assets/scene/milkyway/gaia/gaiastars.asset @@ -1,60 +1,60 @@ local assetHelper = asset.require("util/asset_helper") local textures = asset.syncedResource({ - Name = "Stars Textures", - Type = "HttpSynchronization", - Identifier = "stars_textures", - Version = 1 + Name = "Stars Textures", + Type = "HttpSynchronization", + Identifier = "stars_textures", + Version = 1 }) local colorLUT = asset.syncedResource({ - Name = "Stars Color Table", - Type = "HttpSynchronization", - Identifier = "stars_colormap", - Version = 1 + Name = "Stars Color Table", + Type = "HttpSynchronization", + Identifier = "stars_colormap", + Version = 1 }) -- Download a preprocessed binary octree of Radial Velocity subset values per star (preprocessed into 8 binary files). local starsFolder = asset.syncedResource({ - Name = "Gaia Stars RV", - Type = "HttpSynchronization", - Identifier = "gaia_stars_rv_octree", - Version = 1 + Name = "Gaia Stars RV", + Type = "HttpSynchronization", + Identifier = "gaia_stars_rv_octree", + Version = 1 }) local GaiaStars = { - Identifier = "GaiaStars", - Renderable = { - Type = "RenderableGaiaStars", - File = starsFolder .. "/", - FileReaderOption = "StreamOctree", - RenderOption = "Motion", - ShaderOption = "Point_SSBO", - Texture = textures .. "/halo.png", - ColorMap = colorLUT .. "/colorbv.cmap", - LuminosityMultiplier = 35, - MagnitudeBoost = 25, - CutOffThreshold = 38, - BillboardSize = 1, - CloseUpBoostDist = 250, - Sharpness = 1.45, - LodPixelThreshold = 0, - MaxGpuMemoryPercent = 0.24, - MaxCpuMemoryPercent = 0.4, - FilterSize = 5, - Sigma = 0.5, - AdditionalNodes = {3.0, 2.0}, - FilterPosX = {0.0, 0.0}, - FilterPosY = {0.0, 0.0}, - FilterPosZ = {0.0, 0.0}, - FilterGMag = {20.0, 20.0}, - FilterBpRp = {0.0, 0.0}, - FilterDist = {9.0, 9.0}, - }, - GUI = { - Name = "Gaia Stars", - Path = "/Milky Way" - } + Identifier = "GaiaStars", + Renderable = { + Type = "RenderableGaiaStars", + File = starsFolder .. "/", + FileReaderOption = "StreamOctree", + RenderOption = "Motion", + ShaderOption = "Point_SSBO", + Texture = textures .. "/halo.png", + ColorMap = colorLUT .. "/colorbv.cmap", + LuminosityMultiplier = 35, + MagnitudeBoost = 25, + CutOffThreshold = 38, + BillboardSize = 1, + CloseUpBoostDist = 250, + Sharpness = 1.45, + LodPixelThreshold = 0, + MaxGpuMemoryPercent = 0.24, + MaxCpuMemoryPercent = 0.4, + FilterSize = 5, + Sigma = 0.5, + AdditionalNodes = {3.0, 2.0}, + FilterPosX = {0.0, 0.0}, + FilterPosY = {0.0, 0.0}, + FilterPosZ = {0.0, 0.0}, + FilterGMag = {20.0, 20.0}, + FilterBpRp = {0.0, 0.0}, + FilterDist = {9.0, 9.0}, + }, + GUI = { + Name = "Gaia Stars", + Path = "/Milky Way" + } } assetHelper.registerSceneGraphNodesAndExport(asset, { GaiaStars }) diff --git a/data/assets/scene/milkyway/gaia/galah.asset b/data/assets/scene/milkyway/gaia/galah.asset index a12160fa5a..c9163b2ff3 100644 --- a/data/assets/scene/milkyway/gaia/galah.asset +++ b/data/assets/scene/milkyway/gaia/galah.asset @@ -3,47 +3,47 @@ local assetHelper = asset.require('util/asset_helper') local textures = asset.syncedResource({ - Name = "Stars Textures", - Type = "HttpSynchronization", - Identifier = "stars_textures", - Version = 1 + Name = "Stars Textures", + Type = "HttpSynchronization", + Identifier = "stars_textures", + Version = 1 }) local speck = asset.syncedResource({ - Name = "Galah Speck Files", - Type = "HttpSynchronization", - Identifier = "gaia_galah", - Version = 1 + Name = "Galah Speck Files", + Type = "HttpSynchronization", + Identifier = "gaia_galah", + Version = 1 }) local colorLUT = asset.syncedResource({ - Name = "Stars Color Table", - Type = "HttpSynchronization", - Identifier = "stars_colormap", - Version = 2 + Name = "Stars Color Table", + Type = "HttpSynchronization", + Identifier = "stars_colormap", + Version = 2 }) local gaia_abundance_galah = { - Identifier = "Gaia Abundance Galah", - Renderable = { - Type = "RenderableStars", - Enabled = false, - File = speck .. "/GaiaAbundGalah.speck", - Texture = textures .. "/halo.png", - -- ShapeTexture = textures .. "/disc.png", - MagnitudeExponent = 6.2, - SizeComposition = "Distance Modulus", - RenderMethod = "Texture Based", - ColorOption = "Other Data", - OtherData = "FeH", - ColorMap = colorLUT .. "/colorbv.cmap", - OtherDataColorMap = colorLUT .. "/viridis.cmap", - StaticFilter = -9999, - StaticFilterReplacement = 0.0 - }, - GUI = { - Path = "/Milky Way/Gaia" - } + Identifier = "Gaia Abundance Galah", + Renderable = { + Type = "RenderableStars", + Enabled = false, + File = speck .. "/GaiaAbundGalah.speck", + Texture = textures .. "/halo.png", + -- ShapeTexture = textures .. "/disc.png", + MagnitudeExponent = 6.2, + SizeComposition = "Distance Modulus", + RenderMethod = "Texture Based", + ColorOption = "Other Data", + OtherData = "FeH", + ColorMap = colorLUT .. "/colorbv.cmap", + OtherDataColorMap = colorLUT .. "/viridis.cmap", + StaticFilter = -9999, + StaticFilterReplacement = 0.0 + }, + GUI = { + Path = "/Milky Way/Gaia" + } } assetHelper.registerSceneGraphNodesAndExport(asset, { gaia_abundance_galah }) diff --git a/data/assets/scene/milkyway/habitable_zones/habitable_zone_textures.asset b/data/assets/scene/milkyway/habitable_zones/habitable_zone_textures.asset index 0687c70693..0adb898d5a 100644 --- a/data/assets/scene/milkyway/habitable_zones/habitable_zone_textures.asset +++ b/data/assets/scene/milkyway/habitable_zones/habitable_zone_textures.asset @@ -1,17 +1,17 @@ local TexturesPath = asset.syncedResource({ - Name = "Habitable Zone Textures", - Type = "HttpSynchronization", - Identifier = "habitable_zone_textures", - Version = 1 + Name = "Habitable Zone Textures", + Type = "HttpSynchronization", + Identifier = "habitable_zone_textures", + Version = 1 }) asset.export("TexturesPath", TexturesPath) asset.meta = { - Name = "Habitable Zone Textures", - Version = "1.0", - Description = [[ Default textures that can be used for the habitable zone - rendering]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license", + Name = "Habitable Zone Textures", + Version = "1.0", + Description = [[ Default textures that can be used for the habitable zone + rendering]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license", } diff --git a/data/assets/scene/milkyway/milkyway/eso.asset b/data/assets/scene/milkyway/milkyway/eso.asset index 1820632dc6..887c9a0023 100644 --- a/data/assets/scene/milkyway/milkyway/eso.asset +++ b/data/assets/scene/milkyway/milkyway/eso.asset @@ -3,36 +3,36 @@ local assetHelper = asset.require('util/asset_helper') local textures = asset.syncedResource({ - Name = "ESO Milky Way Textures", - Type = "HttpSynchronization", - Identifier = "milkyway-eso_textures", - Version = 1 + Name = "ESO Milky Way Textures", + Type = "HttpSynchronization", + Identifier = "milkyway-eso_textures", + Version = 1 }) local object = { - Identifier = "MilkyWay-ESO", - Transform = { - Rotation = { - Type = "StaticRotation", - Rotation = {0, 0, 3.14159265359} - } - }, - Renderable = { - Type = "RenderableSphere", - Size = 9.2E20, - Segments = 40, - Opacity = 0.4, - Texture = textures .. "/eso0932a_blend.png", - UseAdditiveBlending = true, - Orientation = "Inside", - MirrorTexture = true, - FadeOutThreshold = 0.01, - Background = true - }, - GUI = { - Name = "Milky Way (ESO)", - Path = "/Milky Way/Milky Way" + Identifier = "MilkyWay-ESO", + Transform = { + Rotation = { + Type = "StaticRotation", + Rotation = {0, 0, 3.14159265359} } + }, + Renderable = { + Type = "RenderableSphere", + Size = 9.2E20, + Segments = 40, + Opacity = 0.4, + Texture = textures .. "/eso0932a_blend.png", + UseAdditiveBlending = true, + Orientation = "Inside", + MirrorTexture = true, + FadeOutThreshold = 0.01, + Background = true + }, + GUI = { + Name = "Milky Way (ESO)", + Path = "/Milky Way/Milky Way" + } } assetHelper.registerSceneGraphNodesAndExport(asset, { object }) diff --git a/data/assets/scene/milkyway/milkyway/volume.asset b/data/assets/scene/milkyway/milkyway/volume.asset index aaf3aa3fec..76103612b3 100644 --- a/data/assets/scene/milkyway/milkyway/volume.asset +++ b/data/assets/scene/milkyway/milkyway/volume.asset @@ -4,50 +4,50 @@ local assetHelper = asset.require("util/asset_helper") local transforms = asset.require("scene/solarsystem/sun/transforms") local data = asset.syncedResource({ - Name = "Milkyway Volume Data", - Type = "HttpSynchronization", - Identifier = "milkyway_volume_data", - Version = 1 + Name = "Milkyway Volume Data", + Type = "HttpSynchronization", + Identifier = "milkyway_volume_data", + Version = 1 }) local kiloparsec = 3.086E19 local MilkyWayVolumeGalaxy = { - Identifier = "MilkyWayVolume", - Parent = transforms.SolarSystemBarycenter.Identifier, - Transform = { - Translation = { - Type = "StaticTranslation", - -- The center of the Milky Way is approximately 8 kiloparsec from the Sun. - -- The x-axis of galactic coordinates points from the sun towards the center - -- of the galaxy. - Position = { 8 * kiloparsec, 0, 0 } - } - }, - Renderable = { - Type = "RenderableGalaxy", - StepSize = 0.01, - AbsorptionMultiply = 200, - EmissionMultiply = 250, - Rotation = { 3.1415926, 3.1248, 4.45741 }, - Volume = { - Type = "Volume", - Filename = data .. "/MilkyWayRGBAVolume1024x1024x128.raw", - Dimensions = { 1024, 1024, 128 }, - Size = { 1.2E21, 1.2E21, 0.15E21 }, - Downscale = 0.4, - }, - Points = { - Type = "Points", - Filename = data .. "/MilkyWayPoints.off", - EnabledPointsRatio = 0.3, - Texture = data .. "/halo.png" - } - }, - GUI = { - Path = "/Milky Way", - Name = "Milky Way Volume" + Identifier = "MilkyWayVolume", + Parent = transforms.SolarSystemBarycenter.Identifier, + Transform = { + Translation = { + Type = "StaticTranslation", + -- The center of the Milky Way is approximately 8 kiloparsec from the Sun. + -- The x-axis of galactic coordinates points from the sun towards the center + -- of the galaxy. + Position = { 8 * kiloparsec, 0, 0 } } + }, + Renderable = { + Type = "RenderableGalaxy", + StepSize = 0.01, + AbsorptionMultiply = 200, + EmissionMultiply = 250, + Rotation = { 3.1415926, 3.1248, 4.45741 }, + Volume = { + Type = "Volume", + Filename = data .. "/MilkyWayRGBAVolume1024x1024x128.raw", + Dimensions = { 1024, 1024, 128 }, + Size = { 1.2E21, 1.2E21, 0.15E21 }, + Downscale = 0.4, + }, + Points = { + Type = "Points", + Filename = data .. "/MilkyWayPoints.off", + EnabledPointsRatio = 0.3, + Texture = data .. "/halo.png" + } + }, + GUI = { + Path = "/Milky Way", + Name = "Milky Way Volume" + } } local objects = { MilkyWayVolumeGalaxy } @@ -55,12 +55,12 @@ assetHelper.registerSceneGraphNodesAndExport(asset, objects) asset.meta = { - Name = "Milky Way Volume", - Version = "1.0", - Description = [[Volumetric rendering of Milky Way galaxy based on simulation from - NAOJ.]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT License", - Identifiers = {"MilkyWayVolume"} + Name = "Milky Way Volume", + Version = "1.0", + Description = [[Volumetric rendering of Milky Way galaxy based on simulation from + NAOJ.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT License", + Identifiers = {"MilkyWayVolume"} } diff --git a/data/assets/scene/milkyway/objects/orionnebula/cluster.asset b/data/assets/scene/milkyway/objects/orionnebula/cluster.asset index d02f8c3a5f..2325788c80 100644 --- a/data/assets/scene/milkyway/objects/orionnebula/cluster.asset +++ b/data/assets/scene/milkyway/objects/orionnebula/cluster.asset @@ -3,53 +3,53 @@ local assetHelper = asset.require('util/asset_helper') local transforms = asset.require("./transforms") local sync = asset.syncedResource({ - Name = "Orion Nebula Star Cluster", - Type = "HttpSynchronization", - Identifier = "orion_nebula_star_cluster", - Version = 1 + Name = "Orion Nebula Star Cluster", + Type = "HttpSynchronization", + Identifier = "orion_nebula_star_cluster", + Version = 1 }) local OrionClusterStars = { - Identifier = "OrionClusterStars", - Parent = transforms.NebulaPosition.Identifier, - Renderable = { - Type = "RenderableStars", - File = sync .. "/oricluster.speck", - Texture = sync .. "/halo.png", - ColorMap = sync .. "/colorbv.cmap", - MagnitudeExponent = 5.02, - SizeComposition = "Distance Modulus", - RenderMethod = "Texture Based" - }, - GUI = { - Name = "Orion Nebula Star Cluster", - Path = "/Milky Way/Orion", - Description = [[ In order to have an accurate depiction of the Orion nebula, we -need to include the star cluster that was birthed from it. We turned to a study of the -cluster's stellar population by Lynne Hillenbrand, who was working at the University of -California, Berkeley at the time. The catalog from her paper contains more than 1500 -stars, about half the stars in the actual cluster. The cluster is very crowded, with a -peak density of 10000 stars per cubic parsec over a wide range of masses from a tenth the -sun's mass up to 50 times its mass. We were presented with one problem: there are no -distances. For the stellar distances, we needed to deduce them by statistical methods. -Knowing the size of the cluster and approximating the shape to be roughly spherical, we -placed each star along a line of sight through this imaginary sphere centered on the -cluster. In this sense, these data are observed data and the view from Earth is accurate. -But the distance of each star has been derived from this educated-guess approach for the -cluster distribution. ]] - } + Identifier = "OrionClusterStars", + Parent = transforms.NebulaPosition.Identifier, + Renderable = { + Type = "RenderableStars", + File = sync .. "/oricluster.speck", + Texture = sync .. "/halo.png", + ColorMap = sync .. "/colorbv.cmap", + MagnitudeExponent = 5.02, + SizeComposition = "Distance Modulus", + RenderMethod = "Texture Based" + }, + GUI = { + Name = "Orion Nebula Star Cluster", + Path = "/Milky Way/Orion", + Description = [[ In order to have an accurate depiction of the Orion nebula, we + need to include the star cluster that was birthed from it. We turned to a study of the + cluster's stellar population by Lynne Hillenbrand, who was working at the University of + California, Berkeley at the time. The catalog from her paper contains more than 1500 + stars, about half the stars in the actual cluster. The cluster is very crowded, with a + peak density of 10000 stars per cubic parsec over a wide range of masses from a tenth the + sun's mass up to 50 times its mass. We were presented with one problem: there are no + distances. For the stellar distances, we needed to deduce them by statistical methods. + Knowing the size of the cluster and approximating the shape to be roughly spherical, we + placed each star along a line of sight through this imaginary sphere centered on the + cluster. In this sense, these data are observed data and the view from Earth is accurate. + But the distance of each star has been derived from this educated-guess approach for the + cluster distribution. ]] + } } assetHelper.registerSceneGraphNodesAndExport(asset, { OrionClusterStars }) asset.meta = { - Name = "Orion Nebula Star Cluster", - Version = "1.0", - Description = [[ Digital Universe asset for the Orion star cluster. To be used in - conjunction with nebula model. Use orionnebula.asset to include both.]], - Author = "AMNH Digital Universe", - URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", - License = "AMNH Digital Universe", - Identifiers = {"OrionClusterStars"} + Name = "Orion Nebula Star Cluster", + Version = "1.0", + Description = [[ Digital Universe asset for the Orion star cluster. To be used in + conjunction with nebula model. Use orionnebula.asset to include both.]], + Author = "AMNH Digital Universe", + URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", + License = "AMNH Digital Universe", + Identifiers = {"OrionClusterStars"} } diff --git a/data/assets/scene/milkyway/objects/orionnebula/nebula.asset b/data/assets/scene/milkyway/objects/orionnebula/nebula.asset index 41a760cda0..cf02ee733e 100644 --- a/data/assets/scene/milkyway/objects/orionnebula/nebula.asset +++ b/data/assets/scene/milkyway/objects/orionnebula/nebula.asset @@ -6,152 +6,152 @@ local center = sunTransforms.SolarSystemBarycenter.Identifier; local LIGHTS = assetHelper.getDefaultLightSources(center); local sync = asset.syncedResource({ - Name = "Orion Nebula Model", - Type = "HttpSynchronization", - Identifier = "orion_nebula_model", - Version = 2 + Name = "Orion Nebula Model", + Type = "HttpSynchronization", + Identifier = "orion_nebula_model", + Version = 2 }) local NebulaHolder = { - Identifier = "OrionNebulaHolder", - Parent = transforms.NebulaPosition.Identifier, - Transform = { - Scale = { - Type = "StaticScale", - Scale = 35999998699110400.000000 - }, - Rotation = { - Type = "FixedRotation", - Attached = "OrionNebulaHolder", - XAxis = {1.000000,1.000000,0.510000}, - XAxisOrthogonal = true, - YAxis = "Sun", - YAxisInverted = false - } + Identifier = "OrionNebulaHolder", + Parent = transforms.NebulaPosition.Identifier, + Transform = { + Scale = { + Type = "StaticScale", + Scale = 35999998699110400.000000 }, - GUI = { - Name = "Orion Nebula", - Path = "/Milky Way/Orion", - Description = [[ In the Digital Universe model of the Orion Nebula, we depict the -ionization front effectively as a terrain, with a flat Hubble image of the nebula mapped -on the undulating surface. In reality, the ionization front has a slight thickness to -it - about a third of a light year - but is quite thin compared to the overall size of -the nebula, which stretches about ten light years from side to side.

Close into -the center, we see small teardrop-shaped structures with their narrow ends pointing away -from the bright star: these are protoplanetary disks, or proplyds, of dense gas and dust -surrounding young stars. The larger formations that one sees farther away from the center -of the nebula take on a cup-like shape, with the narrow end pointing away from the -nebulas center. These enormous structures are bow shocks that delineate the region where -highspeed winds from the central star slow from supersonic to subsonic speeds. You can -think of an HII region as a sort of tremendous explosion, taking place over millennia, -and the bow shocks are part of the outward rush of material. ]] + Rotation = { + Type = "FixedRotation", + Attached = "OrionNebulaHolder", + XAxis = {1.000000,1.000000,0.510000}, + XAxisOrthogonal = true, + YAxis = "Sun", + YAxisInverted = false } + }, + GUI = { + Name = "Orion Nebula", + Path = "/Milky Way/Orion", + Description = [[ In the Digital Universe model of the Orion Nebula, we depict the + ionization front effectively as a terrain, with a flat Hubble image of the nebula mapped + on the undulating surface. In reality, the ionization front has a slight thickness to + it - about a third of a light year - but is quite thin compared to the overall size of + the nebula, which stretches about ten light years from side to side.

Close into + the center, we see small teardrop-shaped structures with their narrow ends pointing away + from the bright star: these are protoplanetary disks, or proplyds, of dense gas and dust + surrounding young stars. The larger formations that one sees farther away from the center + of the nebula take on a cup-like shape, with the narrow end pointing away from the + nebulas center. These enormous structures are bow shocks that delineate the region where + highspeed winds from the central star slow from supersonic to subsonic speeds. You can + think of an HII region as a sort of tremendous explosion, taking place over millennia, + and the bow shocks are part of the outward rush of material. ]] + } } local OrionNebulaModel = { - Identifier = "OrionNebulaModel", - Parent = NebulaHolder.Identifier, - Transform = { - Scale = { - Type = "StaticScale", - Scale = 0.67500000 - } - }, - Renderable = { - Type = "RenderableModel", - GeometryFile = sync .. "/orion_nebula.obj", - Opacity = 1.0, - DisableFaceCulling = false, - SpecularIntensity = 0.0, - AmbientIntensity = 0.0, - DiffuseIntensity = 1.0, - --PerformShading = false, - RotationVector = { 0.000000, 22.300000, 0.000000 }, - LightSources = LIGHTS; - }, - GUI = { - Name = "Orion Nebula Model", - Path = "/Milky Way/Orion", - Hidden = true, - Description = "Orion Nebula 3D model. See Orion Nebula for description." + Identifier = "OrionNebulaModel", + Parent = NebulaHolder.Identifier, + Transform = { + Scale = { + Type = "StaticScale", + Scale = 0.67500000 } + }, + Renderable = { + Type = "RenderableModel", + GeometryFile = sync .. "/orion_nebula.obj", + Opacity = 1.0, + DisableFaceCulling = false, + SpecularIntensity = 0.0, + AmbientIntensity = 0.0, + DiffuseIntensity = 1.0, + --PerformShading = false, + RotationVector = { 0.000000, 22.300000, 0.000000 }, + LightSources = LIGHTS; + }, + GUI = { + Name = "Orion Nebula Model", + Path = "/Milky Way/Orion", + Hidden = true, + Description = "Orion Nebula 3D model. See Orion Nebula for description." + } } local OrionNebulaShocksModel = { - Identifier = "OrionNebulaShocksModel", - Parent = NebulaHolder.Identifier, - Transform = { - Scale = { - Type = "StaticScale", - Scale = 0.67500000 - } - }, - Renderable = { - Type = "RenderableModel", - GeometryFile = sync .. "/orishocks.obj", - Opacity = 1.0, - DisableFaceCulling = false, - SpecularIntensity = 0.0, - AmbientIntensity = 0.0, - DiffuseIntensity = 1.0, - --PerformShading = false, - RotationVector = { 0.000000, 22.300000, 0.000000 }, - LightSources = LIGHTS; - }, - GUI = { - Name = "Orion Nebula Shocks", - Path = "/Milky Way/Orion", - Hidden = false, - Description = "Orion Nebula Shocks 3D model. See Orion Nebula for description." + Identifier = "OrionNebulaShocksModel", + Parent = NebulaHolder.Identifier, + Transform = { + Scale = { + Type = "StaticScale", + Scale = 0.67500000 } + }, + Renderable = { + Type = "RenderableModel", + GeometryFile = sync .. "/orishocks.obj", + Opacity = 1.0, + DisableFaceCulling = false, + SpecularIntensity = 0.0, + AmbientIntensity = 0.0, + DiffuseIntensity = 1.0, + --PerformShading = false, + RotationVector = { 0.000000, 22.300000, 0.000000 }, + LightSources = LIGHTS; + }, + GUI = { + Name = "Orion Nebula Shocks", + Path = "/Milky Way/Orion", + Hidden = false, + Description = "Orion Nebula Shocks 3D model. See Orion Nebula for description." + } } local OrionNebulaProplydsModel = { - Identifier = "OrionNebulaProplydsModel", - Parent = NebulaHolder.Identifier, - Transform = { - Scale = { - Type = "StaticScale", - Scale = 0.67500000 - } - }, - Renderable = { - Type = "RenderableModel", - GeometryFile = sync .. "/proplyds.obj", - Opacity = 1.0, - DisableFaceCulling = false, - SpecularIntensity = 0.0, - AmbientIntensity = 0.0, - DiffuseIntensity = 1.0, - --PerformShading = false, - RotationVector = { 0.000000, 22.300000, 0.000000 }, - LightSources = LIGHTS; - }, - GUI = { - Name = "Orion Nebula Proplyds", - Path = "/Milky Way/Orion", - Hidden = false, - Description = "Orion Nebula Proplyds 3D model. See Orion Nebula for description." + Identifier = "OrionNebulaProplydsModel", + Parent = NebulaHolder.Identifier, + Transform = { + Scale = { + Type = "StaticScale", + Scale = 0.67500000 } + }, + Renderable = { + Type = "RenderableModel", + GeometryFile = sync .. "/proplyds.obj", + Opacity = 1.0, + DisableFaceCulling = false, + SpecularIntensity = 0.0, + AmbientIntensity = 0.0, + DiffuseIntensity = 1.0, + --PerformShading = false, + RotationVector = { 0.000000, 22.300000, 0.000000 }, + LightSources = LIGHTS; + }, + GUI = { + Name = "Orion Nebula Proplyds", + Path = "/Milky Way/Orion", + Hidden = false, + Description = "Orion Nebula Proplyds 3D model. See Orion Nebula for description." + } } assetHelper.registerSceneGraphNodesAndExport(asset, { - NebulaHolder, - OrionNebulaModel, - OrionNebulaShocksModel, - OrionNebulaProplydsModel + NebulaHolder, + OrionNebulaModel, + OrionNebulaShocksModel, + OrionNebulaProplydsModel }) asset.meta = { - Name = "Orion Nebula Model", - Version = "1.0", - Description = [[ Digital Universe asset for the Orion nebula 3D model. This asset - contains seperate models for the nebula, proplyds and shocks. To be used in - conjunction with orion star cluster. Use orionnebula.asset to include both.]], - Author = "AMNH Digital Universe", - URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", - License = "AMNH Digital Universe", - Identifiers = {"OrionNebulaHolder", "OrionNebulaModel", "OrionNebulaProplydsModel", - "OrionNebulaShocksModel"} + Name = "Orion Nebula Model", + Version = "1.0", + Description = [[ Digital Universe asset for the Orion nebula 3D model. This asset + contains seperate models for the nebula, proplyds and shocks. To be used in + conjunction with orion star cluster. Use orionnebula.asset to include both.]], + Author = "AMNH Digital Universe", + URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", + License = "AMNH Digital Universe", + Identifiers = {"OrionNebulaHolder", "OrionNebulaModel", "OrionNebulaProplydsModel", + "OrionNebulaShocksModel"} } diff --git a/data/assets/scene/milkyway/objects/orionnebula/transforms.asset b/data/assets/scene/milkyway/objects/orionnebula/transforms.asset index 3461943c80..82c06e7c32 100644 --- a/data/assets/scene/milkyway/objects/orionnebula/transforms.asset +++ b/data/assets/scene/milkyway/objects/orionnebula/transforms.asset @@ -4,24 +4,24 @@ local sunTransforms = asset.require('scene/solarsystem/sun/transforms') local PARSEC_CONSTANT = 3.0856776E16; local NebulaPosition = { - Identifier = "NebulaPosition", - Parent = sunTransforms.SolarSystemBarycenter.Identifier, - Transform = { - Translation = { - Type = "StaticTranslation", - Position = { - -329.915 * PARSEC_CONSTANT, - -183.153 * PARSEC_CONSTANT, - -132.706 * PARSEC_CONSTANT - } - }, + Identifier = "NebulaPosition", + Parent = sunTransforms.SolarSystemBarycenter.Identifier, + Transform = { + Translation = { + Type = "StaticTranslation", + Position = { + -329.915 * PARSEC_CONSTANT, + -183.153 * PARSEC_CONSTANT, + -132.706 * PARSEC_CONSTANT + } }, - GUI = { - Name = "Orion Nebula Position", - Path = "/Milky Way/Orion", - Hidden = true, - Description = "Static position for Orion Nebula" - } + }, + GUI = { + Name = "Orion Nebula Position", + Path = "/Milky Way/Orion", + Hidden = true, + Description = "Static position for Orion Nebula" + } } assetHelper.registerSceneGraphNodesAndExport(asset, { NebulaPosition }) diff --git a/data/assets/scene/milkyway/stars/denver.asset b/data/assets/scene/milkyway/stars/denver.asset index d33c65aaea..a1c2fbef55 100644 --- a/data/assets/scene/milkyway/stars/denver.asset +++ b/data/assets/scene/milkyway/stars/denver.asset @@ -3,52 +3,52 @@ local assetHelper = asset.require('util/asset_helper') local textures = asset.syncedResource({ - Name = "Stars Textures", - Type = "HttpSynchronization", - Identifier = "stars-denver_textures", - Version = 1 + Name = "Stars Textures", + Type = "HttpSynchronization", + Identifier = "stars-denver_textures", + Version = 1 }) local speck = asset.syncedResource({ - Name = "Stars Speck Files", - Type = "HttpSynchronization", - Identifier = "stars-denver_speck", - Version = 1 + Name = "Stars Speck Files", + Type = "HttpSynchronization", + Identifier = "stars-denver_speck", + Version = 1 }) local colorLUT = asset.syncedResource({ - Name = "Stars Color Table", - Type = "HttpSynchronization", - Identifier = "stars-denver_colormap", - Version = 2 + Name = "Stars Color Table", + Type = "HttpSynchronization", + Identifier = "stars-denver_colormap", + Version = 2 }) local object = { - Identifier = "Stars-Denver", - Renderable = { - Type = "RenderableStars", - File = speck .. "/denver_stars.speck", - Texture = textures .. "/halo.png", - ColorMap = colorLUT .. "/denver_colorbv.cmap", - MagnitudeExponent = 6.2, - SizeComposition = "Distance Modulus", - RenderMethod = "Texture Based" -- or PSF - }, - GUI = { - Name = "Stars (Denver)", - Path = "/Milky Way/Stars" - } + Identifier = "Stars-Denver", + Renderable = { + Type = "RenderableStars", + File = speck .. "/denver_stars.speck", + Texture = textures .. "/halo.png", + ColorMap = colorLUT .. "/denver_colorbv.cmap", + MagnitudeExponent = 6.2, + SizeComposition = "Distance Modulus", + RenderMethod = "Texture Based" -- or PSF + }, + GUI = { + Name = "Stars (Denver)", + Path = "/Milky Way/Stars" + } } assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { - Name = "Stars Denver", - Version = "1.0", - Description = [[Alternative Milky Way Atlas: based on HIPPARCOS and Yale Bright + Name = "Stars Denver", + Version = "1.0", + Description = [[Alternative Milky Way Atlas: based on HIPPARCOS and Yale Bright Star catalogs]], - Author = "Ka chun Yu", - URL = "http://openspaceproject.com", - License = "Creative Commons Attribution-Share Alike 3.0 Unported" + Author = "Ka chun Yu", + URL = "http://openspaceproject.com", + License = "Creative Commons Attribution-Share Alike 3.0 Unported" } diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/charon.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/charon.asset index 0d45b5abd9..fdf60a27e6 100644 --- a/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/charon.asset +++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/charon.asset @@ -7,57 +7,57 @@ local labelsPath = asset.require('./../pluto_globelabels').LabelsPath local Charon = { - Identifier = "Charon", - Parent = transforms.PlutoBarycenter.Identifier, - Transform = { - Translation = { - Type = "SpiceTranslation", - Target = "CHARON", - Observer = "PLUTO BARYCENTER" - }, - Rotation = { - Type = "SpiceRotation", - SourceFrame = "IAU_CHARON", - DestinationFrame = "GALACTIC" - } + Identifier = "Charon", + Parent = transforms.PlutoBarycenter.Identifier, + Transform = { + Translation = { + Type = "SpiceTranslation", + Target = "CHARON", + Observer = "PLUTO BARYCENTER" }, - Renderable = { - Type = "RenderableGlobe", - Radii = { 6.035E5, 6.035E5, 6.035E5 }, - SegmentsPerPatch = 64, - Layers = {}, - Labels = { - Enable = false, - FileName = labelsPath .. "/charon.labels", - LabelAlignmentOption = "Horizontally", -- or Circularly - LabelsFontSize = 40.0, - LabelsSize = 8.0, - LabelsMinSize = 1.0, - LabelsMaxSize = 1500.0, - ProximityEnabled = false, - LabelsFadeInEnabled = true, - LabelsFadeOutEnabled = true, - FadeInStartingDistance = 2000000.0, - FadeOutStartingDistance = 800000.0, - LabelsForceDomeRendering = true, - LabelsDistanceEPS = 250000.0, - LabelsColor = { 1.0, 1.0, 0.0 } - } - }, - Tag = { "planet_solarSystem", "planet_terrestrial" }, - GUI = { - Path = "/Solar System/Dwarf Planets/Pluto" + Rotation = { + Type = "SpiceRotation", + SourceFrame = "IAU_CHARON", + DestinationFrame = "GALACTIC" } + }, + Renderable = { + Type = "RenderableGlobe", + Radii = { 6.035E5, 6.035E5, 6.035E5 }, + SegmentsPerPatch = 64, + Layers = {}, + Labels = { + Enable = false, + FileName = labelsPath .. "/charon.labels", + LabelAlignmentOption = "Horizontally", -- or Circularly + LabelsFontSize = 40.0, + LabelsSize = 8.0, + LabelsMinSize = 1.0, + LabelsMaxSize = 1500.0, + ProximityEnabled = false, + LabelsFadeInEnabled = true, + LabelsFadeOutEnabled = true, + FadeInStartingDistance = 2000000.0, + FadeOutStartingDistance = 800000.0, + LabelsForceDomeRendering = true, + LabelsDistanceEPS = 250000.0, + LabelsColor = { 1.0, 1.0, 0.0 } + } + }, + Tag = { "planet_solarSystem", "planet_terrestrial" }, + GUI = { + Path = "/Solar System/Dwarf Planets/Pluto" + } } assetHelper.registerSceneGraphNodesAndExport(asset, { Charon }) asset.meta = { - Name = "Charon", - Version = "1.0", - Description = [[ Charon globe with labels.]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license" + Name = "Charon", + Version = "1.0", + Description = [[ Charon globe with labels.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/charon_trail.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/charon_trail.asset index be77c85a0b..1c2f6918b8 100644 --- a/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/charon_trail.asset +++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/charon_trail.asset @@ -4,39 +4,40 @@ asset.require("spice/base") local CharonTrailBarycentric = { - Identifier = "CharonBarycentricTrail", - Parent = transforms.PlutoBarycenter.Identifier, - Renderable = { - Type = "RenderableTrailOrbit", - Translation = { - Type = "SpiceTranslation", - Target = "CHARON", - Observer = "PLUTO BARYCENTER" - }, - Color = { 0.00, 0.62, 1.00 }, - Period = 6.38723, - Resolution = 1000 + Identifier = "CharonBarycentricTrail", + Parent = transforms.PlutoBarycenter.Identifier, + Renderable = { + Type = "RenderableTrailOrbit", + Translation = { + Type = "SpiceTranslation", + Target = "CHARON", + Observer = "PLUTO BARYCENTER" }, - Tag = { - "moonTrail_solarSystem", - "moonTrail_dwarf", - "moonTrail_pluto", - "moonTrail_minor" }, - GUI = { - Name = "Charon Barycentric Trail", - Path = "/Solar System/Dwarf Planets/Pluto" - } + Color = { 0.00, 0.62, 1.00 }, + Period = 6.38723, + Resolution = 1000 + }, + Tag = { + "moonTrail_solarSystem", + "moonTrail_dwarf", + "moonTrail_pluto", + "moonTrail_minor" + }, + GUI = { + Name = "Charon Barycentric Trail", + Path = "/Solar System/Dwarf Planets/Pluto" + } } assetHelper.registerSceneGraphNodesAndExport(asset, { CharonTrailBarycentric }) asset.meta = { - Name = "Charon Barycentric Trail", - Version = "1.0", - Description = [[ Trail of Charon as observed by Pluto Barycenter. Data from + Name = "Charon Barycentric Trail", + Version = "1.0", + Description = [[ Trail of Charon as observed by Pluto Barycenter. Data from NASA Spice (see base spice asset)]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license" + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/default_layers.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/default_layers.asset index 267e9e8494..ed825589b3 100644 --- a/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/default_layers.asset +++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/default_layers.asset @@ -5,16 +5,16 @@ local colorLayer = asset.require(colorLayersPath .. "/greyscale_usgs") -- Set enabled layers (temporary solution) -- @TODO: do this using a boolean that's passed to the 'asset.require' instead asset.onInitialize(function () - openspace.setPropertyValueSingle("Scene.Charon.Renderable.Layers.ColorLayers." .. - colorLayer.layer.Identifier .. ".Enabled", true) + openspace.setPropertyValueSingle("Scene.Charon.Renderable.Layers.ColorLayers." .. + colorLayer.layer.Identifier .. ".Enabled", true) end) asset.meta = { - Name = "Default Charon Layers", - Version = "1.0", - Description = [[ Default Charon layers are: Black & White USGS]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license" + Name = "Default Charon Layers", + Version = "1.0", + Description = [[ Default Charon layers are: Black & White USGS]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/layers/colorlayers/greyscale_usgs.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/layers/colorlayers/greyscale_usgs.asset index b27d24046e..0284eda58d 100644 --- a/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/layers/colorlayers/greyscale_usgs.asset +++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/layers/colorlayers/greyscale_usgs.asset @@ -1,22 +1,22 @@ local globeIdentifier = asset.require("./../../charon").Charon.Identifier local layer = { - Identifier = "Greyscale_USGS", - Name = "Black & White [USGS]", - FilePath = "WMS:https://planetarymaps.usgs.gov/cgi-bin/mapserv?map=/maps/pluto/charon_simp_cyl.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&LAYERS=NEWHORIZONS_CHARON_MOSAIC&SRS=EPSG:4326&BBOX=-180,-90.0003,359.972,90", + Identifier = "Greyscale_USGS", + Name = "Black & White [USGS]", + FilePath = "WMS:https://planetarymaps.usgs.gov/cgi-bin/mapserv?map=/maps/pluto/charon_simp_cyl.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&LAYERS=NEWHORIZONS_CHARON_MOSAIC&SRS=EPSG:4326&BBOX=-180,-90.0003,359.972,90", } asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) asset.export("layer", layer) asset.meta = { - Name = "Charon Black & White & White [USGS]", - Version = "1.0", - Description = [[ Charon New Horizons LORRI MVIC Global Mosaic 300m v1. This detailed, + Name = "Charon Black & White & White [USGS]", + Version = "1.0", + Description = [[ Charon New Horizons LORRI MVIC Global Mosaic 300m v1. This detailed, high-quality global mosaic of Pluto’s largest moon, Charon, was assembled from nearly all of the highest-resolution images obtained by the Long-Range Reconnaissance Imager (LORRI) and the Multispectral Visible Imaging Camera (MVIC) on New Horizons. The @@ -25,8 +25,8 @@ asset.meta = { kilometers long, and reaching 14 kilometers deep –more than seven times as deep as the Grand Canyon. This mosaic is available in equirectangular projection at an equatorial pixel scale of 300 meters per pixel (m). (Description from URL)]], - Author = "USGS", - URL = "https://astrogeology.usgs.gov/search/map/Charon/NewHorizons/" .. - "Charon_NewHorizons_Global_Mosaic_300m_Jul2017", - License = "NASA/PDS" + Author = "USGS", + URL = "https://astrogeology.usgs.gov/search/map/Charon/NewHorizons/" .. + "Charon_NewHorizons_Global_Mosaic_300m_Jul2017", + License = "NASA/PDS" } diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/default_layers.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/default_layers.asset index b5e907d024..42c8f9f260 100644 --- a/data/assets/scene/solarsystem/dwarf_planets/pluto/default_layers.asset +++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/default_layers.asset @@ -5,16 +5,16 @@ local colorLayer = asset.require(colorLayersPath .. "/greyscale_usgs") -- Set enabled layers (temporary solution) -- @TODO: do this using a boolean that's passed to the 'asset.require' instead asset.onInitialize(function () - openspace.setPropertyValueSingle("Scene.Pluto.Renderable.Layers.ColorLayers." .. - colorLayer.layer.Identifier .. ".Enabled", true) + openspace.setPropertyValueSingle("Scene.Pluto.Renderable.Layers.ColorLayers." .. + colorLayer.layer.Identifier .. ".Enabled", true) end) asset.meta = { - Name = "Default Pluto Layers", - Version = "1.0", - Description = [[ Default Pluto layers are: Black & White USGS]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license" + Name = "Default Pluto Layers", + Version = "1.0", + Description = [[ Default Pluto layers are: Black & White USGS]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" } \ No newline at end of file diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/kernels.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/kernels.asset index 1baaddf851..09f2f6debb 100644 --- a/data/assets/scene/solarsystem/dwarf_planets/pluto/kernels.asset +++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/kernels.asset @@ -1,24 +1,24 @@ local Kernels = asset.syncedResource({ - Name = "Pluto Kernels", - Type = "HttpSynchronization", - Identifier = "pluto_kernels", - Version = 1 + Name = "Pluto Kernels", + Type = "HttpSynchronization", + Identifier = "pluto_kernels", + Version = 1 }) local PlutoKernels = { - Kernels .. "/NavPE_de433_od122.bsp", - Kernels .. "/NavSE_plu047_od122.bsp", - Kernels .. "/ssd_jpl_nasa_gov_plu043.bsp" + Kernels .. "/NavPE_de433_od122.bsp", + Kernels .. "/NavSE_plu047_od122.bsp", + Kernels .. "/ssd_jpl_nasa_gov_plu043.bsp" } asset.export("PlutoKernels", PlutoKernels) asset.meta = { - Name = "Pluto Spice Kernels", - Version = "1.0", - Description = [[ Generic SPICE kernels for Pluto.]], - Author = "OpenSpace Team", - URL = "https://naif.jpl.nasa.gov/pub/naif/pds/wgc/kernels/spk/", - License = "NASA" + Name = "Pluto Spice Kernels", + Version = "1.0", + Description = [[ Generic SPICE kernels for Pluto.]], + Author = "OpenSpace Team", + URL = "https://naif.jpl.nasa.gov/pub/naif/pds/wgc/kernels/spk/", + License = "NASA" } diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/layers/colorlayers/greyscale_usgs.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/layers/colorlayers/greyscale_usgs.asset index 6c5738adbd..de63a8a609 100644 --- a/data/assets/scene/solarsystem/dwarf_planets/pluto/layers/colorlayers/greyscale_usgs.asset +++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/layers/colorlayers/greyscale_usgs.asset @@ -1,35 +1,35 @@ local globeIdentifier = asset.require("./../../pluto").Pluto.Identifier local layer = { - Identifier = "Greyscale_USGS", - Name = "Black & White [USGS]", - FilePath = "WMS:https://planetarymaps.usgs.gov/cgi-bin/mapserv?map=/maps/pluto/pluto_simp_cyl.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&LAYERS=NEWHORIZONS_PLUTO_MOSAIC&SRS=EPSG:4326&BBOX=-180,-90,360,90", + Identifier = "Greyscale_USGS", + Name = "Black & White [USGS]", + FilePath = "WMS:https://planetarymaps.usgs.gov/cgi-bin/mapserv?map=/maps/pluto/pluto_simp_cyl.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&LAYERS=NEWHORIZONS_PLUTO_MOSAIC&SRS=EPSG:4326&BBOX=-180,-90,360,90", } asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) asset.export("layer", layer) asset.meta = { - Name = "Pluto Black & White & White [USGS]", - Version = "1.0", - Description = [[ This detailed, high-quality global mosaic of Pluto was assembled from - nearly all of the highest-resolution images obtained by the Long-Range - Reconnaissance Imager (LORRI) and the Multispectral Visible Imaging Camera (MVIC) - on New Horizons.The mosaic is the most detailed and comprehensive global view yet - of Pluto’s surface using New Horizons data. It includes topography data of the - hemisphere visible to New Horizons during the spacecraft’s closest approach. The - topography is derived from digital stereo-image mapping tools that measure the - parallax – or the difference in the apparent relative positions – of features on - the surface obtained at different viewing angles during the encounter. Scientists - use these parallax displacements of high and low terrain to estimate landform - heights.The mosaic is available in Equirectangular projection at an equatorial - pixel scale of 300 meters per pixel (m). (Description from URL)]], - Author = "USGS", - URL = "https://astrogeology.usgs.gov/search/map/Pluto/NewHorizons/" .. - "Pluto_NewHorizons_Global_Mosaic_300m_Jul2017", - License = "NASA/PDS" + Name = "Pluto Black & White & White [USGS]", + Version = "1.0", + Description = [[ This detailed, high-quality global mosaic of Pluto was assembled from + nearly all of the highest-resolution images obtained by the Long-Range + Reconnaissance Imager (LORRI) and the Multispectral Visible Imaging Camera (MVIC) + on New Horizons.The mosaic is the most detailed and comprehensive global view yet + of Pluto’s surface using New Horizons data. It includes topography data of the + hemisphere visible to New Horizons during the spacecraft’s closest approach. The + topography is derived from digital stereo-image mapping tools that measure the + parallax – or the difference in the apparent relative positions – of features on + the surface obtained at different viewing angles during the encounter. Scientists + use these parallax displacements of high and low terrain to estimate landform + heights.The mosaic is available in Equirectangular projection at an equatorial + pixel scale of 300 meters per pixel (m). (Description from URL)]], + Author = "USGS", + URL = "https://astrogeology.usgs.gov/search/map/Pluto/NewHorizons/" .. + "Pluto_NewHorizons_Global_Mosaic_300m_Jul2017", + License = "NASA/PDS" } diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/hydra.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/hydra.asset index 37c7f0d6cf..30bcb528b6 100644 --- a/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/hydra.asset +++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/hydra.asset @@ -5,62 +5,63 @@ local kernels = asset.require('../kernels').PlutoKernels local Hydra = { - Identifier = "Hydra", - Parent = transforms.PlutoBarycenter.Identifier, - Transform = { - Translation = { - Type = "SpiceTranslation", - Target = "HYDRA", - Observer = "PLUTO BARYCENTER", - Kernels = kernels - } - }, - Renderable = { - Type = "RenderableGlobe", - Radii = { 0.53E5, 0.53E5, 0.53E5 }, - SegmentsPerPatch = 64, - Layers = {} - }, - Tag = { "moon_solarSystem", "moon_dwarf", "moon_pluto" }, - GUI = { - Path = "/Solar System/Dwarf Planets/Pluto" + Identifier = "Hydra", + Parent = transforms.PlutoBarycenter.Identifier, + Transform = { + Translation = { + Type = "SpiceTranslation", + Target = "HYDRA", + Observer = "PLUTO BARYCENTER", + Kernels = kernels } + }, + Renderable = { + Type = "RenderableGlobe", + Radii = { 0.53E5, 0.53E5, 0.53E5 }, + SegmentsPerPatch = 64, + Layers = {} + }, + Tag = { "moon_solarSystem", "moon_dwarf", "moon_pluto" }, + GUI = { + Path = "/Solar System/Dwarf Planets/Pluto" + } } local HydraTrail = { - Identifier = "HydraTrail", - Parent = transforms.PlutoBarycenter.Identifier, - Renderable = { - Type = "RenderableTrailOrbit", - Translation = { - Type = "SpiceTranslation", - Target = "HYDRA", - Observer = "PLUTO BARYCENTER", - }, - Color = { 0.00, 0.62, 1.00 }, - Period = 38.20177, - Resolution = 1000 + Identifier = "HydraTrail", + Parent = transforms.PlutoBarycenter.Identifier, + Renderable = { + Type = "RenderableTrailOrbit", + Translation = { + Type = "SpiceTranslation", + Target = "HYDRA", + Observer = "PLUTO BARYCENTER", }, - Tag = { - "moonTrail_solarSystem", - "moonTrail_dwarf", - "moonTrail_pluto", - "moonTrail_minor" }, - GUI = { - Name = "Hydra Trail", - Path = "/Solar System/Dwarf Planets/Pluto" - } + Color = { 0.00, 0.62, 1.00 }, + Period = 38.20177, + Resolution = 1000 + }, + Tag = { + "moonTrail_solarSystem", + "moonTrail_dwarf", + "moonTrail_pluto", + "moonTrail_minor" + }, + GUI = { + Name = "Hydra Trail", + Path = "/Solar System/Dwarf Planets/Pluto" + } } assetHelper.registerSceneGraphNodesAndExport(asset, { Hydra, HydraTrail }) asset.meta = { - Name = "Hydra", - Version = "1.0", - Description = [[ Globe and trail for Pluto's moon Hydra. Data from + Name = "Hydra", + Version = "1.0", + Description = [[ Globe and trail for Pluto's moon Hydra. Data from NASA Spice (see base spice asset)]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license" + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/kerberos.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/kerberos.asset index fb2ddb43a6..8d394e60c4 100644 --- a/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/kerberos.asset +++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/kerberos.asset @@ -5,61 +5,62 @@ local kernels = asset.require('../kernels').PlutoKernels local Kerberos = { - Identifier = "Kerberos", - Parent = transforms.PlutoBarycenter.Identifier, - Transform = { - Translation = { - Type = "SpiceTranslation", - Target = "KERBEROS", - Observer = "PLUTO BARYCENTER" - } - }, - Renderable = { - Type = "RenderableGlobe", - Radii = { 0.1E5, 0.1E5, 0.1E5 }, - SegmentsPerPatch = 64, - Layers = {} - }, - Tag = { "moon_solarSystem", "moon_dwarf", "moon_pluto" }, - GUI = { - Path = "/Solar System/Dwarf Planets/Pluto" + Identifier = "Kerberos", + Parent = transforms.PlutoBarycenter.Identifier, + Transform = { + Translation = { + Type = "SpiceTranslation", + Target = "KERBEROS", + Observer = "PLUTO BARYCENTER" } + }, + Renderable = { + Type = "RenderableGlobe", + Radii = { 0.1E5, 0.1E5, 0.1E5 }, + SegmentsPerPatch = 64, + Layers = {} + }, + Tag = { "moon_solarSystem", "moon_dwarf", "moon_pluto" }, + GUI = { + Path = "/Solar System/Dwarf Planets/Pluto" + } } local KerberosTrail = { - Identifier = "KerberosTrail", - Parent = transforms.PlutoBarycenter.Identifier, - Renderable = { - Type = "RenderableTrailOrbit", - Translation = { - Type = "SpiceTranslation", - Target = "KERBEROS", - Observer = "PLUTO BARYCENTER", - }, - Color = { 0.00, 0.62, 1.00 }, - Period = 32.16756, - Resolution = 1000 + Identifier = "KerberosTrail", + Parent = transforms.PlutoBarycenter.Identifier, + Renderable = { + Type = "RenderableTrailOrbit", + Translation = { + Type = "SpiceTranslation", + Target = "KERBEROS", + Observer = "PLUTO BARYCENTER", }, - Tag = { - "moonTrail_solarSystem", - "moonTrail_dwarf", - "moonTrail_pluto", - "moonTrail_minor" }, - GUI = { - Name = "Kerberos Trail", - Path = "/Solar System/Dwarf Planets/Pluto" - } + Color = { 0.00, 0.62, 1.00 }, + Period = 32.16756, + Resolution = 1000 + }, + Tag = { + "moonTrail_solarSystem", + "moonTrail_dwarf", + "moonTrail_pluto", + "moonTrail_minor" + }, + GUI = { + Name = "Kerberos Trail", + Path = "/Solar System/Dwarf Planets/Pluto" + } } assetHelper.registerSceneGraphNodesAndExport(asset, { Kerberos, KerberosTrail }) asset.meta = { - Name = "Kerberos", - Version = "1.0", - Description = [[ Globe and trail for Pluto's moon Kerberos. Data from + Name = "Kerberos", + Version = "1.0", + Description = [[ Globe and trail for Pluto's moon Kerberos. Data from NASA Spice (see base spice asset)]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license" + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/nix.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/nix.asset index c5f7e03923..4503fe1893 100644 --- a/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/nix.asset +++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/nix.asset @@ -5,61 +5,62 @@ local kernels = asset.require('../kernels').PlutoKernels local Nix = { - Identifier = "Nix", - Parent = transforms.PlutoBarycenter.Identifier, - Transform = { - Translation = { - Type = "SpiceTranslation", - Target = "NIX", - Observer = "PLUTO BARYCENTER" - } - }, - Renderable = { - Type = "RenderableGlobe", - Radii = { 0.45E5, 0.45E5, 0.45E5 }, - SegmentsPerPatch = 64, - Layers = {} - }, - Tag = { "moon_solarSystem", "moon_dwarf", "moon_pluto" }, - GUI = { - Path = "/Solar System/Dwarf Planets/Pluto" + Identifier = "Nix", + Parent = transforms.PlutoBarycenter.Identifier, + Transform = { + Translation = { + Type = "SpiceTranslation", + Target = "NIX", + Observer = "PLUTO BARYCENTER" } + }, + Renderable = { + Type = "RenderableGlobe", + Radii = { 0.45E5, 0.45E5, 0.45E5 }, + SegmentsPerPatch = 64, + Layers = {} + }, + Tag = { "moon_solarSystem", "moon_dwarf", "moon_pluto" }, + GUI = { + Path = "/Solar System/Dwarf Planets/Pluto" + } } local NixTrail = { - Identifier = "NixTrail", - Parent = transforms.PlutoBarycenter.Identifier, - Renderable = { - Type = "RenderableTrailOrbit", - Translation = { - Type = "SpiceTranslation", - Target = "NIX", - Observer = "PLUTO BARYCENTER", - }, - Color = { 0.00, 0.62, 1.00 }, - Period = 24.85463, - Resolution = 1000 + Identifier = "NixTrail", + Parent = transforms.PlutoBarycenter.Identifier, + Renderable = { + Type = "RenderableTrailOrbit", + Translation = { + Type = "SpiceTranslation", + Target = "NIX", + Observer = "PLUTO BARYCENTER", }, - Tag = { - "moonTrail_solarSystem", - "moonTrail_dwarf", - "moonTrail_pluto", - "moonTrail_minor" }, - GUI = { - Name = "Nix Trail", - Path = "/Solar System/Dwarf Planets/Pluto" - } + Color = { 0.00, 0.62, 1.00 }, + Period = 24.85463, + Resolution = 1000 + }, + Tag = { + "moonTrail_solarSystem", + "moonTrail_dwarf", + "moonTrail_pluto", + "moonTrail_minor" + }, + GUI = { + Name = "Nix Trail", + Path = "/Solar System/Dwarf Planets/Pluto" + } } assetHelper.registerSceneGraphNodesAndExport(asset, { Nix, NixTrail }) asset.meta = { - Name = "Nix", - Version = "1.0", - Description = [[ Globe and trail for Pluto's moon Nix. Data from + Name = "Nix", + Version = "1.0", + Description = [[ Globe and trail for Pluto's moon Nix. Data from NASA Spice (see base spice asset)]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license" + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/styx.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/styx.asset index bc54df433a..071839e0e4 100644 --- a/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/styx.asset +++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/styx.asset @@ -4,61 +4,62 @@ local kernels = asset.require('../kernels').PlutoKernels local Styx = { - Identifier = "Styx", - Parent = transforms.PlutoBarycenter.Identifier, - Transform = { - Translation = { - Type = "SpiceTranslation", - Target = "STYX", - Observer = "PLUTO BARYCENTER" - } - }, - Renderable = { - Type = "RenderableGlobe", - Radii = { 0.45E5, 0.45E5, 0.45E5 }, - SegmentsPerPatch = 64, - Layers = {} - }, - Tag = { "moon_solarSystem", "moon_dwarf", "moon_pluto" }, - GUI = { - Path = "/Solar System/Dwarf Planets/Pluto" + Identifier = "Styx", + Parent = transforms.PlutoBarycenter.Identifier, + Transform = { + Translation = { + Type = "SpiceTranslation", + Target = "STYX", + Observer = "PLUTO BARYCENTER" } + }, + Renderable = { + Type = "RenderableGlobe", + Radii = { 0.45E5, 0.45E5, 0.45E5 }, + SegmentsPerPatch = 64, + Layers = {} + }, + Tag = { "moon_solarSystem", "moon_dwarf", "moon_pluto" }, + GUI = { + Path = "/Solar System/Dwarf Planets/Pluto" + } } local StyxTrail = { - Identifier = "StyxTrail", - Parent = transforms.PlutoBarycenter.Identifier, - Renderable = { - Type = "RenderableTrailOrbit", - Translation = { - Type = "SpiceTranslation", - Target = "STYX", - Observer = "PLUTO BARYCENTER", - }, - Color = { 0.00, 0.62, 1.00 }, - Period = 20.16155, - Resolution = 1000 + Identifier = "StyxTrail", + Parent = transforms.PlutoBarycenter.Identifier, + Renderable = { + Type = "RenderableTrailOrbit", + Translation = { + Type = "SpiceTranslation", + Target = "STYX", + Observer = "PLUTO BARYCENTER", }, - Tag = { - "moonTrail_solarSystem", - "moonTrail_dwarf", - "moonTrail_pluto", - "moonTrail_minor" }, - GUI = { - Name = "Styx Trail", - Path = "/Solar System/Dwarf Planets/Pluto" - } + Color = { 0.00, 0.62, 1.00 }, + Period = 20.16155, + Resolution = 1000 + }, + Tag = { + "moonTrail_solarSystem", + "moonTrail_dwarf", + "moonTrail_pluto", + "moonTrail_minor" + }, + GUI = { + Name = "Styx Trail", + Path = "/Solar System/Dwarf Planets/Pluto" + } } assetHelper.registerSceneGraphNodesAndExport(asset, { Styx, StyxTrail }) asset.meta = { - Name = "Styx", - Version = "1.0", - Description = [[ Globe and trail for Pluto's moon Styx. Data from + Name = "Styx", + Version = "1.0", + Description = [[ Globe and trail for Pluto's moon Styx. Data from NASA Spice (see base spice asset)]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license" + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/pluto.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/pluto.asset index 968a7edd86..ee44ed93de 100644 --- a/data/assets/scene/solarsystem/dwarf_planets/pluto/pluto.asset +++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/pluto.asset @@ -7,78 +7,78 @@ local labelsPath = asset.require('./pluto_globelabels').LabelsPath local Pluto = { - Identifier = "Pluto", - Parent = transforms.PlutoBarycenter.Identifier, - Transform = { - Translation = { - Type = "SpiceTranslation", - Target = "PLUTO", - Observer = "PLUTO BARYCENTER" - }, - Rotation = { - Type = "SpiceRotation", - SourceFrame = "IAU_PLUTO", - DestinationFrame = "GALACTIC" - } + Identifier = "Pluto", + Parent = transforms.PlutoBarycenter.Identifier, + Transform = { + Translation = { + Type = "SpiceTranslation", + Target = "PLUTO", + Observer = "PLUTO BARYCENTER" }, - Renderable = { - Type = "RenderableGlobe", - Radii = { 1.173E6, 1.173E6, 1.173E6 }, - SegmentsPerPatch = 64, - Layers = {}, - Labels = { - Enable = false, - FileName = labelsPath .. "/pluto.labels", - LabelAlignmentOption = "Horizontally", -- or Circularly - LabelsFontSize = 28.0, - LabelsSize = 8.0, - LabelsMinSize = 1.0, - LabelsMaxSize = 1500.0, - ProximityEnabled = false, - LabelsFadeInEnabled = true, - LabelsFadeOutEnabled = true, - FadeInStartingDistance = 4000000.0, - FadeOutStartingDistance = 650000.0, - LabelsForceDomeRendering = true, - LabelsDistanceEPS = 500000.0, - LabelsColor = { 1.0, 1.0, 0.0 } - } - }, - Tag = { "planet_solarSystem", "planet_terrestrial" }, - GUI = { - Path = "/Solar System/Dwarf Planets/Pluto" + Rotation = { + Type = "SpiceRotation", + SourceFrame = "IAU_PLUTO", + DestinationFrame = "GALACTIC" } + }, + Renderable = { + Type = "RenderableGlobe", + Radii = { 1.173E6, 1.173E6, 1.173E6 }, + SegmentsPerPatch = 64, + Layers = {}, + Labels = { + Enable = false, + FileName = labelsPath .. "/pluto.labels", + LabelAlignmentOption = "Horizontally", -- or Circularly + LabelsFontSize = 28.0, + LabelsSize = 8.0, + LabelsMinSize = 1.0, + LabelsMaxSize = 1500.0, + ProximityEnabled = false, + LabelsFadeInEnabled = true, + LabelsFadeOutEnabled = true, + FadeInStartingDistance = 4000000.0, + FadeOutStartingDistance = 650000.0, + LabelsForceDomeRendering = true, + LabelsDistanceEPS = 500000.0, + LabelsColor = { 1.0, 1.0, 0.0 } + } + }, + Tag = { "planet_solarSystem", "planet_terrestrial" }, + GUI = { + Path = "/Solar System/Dwarf Planets/Pluto" + } } local PlutoLabel = { - Identifier = "PlutoLabel", - Parent = Pluto.Identifier, - Renderable = { - Enabled = false, - Type = "RenderableLabels", - LabelText = "Pluto", - FontSize = 100.0, - LabelSize = 8.9, - LabelMaxSize = 100.0, - LabelMinSize = 1.0, - BlendMode = "Additive", - LabelOrientationOption = "Camera View Direction" - }, - Tag = { "solarsystem_labels" }, - GUI = { - Name = "Pluto Label", - Path = "/Solar System/Dwarf Planets/Pluto" - } + Identifier = "PlutoLabel", + Parent = Pluto.Identifier, + Renderable = { + Enabled = false, + Type = "RenderableLabels", + LabelText = "Pluto", + FontSize = 100.0, + LabelSize = 8.9, + LabelMaxSize = 100.0, + LabelMinSize = 1.0, + BlendMode = "Additive", + LabelOrientationOption = "Camera View Direction" + }, + Tag = { "solarsystem_labels" }, + GUI = { + Name = "Pluto Label", + Path = "/Solar System/Dwarf Planets/Pluto" + } } assetHelper.registerSceneGraphNodesAndExport(asset, { Pluto, PlutoLabel }) asset.meta = { - Name = "Pluto", - Version = "1.0", - Description = [[ Pluto globe, and main planet label.]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license" + Name = "Pluto", + Version = "1.0", + Description = [[ Pluto globe, and main planet label.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/pluto_globelabels.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/pluto_globelabels.asset index 241ef8e6b7..4a045b3e9d 100644 --- a/data/assets/scene/solarsystem/dwarf_planets/pluto/pluto_globelabels.asset +++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/pluto_globelabels.asset @@ -1,7 +1,7 @@ local LabelsPath = asset.syncedResource({ - Name = "Pluto Labels", - Type = "HttpSynchronization", - Identifier = "pluto_labels", - Version = 1 + Name = "Pluto Labels", + Type = "HttpSynchronization", + Identifier = "pluto_labels", + Version = 1 }) asset.export("LabelsPath", LabelsPath) diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/pluto_trail.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/pluto_trail.asset index 9fd47cf804..fc9f456e51 100644 --- a/data/assets/scene/solarsystem/dwarf_planets/pluto/pluto_trail.asset +++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/pluto_trail.asset @@ -4,35 +4,35 @@ asset.require("spice/base") local PlutoTrailBarycentric = { - Identifier = "PlutoBarycentricTrail", - Parent = transforms.PlutoBarycenter.Identifier, - Renderable = { - Type = "RenderableTrailOrbit", - Translation = { - Type = "SpiceTranslation", - Target = "PLUTO", - Observer = "PLUTO BARYCENTER" - }, - Color = { 0.00, 0.62, 1.00 }, - Period = 6.38723, - Resolution = 1000 + Identifier = "PlutoBarycentricTrail", + Parent = transforms.PlutoBarycenter.Identifier, + Renderable = { + Type = "RenderableTrailOrbit", + Translation = { + Type = "SpiceTranslation", + Target = "PLUTO", + Observer = "PLUTO BARYCENTER" }, - Tag = { "planetTrail_solarSystem", "planetTrail_dwarf" }, - GUI = { - Name = "Pluto Barycentric Trail", - Path = "/Solar System/Dwarf Planets/Pluto" - } + Color = { 0.00, 0.62, 1.00 }, + Period = 6.38723, + Resolution = 1000 + }, + Tag = { "planetTrail_solarSystem", "planetTrail_dwarf" }, + GUI = { + Name = "Pluto Barycentric Trail", + Path = "/Solar System/Dwarf Planets/Pluto" + } } assetHelper.registerSceneGraphNodesAndExport(asset, { PlutoTrailBarycentric }) asset.meta = { - Name = "Pluto Barycentric Trail", - Version = "1.0", - Description = [[ Trail of Pluto as observed by it's Barrycenter. Data from + Name = "Pluto Barycentric Trail", + Version = "1.0", + Description = [[ Trail of Pluto as observed by it's Barrycenter. Data from NASA Spice (see base spice asset)]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license" + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/system.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/system.asset index 3f21014b5b..0a99b94527 100644 --- a/data/assets/scene/solarsystem/dwarf_planets/pluto/system.asset +++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/system.asset @@ -10,11 +10,11 @@ asset.require('./minor/styx') asset.meta = { - Name = "Pluto System", - Version = "1.0", - Description = [[ Meta asset for the Pluto system, containing : Pluto, Pluto Trail, - Charon, Charon Trail, Hydra, Kerberos, Nix, and Styx]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license" + Name = "Pluto System", + Version = "1.0", + Description = [[ Meta asset for the Pluto system, containing : Pluto, Pluto Trail, + Charon, Charon Trail, Hydra, Kerberos, Nix, and Styx]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/trail.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/trail.asset index 44eafbb893..689500df90 100644 --- a/data/assets/scene/solarsystem/dwarf_planets/pluto/trail.asset +++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/trail.asset @@ -6,36 +6,36 @@ local kernels = asset.require('./kernels').PlutoKernels local PlutoBarycenterTrail = { - Identifier = "PlutoBarycenterTrail", - Parent = transforms.SolarSystemBarycenter.Identifier, - Renderable = { - Type = "RenderableTrailOrbit", - Translation = { - Type = "SpiceTranslation", - Target = "PLUTO BARYCENTER", - Observer = "SUN", - Kernels = kernels - }, - Color = { 0.3, 0.7, 0.3 }, - Period = 365.25, - Resolution = 1000 + Identifier = "PlutoBarycenterTrail", + Parent = transforms.SolarSystemBarycenter.Identifier, + Renderable = { + Type = "RenderableTrailOrbit", + Translation = { + Type = "SpiceTranslation", + Target = "PLUTO BARYCENTER", + Observer = "SUN", + Kernels = kernels }, - Tag = { "planetTrail_solarSystem", "planetTrail_dwarf" }, - GUI = { - Name = "Pluto Barycenter Trail", - Path = "/Solar System/Dwarf Planets/Pluto" - } + Color = { 0.3, 0.7, 0.3 }, + Period = 365.25, + Resolution = 1000 + }, + Tag = { "planetTrail_solarSystem", "planetTrail_dwarf" }, + GUI = { + Name = "Pluto Barycenter Trail", + Path = "/Solar System/Dwarf Planets/Pluto" + } } assetHelper.registerSceneGraphNodesAndExport(asset, { PlutoBarycenterTrail }) asset.meta = { - Name = "Pluto Barycenter Trail", - Version = "1.0", - Description = [[ Trail of Pluto as observed by the Sun. Data from + Name = "Pluto Barycenter Trail", + Version = "1.0", + Description = [[ Trail of Pluto as observed by the Sun. Data from NASA Spice (see base spice asset)]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license" + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/transforms.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/transforms.asset index f9be7f483d..e190435fd3 100644 --- a/data/assets/scene/solarsystem/dwarf_planets/pluto/transforms.asset +++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/transforms.asset @@ -6,30 +6,30 @@ asset.require("spice/base") local PlutoBarycenter = { - Identifier = "PlutoBarycenter", - Parent = transforms.SolarSystemBarycenter.Identifier, - Transform = { - Translation = { - Type = "SpiceTranslation", - Target = "PLUTO BARYCENTER", - Observer = "SUN", - Kernels = kernels - } - }, - GUI = { - Name = "Pluto Barycenter", - Path = "/Solar System/Dwarf Planets/Pluto" + Identifier = "PlutoBarycenter", + Parent = transforms.SolarSystemBarycenter.Identifier, + Transform = { + Translation = { + Type = "SpiceTranslation", + Target = "PLUTO BARYCENTER", + Observer = "SUN", + Kernels = kernels } + }, + GUI = { + Name = "Pluto Barycenter", + Path = "/Solar System/Dwarf Planets/Pluto" + } } assetHelper.registerSceneGraphNodesAndExport(asset, { PlutoBarycenter }) asset.meta = { - Name = "Pluto Transforms", - Version = "1.0", - Description = [[ Pluto Barycenter transform]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license" + Name = "Pluto Transforms", + Version = "1.0", + Description = [[ Pluto Barycenter transform]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/interstellar/c-2019_q4_borisov.asset b/data/assets/scene/solarsystem/interstellar/c-2019_q4_borisov.asset index 2796e28dc1..0413de7199 100644 --- a/data/assets/scene/solarsystem/interstellar/c-2019_q4_borisov.asset +++ b/data/assets/scene/solarsystem/interstellar/c-2019_q4_borisov.asset @@ -2,59 +2,59 @@ local assetHelper = asset.require('util/asset_helper') local sunTransforms = asset.require('scene/solarsystem/sun/transforms') local trajectory = asset.syncedResource({ - Name = "C-2019 Q4 Borisov Trajectory", - Type = "HttpSynchronization", - Identifier = "borisov_horizons", - Version = 1 + Name = "C-2019 Q4 Borisov Trajectory", + Type = "HttpSynchronization", + Identifier = "borisov_horizons", + Version = 1 }) local C2019Q4BorisovTrail = { - Identifier = "C2019Q4BorisovTrail", - Parent = sunTransforms.SolarSystemBarycenter.Identifier, - Renderable = { - Type = "RenderableTrailTrajectory", - Translation = { - Type = "HorizonsTranslation", - HorizonsTextFile = trajectory .. "/horizons_c2019q4borisov.dat" - }, - Color = { 0.9, 0.9, 0.0 }, - StartTime = "2015 JAN 01 00:00:00", - EndTime = "2024 JAN 01 00:00:00", - SampleInterval = 60 * 60 * 24 * 7 + Identifier = "C2019Q4BorisovTrail", + Parent = sunTransforms.SolarSystemBarycenter.Identifier, + Renderable = { + Type = "RenderableTrailTrajectory", + Translation = { + Type = "HorizonsTranslation", + HorizonsTextFile = trajectory .. "/horizons_c2019q4borisov.dat" }, - GUI = { - Name = "C/2019 Q4 Borisov Trail", - Path = "/Solar System/Interstellar" - } + Color = { 0.9, 0.9, 0.0 }, + StartTime = "2015 JAN 01 00:00:00", + EndTime = "2024 JAN 01 00:00:00", + SampleInterval = 60 * 60 * 24 * 7 + }, + GUI = { + Name = "C/2019 Q4 Borisov Trail", + Path = "/Solar System/Interstellar" + } } local C2019Q4BorisovPosition = { - Identifier = "C2019Q4BorisovPosition", - Parent = sunTransforms.SolarSystemBarycenter.Identifier, - Transform = { - Translation = { - Type = "HorizonsTranslation", - HorizonsTextFile = trajectory .. "/horizons_c2019q4borisov.dat" - }, - }, - GUI = { - Name = "C/2019 Q4 Borisov", - Path = "/Solar System/Interstellar" + Identifier = "C2019Q4BorisovPosition", + Parent = sunTransforms.SolarSystemBarycenter.Identifier, + Transform = { + Translation = { + Type = "HorizonsTranslation", + HorizonsTextFile = trajectory .. "/horizons_c2019q4borisov.dat" } + }, + GUI = { + Name = "C/2019 Q4 Borisov", + Path = "/Solar System/Interstellar" + } } assetHelper.registerSceneGraphNodesAndExport(asset, { C2019Q4BorisovPosition, C2019Q4BorisovTrail }) asset.meta = { - Name = "C/2019 Q4 Borisov", - Version = "1.0", - Description = [[ This asset contains the trail - and position of C-2019 Q4 Borisov from 2015 JAN 01 00:00:00 - to 2024 JAN 01 00:00:00. Data from JPL Horizons']], - Author = "OpenSpace Team", - URL = "https://ssd.jpl.nasa.gov/horizons.cgi", - License = [[ JPL-authored documents are sponsored by NASA under Contract - NAS7-030010. All documents available from this server may be protected - under the U.S. and Foreign Copyright Laws."]] + Name = "C/2019 Q4 Borisov", + Version = "1.0", + Description = [[ This asset contains the trail + and position of C-2019 Q4 Borisov from 2015 JAN 01 00:00:00 + to 2024 JAN 01 00:00:00. Data from JPL Horizons']], + Author = "OpenSpace Team", + URL = "https://ssd.jpl.nasa.gov/horizons.cgi", + License = [[ JPL-authored documents are sponsored by NASA under Contract + NAS7-030010. All documents available from this server may be protected + under the U.S. and Foreign Copyright Laws."]] } diff --git a/data/assets/scene/solarsystem/interstellar/oumuamua.asset b/data/assets/scene/solarsystem/interstellar/oumuamua.asset index cf6cce4a0a..972d7cd3da 100644 --- a/data/assets/scene/solarsystem/interstellar/oumuamua.asset +++ b/data/assets/scene/solarsystem/interstellar/oumuamua.asset @@ -2,57 +2,57 @@ local assetHelper = asset.require('util/asset_helper') local sunTransforms = asset.require('scene/solarsystem/sun/transforms') local trajectory = asset.syncedResource({ - Name = "'Oumuamua Trajectory", - Type = "HttpSynchronization", - Identifier = "oumuamua_horizons", - Version = 1 + Name = "'Oumuamua Trajectory", + Type = "HttpSynchronization", + Identifier = "oumuamua_horizons", + Version = 1 }) local OumuamuaTrail = { - Identifier = "OumuamuaTrail", - Parent = sunTransforms.SolarSystemBarycenter.Identifier, - Renderable = { - Type = "RenderableTrailTrajectory", - Translation = { - Type = "HorizonsTranslation", - HorizonsTextFile = trajectory .. "/horizons_oumuamua.dat" - }, - Color = { 0.9, 0.9, 0.0 }, - StartTime = "2014 JAN 01 00:00:00", - EndTime = "2023 JAN 01 00:00:00", - SampleInterval = 7000, - TimeStampSubsampleFactor = 1 + Identifier = "OumuamuaTrail", + Parent = sunTransforms.SolarSystemBarycenter.Identifier, + Renderable = { + Type = "RenderableTrailTrajectory", + Translation = { + Type = "HorizonsTranslation", + HorizonsTextFile = trajectory .. "/horizons_oumuamua.dat" }, - GUI = { - Name = "'Oumuamua Trail", - Path = "/Solar System/Interstellar" - } + Color = { 0.9, 0.9, 0.0 }, + StartTime = "2014 JAN 01 00:00:00", + EndTime = "2023 JAN 01 00:00:00", + SampleInterval = 7000, + TimeStampSubsampleFactor = 1 + }, + GUI = { + Name = "'Oumuamua Trail", + Path = "/Solar System/Interstellar" + } } local OumuamuaPosition = { - Identifier = "OumuamuaPosition", - Parent = sunTransforms.SolarSystemBarycenter.Identifier, - Transform = { - Translation = { - Type = "HorizonsTranslation", - HorizonsTextFile = trajectory .. "/horizons_oumuamua.dat" - }, + Identifier = "OumuamuaPosition", + Parent = sunTransforms.SolarSystemBarycenter.Identifier, + Transform = { + Translation = { + Type = "HorizonsTranslation", + HorizonsTextFile = trajectory .. "/horizons_oumuamua.dat" }, - GUI = { - Name = "'Oumuamua", - Path = "/Solar System/Interstellar" - } + }, + GUI = { + Name = "'Oumuamua", + Path = "/Solar System/Interstellar" + } } assetHelper.registerSceneGraphNodesAndExport(asset, { OumuamuaPosition, OumuamuaTrail }) asset.meta = { - Name = "'Oumuamua", - Version = "1.0", - Description = [[ This asset contains the trail and position of 'Oumuamua from 2014 - JAN 01 00:00:00 to 2023 JAN 01 00:00:00. Data from JPL Horizons']], - Author = "OpenSpace Team", - URL = "https://ssd.jpl.nasa.gov/horizons.cgi", - License = "NASA" + Name = "'Oumuamua", + Version = "1.0", + Description = [[ This asset contains the trail and position of 'Oumuamua from 2014 + JAN 01 00:00:00 to 2023 JAN 01 00:00:00. Data from JPL Horizons']], + Author = "OpenSpace Team", + URL = "https://ssd.jpl.nasa.gov/horizons.cgi", + License = "NASA" } diff --git a/data/assets/scene/solarsystem/missions/apollo/11/apollo11.asset b/data/assets/scene/solarsystem/missions/apollo/11/apollo11.asset index 0c34a723cd..92b5cb3525 100644 --- a/data/assets/scene/solarsystem/missions/apollo/11/apollo11.asset +++ b/data/assets/scene/solarsystem/missions/apollo/11/apollo11.asset @@ -17,205 +17,205 @@ local apolloSpiceId = "-911" local apolloLemSpiceId = "-911500" local Apollo11Position = { - Identifier = "Apollo11Position", - Parent = moon_transforms.Moon.Identifier, - TimeFrame = { - Type = "TimeFrameInterval", - Start = "1969 JUL 19 19:38:29.183", - End = "1969 JUL 22 04:55:35.183" - }, - Transform = { - Translation = { - Type = "SpiceTranslation", - Target = apolloSpiceId, - Observer = "MOON", - Frame = "MOON_ME", - Kernels = kernels - }, - }, - GUI = { - Hidden = true, - Name = "Apollo 11", - Path = "/Solar System/Missions/Apollo/11" + Identifier = "Apollo11Position", + Parent = moon_transforms.Moon.Identifier, + TimeFrame = { + Type = "TimeFrameInterval", + Start = "1969 JUL 19 19:38:29.183", + End = "1969 JUL 22 04:55:35.183" + }, + Transform = { + Translation = { + Type = "SpiceTranslation", + Target = apolloSpiceId, + Observer = "MOON", + Frame = "MOON_ME", + Kernels = kernels } + }, + GUI = { + Hidden = true, + Name = "Apollo 11", + Path = "/Solar System/Missions/Apollo/11" + } } local Apollo11Model = { - Identifier = "Apollo11", - Parent = Apollo11Position.Identifier, - TimeFrame = { - Type = "TimeFrameInterval", - Start = "1969 JUL 19 19:38:29.183", - End = "1969 JUL 22 04:55:35.183" - }, - Transform = { - Scale = { - Type = "StaticScale", - Scale = 20.0 - } - }, - Renderable = { - Type = "RenderableModel", - GeometryFile = models .. "/Apollo_CSM_shrunk_rotated_xy_double_size.obj", - LightSources = asset_helper.getDefaultLightSources(sun_transforms.SolarSystemBarycenter.Identifier) - }, - GUI = { - Name = "Apollo 11 CSM", - Path = "/Solar System/Missions/Apollo/11" + Identifier = "Apollo11", + Parent = Apollo11Position.Identifier, + TimeFrame = { + Type = "TimeFrameInterval", + Start = "1969 JUL 19 19:38:29.183", + End = "1969 JUL 22 04:55:35.183" + }, + Transform = { + Scale = { + Type = "StaticScale", + Scale = 20.0 } + }, + Renderable = { + Type = "RenderableModel", + GeometryFile = models .. "/Apollo_CSM_shrunk_rotated_xy_double_size.obj", + LightSources = asset_helper.getDefaultLightSources(sun_transforms.SolarSystemBarycenter.Identifier) + }, + GUI = { + Name = "Apollo 11 CSM", + Path = "/Solar System/Missions/Apollo/11" + } } local Apollo11MoonTrail = { - Identifier = "Apollo11MoonTrail", - Parent = moon_transforms.Moon.Identifier, - Renderable = { - Type = "RenderableTrailTrajectory", - Translation = { - Type = "SpiceTranslation", - Target = apolloSpiceId, - Observer = "MOON", - Frame = "IAU_MOON", - Kernels = kernels - }, - Color = { 0.180000,0.510000,0.750000 }, - StartTime = "1969 JUL 19 19:38:29.183", - EndTime = "1969 JUL 22 04:55:35.183", - SampleInterval = 60, - EnableFade = false, - Enabled = false + Identifier = "Apollo11MoonTrail", + Parent = moon_transforms.Moon.Identifier, + Renderable = { + Type = "RenderableTrailTrajectory", + Translation = { + Type = "SpiceTranslation", + Target = apolloSpiceId, + Observer = "MOON", + Frame = "IAU_MOON", + Kernels = kernels }, - GUI = { - Name = "Apollo 11 Moon Orbits", - Path = "/Solar System/Missions/Apollo/11" - } + Color = { 0.180000,0.510000,0.750000 }, + StartTime = "1969 JUL 19 19:38:29.183", + EndTime = "1969 JUL 22 04:55:35.183", + SampleInterval = 60, + EnableFade = false, + Enabled = false + }, + GUI = { + Name = "Apollo 11 Moon Orbits", + Path = "/Solar System/Missions/Apollo/11" + } } local lemTranslation = { - Type = "TimelineTranslation", - Keyframes = { - -- 20:14:30 is an arbitrary cutoff, but last 4 minutes data in descentKeyframes - -- begins at 20.14.40. Due to linear interpolation, we will get - -- a 10s linear transition to the location where the descentKeyframes start. - ['1969 JUL 20 20:14:30'] = { - Type = "SpiceTranslation", - Target = apolloLemSpiceId, - Observer = "MOON", - Frame = "IAU_MOON", - Kernels = kernels - }, - ['1969 JUL 20 20:14:40'] = { - Type = "TimelineTranslation", - Keyframes = descentKeyframes.keyframes - } + Type = "TimelineTranslation", + Keyframes = { + -- 20:14:30 is an arbitrary cutoff, but last 4 minutes data in descentKeyframes + -- begins at 20.14.40. Due to linear interpolation, we will get + -- a 10s linear transition to the location where the descentKeyframes start. + ['1969 JUL 20 20:14:30'] = { + Type = "SpiceTranslation", + Target = apolloLemSpiceId, + Observer = "MOON", + Frame = "IAU_MOON", + Kernels = kernels + }, + ['1969 JUL 20 20:14:40'] = { + Type = "TimelineTranslation", + Keyframes = descentKeyframes.keyframes } + } } local lemRotation = { - Type = "TimelineRotation", - Keyframes = descentRotationKeyframes.keyframes + Type = "TimelineRotation", + Keyframes = descentRotationKeyframes.keyframes } local Apollo11LemTrail = { - Identifier = "Apollo11LemTrail", - Parent = moon_transforms.Moon.Identifier, - Renderable = { - Type = "RenderableTrailTrajectory", - Translation = lemTranslation, - Color = { 0.780000,0.940000,0.340000 }, - StartTime = "1969 JUL 20 19:10:25.183", - EndTime = "1969 JUL 20 20:17:46.183", - SampleInterval = 2, - EnableFade = false, - Enabled = false, - }, - GUI = { - Name = "Apollo 11 Lunar Lander Trail", - Path = "/Solar System/Missions/Apollo/11" - } + Identifier = "Apollo11LemTrail", + Parent = moon_transforms.Moon.Identifier, + Renderable = { + Type = "RenderableTrailTrajectory", + Translation = lemTranslation, + Color = { 0.780000,0.940000,0.340000 }, + StartTime = "1969 JUL 20 19:10:25.183", + EndTime = "1969 JUL 20 20:17:46.183", + SampleInterval = 2, + EnableFade = false, + Enabled = false, + }, + GUI = { + Name = "Apollo 11 Lunar Lander Trail", + Path = "/Solar System/Missions/Apollo/11" + } } local Apollo11LemPosition = { - Identifier = "Apollo11LemPosition", - Parent = moon_transforms.Moon.Identifier, - TimeFrame = { - Type = "TimeFrameInterval", - Start = "1969 JUL 20 19:10:25.183" - }, - Transform = { - Translation = lemTranslation, - Rotation = lemRotation - }, - GUI = { - Name = "Apollo 11 Lunar Lander Position", - Path = "/Solar System/Missions/Apollo/11" - } + Identifier = "Apollo11LemPosition", + Parent = moon_transforms.Moon.Identifier, + TimeFrame = { + Type = "TimeFrameInterval", + Start = "1969 JUL 20 19:10:25.183" + }, + Transform = { + Translation = lemTranslation, + Rotation = lemRotation + }, + GUI = { + Name = "Apollo 11 Lunar Lander Position", + Path = "/Solar System/Missions/Apollo/11" + } } --landing - 1969-07-20T20:17:40 local Apollo11LemDescentModel = { - Identifier = "Apollo11LemDescentModel", - Parent = Apollo11LemPosition.Identifier, - TimeFrame = { - Type = "TimeFrameInterval", - Start = "1969 JUL 19 19:38:29.183", - End = "1969 JUL 20 20:17:40.0" - }, - Transform = { - Scale = { - Type = "StaticScale", - Scale = 0.24 - } - }, - Renderable = { - Type = "RenderableModel", - GeometryFile = lem_model.modelFolder .. "/lmremoved.obj", - SpecularIntensity = 0.0, - RotationVector = { 273.750,28.0,309.85 }, - LightSources = asset_helper.getDefaultLightSources(sun_transforms.SolarSystemBarycenter.Identifier) - }, - GUI = { - Name = "Apollo 11 Descent Lem", - Path = "/Solar System/Missions/Apollo/11" + Identifier = "Apollo11LemDescentModel", + Parent = Apollo11LemPosition.Identifier, + TimeFrame = { + Type = "TimeFrameInterval", + Start = "1969 JUL 19 19:38:29.183", + End = "1969 JUL 20 20:17:40.0" + }, + Transform = { + Scale = { + Type = "StaticScale", + Scale = 0.24 } + }, + Renderable = { + Type = "RenderableModel", + GeometryFile = lem_model.modelFolder .. "/lmremoved.obj", + SpecularIntensity = 0.0, + RotationVector = { 273.750,28.0,309.85 }, + LightSources = asset_helper.getDefaultLightSources(sun_transforms.SolarSystemBarycenter.Identifier) + }, + GUI = { + Name = "Apollo 11 Descent Lem", + Path = "/Solar System/Missions/Apollo/11" + } } local Apollo11LemLandedModel = { - Identifier = "Apollo11LemLandedModel", - Parent = Apollo11LemPosition.Identifier, - TimeFrame = { - Type = "TimeFrameInterval", - Start = "1969 JUL 20 20:17:40.0" - }, - Transform = { - Scale = { - Type = "StaticScale", - Scale = 0.24 - } - }, - Renderable = { - Type = "RenderableModel", - GeometryFile = lem_model.modelFolder .. "/LM-2_ver2clean.obj", - SpecularIntensity = 0.0, - RotationVector = { 273.750,28.0,309.85 }, - LightSources = asset_helper.getDefaultLightSources(sun_transforms.SolarSystemBarycenter.Identifier) - }, - GUI = { - Name = "Apollo 11 Landed Lem", - Path = "/Solar System/Missions/Apollo/11" + Identifier = "Apollo11LemLandedModel", + Parent = Apollo11LemPosition.Identifier, + TimeFrame = { + Type = "TimeFrameInterval", + Start = "1969 JUL 20 20:17:40.0" + }, + Transform = { + Scale = { + Type = "StaticScale", + Scale = 0.24 } + }, + Renderable = { + Type = "RenderableModel", + GeometryFile = lem_model.modelFolder .. "/LM-2_ver2clean.obj", + SpecularIntensity = 0.0, + RotationVector = { 273.750,28.0,309.85 }, + LightSources = asset_helper.getDefaultLightSources(sun_transforms.SolarSystemBarycenter.Identifier) + }, + GUI = { + Name = "Apollo 11 Landed Lem", + Path = "/Solar System/Missions/Apollo/11" + } } local exportList = { - Apollo11Position, - Apollo11LemPosition, - Apollo11Model, - Apollo11LemDescentModel, - Apollo11LemLandedModel, - Apollo11MoonTrail, - Apollo11LemTrail, + Apollo11Position, + Apollo11LemPosition, + Apollo11Model, + Apollo11LemDescentModel, + Apollo11LemLandedModel, + Apollo11MoonTrail, + Apollo11LemTrail, } asset_helper.registerSceneGraphNodesAndExport(asset, exportList) diff --git a/data/assets/scene/solarsystem/missions/apollo/11/kernels.asset b/data/assets/scene/solarsystem/missions/apollo/11/kernels.asset index d1ffcf55e4..d6fdbf3dbd 100644 --- a/data/assets/scene/solarsystem/missions/apollo/11/kernels.asset +++ b/data/assets/scene/solarsystem/missions/apollo/11/kernels.asset @@ -1,16 +1,16 @@ local kernelsFolder = asset.syncedResource({ - Name = "Apollo Kernels", - Type = "HttpSynchronization", - Identifier = "apollo_11_spice", - Version = 1 + Name = "Apollo Kernels", + Type = "HttpSynchronization", + Identifier = "apollo_11_spice", + Version = 1 }) local kernels = { - kernelsFolder .. "/moon_080317.tf", - kernelsFolder .. "/apollo_naif_ids.tf", - kernelsFolder .. "/moon_pa_de421_1900-2050.bpc", - kernelsFolder .. '/apollo11_orbits_full9km.bsp', - kernelsFolder .. '/apollo11_orbits_lm9km.bsp', + kernelsFolder .. "/moon_080317.tf", + kernelsFolder .. "/apollo_naif_ids.tf", + kernelsFolder .. "/moon_pa_de421_1900-2050.bpc", + kernelsFolder .. '/apollo11_orbits_full9km.bsp', + kernelsFolder .. '/apollo11_orbits_lm9km.bsp', } asset.export('kernels', kernels) diff --git a/data/assets/scene/solarsystem/missions/apollo/11/lem.asset b/data/assets/scene/solarsystem/missions/apollo/11/lem.asset index df7b210a9d..bb5a78ec79 100644 --- a/data/assets/scene/solarsystem/missions/apollo/11/lem.asset +++ b/data/assets/scene/solarsystem/missions/apollo/11/lem.asset @@ -7,43 +7,43 @@ local lem_model = asset.require('scene/solarsystem/missions/apollo/lem_model') local Apollo11Lem = { - Identifier = "Apollo11Lem", - Parent = moon_asset.Moon.Identifier, - Transform = { - Translation = { - Type = "GlobeTranslation", - Globe = moon_asset.Moon.Identifier, - Longitude = -360+23.47306, - Latitude = 0.67402, - Altitude = -1927.65, - UseHeightMap = false - }, - }, - GUI = { - Name = "Apollo 11 Lem Position", - Path = "/Solar System/Missions/Apollo/11" + Identifier = "Apollo11Lem", + Parent = moon_asset.Moon.Identifier, + Transform = { + Translation = { + Type = "GlobeTranslation", + Globe = moon_asset.Moon.Identifier, + Longitude = -360+23.47306, + Latitude = 0.67402, + Altitude = -1927.65, + UseHeightMap = false } + }, + GUI = { + Name = "Apollo 11 Lem Position", + Path = "/Solar System/Missions/Apollo/11" +} } local Apollo11LemModel = { - Identifier = "Apollo11LemModel", - Parent = Apollo11Lem.Identifier, - Transform = { - Scale = { - Type = "StaticScale", - Scale = 0.24 - } - }, - Renderable = { - Type = "RenderableModel", - GeometryFile = lem_model.modelFolder .. "/LM-2_ver2clean.obj", - RotationVector = { 91.044090,171.229706,111.666664 }, - LightSources = asset_helper.getDefaultLightSources(sun_transforms.SolarSystemBarycenter.Identifier) - }, - GUI = { - Name = "Apollo 11 Lem", - Path = "/Solar System/Missions/Apollo/11" + Identifier = "Apollo11LemModel", + Parent = Apollo11Lem.Identifier, + Transform = { + Scale = { + Type = "StaticScale", + Scale = 0.24 } + }, + Renderable = { + Type = "RenderableModel", + GeometryFile = lem_model.modelFolder .. "/LM-2_ver2clean.obj", + RotationVector = { 91.044090,171.229706,111.666664 }, + LightSources = asset_helper.getDefaultLightSources(sun_transforms.SolarSystemBarycenter.Identifier) + }, + GUI = { + Name = "Apollo 11 Lem", + Path = "/Solar System/Missions/Apollo/11" + } } asset_helper.registerSceneGraphNodesAndExport(asset, { Apollo11Lem, Apollo11LemModel }) diff --git a/data/assets/scene/solarsystem/missions/apollo/11/lem_descent.asset b/data/assets/scene/solarsystem/missions/apollo/11/lem_descent.asset index 3102e6a618..36189888fb 100644 --- a/data/assets/scene/solarsystem/missions/apollo/11/lem_descent.asset +++ b/data/assets/scene/solarsystem/missions/apollo/11/lem_descent.asset @@ -13,1822 +13,1822 @@ In the conversion, some assumptions and simplifications were made: ]]-- local keyframes = { - ['1969-07-20T20:13:40'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.64480784327766, - Latitude = 0.6899960896998255, - Altitude = -1546.3568594681615, - UseHeightmap = false - }, - ['1969-07-20T20:13:41'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.64371058653857, - Latitude = 0.6878218095380976, - Altitude = -1565.4215164947534, - UseHeightmap = false - }, - ['1969-07-20T20:13:42'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.64182673932963, - Latitude = 0.6868724573827948, - Altitude = -1565.4215164947534, - UseHeightmap = false - }, - ['1969-07-20T20:13:43'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.64054706630478, - Latitude = 0.6858670898943581, - Altitude = -1579.0391286566048, - UseHeightmap = false - }, - ['1969-07-20T20:13:44'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.63636509003987, - Latitude = 0.6869318608730292, - Altitude = -1579.0391286566048, - UseHeightmap = false - }, - ['1969-07-20T20:13:45'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.63333610553231, - Latitude = 0.6875049989808152, - Altitude = -1584.4861735213453, - UseHeightmap = false - }, - ['1969-07-20T20:13:46'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.630258198415152, - Latitude = 0.6879251024075629, - Altitude = -1587.2096959537155, - UseHeightmap = false - }, - ['1969-07-20T20:13:47'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.62944534804935, - Latitude = 0.6868614912680597, - Altitude = -1592.656740818456, - UseHeightmap = false - }, - ['1969-07-20T20:13:48'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.62679291745059, - Latitude = 0.6859161360075229, - Altitude = -1604.9125917641222, - UseHeightmap = false - }, - ['1969-07-20T20:13:49'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.624085315638872, - Latitude = 0.685126212476227, - Altitude = -1619.8919651421588, - UseHeightmap = false - }, - ['1969-07-20T20:13:50'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.62142772795633, - Latitude = 0.6848656185526153, - Altitude = -1630.7860548716399, - UseHeightmap = false - }, - ['1969-07-20T20:13:51'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.617193313827283, - Latitude = 0.6849603490017026, - Altitude = -1630.7860548716399, - UseHeightmap = false - }, - ['1969-07-20T20:13:52'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.61543137875974, - Latitude = 0.68523470439912, - Altitude = -1629.4242936554547, - UseHeightmap = false - }, - ['1969-07-20T20:13:53'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.61158202958536, - Latitude = 0.6853852597026965, - Altitude = -1633.5095773040102, - UseHeightmap = false - }, - ['1969-07-20T20:13:54'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.60991413189263, - Latitude = 0.6852537398149626, - Altitude = -1643.041905817306, - UseHeightmap = false - }, - ['1969-07-20T20:13:55'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.607915527643012, - Latitude = 0.6853963551830907, - Altitude = -1662.106562843898, - UseHeightmap = false - }, - ['1969-07-20T20:13:56'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.605996916437142, - Latitude = 0.6830167672762936, - Altitude = -1663.4683240600832, - UseHeightmap = false - }, - ['1969-07-20T20:13:57'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.6027345854584, - Latitude = 0.6824580715414034, - Altitude = -1671.09418687072, - UseHeightmap = false - }, - ['1969-07-20T20:13:58'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.60047452065999, - Latitude = 0.6837230890353062, - Altitude = -1671.638891357194, - UseHeightmap = false - }, - ['1969-07-20T20:13:59'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.598006245556462, - Latitude = 0.6851039272779041, - Altitude = -1670.277130141009, - UseHeightmap = false - }, - ['1969-07-20T20:14:00'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.594980604909782, - Latitude = 0.6859011120513393, - Altitude = -1683.8947423028603, - UseHeightmap = false - }, - ['1969-07-20T20:14:01'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.595085912567033, - Latitude = 0.685405665002322, - Altitude = -1698.874115680897, - UseHeightmap = false - }, - ['1969-07-20T20:14:02'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.5930664955042, - Latitude = 0.6852493785380211, - Altitude = -1701.597638113267, - UseHeightmap = false - }, - ['1969-07-20T20:14:03'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.591385100243283, - Latitude = 0.6848676328581234, - Altitude = -1709.768205410378, - UseHeightmap = false - }, - ['1969-07-20T20:14:04'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.58888799865371, - Latitude = 0.6847945134519827, - Altitude = -1717.9387727074889, - UseHeightmap = false - }, - ['1969-07-20T20:14:05'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.58707895840121, - Latitude = 0.6847997274847563, - Altitude = -1720.662295139859, - UseHeightmap = false - }, - ['1969-07-20T20:14:06'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.585134523523262, - Latitude = 0.6844679679748537, - Altitude = -1726.1093400045995, - UseHeightmap = false - }, - ['1969-07-20T20:14:07'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.58309233633901, - Latitude = 0.6845115405154798, - Altitude = -1730.194623653155, - UseHeightmap = false - }, - ['1969-07-20T20:14:08'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.581800658763132, - Latitude = 0.6837790677972603, - Altitude = -1737.0034297340808, - UseHeightmap = false - }, - ['1969-07-20T20:14:09'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.580055660445762, - Latitude = 0.6831436064664251, - Altitude = -1741.0887133826361, - UseHeightmap = false - }, - ['1969-07-20T20:14:10'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.57863282556605, - Latitude = 0.6828140286921376, - Altitude = -1749.259280679747, - UseHeightmap = false - }, - ['1969-07-20T20:14:11'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.57640031861404, - Latitude = 0.6825176811105468, - Altitude = -1751.9828031121174, - UseHeightmap = false - }, - ['1969-07-20T20:14:12'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.57398679174075, - Latitude = 0.6826876185178852, - Altitude = -1750.6210418959322, - UseHeightmap = false - }, - ['1969-07-20T20:14:13'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.57156483164977, - Latitude = 0.6825035088375115, - Altitude = -1758.7916091930429, - UseHeightmap = false - }, - ['1969-07-20T20:14:14'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.568805614344672, - Latitude = 0.6825830127392937, - Altitude = -1764.2386540577836, - UseHeightmap = false - }, - ['1969-07-20T20:14:15'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.56712274763365, - Latitude = 0.6821390846562359, - Altitude = -1764.2386540577836, - UseHeightmap = false - }, - ['1969-07-20T20:14:16'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.56530723506546, - Latitude = 0.6815597518028071, - Altitude = -1772.4092213548943, - UseHeightmap = false - }, - ['1969-07-20T20:14:17'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.56412162578659, - Latitude = 0.6811736246098009, - Altitude = -1773.7709825710795, - UseHeightmap = false - }, - ['1969-07-20T20:14:18'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.56276962682385, - Latitude = 0.6808738576281527, - Altitude = -1779.2180274358202, - UseHeightmap = false - }, - ['1969-07-20T20:14:19'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.560994966586822, - Latitude = 0.6806433210749815, - Altitude = -1781.9415498681901, - UseHeightmap = false - }, - ['1969-07-20T20:14:20'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.55943927760013, - Latitude = 0.680762500394614, - Altitude = -1788.7503559491158, - UseHeightmap = false - }, - ['1969-07-20T20:14:21'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.55808185917876, - Latitude = 0.6806932677701746, - Altitude = -1788.205651462642, - UseHeightmap = false - }, - ['1969-07-20T20:14:22'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.556393791415733, - Latitude = 0.6811207130416086, - Altitude = -1791.4738783814862, - UseHeightmap = false - }, - ['1969-07-20T20:14:23'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.55496480157647, - Latitude = 0.6814204204715102, - Altitude = -1792.8356395976714, - UseHeightmap = false - }, - ['1969-07-20T20:14:24'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.55306742293409, - Latitude = 0.6817752241315425, - Altitude = -1795.5591620300418, - UseHeightmap = false - }, - ['1969-07-20T20:14:25'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.55137129589691, - Latitude = 0.6815869620825672, - Altitude = -1802.3679681109675, - UseHeightmap = false - }, - ['1969-07-20T20:14:26'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.54977453252549, - Latitude = 0.681089420496018, - Altitude = -1805.0914905433376, - UseHeightmap = false - }, - ['1969-07-20T20:14:27'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.548083879890072, - Latitude = 0.6807962459602379, - Altitude = -1807.8150129757078, - UseHeightmap = false - }, - ['1969-07-20T20:14:28'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.546540200146502, - Latitude = 0.6805000865197504, - Altitude = -1810.5385354080781, - UseHeightmap = false - }, - ['1969-07-20T20:14:29'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.54516644867878, - Latitude = 0.6804026508636472, - Altitude = -1815.9855802728187, - UseHeightmap = false - }, - ['1969-07-20T20:14:30'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.54408346592703, - Latitude = 0.6805503084088244, - Altitude = -1817.3473414890038, - UseHeightmap = false - }, - ['1969-07-20T20:14:31'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.54339758182375, - Latitude = 0.6804859303352504, - Altitude = -1818.709102705189, - UseHeightmap = false - }, - ['1969-07-20T20:14:32'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.54194570925206, - Latitude = 0.6803064377127922, - Altitude = -1821.4326251375592, - UseHeightmap = false - }, - ['1969-07-20T20:14:33'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.54085221251783, - Latitude = 0.6801546546560774, - Altitude = -1824.9732042996407, - UseHeightmap = false - }, - ['1969-07-20T20:14:34'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.53954140597472, - Latitude = 0.6797325898259152, - Altitude = -1827.696726732011, - UseHeightmap = false - }, - ['1969-07-20T20:14:35'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.537934104316932, - Latitude = 0.679569186740729, - Altitude = -1831.7820103805664, - UseHeightmap = false - }, - ['1969-07-20T20:14:36'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.53689199133522, - Latitude = 0.6794114031790662, - Altitude = -1833.6884760832256, - UseHeightmap = false - }, - ['1969-07-20T20:14:37'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.53536814560564, - Latitude = 0.6791732992510942, - Altitude = -1836.9567030020698, - UseHeightmap = false - }, - ['1969-07-20T20:14:38'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.53395331216349, - Latitude = 0.6792039275673737, - Altitude = -1839.4078731912032, - UseHeightmap = false - }, - ['1969-07-20T20:14:39'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.53275788877434, - Latitude = 0.6790059399149831, - Altitude = -1840.497282164151, - UseHeightmap = false - }, - ['1969-07-20T20:14:40'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.531279977460432, - Latitude = 0.6788794363528592, - Altitude = -1844.5825658127067, - UseHeightmap = false - }, - ['1969-07-20T20:14:41'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.52959475512685, - Latitude = 0.6788906739797406, - Altitude = -1845.9443270288918, - UseHeightmap = false - }, - ['1969-07-20T20:14:42'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.52769228385669, - Latitude = 0.6787279693068425, - Altitude = -1848.123144974788, - UseHeightmap = false - }, - ['1969-07-20T20:14:43'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.52685377337869, - Latitude = 0.6787634478561919, - Altitude = -1850.8466674071583, - UseHeightmap = false - }, - ['1969-07-20T20:14:44'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.526284004538702, - Latitude = 0.6785694853441325, - Altitude = -1853.0254853530546, - UseHeightmap = false - }, - ['1969-07-20T20:14:45'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.5258419320743, - Latitude = 0.6784720829848033, - Altitude = -1852.2084286233435, - UseHeightmap = false - }, - ['1969-07-20T20:14:46'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.524906401275462, - Latitude = 0.6784174518581257, - Altitude = -1855.7490077854247, - UseHeightmap = false - }, - ['1969-07-20T20:14:47'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.52349915098792, - Latitude = 0.6782893729810321, - Altitude = -1857.383121244847, - UseHeightmap = false - }, - ['1969-07-20T20:14:48'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.522315823805602, - Latitude = 0.6780556991046269, - Altitude = -1859.5619391907433, - UseHeightmap = false - }, - ['1969-07-20T20:14:49'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.52101739233993, - Latitude = 0.6779647310824661, - Altitude = -1862.2854616231134, - UseHeightmap = false - }, - ['1969-07-20T20:14:50'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.51994166433182, - Latitude = 0.6778711676787862, - Altitude = -1864.7366318122467, - UseHeightmap = false - }, - ['1969-07-20T20:14:51'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.51898851685442, - Latitude = 0.6778817565177891, - Altitude = -1866.643097514906, - UseHeightmap = false - }, - ['1969-07-20T20:14:52'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.51808183367586, - Latitude = 0.6778718533214779, - Altitude = -1868.821915460802, - UseHeightmap = false - }, - ['1969-07-20T20:14:53'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.517315195124922, - Latitude = 0.6777409244088132, - Altitude = -1869.6389721905132, - UseHeightmap = false - }, - ['1969-07-20T20:14:54'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.516423288093712, - Latitude = 0.6776383502937863, - Altitude = -1872.0901423796465, - UseHeightmap = false - }, - ['1969-07-20T20:14:55'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.515618488386473, - Latitude = 0.6775904175972421, - Altitude = -1873.7242558390685, - UseHeightmap = false - }, - ['1969-07-20T20:14:56'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.514931748492103, - Latitude = 0.677451729714544, - Altitude = -1875.0860170552537, - UseHeightmap = false - }, - ['1969-07-20T20:14:57'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.5141592094038, - Latitude = 0.6774090469390076, - Altitude = -1876.1754260282019, - UseHeightmap = false - }, - ['1969-07-20T20:14:58'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.513268517407862, - Latitude = 0.677380792748438, - Altitude = -1878.3542439740982, - UseHeightmap = false - }, - ['1969-07-20T20:14:59'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.51249864236425, - Latitude = 0.6773301671802587, - Altitude = -1878.8989484605722, - UseHeightmap = false - }, - ['1969-07-20T20:15:00'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.511670817073732, - Latitude = 0.6773498341149018, - Altitude = -1879.9883574335202, - UseHeightmap = false - }, - ['1969-07-20T20:15:01'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.510927468201952, - Latitude = 0.6773124695718212, - Altitude = -1881.0777664064683, - UseHeightmap = false - }, - ['1969-07-20T20:15:02'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.510140364179833, - Latitude = 0.6772452153026853, - Altitude = -1882.9842321091276, - UseHeightmap = false - }, - ['1969-07-20T20:15:03'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.50940612514804, - Latitude = 0.6772084204274821, - Altitude = -1884.3459933253127, - UseHeightmap = false - }, - ['1969-07-20T20:15:04'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.508556629045042, - Latitude = 0.6771417022964165, - Altitude = -1885.1630500550239, - UseHeightmap = false - }, - ['1969-07-20T20:15:05'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.5078270022667, - Latitude = 0.6770996409435569, - Altitude = -1885.707754541498, - UseHeightmap = false - }, - ['1969-07-20T20:15:06'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.50712374883535, - Latitude = 0.6770942256987497, - Altitude = -1886.7971635144459, - UseHeightmap = false - }, - ['1969-07-20T20:15:07'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.50638631083077, - Latitude = 0.6770208020089364, - Altitude = -1888.158924730631, - UseHeightmap = false - }, - ['1969-07-20T20:15:08'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.50572166907488, - Latitude = 0.6769421116864789, - Altitude = -1888.431276973868, - UseHeightmap = false - }, - ['1969-07-20T20:15:09'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.505080467779102, - Latitude = 0.6769068207439769, - Altitude = -1889.5206859468162, - UseHeightmap = false - }, - ['1969-07-20T20:15:10'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.504394828536693, - Latitude = 0.6768437996516232, - Altitude = -1890.6100949197644, - UseHeightmap = false - }, - ['1969-07-20T20:15:11'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.50370057106609, - Latitude = 0.6767452474349132, - Altitude = -1891.9718561359496, - UseHeightmap = false - }, - ['1969-07-20T20:15:12'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.503056349392182, - Latitude = 0.6766723806693259, - Altitude = -1893.3336173521345, - UseHeightmap = false - }, - ['1969-07-20T20:15:13'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.50246925266341, - Latitude = 0.6766252349202276, - Altitude = -1893.8783218386086, - UseHeightmap = false - }, - ['1969-07-20T20:15:14'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.50184956306549, - Latitude = 0.6765535257068991, - Altitude = -1894.9677308115567, - UseHeightmap = false - }, - ['1969-07-20T20:15:15'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.501422630419572, - Latitude = 0.6765112802947014, - Altitude = -1894.1506740818456, - UseHeightmap = false - }, - ['1969-07-20T20:15:16'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.50104221348722, - Latitude = 0.676487362071662, - Altitude = -1893.8783218386086, - UseHeightmap = false - }, - ['1969-07-20T20:15:17'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.50076948252455, - Latitude = 0.6764658967447386, - Altitude = -1892.2442083791866, - UseHeightmap = false - }, - ['1969-07-20T20:15:18'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.50013364513089, - Latitude = 0.6764482060496164, - Altitude = -1893.3336173521345, - UseHeightmap = false - }, - ['1969-07-20T20:15:19'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.499460285339502, - Latitude = 0.6764309028737, - Altitude = -1894.9677308115567, - UseHeightmap = false - }, - ['1969-07-20T20:15:20'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.498899330647752, - Latitude = 0.6763755753041285, - Altitude = -1896.057139784505, - UseHeightmap = false - }, - ['1969-07-20T20:15:21'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.49826864115494, - Latitude = 0.6763489810183512, - Altitude = -1896.601844270979, - UseHeightmap = false - }, - ['1969-07-20T20:15:22'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.49765193973772, - Latitude = 0.6763177659437667, - Altitude = -1897.41890100069, - UseHeightmap = false - }, - ['1969-07-20T20:15:23'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.49706547748806, - Latitude = 0.6762368192356724, - Altitude = -1898.2359577304012, - UseHeightmap = false - }, - ['1969-07-20T20:15:24'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.496489420526313, - Latitude = 0.676209886695223, - Altitude = -1899.053014460112, - UseHeightmap = false - }, - ['1969-07-20T20:15:25'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.495878153012562, - Latitude = 0.6761763249034947, - Altitude = -1900.1424234330602, - UseHeightmap = false - }, - ['1969-07-20T20:15:26'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.4953425244022, - Latitude = 0.6761311089575274, - Altitude = -1901.5041846492454, - UseHeightmap = false - }, - ['1969-07-20T20:15:27'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.494725217962213, - Latitude = 0.6761017566851846, - Altitude = -1902.5935936221936, - UseHeightmap = false - }, - ['1969-07-20T20:15:28'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.494112443564592, - Latitude = 0.6760842983575135, - Altitude = -1903.4106503519047, - UseHeightmap = false - }, - ['1969-07-20T20:15:29'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.493537644480202, - Latitude = 0.6760386448926926, - Altitude = -1903.9553548383788, - UseHeightmap = false - }, - ['1969-07-20T20:15:30'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.49299719757025, - Latitude = 0.6760147528943234, - Altitude = -1903.9553548383788, - UseHeightmap = false - }, - ['1969-07-20T20:15:31'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.492415313069813, - Latitude = 0.6759919962423392, - Altitude = -1904.2277070816158, - UseHeightmap = false - }, - ['1969-07-20T20:15:32'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.491877755110142, - Latitude = 0.6759640721591937, - Altitude = -1904.2277070816158, - UseHeightmap = false - }, - ['1969-07-20T20:15:33'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.49128819308786, - Latitude = 0.6759491077295323, - Altitude = -1904.2277070816158, - UseHeightmap = false - }, - ['1969-07-20T20:15:34'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.49073158429634, - Latitude = 0.6759379383686839, - Altitude = -1904.2277070816158, - UseHeightmap = false - }, - ['1969-07-20T20:15:35'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.490174891596332, - Latitude = 0.6759054634588104, - Altitude = -1904.2277070816158, - UseHeightmap = false - }, - ['1969-07-20T20:15:36'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.489635065407523, - Latitude = 0.6758939648884956, - Altitude = -1904.5000593248528, - UseHeightmap = false - }, - ['1969-07-20T20:15:37'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.4891060535486, - Latitude = 0.6759004097281942, - Altitude = -1904.2277070816158, - UseHeightmap = false - }, - ['1969-07-20T20:15:38'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.48855436619652, - Latitude = 0.6758862600165565, - Altitude = -1904.2277070816158, - UseHeightmap = false - }, - ['1969-07-20T20:15:39'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.488052711552413, - Latitude = 0.6758544116957282, - Altitude = -1904.5000593248528, - UseHeightmap = false - }, - ['1969-07-20T20:15:40'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.48754943516269, - Latitude = 0.6758316193430558, - Altitude = -1904.2277070816158, - UseHeightmap = false - }, - ['1969-07-20T20:15:41'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.487094304824993, - Latitude = 0.6758175052522961, - Altitude = -1904.2277070816158, - UseHeightmap = false - }, - ['1969-07-20T20:15:42'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.486618165034592, - Latitude = 0.6757757367756437, - Altitude = -1904.7724115680899, - UseHeightmap = false - }, - ['1969-07-20T20:15:43'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.48604740534131, - Latitude = 0.675733428263931, - Altitude = -1905.3171160545637, - UseHeightmap = false - }, - ['1969-07-20T20:15:44'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.48548248435554, - Latitude = 0.6756797157749009, - Altitude = -1905.8618205410378, - UseHeightmap = false - }, - ['1969-07-20T20:15:45'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.48494957486896, - Latitude = 0.6756120527881188, - Altitude = -1905.8618205410378, - UseHeightmap = false - }, - ['1969-07-20T20:15:46'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.484598386683622, - Latitude = 0.675584857481579, - Altitude = -1907.49593400046, - UseHeightmap = false - }, - ['1969-07-20T20:15:47'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.4841269963268, - Latitude = 0.6755482784409179, - Altitude = -1908.040638486934, - UseHeightmap = false - }, - ['1969-07-20T20:15:48'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.48373390336955, - Latitude = 0.6754890811171497, - Altitude = -1908.8576952166452, - UseHeightmap = false - }, - ['1969-07-20T20:15:49'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.48325134882829, - Latitude = 0.6754258626149947, - Altitude = -1908.4491668517896, - UseHeightmap = false - }, - ['1969-07-20T20:15:50'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.48284574619883, - Latitude = 0.6753753196460469, - Altitude = -1909.1300474598822, - UseHeightmap = false - }, - ['1969-07-20T20:15:51'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.48245362823393, - Latitude = 0.6753264776464533, - Altitude = -1909.4023997031193, - UseHeightmap = false - }, - ['1969-07-20T20:15:52'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.482060114185842, - Latitude = 0.6752749804130574, - Altitude = -1909.6747519463563, - UseHeightmap = false - }, - ['1969-07-20T20:15:53'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.481698202127482, - Latitude = 0.675223605520775, - Altitude = -1909.6747519463563, - UseHeightmap = false - }, - ['1969-07-20T20:15:54'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.48129046365451, - Latitude = 0.6751730022703166, - Altitude = -1909.6747519463563, - UseHeightmap = false - }, - ['1969-07-20T20:15:55'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.480893026154902, - Latitude = 0.6751376710849429, - Altitude = -1909.6747519463563, - UseHeightmap = false - }, - ['1969-07-20T20:15:56'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.48059324160945, - Latitude = 0.6750772226256051, - Altitude = -1909.6747519463563, - UseHeightmap = false - }, - ['1969-07-20T20:15:57'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.48034984354739, - Latitude = 0.6750430267458865, - Altitude = -1909.6747519463563, - UseHeightmap = false - }, - ['1969-07-20T20:15:58'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.48005268645993, - Latitude = 0.6750019848756621, - Altitude = -1909.6747519463563, - UseHeightmap = false - }, - ['1969-07-20T20:15:59'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.47978070153665, - Latitude = 0.6749655364121049, - Altitude = -1909.9471041895933, - UseHeightmap = false - }, - ['1969-07-20T20:16:00'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.47951311851127, - Latitude = 0.6749420304945992, - Altitude = -1909.9471041895933, - UseHeightmap = false - }, - ['1969-07-20T20:16:01'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.47927978098579, - Latitude = 0.6748989409040068, - Altitude = -1909.9471041895933, - UseHeightmap = false - }, - ['1969-07-20T20:16:02'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.47904250519933, - Latitude = 0.6748472712728636, - Altitude = -1910.4918086760674, - UseHeightmap = false - }, - ['1969-07-20T20:16:03'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.47879202998348, - Latitude = 0.674809514541568, - Altitude = -1910.7641609193045, - UseHeightmap = false - }, - ['1969-07-20T20:16:04'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.478567222437622, - Latitude = 0.6747692774477394, - Altitude = -1910.7641609193045, - UseHeightmap = false - }, - ['1969-07-20T20:16:05'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.47836548542964, - Latitude = 0.6747160116119115, - Altitude = -1910.7641609193045, - UseHeightmap = false - }, - ['1969-07-20T20:16:06'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.47818769774975, - Latitude = 0.6746866473279819, - Altitude = -1911.3088654057785, - UseHeightmap = false - }, - ['1969-07-20T20:16:07'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.477896613823983, - Latitude = 0.6746547793250971, - Altitude = -1913.2153311084376, - UseHeightmap = false - }, - ['1969-07-20T20:16:08'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.47781195503974, - Latitude = 0.6746276583132307, - Altitude = -1913.2153311084376, - UseHeightmap = false - }, - ['1969-07-20T20:16:09'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.477664452707373, - Latitude = 0.6746112868414526, - Altitude = -1914.0323878381487, - UseHeightmap = false - }, - -- ['1969-07-20T20:16:10'] = { - -- Type = "GlobeTranslation", - -- Globe = "Moon", - -- Longitude = 23.477750217762413, - -- Latitude = 0.6745910947360472, - -- Altitude = -1912.6706266219635, - -- UseHeightmap = false - -- }, - -- ['1969-07-20T20:16:11'] = { - -- Type = "GlobeTranslation", - -- Globe = "Moon", - -- Longitude = 23.477590925415402, - -- Latitude = 0.6745598993839581, - -- Altitude = -1912.6706266219635, - -- UseHeightmap = false - -- }, - -- ['1969-07-20T20:16:12'] = { - -- Type = "GlobeTranslation", - -- Globe = "Moon", - -- Longitude = 23.47745952757753, - -- Latitude = 0.6745298610932787, - -- Altitude = -1912.6706266219635, - -- UseHeightmap = false - -- }, - -- ['1969-07-20T20:16:13'] = { - -- Type = "GlobeTranslation", - -- Globe = "Moon", - -- Longitude = 23.477271343369093, - -- Latitude = 0.6745166392893209, - -- Altitude = -1913.2153311084376, - -- UseHeightmap = false - -- }, - -- ['1969-07-20T20:16:14'] = { - -- Type = "GlobeTranslation", - -- Globe = "Moon", - -- Longitude = 23.477100932665042, - -- Latitude = 0.6744937499451563, - -- Altitude = -1914.3047400813857, - -- UseHeightmap = false - -- }, - ['1969-07-20T20:16:15'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.47697690593997, - Latitude = 0.6744644602883288, - Altitude = -1914.8494445678598, - UseHeightmap = false - }, - ['1969-07-20T20:16:16'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.476842953277412, - Latitude = 0.6744457159538018, - Altitude = -1915.1217968110968, - UseHeightmap = false - }, - ['1969-07-20T20:16:17'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.476774052091812, - Latitude = 0.6744243634139203, - Altitude = -1914.8494445678598, - UseHeightmap = false - }, - ['1969-07-20T20:16:18'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.47665204889191, - Latitude = 0.6743981221140924, - Altitude = -1915.1217968110968, - UseHeightmap = false - }, - ['1969-07-20T20:16:19'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.47657652039885, - Latitude = 0.6743808573601865, - Altitude = -1915.1217968110968, - UseHeightmap = false - }, - ['1969-07-20T20:16:20'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.476475036022492, - Latitude = 0.6743552389834175, - Altitude = -1914.8494445678598, - UseHeightmap = false - }, - ['1969-07-20T20:16:21'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.47638671770867, - Latitude = 0.6743412077411113, - Altitude = -1915.3941490543339, - UseHeightmap = false - }, - ['1969-07-20T20:16:22'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.476286834646782, - Latitude = 0.6743241644041175, - Altitude = -1915.3941490543339, - UseHeightmap = false - }, - ['1969-07-20T20:16:23'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.47623840477727, - Latitude = 0.6743121023448013, - Altitude = -1915.3941490543339, - UseHeightmap = false - }, - ['1969-07-20T20:16:24'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.476125794037742, - Latitude = 0.6743019779643423, - Altitude = -1915.938853540808, - UseHeightmap = false - }, - ['1969-07-20T20:16:25'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.47604582826371, - Latitude = 0.6742984062330349, - Altitude = -1916.211205784045, - UseHeightmap = false - }, - ['1969-07-20T20:16:26'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.47599605084473, - Latitude = 0.6742864748966985, - Altitude = -1916.211205784045, - UseHeightmap = false - }, - ['1969-07-20T20:16:27'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.47598166921822, - Latitude = 0.6742856341308172, - Altitude = -1916.755910270519, - UseHeightmap = false - }, - -- ['1969-07-20T20:16:28'] = { - -- Type = "GlobeTranslation", - -- Globe = "Moon", - -- Longitude = 23.47600003592791, - -- Latitude = 0.6742816108377042, - -- Altitude = -1916.211205784045, - -- UseHeightmap = false - -- }, - -- ['1969-07-20T20:16:29'] = { - -- Type = "GlobeTranslation", - -- Globe = "Moon", - -- Longitude = 23.47593990066764, - -- Latitude = 0.6742699316275284, - -- Altitude = -1916.483558027282, - -- UseHeightmap = false - -- }, - ['1969-07-20T20:16:30'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.47587957412098, - Latitude = 0.6742661771136219, - Altitude = -1916.755910270519, - UseHeightmap = false - }, - ['1969-07-20T20:16:31'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.47579282136856, - Latitude = 0.6742214263433656, - Altitude = -1917.028262513756, - UseHeightmap = false - }, - ['1969-07-20T20:16:32'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.47571834266516, - Latitude = 0.6741885448706321, - Altitude = -1917.5729670002302, - UseHeightmap = false - }, - -- ['1969-07-20T20:16:33'] = { - -- Type = "GlobeTranslation", - -- Globe = "Moon", - -- Longitude = 23.47569457676149, - -- Latitude = 0.6741859152655852, - -- Altitude = -1917.3006147569931, - -- UseHeightmap = false - -- }, - ['1969-07-20T20:16:34'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.47557041293751, - Latitude = 0.6741798073326593, - Altitude = -1918.117671486704, - UseHeightmap = false - }, - ['1969-07-20T20:16:35'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.475475681892203, - Latitude = 0.6741822414281841, - Altitude = -1918.117671486704, - UseHeightmap = false - }, - ['1969-07-20T20:16:36'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.47541533097675, - Latitude = 0.6742009046793005, - Altitude = -1918.390023729941, - UseHeightmap = false - }, - ['1969-07-20T20:16:37'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.47532207549478, - Latitude = 0.6742269926054295, - Altitude = -1918.662375973178, - UseHeightmap = false - }, - ['1969-07-20T20:16:38'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.47522251798864, - Latitude = 0.6742695236577596, - Altitude = -1918.662375973178, - UseHeightmap = false - }, - ['1969-07-20T20:16:39'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.47513564425997, - Latitude = 0.6742809051574165, - Altitude = -1918.662375973178, - UseHeightmap = false - }, - ['1969-07-20T20:16:40'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.47498810518855, - Latitude = 0.6743095342428154, - Altitude = -1920.2964894326003, - UseHeightmap = false - }, - -- ['1969-07-20T20:16:41'] = { - -- Type = "GlobeTranslation", - -- Globe = "Moon", - -- Longitude = 23.47489523759891, - -- Latitude = 0.6743154022599566, - -- Altitude = -1920.0241371893633, - -- UseHeightmap = false - -- }, - -- ['1969-07-20T20:16:42'] = { - -- Type = "GlobeTranslation", - -- Globe = "Moon", - -- Longitude = 23.47479438729774, - -- Latitude = 0.6743324078003049, - -- Altitude = -1920.2964894326003, - -- UseHeightmap = false - -- }, - -- ['1969-07-20T20:16:43'] = { - -- Type = "GlobeTranslation", - -- Globe = "Moon", - -- Longitude = 23.47475788126512, - -- Latitude = 0.674345583979325, - -- Altitude = -1920.0241371893633, - -- UseHeightmap = false - -- }, - ['1969-07-20T20:16:44'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.474678823712882, - Latitude = 0.6743691203511213, - Altitude = -1920.2964894326003, - UseHeightmap = false - }, - ['1969-07-20T20:16:45'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.47460302474115, - Latitude = 0.6743890347121807, - Altitude = -1920.2964894326003, - UseHeightmap = false - }, - ['1969-07-20T20:16:46'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.47450130965027, - Latitude = 0.6744202280781089, - Altitude = -1920.8411939190744, - UseHeightmap = false - }, - ['1969-07-20T20:16:47'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.474379586340042, - Latitude = 0.6744490653475903, - Altitude = -1921.1135461623114, - UseHeightmap = false - }, - ['1969-07-20T20:16:48'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.47431921657337, - Latitude = 0.6745028925523043, - Altitude = -1921.1135461623114, - UseHeightmap = false - }, - ['1969-07-20T20:16:49'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.47424698504895, - Latitude = 0.6745115395661241, - Altitude = -1921.1135461623114, - UseHeightmap = false - }, - ['1969-07-20T20:16:50'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.474158028620153, - Latitude = 0.6745268900936557, - Altitude = -1921.6582506487855, - UseHeightmap = false - }, - ['1969-07-20T20:16:51'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.47408003386958, - Latitude = 0.674531434078838, - Altitude = -1921.6582506487855, - UseHeightmap = false - }, - ['1969-07-20T20:16:52'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.473993195514502, - Latitude = 0.6745434127092755, - Altitude = -1921.9306028920225, - UseHeightmap = false - }, - -- ['1969-07-20T20:16:53'] = { - -- Type = "GlobeTranslation", - -- Globe = "Moon", - -- Longitude = 23.47392353665608, - -- Latitude = 0.6745464032805983, - -- Altitude = -1922.2029551352596, - -- UseHeightmap = false - -- }, - ['1969-07-20T20:16:54'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.47388537487237, - Latitude = 0.674552865152663, - Altitude = -1921.9306028920225, - UseHeightmap = false - }, - ['1969-07-20T20:16:55'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.47382957912373, - Latitude = 0.6745443566727537, - Altitude = -1921.9306028920225, - UseHeightmap = false - }, - ['1969-07-20T20:16:56'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.47378652829031, - Latitude = 0.6745361955127924, - Altitude = -1921.6582506487855, - UseHeightmap = false - }, - ['1969-07-20T20:16:57'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.473741159081282, - Latitude = 0.6745139398577651, - Altitude = -1921.6582506487855, - UseHeightmap = false - }, - ['1969-07-20T20:16:58'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.473674434325403, - Latitude = 0.6745046665169872, - Altitude = -1922.2029551352596, - UseHeightmap = false - }, - ['1969-07-20T20:16:59'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.47366202033169, - Latitude = 0.6744553774680945, - Altitude = -1922.2029551352596, - UseHeightmap = false - }, - ['1969-07-20T20:17:00'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.47360771579434, - Latitude = 0.6744345598586292, - Altitude = -1922.7476596217336, - UseHeightmap = false - }, - ['1969-07-20T20:17:01'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.47357090816817, - Latitude = 0.6744054827778567, - Altitude = -1923.0200118649707, - UseHeightmap = false - }, - ['1969-07-20T20:17:02'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.47354290217646, - Latitude = 0.6743765403194303, - Altitude = -1923.2923641082077, - UseHeightmap = false - }, - ['1969-07-20T20:17:03'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.47354640286736, - Latitude = 0.6743332580785223, - Altitude = -1923.5647163514448, - UseHeightmap = false - }, - ['1969-07-20T20:17:04'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.473541367503802, - Latitude = 0.6742974556070759, - Altitude = -1923.8370685946818, - UseHeightmap = false - }, - ['1969-07-20T20:17:05'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.47350854369485, - Latitude = 0.6742858449512636, - Altitude = -1924.1094208379188, - UseHeightmap = false - }, - ['1969-07-20T20:17:06'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.47347424911663, - Latitude = 0.6742611487873781, - Altitude = -1924.6541253243927, - UseHeightmap = false - }, - ['1969-07-20T20:17:07'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.473503629496022, - Latitude = 0.6742462694505276, - Altitude = -1924.6541253243927, - UseHeightmap = false - }, - ['1969-07-20T20:17:08'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.473512768546712, - Latitude = 0.6742384048959066, - Altitude = -1924.6541253243927, - UseHeightmap = false - }, - ['1969-07-20T20:17:09'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.47353343175876, - Latitude = 0.6742241072273591, - Altitude = -1924.3817730811559, - UseHeightmap = false - }, - ['1969-07-20T20:17:10'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.47353316391657, - Latitude = 0.6742142580747189, - Altitude = -1925.4711820541038, - UseHeightmap = false - }, - ['1969-07-20T20:17:11'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.47355774790429, - Latitude = 0.6742015107317392, - Altitude = -1924.9264775676297, - UseHeightmap = false - }, - ['1969-07-20T20:17:12'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.4735540335665, - Latitude = 0.6741800864866416, - Altitude = -1924.9264775676297, - UseHeightmap = false - }, - ['1969-07-20T20:17:13'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.47353500681606, - Latitude = 0.6741617950501063, - Altitude = -1925.1988298108668, - UseHeightmap = false - }, - ['1969-07-20T20:17:14'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.47350664772458, - Latitude = 0.6741447111551033, - Altitude = -1925.4711820541038, - UseHeightmap = false - }, - ['1969-07-20T20:17:15'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.473494757982273, - Latitude = 0.6741430011390509, - Altitude = -1925.4711820541038, - UseHeightmap = false - }, - ['1969-07-20T20:17:16'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.473485349949943, - Latitude = 0.6741431504511513, - Altitude = -1925.4711820541038, - UseHeightmap = false - }, - ['1969-07-20T20:17:17'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.473464448566723, - Latitude = 0.674141681840806, - Altitude = -1925.4711820541038, - UseHeightmap = false - }, - ['1969-07-20T20:17:18'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.47344203973089, - Latitude = 0.6741518055278933, - Altitude = -1925.4711820541038, - UseHeightmap = false - }, - ['1969-07-20T20:17:19'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.473416197134252, - Latitude = 0.6741705280217748, - Altitude = -1925.7435342973408, - UseHeightmap = false - }, - ['1969-07-20T20:17:20'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.47339416150648, - Latitude = 0.6741799656622618, - Altitude = -1925.7435342973408, - UseHeightmap = false - }, - ['1969-07-20T20:17:21'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.4733232813815, - Latitude = 0.6741727841821631, - Altitude = -1926.288238783815, - UseHeightmap = false - }, - ['1969-07-20T20:17:24'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.47324174890097, - Latitude = 0.6742091863213222, - Altitude = -1926.288238783815, - UseHeightmap = false - }, - ['1969-07-20T20:17:27'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.47317556908458, - Latitude = 0.6742072669430229, - Altitude = -1926.560591027052, - UseHeightmap = false - }, - ['1969-07-20T20:17:30'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.47310752310149, - Latitude = 0.6742134078571678, - Altitude = -1926.832943270289, - UseHeightmap = false - }, - ['1969-07-20T20:17:32'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.473074792306253, - Latitude = 0.6741925230045956, - Altitude = -1927.105295513526, - UseHeightmap = false - }, - ['1969-07-20T20:17:40'] = { - Type = "GlobeTranslation", - Globe = "Moon", - Longitude = 23.47306, - Latitude = 0.67402, - Altitude = -1927.65, - UseHeightmap = false - }, + ['1969-07-20T20:13:40'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.64480784327766, + Latitude = 0.6899960896998255, + Altitude = -1546.3568594681615, + UseHeightmap = false + }, + ['1969-07-20T20:13:41'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.64371058653857, + Latitude = 0.6878218095380976, + Altitude = -1565.4215164947534, + UseHeightmap = false + }, + ['1969-07-20T20:13:42'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.64182673932963, + Latitude = 0.6868724573827948, + Altitude = -1565.4215164947534, + UseHeightmap = false + }, + ['1969-07-20T20:13:43'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.64054706630478, + Latitude = 0.6858670898943581, + Altitude = -1579.0391286566048, + UseHeightmap = false + }, + ['1969-07-20T20:13:44'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.63636509003987, + Latitude = 0.6869318608730292, + Altitude = -1579.0391286566048, + UseHeightmap = false + }, + ['1969-07-20T20:13:45'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.63333610553231, + Latitude = 0.6875049989808152, + Altitude = -1584.4861735213453, + UseHeightmap = false + }, + ['1969-07-20T20:13:46'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.630258198415152, + Latitude = 0.6879251024075629, + Altitude = -1587.2096959537155, + UseHeightmap = false + }, + ['1969-07-20T20:13:47'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.62944534804935, + Latitude = 0.6868614912680597, + Altitude = -1592.656740818456, + UseHeightmap = false + }, + ['1969-07-20T20:13:48'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.62679291745059, + Latitude = 0.6859161360075229, + Altitude = -1604.9125917641222, + UseHeightmap = false + }, + ['1969-07-20T20:13:49'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.624085315638872, + Latitude = 0.685126212476227, + Altitude = -1619.8919651421588, + UseHeightmap = false + }, + ['1969-07-20T20:13:50'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.62142772795633, + Latitude = 0.6848656185526153, + Altitude = -1630.7860548716399, + UseHeightmap = false + }, + ['1969-07-20T20:13:51'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.617193313827283, + Latitude = 0.6849603490017026, + Altitude = -1630.7860548716399, + UseHeightmap = false + }, + ['1969-07-20T20:13:52'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.61543137875974, + Latitude = 0.68523470439912, + Altitude = -1629.4242936554547, + UseHeightmap = false + }, + ['1969-07-20T20:13:53'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.61158202958536, + Latitude = 0.6853852597026965, + Altitude = -1633.5095773040102, + UseHeightmap = false + }, + ['1969-07-20T20:13:54'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.60991413189263, + Latitude = 0.6852537398149626, + Altitude = -1643.041905817306, + UseHeightmap = false + }, + ['1969-07-20T20:13:55'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.607915527643012, + Latitude = 0.6853963551830907, + Altitude = -1662.106562843898, + UseHeightmap = false + }, + ['1969-07-20T20:13:56'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.605996916437142, + Latitude = 0.6830167672762936, + Altitude = -1663.4683240600832, + UseHeightmap = false + }, + ['1969-07-20T20:13:57'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.6027345854584, + Latitude = 0.6824580715414034, + Altitude = -1671.09418687072, + UseHeightmap = false + }, + ['1969-07-20T20:13:58'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.60047452065999, + Latitude = 0.6837230890353062, + Altitude = -1671.638891357194, + UseHeightmap = false + }, + ['1969-07-20T20:13:59'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.598006245556462, + Latitude = 0.6851039272779041, + Altitude = -1670.277130141009, + UseHeightmap = false + }, + ['1969-07-20T20:14:00'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.594980604909782, + Latitude = 0.6859011120513393, + Altitude = -1683.8947423028603, + UseHeightmap = false + }, + ['1969-07-20T20:14:01'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.595085912567033, + Latitude = 0.685405665002322, + Altitude = -1698.874115680897, + UseHeightmap = false + }, + ['1969-07-20T20:14:02'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.5930664955042, + Latitude = 0.6852493785380211, + Altitude = -1701.597638113267, + UseHeightmap = false + }, + ['1969-07-20T20:14:03'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.591385100243283, + Latitude = 0.6848676328581234, + Altitude = -1709.768205410378, + UseHeightmap = false + }, + ['1969-07-20T20:14:04'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.58888799865371, + Latitude = 0.6847945134519827, + Altitude = -1717.9387727074889, + UseHeightmap = false + }, + ['1969-07-20T20:14:05'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.58707895840121, + Latitude = 0.6847997274847563, + Altitude = -1720.662295139859, + UseHeightmap = false + }, + ['1969-07-20T20:14:06'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.585134523523262, + Latitude = 0.6844679679748537, + Altitude = -1726.1093400045995, + UseHeightmap = false + }, + ['1969-07-20T20:14:07'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.58309233633901, + Latitude = 0.6845115405154798, + Altitude = -1730.194623653155, + UseHeightmap = false + }, + ['1969-07-20T20:14:08'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.581800658763132, + Latitude = 0.6837790677972603, + Altitude = -1737.0034297340808, + UseHeightmap = false + }, + ['1969-07-20T20:14:09'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.580055660445762, + Latitude = 0.6831436064664251, + Altitude = -1741.0887133826361, + UseHeightmap = false + }, + ['1969-07-20T20:14:10'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.57863282556605, + Latitude = 0.6828140286921376, + Altitude = -1749.259280679747, + UseHeightmap = false + }, + ['1969-07-20T20:14:11'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.57640031861404, + Latitude = 0.6825176811105468, + Altitude = -1751.9828031121174, + UseHeightmap = false + }, + ['1969-07-20T20:14:12'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.57398679174075, + Latitude = 0.6826876185178852, + Altitude = -1750.6210418959322, + UseHeightmap = false + }, + ['1969-07-20T20:14:13'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.57156483164977, + Latitude = 0.6825035088375115, + Altitude = -1758.7916091930429, + UseHeightmap = false + }, + ['1969-07-20T20:14:14'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.568805614344672, + Latitude = 0.6825830127392937, + Altitude = -1764.2386540577836, + UseHeightmap = false + }, + ['1969-07-20T20:14:15'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.56712274763365, + Latitude = 0.6821390846562359, + Altitude = -1764.2386540577836, + UseHeightmap = false + }, + ['1969-07-20T20:14:16'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.56530723506546, + Latitude = 0.6815597518028071, + Altitude = -1772.4092213548943, + UseHeightmap = false + }, + ['1969-07-20T20:14:17'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.56412162578659, + Latitude = 0.6811736246098009, + Altitude = -1773.7709825710795, + UseHeightmap = false + }, + ['1969-07-20T20:14:18'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.56276962682385, + Latitude = 0.6808738576281527, + Altitude = -1779.2180274358202, + UseHeightmap = false + }, + ['1969-07-20T20:14:19'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.560994966586822, + Latitude = 0.6806433210749815, + Altitude = -1781.9415498681901, + UseHeightmap = false + }, + ['1969-07-20T20:14:20'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.55943927760013, + Latitude = 0.680762500394614, + Altitude = -1788.7503559491158, + UseHeightmap = false + }, + ['1969-07-20T20:14:21'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.55808185917876, + Latitude = 0.6806932677701746, + Altitude = -1788.205651462642, + UseHeightmap = false + }, + ['1969-07-20T20:14:22'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.556393791415733, + Latitude = 0.6811207130416086, + Altitude = -1791.4738783814862, + UseHeightmap = false + }, + ['1969-07-20T20:14:23'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.55496480157647, + Latitude = 0.6814204204715102, + Altitude = -1792.8356395976714, + UseHeightmap = false + }, + ['1969-07-20T20:14:24'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.55306742293409, + Latitude = 0.6817752241315425, + Altitude = -1795.5591620300418, + UseHeightmap = false + }, + ['1969-07-20T20:14:25'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.55137129589691, + Latitude = 0.6815869620825672, + Altitude = -1802.3679681109675, + UseHeightmap = false + }, + ['1969-07-20T20:14:26'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.54977453252549, + Latitude = 0.681089420496018, + Altitude = -1805.0914905433376, + UseHeightmap = false + }, + ['1969-07-20T20:14:27'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.548083879890072, + Latitude = 0.6807962459602379, + Altitude = -1807.8150129757078, + UseHeightmap = false + }, + ['1969-07-20T20:14:28'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.546540200146502, + Latitude = 0.6805000865197504, + Altitude = -1810.5385354080781, + UseHeightmap = false + }, + ['1969-07-20T20:14:29'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.54516644867878, + Latitude = 0.6804026508636472, + Altitude = -1815.9855802728187, + UseHeightmap = false + }, + ['1969-07-20T20:14:30'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.54408346592703, + Latitude = 0.6805503084088244, + Altitude = -1817.3473414890038, + UseHeightmap = false + }, + ['1969-07-20T20:14:31'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.54339758182375, + Latitude = 0.6804859303352504, + Altitude = -1818.709102705189, + UseHeightmap = false + }, + ['1969-07-20T20:14:32'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.54194570925206, + Latitude = 0.6803064377127922, + Altitude = -1821.4326251375592, + UseHeightmap = false + }, + ['1969-07-20T20:14:33'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.54085221251783, + Latitude = 0.6801546546560774, + Altitude = -1824.9732042996407, + UseHeightmap = false + }, + ['1969-07-20T20:14:34'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.53954140597472, + Latitude = 0.6797325898259152, + Altitude = -1827.696726732011, + UseHeightmap = false + }, + ['1969-07-20T20:14:35'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.537934104316932, + Latitude = 0.679569186740729, + Altitude = -1831.7820103805664, + UseHeightmap = false + }, + ['1969-07-20T20:14:36'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.53689199133522, + Latitude = 0.6794114031790662, + Altitude = -1833.6884760832256, + UseHeightmap = false + }, + ['1969-07-20T20:14:37'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.53536814560564, + Latitude = 0.6791732992510942, + Altitude = -1836.9567030020698, + UseHeightmap = false + }, + ['1969-07-20T20:14:38'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.53395331216349, + Latitude = 0.6792039275673737, + Altitude = -1839.4078731912032, + UseHeightmap = false + }, + ['1969-07-20T20:14:39'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.53275788877434, + Latitude = 0.6790059399149831, + Altitude = -1840.497282164151, + UseHeightmap = false + }, + ['1969-07-20T20:14:40'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.531279977460432, + Latitude = 0.6788794363528592, + Altitude = -1844.5825658127067, + UseHeightmap = false + }, + ['1969-07-20T20:14:41'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.52959475512685, + Latitude = 0.6788906739797406, + Altitude = -1845.9443270288918, + UseHeightmap = false + }, + ['1969-07-20T20:14:42'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.52769228385669, + Latitude = 0.6787279693068425, + Altitude = -1848.123144974788, + UseHeightmap = false + }, + ['1969-07-20T20:14:43'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.52685377337869, + Latitude = 0.6787634478561919, + Altitude = -1850.8466674071583, + UseHeightmap = false + }, + ['1969-07-20T20:14:44'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.526284004538702, + Latitude = 0.6785694853441325, + Altitude = -1853.0254853530546, + UseHeightmap = false + }, + ['1969-07-20T20:14:45'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.5258419320743, + Latitude = 0.6784720829848033, + Altitude = -1852.2084286233435, + UseHeightmap = false + }, + ['1969-07-20T20:14:46'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.524906401275462, + Latitude = 0.6784174518581257, + Altitude = -1855.7490077854247, + UseHeightmap = false + }, + ['1969-07-20T20:14:47'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.52349915098792, + Latitude = 0.6782893729810321, + Altitude = -1857.383121244847, + UseHeightmap = false + }, + ['1969-07-20T20:14:48'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.522315823805602, + Latitude = 0.6780556991046269, + Altitude = -1859.5619391907433, + UseHeightmap = false + }, + ['1969-07-20T20:14:49'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.52101739233993, + Latitude = 0.6779647310824661, + Altitude = -1862.2854616231134, + UseHeightmap = false + }, + ['1969-07-20T20:14:50'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.51994166433182, + Latitude = 0.6778711676787862, + Altitude = -1864.7366318122467, + UseHeightmap = false + }, + ['1969-07-20T20:14:51'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.51898851685442, + Latitude = 0.6778817565177891, + Altitude = -1866.643097514906, + UseHeightmap = false + }, + ['1969-07-20T20:14:52'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.51808183367586, + Latitude = 0.6778718533214779, + Altitude = -1868.821915460802, + UseHeightmap = false + }, + ['1969-07-20T20:14:53'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.517315195124922, + Latitude = 0.6777409244088132, + Altitude = -1869.6389721905132, + UseHeightmap = false + }, + ['1969-07-20T20:14:54'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.516423288093712, + Latitude = 0.6776383502937863, + Altitude = -1872.0901423796465, + UseHeightmap = false + }, + ['1969-07-20T20:14:55'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.515618488386473, + Latitude = 0.6775904175972421, + Altitude = -1873.7242558390685, + UseHeightmap = false + }, + ['1969-07-20T20:14:56'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.514931748492103, + Latitude = 0.677451729714544, + Altitude = -1875.0860170552537, + UseHeightmap = false + }, + ['1969-07-20T20:14:57'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.5141592094038, + Latitude = 0.6774090469390076, + Altitude = -1876.1754260282019, + UseHeightmap = false + }, + ['1969-07-20T20:14:58'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.513268517407862, + Latitude = 0.677380792748438, + Altitude = -1878.3542439740982, + UseHeightmap = false + }, + ['1969-07-20T20:14:59'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.51249864236425, + Latitude = 0.6773301671802587, + Altitude = -1878.8989484605722, + UseHeightmap = false + }, + ['1969-07-20T20:15:00'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.511670817073732, + Latitude = 0.6773498341149018, + Altitude = -1879.9883574335202, + UseHeightmap = false + }, + ['1969-07-20T20:15:01'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.510927468201952, + Latitude = 0.6773124695718212, + Altitude = -1881.0777664064683, + UseHeightmap = false + }, + ['1969-07-20T20:15:02'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.510140364179833, + Latitude = 0.6772452153026853, + Altitude = -1882.9842321091276, + UseHeightmap = false + }, + ['1969-07-20T20:15:03'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.50940612514804, + Latitude = 0.6772084204274821, + Altitude = -1884.3459933253127, + UseHeightmap = false + }, + ['1969-07-20T20:15:04'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.508556629045042, + Latitude = 0.6771417022964165, + Altitude = -1885.1630500550239, + UseHeightmap = false + }, + ['1969-07-20T20:15:05'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.5078270022667, + Latitude = 0.6770996409435569, + Altitude = -1885.707754541498, + UseHeightmap = false + }, + ['1969-07-20T20:15:06'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.50712374883535, + Latitude = 0.6770942256987497, + Altitude = -1886.7971635144459, + UseHeightmap = false + }, + ['1969-07-20T20:15:07'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.50638631083077, + Latitude = 0.6770208020089364, + Altitude = -1888.158924730631, + UseHeightmap = false + }, + ['1969-07-20T20:15:08'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.50572166907488, + Latitude = 0.6769421116864789, + Altitude = -1888.431276973868, + UseHeightmap = false + }, + ['1969-07-20T20:15:09'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.505080467779102, + Latitude = 0.6769068207439769, + Altitude = -1889.5206859468162, + UseHeightmap = false + }, + ['1969-07-20T20:15:10'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.504394828536693, + Latitude = 0.6768437996516232, + Altitude = -1890.6100949197644, + UseHeightmap = false + }, + ['1969-07-20T20:15:11'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.50370057106609, + Latitude = 0.6767452474349132, + Altitude = -1891.9718561359496, + UseHeightmap = false + }, + ['1969-07-20T20:15:12'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.503056349392182, + Latitude = 0.6766723806693259, + Altitude = -1893.3336173521345, + UseHeightmap = false + }, + ['1969-07-20T20:15:13'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.50246925266341, + Latitude = 0.6766252349202276, + Altitude = -1893.8783218386086, + UseHeightmap = false + }, + ['1969-07-20T20:15:14'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.50184956306549, + Latitude = 0.6765535257068991, + Altitude = -1894.9677308115567, + UseHeightmap = false + }, + ['1969-07-20T20:15:15'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.501422630419572, + Latitude = 0.6765112802947014, + Altitude = -1894.1506740818456, + UseHeightmap = false + }, + ['1969-07-20T20:15:16'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.50104221348722, + Latitude = 0.676487362071662, + Altitude = -1893.8783218386086, + UseHeightmap = false + }, + ['1969-07-20T20:15:17'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.50076948252455, + Latitude = 0.6764658967447386, + Altitude = -1892.2442083791866, + UseHeightmap = false + }, + ['1969-07-20T20:15:18'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.50013364513089, + Latitude = 0.6764482060496164, + Altitude = -1893.3336173521345, + UseHeightmap = false + }, + ['1969-07-20T20:15:19'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.499460285339502, + Latitude = 0.6764309028737, + Altitude = -1894.9677308115567, + UseHeightmap = false + }, + ['1969-07-20T20:15:20'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.498899330647752, + Latitude = 0.6763755753041285, + Altitude = -1896.057139784505, + UseHeightmap = false + }, + ['1969-07-20T20:15:21'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.49826864115494, + Latitude = 0.6763489810183512, + Altitude = -1896.601844270979, + UseHeightmap = false + }, + ['1969-07-20T20:15:22'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.49765193973772, + Latitude = 0.6763177659437667, + Altitude = -1897.41890100069, + UseHeightmap = false + }, + ['1969-07-20T20:15:23'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.49706547748806, + Latitude = 0.6762368192356724, + Altitude = -1898.2359577304012, + UseHeightmap = false + }, + ['1969-07-20T20:15:24'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.496489420526313, + Latitude = 0.676209886695223, + Altitude = -1899.053014460112, + UseHeightmap = false + }, + ['1969-07-20T20:15:25'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.495878153012562, + Latitude = 0.6761763249034947, + Altitude = -1900.1424234330602, + UseHeightmap = false + }, + ['1969-07-20T20:15:26'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.4953425244022, + Latitude = 0.6761311089575274, + Altitude = -1901.5041846492454, + UseHeightmap = false + }, + ['1969-07-20T20:15:27'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.494725217962213, + Latitude = 0.6761017566851846, + Altitude = -1902.5935936221936, + UseHeightmap = false + }, + ['1969-07-20T20:15:28'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.494112443564592, + Latitude = 0.6760842983575135, + Altitude = -1903.4106503519047, + UseHeightmap = false + }, + ['1969-07-20T20:15:29'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.493537644480202, + Latitude = 0.6760386448926926, + Altitude = -1903.9553548383788, + UseHeightmap = false + }, + ['1969-07-20T20:15:30'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.49299719757025, + Latitude = 0.6760147528943234, + Altitude = -1903.9553548383788, + UseHeightmap = false + }, + ['1969-07-20T20:15:31'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.492415313069813, + Latitude = 0.6759919962423392, + Altitude = -1904.2277070816158, + UseHeightmap = false + }, + ['1969-07-20T20:15:32'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.491877755110142, + Latitude = 0.6759640721591937, + Altitude = -1904.2277070816158, + UseHeightmap = false + }, + ['1969-07-20T20:15:33'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.49128819308786, + Latitude = 0.6759491077295323, + Altitude = -1904.2277070816158, + UseHeightmap = false + }, + ['1969-07-20T20:15:34'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.49073158429634, + Latitude = 0.6759379383686839, + Altitude = -1904.2277070816158, + UseHeightmap = false + }, + ['1969-07-20T20:15:35'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.490174891596332, + Latitude = 0.6759054634588104, + Altitude = -1904.2277070816158, + UseHeightmap = false + }, + ['1969-07-20T20:15:36'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.489635065407523, + Latitude = 0.6758939648884956, + Altitude = -1904.5000593248528, + UseHeightmap = false + }, + ['1969-07-20T20:15:37'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.4891060535486, + Latitude = 0.6759004097281942, + Altitude = -1904.2277070816158, + UseHeightmap = false + }, + ['1969-07-20T20:15:38'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.48855436619652, + Latitude = 0.6758862600165565, + Altitude = -1904.2277070816158, + UseHeightmap = false + }, + ['1969-07-20T20:15:39'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.488052711552413, + Latitude = 0.6758544116957282, + Altitude = -1904.5000593248528, + UseHeightmap = false + }, + ['1969-07-20T20:15:40'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.48754943516269, + Latitude = 0.6758316193430558, + Altitude = -1904.2277070816158, + UseHeightmap = false + }, + ['1969-07-20T20:15:41'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.487094304824993, + Latitude = 0.6758175052522961, + Altitude = -1904.2277070816158, + UseHeightmap = false + }, + ['1969-07-20T20:15:42'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.486618165034592, + Latitude = 0.6757757367756437, + Altitude = -1904.7724115680899, + UseHeightmap = false + }, + ['1969-07-20T20:15:43'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.48604740534131, + Latitude = 0.675733428263931, + Altitude = -1905.3171160545637, + UseHeightmap = false + }, + ['1969-07-20T20:15:44'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.48548248435554, + Latitude = 0.6756797157749009, + Altitude = -1905.8618205410378, + UseHeightmap = false + }, + ['1969-07-20T20:15:45'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.48494957486896, + Latitude = 0.6756120527881188, + Altitude = -1905.8618205410378, + UseHeightmap = false + }, + ['1969-07-20T20:15:46'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.484598386683622, + Latitude = 0.675584857481579, + Altitude = -1907.49593400046, + UseHeightmap = false + }, + ['1969-07-20T20:15:47'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.4841269963268, + Latitude = 0.6755482784409179, + Altitude = -1908.040638486934, + UseHeightmap = false + }, + ['1969-07-20T20:15:48'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.48373390336955, + Latitude = 0.6754890811171497, + Altitude = -1908.8576952166452, + UseHeightmap = false + }, + ['1969-07-20T20:15:49'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.48325134882829, + Latitude = 0.6754258626149947, + Altitude = -1908.4491668517896, + UseHeightmap = false + }, + ['1969-07-20T20:15:50'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.48284574619883, + Latitude = 0.6753753196460469, + Altitude = -1909.1300474598822, + UseHeightmap = false + }, + ['1969-07-20T20:15:51'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.48245362823393, + Latitude = 0.6753264776464533, + Altitude = -1909.4023997031193, + UseHeightmap = false + }, + ['1969-07-20T20:15:52'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.482060114185842, + Latitude = 0.6752749804130574, + Altitude = -1909.6747519463563, + UseHeightmap = false + }, + ['1969-07-20T20:15:53'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.481698202127482, + Latitude = 0.675223605520775, + Altitude = -1909.6747519463563, + UseHeightmap = false + }, + ['1969-07-20T20:15:54'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.48129046365451, + Latitude = 0.6751730022703166, + Altitude = -1909.6747519463563, + UseHeightmap = false + }, + ['1969-07-20T20:15:55'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.480893026154902, + Latitude = 0.6751376710849429, + Altitude = -1909.6747519463563, + UseHeightmap = false + }, + ['1969-07-20T20:15:56'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.48059324160945, + Latitude = 0.6750772226256051, + Altitude = -1909.6747519463563, + UseHeightmap = false + }, + ['1969-07-20T20:15:57'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.48034984354739, + Latitude = 0.6750430267458865, + Altitude = -1909.6747519463563, + UseHeightmap = false + }, + ['1969-07-20T20:15:58'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.48005268645993, + Latitude = 0.6750019848756621, + Altitude = -1909.6747519463563, + UseHeightmap = false + }, + ['1969-07-20T20:15:59'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.47978070153665, + Latitude = 0.6749655364121049, + Altitude = -1909.9471041895933, + UseHeightmap = false + }, + ['1969-07-20T20:16:00'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.47951311851127, + Latitude = 0.6749420304945992, + Altitude = -1909.9471041895933, + UseHeightmap = false + }, + ['1969-07-20T20:16:01'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.47927978098579, + Latitude = 0.6748989409040068, + Altitude = -1909.9471041895933, + UseHeightmap = false + }, + ['1969-07-20T20:16:02'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.47904250519933, + Latitude = 0.6748472712728636, + Altitude = -1910.4918086760674, + UseHeightmap = false + }, + ['1969-07-20T20:16:03'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.47879202998348, + Latitude = 0.674809514541568, + Altitude = -1910.7641609193045, + UseHeightmap = false + }, + ['1969-07-20T20:16:04'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.478567222437622, + Latitude = 0.6747692774477394, + Altitude = -1910.7641609193045, + UseHeightmap = false + }, + ['1969-07-20T20:16:05'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.47836548542964, + Latitude = 0.6747160116119115, + Altitude = -1910.7641609193045, + UseHeightmap = false + }, + ['1969-07-20T20:16:06'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.47818769774975, + Latitude = 0.6746866473279819, + Altitude = -1911.3088654057785, + UseHeightmap = false + }, + ['1969-07-20T20:16:07'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.477896613823983, + Latitude = 0.6746547793250971, + Altitude = -1913.2153311084376, + UseHeightmap = false + }, + ['1969-07-20T20:16:08'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.47781195503974, + Latitude = 0.6746276583132307, + Altitude = -1913.2153311084376, + UseHeightmap = false + }, + ['1969-07-20T20:16:09'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.477664452707373, + Latitude = 0.6746112868414526, + Altitude = -1914.0323878381487, + UseHeightmap = false + }, + -- ['1969-07-20T20:16:10'] = { + -- Type = "GlobeTranslation", + -- Globe = "Moon", + -- Longitude = 23.477750217762413, + -- Latitude = 0.6745910947360472, + -- Altitude = -1912.6706266219635, + -- UseHeightmap = false + -- }, + -- ['1969-07-20T20:16:11'] = { + -- Type = "GlobeTranslation", + -- Globe = "Moon", + -- Longitude = 23.477590925415402, + -- Latitude = 0.6745598993839581, + -- Altitude = -1912.6706266219635, + -- UseHeightmap = false + -- }, + -- ['1969-07-20T20:16:12'] = { + -- Type = "GlobeTranslation", + -- Globe = "Moon", + -- Longitude = 23.47745952757753, + -- Latitude = 0.6745298610932787, + -- Altitude = -1912.6706266219635, + -- UseHeightmap = false + -- }, + -- ['1969-07-20T20:16:13'] = { + -- Type = "GlobeTranslation", + -- Globe = "Moon", + -- Longitude = 23.477271343369093, + -- Latitude = 0.6745166392893209, + -- Altitude = -1913.2153311084376, + -- UseHeightmap = false + -- }, + -- ['1969-07-20T20:16:14'] = { + -- Type = "GlobeTranslation", + -- Globe = "Moon", + -- Longitude = 23.477100932665042, + -- Latitude = 0.6744937499451563, + -- Altitude = -1914.3047400813857, + -- UseHeightmap = false + -- }, + ['1969-07-20T20:16:15'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.47697690593997, + Latitude = 0.6744644602883288, + Altitude = -1914.8494445678598, + UseHeightmap = false + }, + ['1969-07-20T20:16:16'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.476842953277412, + Latitude = 0.6744457159538018, + Altitude = -1915.1217968110968, + UseHeightmap = false + }, + ['1969-07-20T20:16:17'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.476774052091812, + Latitude = 0.6744243634139203, + Altitude = -1914.8494445678598, + UseHeightmap = false + }, + ['1969-07-20T20:16:18'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.47665204889191, + Latitude = 0.6743981221140924, + Altitude = -1915.1217968110968, + UseHeightmap = false + }, + ['1969-07-20T20:16:19'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.47657652039885, + Latitude = 0.6743808573601865, + Altitude = -1915.1217968110968, + UseHeightmap = false + }, + ['1969-07-20T20:16:20'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.476475036022492, + Latitude = 0.6743552389834175, + Altitude = -1914.8494445678598, + UseHeightmap = false + }, + ['1969-07-20T20:16:21'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.47638671770867, + Latitude = 0.6743412077411113, + Altitude = -1915.3941490543339, + UseHeightmap = false + }, + ['1969-07-20T20:16:22'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.476286834646782, + Latitude = 0.6743241644041175, + Altitude = -1915.3941490543339, + UseHeightmap = false + }, + ['1969-07-20T20:16:23'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.47623840477727, + Latitude = 0.6743121023448013, + Altitude = -1915.3941490543339, + UseHeightmap = false + }, + ['1969-07-20T20:16:24'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.476125794037742, + Latitude = 0.6743019779643423, + Altitude = -1915.938853540808, + UseHeightmap = false + }, + ['1969-07-20T20:16:25'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.47604582826371, + Latitude = 0.6742984062330349, + Altitude = -1916.211205784045, + UseHeightmap = false + }, + ['1969-07-20T20:16:26'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.47599605084473, + Latitude = 0.6742864748966985, + Altitude = -1916.211205784045, + UseHeightmap = false + }, + ['1969-07-20T20:16:27'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.47598166921822, + Latitude = 0.6742856341308172, + Altitude = -1916.755910270519, + UseHeightmap = false + }, + -- ['1969-07-20T20:16:28'] = { + -- Type = "GlobeTranslation", + -- Globe = "Moon", + -- Longitude = 23.47600003592791, + -- Latitude = 0.6742816108377042, + -- Altitude = -1916.211205784045, + -- UseHeightmap = false + -- }, + -- ['1969-07-20T20:16:29'] = { + -- Type = "GlobeTranslation", + -- Globe = "Moon", + -- Longitude = 23.47593990066764, + -- Latitude = 0.6742699316275284, + -- Altitude = -1916.483558027282, + -- UseHeightmap = false + -- }, + ['1969-07-20T20:16:30'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.47587957412098, + Latitude = 0.6742661771136219, + Altitude = -1916.755910270519, + UseHeightmap = false + }, + ['1969-07-20T20:16:31'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.47579282136856, + Latitude = 0.6742214263433656, + Altitude = -1917.028262513756, + UseHeightmap = false + }, + ['1969-07-20T20:16:32'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.47571834266516, + Latitude = 0.6741885448706321, + Altitude = -1917.5729670002302, + UseHeightmap = false + }, + -- ['1969-07-20T20:16:33'] = { + -- Type = "GlobeTranslation", + -- Globe = "Moon", + -- Longitude = 23.47569457676149, + -- Latitude = 0.6741859152655852, + -- Altitude = -1917.3006147569931, + -- UseHeightmap = false + -- }, + ['1969-07-20T20:16:34'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.47557041293751, + Latitude = 0.6741798073326593, + Altitude = -1918.117671486704, + UseHeightmap = false + }, + ['1969-07-20T20:16:35'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.475475681892203, + Latitude = 0.6741822414281841, + Altitude = -1918.117671486704, + UseHeightmap = false + }, + ['1969-07-20T20:16:36'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.47541533097675, + Latitude = 0.6742009046793005, + Altitude = -1918.390023729941, + UseHeightmap = false + }, + ['1969-07-20T20:16:37'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.47532207549478, + Latitude = 0.6742269926054295, + Altitude = -1918.662375973178, + UseHeightmap = false + }, + ['1969-07-20T20:16:38'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.47522251798864, + Latitude = 0.6742695236577596, + Altitude = -1918.662375973178, + UseHeightmap = false + }, + ['1969-07-20T20:16:39'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.47513564425997, + Latitude = 0.6742809051574165, + Altitude = -1918.662375973178, + UseHeightmap = false + }, + ['1969-07-20T20:16:40'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.47498810518855, + Latitude = 0.6743095342428154, + Altitude = -1920.2964894326003, + UseHeightmap = false + }, + -- ['1969-07-20T20:16:41'] = { + -- Type = "GlobeTranslation", + -- Globe = "Moon", + -- Longitude = 23.47489523759891, + -- Latitude = 0.6743154022599566, + -- Altitude = -1920.0241371893633, + -- UseHeightmap = false + -- }, + -- ['1969-07-20T20:16:42'] = { + -- Type = "GlobeTranslation", + -- Globe = "Moon", + -- Longitude = 23.47479438729774, + -- Latitude = 0.6743324078003049, + -- Altitude = -1920.2964894326003, + -- UseHeightmap = false + -- }, + -- ['1969-07-20T20:16:43'] = { + -- Type = "GlobeTranslation", + -- Globe = "Moon", + -- Longitude = 23.47475788126512, + -- Latitude = 0.674345583979325, + -- Altitude = -1920.0241371893633, + -- UseHeightmap = false + -- }, + ['1969-07-20T20:16:44'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.474678823712882, + Latitude = 0.6743691203511213, + Altitude = -1920.2964894326003, + UseHeightmap = false + }, + ['1969-07-20T20:16:45'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.47460302474115, + Latitude = 0.6743890347121807, + Altitude = -1920.2964894326003, + UseHeightmap = false + }, + ['1969-07-20T20:16:46'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.47450130965027, + Latitude = 0.6744202280781089, + Altitude = -1920.8411939190744, + UseHeightmap = false + }, + ['1969-07-20T20:16:47'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.474379586340042, + Latitude = 0.6744490653475903, + Altitude = -1921.1135461623114, + UseHeightmap = false + }, + ['1969-07-20T20:16:48'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.47431921657337, + Latitude = 0.6745028925523043, + Altitude = -1921.1135461623114, + UseHeightmap = false + }, + ['1969-07-20T20:16:49'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.47424698504895, + Latitude = 0.6745115395661241, + Altitude = -1921.1135461623114, + UseHeightmap = false + }, + ['1969-07-20T20:16:50'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.474158028620153, + Latitude = 0.6745268900936557, + Altitude = -1921.6582506487855, + UseHeightmap = false + }, + ['1969-07-20T20:16:51'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.47408003386958, + Latitude = 0.674531434078838, + Altitude = -1921.6582506487855, + UseHeightmap = false + }, + ['1969-07-20T20:16:52'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.473993195514502, + Latitude = 0.6745434127092755, + Altitude = -1921.9306028920225, + UseHeightmap = false + }, + -- ['1969-07-20T20:16:53'] = { + -- Type = "GlobeTranslation", + -- Globe = "Moon", + -- Longitude = 23.47392353665608, + -- Latitude = 0.6745464032805983, + -- Altitude = -1922.2029551352596, + -- UseHeightmap = false + -- }, + ['1969-07-20T20:16:54'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.47388537487237, + Latitude = 0.674552865152663, + Altitude = -1921.9306028920225, + UseHeightmap = false + }, + ['1969-07-20T20:16:55'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.47382957912373, + Latitude = 0.6745443566727537, + Altitude = -1921.9306028920225, + UseHeightmap = false + }, + ['1969-07-20T20:16:56'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.47378652829031, + Latitude = 0.6745361955127924, + Altitude = -1921.6582506487855, + UseHeightmap = false + }, + ['1969-07-20T20:16:57'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.473741159081282, + Latitude = 0.6745139398577651, + Altitude = -1921.6582506487855, + UseHeightmap = false + }, + ['1969-07-20T20:16:58'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.473674434325403, + Latitude = 0.6745046665169872, + Altitude = -1922.2029551352596, + UseHeightmap = false + }, + ['1969-07-20T20:16:59'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.47366202033169, + Latitude = 0.6744553774680945, + Altitude = -1922.2029551352596, + UseHeightmap = false + }, + ['1969-07-20T20:17:00'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.47360771579434, + Latitude = 0.6744345598586292, + Altitude = -1922.7476596217336, + UseHeightmap = false + }, + ['1969-07-20T20:17:01'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.47357090816817, + Latitude = 0.6744054827778567, + Altitude = -1923.0200118649707, + UseHeightmap = false + }, + ['1969-07-20T20:17:02'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.47354290217646, + Latitude = 0.6743765403194303, + Altitude = -1923.2923641082077, + UseHeightmap = false + }, + ['1969-07-20T20:17:03'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.47354640286736, + Latitude = 0.6743332580785223, + Altitude = -1923.5647163514448, + UseHeightmap = false + }, + ['1969-07-20T20:17:04'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.473541367503802, + Latitude = 0.6742974556070759, + Altitude = -1923.8370685946818, + UseHeightmap = false + }, + ['1969-07-20T20:17:05'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.47350854369485, + Latitude = 0.6742858449512636, + Altitude = -1924.1094208379188, + UseHeightmap = false + }, + ['1969-07-20T20:17:06'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.47347424911663, + Latitude = 0.6742611487873781, + Altitude = -1924.6541253243927, + UseHeightmap = false + }, + ['1969-07-20T20:17:07'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.473503629496022, + Latitude = 0.6742462694505276, + Altitude = -1924.6541253243927, + UseHeightmap = false + }, + ['1969-07-20T20:17:08'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.473512768546712, + Latitude = 0.6742384048959066, + Altitude = -1924.6541253243927, + UseHeightmap = false + }, + ['1969-07-20T20:17:09'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.47353343175876, + Latitude = 0.6742241072273591, + Altitude = -1924.3817730811559, + UseHeightmap = false + }, + ['1969-07-20T20:17:10'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.47353316391657, + Latitude = 0.6742142580747189, + Altitude = -1925.4711820541038, + UseHeightmap = false + }, + ['1969-07-20T20:17:11'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.47355774790429, + Latitude = 0.6742015107317392, + Altitude = -1924.9264775676297, + UseHeightmap = false + }, + ['1969-07-20T20:17:12'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.4735540335665, + Latitude = 0.6741800864866416, + Altitude = -1924.9264775676297, + UseHeightmap = false + }, + ['1969-07-20T20:17:13'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.47353500681606, + Latitude = 0.6741617950501063, + Altitude = -1925.1988298108668, + UseHeightmap = false + }, + ['1969-07-20T20:17:14'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.47350664772458, + Latitude = 0.6741447111551033, + Altitude = -1925.4711820541038, + UseHeightmap = false + }, + ['1969-07-20T20:17:15'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.473494757982273, + Latitude = 0.6741430011390509, + Altitude = -1925.4711820541038, + UseHeightmap = false + }, + ['1969-07-20T20:17:16'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.473485349949943, + Latitude = 0.6741431504511513, + Altitude = -1925.4711820541038, + UseHeightmap = false + }, + ['1969-07-20T20:17:17'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.473464448566723, + Latitude = 0.674141681840806, + Altitude = -1925.4711820541038, + UseHeightmap = false + }, + ['1969-07-20T20:17:18'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.47344203973089, + Latitude = 0.6741518055278933, + Altitude = -1925.4711820541038, + UseHeightmap = false + }, + ['1969-07-20T20:17:19'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.473416197134252, + Latitude = 0.6741705280217748, + Altitude = -1925.7435342973408, + UseHeightmap = false + }, + ['1969-07-20T20:17:20'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.47339416150648, + Latitude = 0.6741799656622618, + Altitude = -1925.7435342973408, + UseHeightmap = false + }, + ['1969-07-20T20:17:21'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.4733232813815, + Latitude = 0.6741727841821631, + Altitude = -1926.288238783815, + UseHeightmap = false + }, + ['1969-07-20T20:17:24'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.47324174890097, + Latitude = 0.6742091863213222, + Altitude = -1926.288238783815, + UseHeightmap = false + }, + ['1969-07-20T20:17:27'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.47317556908458, + Latitude = 0.6742072669430229, + Altitude = -1926.560591027052, + UseHeightmap = false + }, + ['1969-07-20T20:17:30'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.47310752310149, + Latitude = 0.6742134078571678, + Altitude = -1926.832943270289, + UseHeightmap = false + }, + ['1969-07-20T20:17:32'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.473074792306253, + Latitude = 0.6741925230045956, + Altitude = -1927.105295513526, + UseHeightmap = false + }, + ['1969-07-20T20:17:40'] = { + Type = "GlobeTranslation", + Globe = "Moon", + Longitude = 23.47306, + Latitude = 0.67402, + Altitude = -1927.65, + UseHeightmap = false + }, }; asset.export('keyframes', keyframes); diff --git a/data/assets/scene/solarsystem/missions/apollo/11/lem_descent_rotation.asset b/data/assets/scene/solarsystem/missions/apollo/11/lem_descent_rotation.asset index 2c45cb9d0f..8ed85f9feb 100644 --- a/data/assets/scene/solarsystem/missions/apollo/11/lem_descent_rotation.asset +++ b/data/assets/scene/solarsystem/missions/apollo/11/lem_descent_rotation.asset @@ -1,1587 +1,1586 @@ asset.export('keyframes', { - -- ['1969-7-20T20:9:53'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.3815, -0.0048, -0.4891} - -- }, - -- ['1969-7-20T20:9:55'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.3773, 0.0042, -0.3557} - -- }, - -- ['1969-7-20T20:9:57'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.3677, 0.0184, -0.2218} - -- }, - -- ['1969-7-20T20:9:59'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.3606, -0.0117, -0.0861} - -- }, - -- ['1969-7-20T20:10:1'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.3587, -0.0222, -0.0219} - -- }, - -- ['1969-7-20T20:10:3'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.3622, -0.0207, -0.0533} - -- }, - -- ['1969-7-20T20:10:5'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.3639, -0.0032, -0.0640} - -- }, - -- ['1969-7-20T20:10:7'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.3612, 0.0178, -0.0685} - -- }, - -- ['1969-7-20T20:10:9'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.3571, 0.0196, -0.0796} - -- }, - -- ['1969-7-20T20:10:11'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.3484, 0.0029, -0.0913} - -- }, - -- ['1969-7-20T20:10:13'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.3597, -0.0149, -0.0832} - -- }, - -- ['1969-7-20T20:10:15'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.3587, -0.0220, -0.0679} - -- }, - -- ['1969-7-20T20:10:17'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.3482, -0.0121, -0.0736} - -- }, - -- ['1969-7-20T20:10:19'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.3520, -0.0098, -0.0876} - -- }, - -- ['1969-7-20T20:10:21'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.3503, -0.0240, -0.0872} - -- }, - -- ['1969-7-20T20:10:25'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.3470, 0.0245, -0.0545} - -- }, - -- ['1969-7-20T20:10:27'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.3420, 0.0115, -0.0518} - -- }, - -- ['1969-7-20T20:10:29'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.3294, -0.0153, -0.0556} - -- }, - -- ['1969-7-20T20:10:31'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.3399, -0.0136, -0.0573} - -- }, - -- ['1969-7-20T20:10:33'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.3459, 0.0002, -0.0569} - -- }, - -- ['1969-7-20T20:10:35'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.3440, 0.0012, -0.0542} - -- }, - -- ['1969-7-20T20:10:37'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.3230, -0.0096, -0.0527} - -- }, - -- ['1969-7-20T20:10:39'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.2966, -0.0119, -0.0510} - -- }, - -- ['1969-7-20T20:10:41'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.3146, -0.0040, -0.0504} - -- }, - -- ['1969-7-20T20:10:43'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.3355, -0.0015, -0.0514} - -- }, - -- ['1969-7-20T20:10:45'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.2916, 0.0061, -0.0516} - -- }, - -- ['1969-7-20T20:10:47'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.2901, -0.0257, -0.0516} - -- }, - -- ['1969-7-20T20:10:49'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.2818, -0.0123, -0.0495} - -- }, - -- ['1969-7-20T20:10:51'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.2682, 0.0058, -0.0477} - -- }, - -- ['1969-7-20T20:10:53'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.2732, 0.0035, -0.0195} - -- }, - -- ['1969-7-20T20:10:54'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.2740, 0.0029, 0.0123} - -- }, - -- ['1969-7-20T20:10:55'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.2778, 0.0035, 0.0234} - -- }, - -- ['1969-7-20T20:10:57'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.2573, 0.0069, 0.0174} - -- }, - -- ['1969-7-20T20:10:58'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.2515, -0.0023, 0.0115} - -- }, - -- ['1969-7-20T20:10:59'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.2333, -0.0092, 0.0092} - -- }, - -- ['1969-7-20T20:11:0'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.2191, -0.0157, 0.0056} - -- }, - -- ['1969-7-20T20:11:1'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.2246, -0.0195, 0.0029} - -- }, - -- ['1969-7-20T20:11:3'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.2419, -0.0146, -0.0019} - -- }, - -- ['1969-7-20T20:11:5'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.2274, -0.0054, -0.0048} - -- }, - -- ['1969-7-20T20:11:6'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.2218, -0.0042, -0.0056} - -- }, - -- ['1969-7-20T20:11:7'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.2047, 0.0010, -0.0065} - -- }, - -- ['1969-7-20T20:11:7'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.2042, -0.0054, -0.0069} - -- }, - -- ['1969-7-20T20:11:9'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.2007, -0.0100, -0.0077} - -- }, - -- ['1969-7-20T20:11:11'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.2136, -0.0173, -0.0077} - -- }, - -- ['1969-7-20T20:11:11'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.2013, -0.0021, -0.0077} - -- }, - -- ['1969-7-20T20:11:13'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.1928, 0.0102, -0.0056} - -- }, - -- ['1969-7-20T20:11:13'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.1854, 0.0090, -0.0057} - -- }, - -- ['1969-7-20T20:11:15'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.1856, -0.0075, -0.0044} - -- }, - -- ['1969-7-20T20:11:17'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.1670, -0.0157, -0.0023} - -- }, - -- ['1969-7-20T20:11:17'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.1599, -0.0149, 0.0012} - -- }, - -- ['1969-7-20T20:11:19'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.1514, -0.0119, 0.0012} - -- }, - -- ['1969-7-20T20:11:19'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.1465, -0.0094, 0.0040} - -- }, - -- ['1969-7-20T20:11:21'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.1593, -0.0176, 0.0063} - -- }, - -- ['1969-7-20T20:11:23'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.1712, -0.0144, 0.0132} - -- }, - -- ['1969-7-20T20:11:24'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.1727, -0.0052, 0.0176} - -- }, - -- ['1969-7-20T20:11:25'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.1652, 0.0083, 0.0190} - -- }, - -- ['1969-7-20T20:11:26'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.1827, -0.0044, 0.0178} - -- }, - -- ['1969-7-20T20:11:27'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.1942, -0.0172, 0.0180} - -- }, - -- ['1969-7-20T20:11:29'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.1788, -0.0071, 0.0188} - -- }, - -- ['1969-7-20T20:11:30'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.1639, 0.0035, 0.0176} - -- }, - -- ['1969-7-20T20:11:31'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.1614, 0.0048, 0.0178} - -- }, - -- ['1969-7-20T20:11:31'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.1551, 0.0083, 0.0169} - -- }, - -- ['1969-7-20T20:11:33'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.1643, 0.0060, 0.0175} - -- }, - -- ['1969-7-20T20:11:35'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.1746, 0.0006, 0.0173} - -- }, - -- ['1969-7-20T20:11:35'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.1679, -0.0008, 0.0178} - -- }, - -- ['1969-7-20T20:11:37'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.1735, -0.0127, 0.0173} - -- }, - -- ['1969-7-20T20:11:37'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.1599, -0.0044, 0.0186} - -- }, - -- ['1969-7-20T20:11:39'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.1545, 0.0012, 0.0167} - -- }, - -- ['1969-7-20T20:11:39'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.1461, 0.0075, 0.0169} - -- }, - -- ['1969-7-20T20:11:41'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.1470, 0.0012, 0.0155} - -- }, - -- ['1969-7-20T20:11:41'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.1442, -0.0086, 0.0148} - -- }, - -- ['1969-7-20T20:11:43'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.1411, -0.0236, 0.0142} - -- }, - -- ['1969-7-20T20:11:43'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.1302, -0.0240, 0.0131} - -- }, - -- ['1969-7-20T20:11:45'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.1098, -0.0115, 0.0140} - -- }, - -- ['1969-7-20T20:11:45'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.1043, -0.0088, 0.0134} - -- }, - -- ['1969-7-20T20:11:47'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.0979, -0.0025, 0.0144} - -- }, - -- ['1969-7-20T20:11:47'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.1092, -0.0125, 0.0144} - -- }, - -- ['1969-7-20T20:11:49'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.1175, -0.0205, 0.0146} - -- }, - -- ['1969-7-20T20:11:49'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.1230, -0.0249, 0.0157} - -- }, - -- ['1969-7-20T20:11:51'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.1099, -0.0119, 0.0161} - -- }, - -- ['1969-7-20T20:11:51'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.1056, -0.0071, 0.0167} - -- }, - -- ['1969-7-20T20:11:53'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.0916, 0.0044, 0.0131} - -- }, - -- ['1969-7-20T20:11:53'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.0901, 0.0073, 0.0111} - -- }, - -- ['1969-7-20T20:11:55'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.0839, 0.0040, 0.0075} - -- }, - -- ['1969-7-20T20:11:55'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.0832, 0.0015, 0.0050} - -- }, - -- ['1969-7-20T20:11:57'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.0831, -0.0109, 0.0003} - -- }, - -- ['1969-7-20T20:11:57'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.0812, -0.0147, -0.0009} - -- }, - -- ['1969-7-20T20:11:59'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.0814, -0.0278, -0.0031} - -- }, - -- ['1969-7-20T20:11:59'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.0696, -0.0224, -0.0050} - -- }, - -- ['1969-7-20T20:12:1'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.0617, -0.0242, -0.0067} - -- }, - -- ['1969-7-20T20:12:1'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.0508, -0.0174, -0.0075} - -- }, - -- ['1969-7-20T20:12:3'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.0523, -0.0174, -0.0094} - -- }, - -- ['1969-7-20T20:12:3'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.0466, -0.0117, -0.0094} - -- }, - -- ['1969-7-20T20:12:5'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.0565, -0.0107, -0.0109} - -- }, - -- ['1969-7-20T20:12:5'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.0559, -0.0080, -0.0109} - -- }, - -- ['1969-7-20T20:12:7'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.0686, -0.0065, -0.0113} - -- }, - -- ['1969-7-20T20:12:7'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.0692, -0.0082, -0.0115} - -- }, - -- ['1969-7-20T20:12:9'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.0722, -0.0075, -0.0107} - -- }, - -- ['1969-7-20T20:12:9'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.0707, -0.0144, -0.0113} - -- }, - -- ['1969-7-20T20:12:11'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.0630, -0.0153, -0.0103} - -- }, - -- ['1969-7-20T20:12:11'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.0605, -0.0261, -0.0102} - -- }, - -- ['1969-7-20T20:12:13'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.0441, -0.0305, -0.0096} - -- }, - -- ['1969-7-20T20:12:13'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.0427, -0.0410, -0.0086} - -- }, - -- ['1969-7-20T20:12:15'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.0283, -0.0228, -0.0075} - -- }, - -- ['1969-7-20T20:12:15'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.0329, -0.0178, -0.0050} - -- }, - -- ['1969-7-20T20:12:17'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.0260, -0.0009, -0.0027} - -- }, - -- ['1969-7-20T20:12:17'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.0404, -0.0059, -0.0004} - -- }, - -- ['1969-7-20T20:12:19'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.0467, -0.0140, 0.0023} - -- }, - -- ['1969-7-20T20:12:19'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.0584, -0.0220, 0.0044} - -- }, - -- ['1969-7-20T20:12:21'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.0416, -0.0176, 0.0088} - -- }, - -- ['1969-7-20T20:12:21'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.0370, -0.0102, 0.0104} - -- }, - -- ['1969-7-20T20:12:23'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.0222, -0.0063, 0.0121} - -- }, - -- ['1969-7-20T20:12:23'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.0193, 0.0006, 0.0108} - -- }, - -- ['1969-7-20T20:12:25'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.0166, -0.0059, 0.0098} - -- }, - -- ['1969-7-20T20:12:25'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.0164, -0.0038, 0.0092} - -- }, - -- ['1969-7-20T20:12:27'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.0237, -0.0188, 0.0081} - -- }, - -- ['1969-7-20T20:12:27'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.0249, -0.0199, 0.0081} - -- }, - -- ['1969-7-20T20:12:29'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.0329, -0.0330, 0.0077} - -- }, - -- ['1969-7-20T20:12:29'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.0209, -0.0255, 0.0079} - -- }, - -- ['1969-7-20T20:12:31'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.0157, -0.0205, 0.0084} - -- }, - -- ['1969-7-20T20:12:31'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.0034, -0.0159, 0.0092} - -- }, - -- ['1969-7-20T20:12:33'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.0044, -0.0136, 0.0106} - -- }, - -- ['1969-7-20T20:12:33'] = { - -- Type = "StaticRotation", - -- Rotation = {-0.9963, -0.0161, 0.0096} - -- }, - -- ['1969-7-20T20:12:35'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.0036, -0.0180, 0.0084} - -- }, - -- ['1969-7-20T20:12:35'] = { - -- Type = "StaticRotation", - -- Rotation = {-0.9998, -0.0253, 0.0073} - -- }, - -- ['1969-7-20T20:12:37'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.0088, -0.0265, 0.0065} - -- }, - -- ['1969-7-20T20:12:37'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.0105, -0.0339, 0.0065} - -- }, - -- ['1969-7-20T20:12:39'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.0230, -0.0280, 0.0060} - -- }, - -- ['1969-7-20T20:12:39'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.0253, -0.0282, 0.0067} - -- }, - -- ['1969-7-20T20:12:41'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.0216, -0.0071, 0.0067} - -- }, - -- ['1969-7-20T20:12:42'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.0118, -0.0115, 0.0079} - -- }, - -- ['1969-7-20T20:12:43'] = { - -- Type = "StaticRotation", - -- Rotation = {-0.9946, -0.0098, 0.0077} - -- }, - -- ['1969-7-20T20:12:43'] = { - -- Type = "StaticRotation", - -- Rotation = {-0.9927, -0.0172, 0.0081} - -- }, - -- ['1969-7-20T20:12:45'] = { - -- Type = "StaticRotation", - -- Rotation = {-0.9890, -0.0147, 0.0094} - -- }, - -- ['1969-7-20T20:12:45'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.0046, -0.0125, 0.0094} - -- }, - -- ['1969-7-20T20:12:47'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.0109, -0.0048, 0.0104} - -- }, - -- ['1969-7-20T20:12:47'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.0186, -0.0057, 0.0083} - -- }, - -- ['1969-7-20T20:12:49'] = { - -- Type = "StaticRotation", - -- Rotation = {-0.9940, -0.0226, 0.0048} - -- }, - -- ['1969-7-20T20:12:49'] = { - -- Type = "StaticRotation", - -- Rotation = {-0.9861, -0.0278, 0.0023} - -- }, - -- ['1969-7-20T20:12:51'] = { - -- Type = "StaticRotation", - -- Rotation = {-0.9712, -0.0301, 0.0000} - -- }, - -- ['1969-7-20T20:12:51'] = { - -- Type = "StaticRotation", - -- Rotation = {-0.9768, -0.0176, -0.0013} - -- }, - -- ['1969-7-20T20:12:53'] = { - -- Type = "StaticRotation", - -- Rotation = {-0.9791, -0.0088, -0.0025} - -- }, - -- ['1969-7-20T20:12:53'] = { - -- Type = "StaticRotation", - -- Rotation = {-0.9890, -0.0017, -0.0036} - -- }, - -- ['1969-7-20T20:12:55'] = { - -- Type = "StaticRotation", - -- Rotation = {-0.9906, -0.0245, -0.0056} - -- }, - -- ['1969-7-20T20:12:55'] = { - -- Type = "StaticRotation", - -- Rotation = {-0.9892, -0.0303, -0.0067} - -- }, - -- ['1969-7-20T20:12:57'] = { - -- Type = "StaticRotation", - -- Rotation = {-0.9852, -0.0470, -0.0086} - -- }, - -- ['1969-7-20T20:12:57'] = { - -- Type = "StaticRotation", - -- Rotation = {-0.9837, -0.0307, -0.0088} - -- }, - -- ['1969-7-20T20:12:59'] = { - -- Type = "StaticRotation", - -- Rotation = {-0.9873, -0.0128, -0.0090} - -- }, - -- ['1969-7-20T20:12:59'] = { - -- Type = "StaticRotation", - -- Rotation = {-0.9861, 0.0010, -0.0088} - -- }, - -- ['1969-7-20T20:13:1'] = { - -- Type = "StaticRotation", - -- Rotation = {-0.9944, -0.0117, -0.0094} - -- }, - -- ['1969-7-20T20:13:1'] = { - -- Type = "StaticRotation", - -- Rotation = {-0.9900, -0.0194, -0.0100} - -- }, - -- ['1969-7-20T20:13:3'] = { - -- Type = "StaticRotation", - -- Rotation = {-0.9917, -0.0355, -0.0103} - -- }, - -- ['1969-7-20T20:13:3'] = { - -- Type = "StaticRotation", - -- Rotation = {-0.9856, -0.0395, -0.0105} - -- }, - -- ['1969-7-20T20:13:5'] = { - -- Type = "StaticRotation", - -- Rotation = {-0.9969, -0.0299, -0.0096} - -- }, - -- ['1969-7-20T20:13:5'] = { - -- Type = "StaticRotation", - -- Rotation = {-0.9965, -0.0228, -0.0088} - -- }, - -- ['1969-7-20T20:13:7'] = { - -- Type = "StaticRotation", - -- Rotation = {-1.0015, -0.0073, -0.0075} - -- }, - -- ['1969-7-20T20:13:7'] = { - -- Type = "StaticRotation", - -- Rotation = {-0.9908, -0.0098, -0.0067} - -- }, - -- ['1969-7-20T20:13:9'] = { - -- Type = "StaticRotation", - -- Rotation = {-0.9814, -0.0034, -0.0057} - -- }, - -- ['1969-7-20T20:13:9'] = { - -- Type = "StaticRotation", - -- Rotation = {-0.9729, -0.0071, -0.0044} - -- }, - -- ['1969-7-20T20:13:11'] = { - -- Type = "StaticRotation", - -- Rotation = {-0.9716, -0.0002, -0.0029} - -- }, - -- ['1969-7-20T20:13:11'] = { - -- Type = "StaticRotation", - -- Rotation = {-0.9729, -0.0044, -0.0013} - -- }, - -- ['1969-7-20T20:13:13'] = { - -- Type = "StaticRotation", - -- Rotation = {-0.9793, 0.0010, 0.0006} - -- }, - -- ['1969-7-20T20:13:14'] = { - -- Type = "StaticRotation", - -- Rotation = {-0.9869, -0.0040, 0.0031} - -- }, - -- ['1969-7-20T20:13:15'] = { - -- Type = "StaticRotation", - -- Rotation = {-0.9938, -0.0031, 0.0048} - -- }, - -- ['1969-7-20T20:13:15'] = { - -- Type = "StaticRotation", - -- Rotation = {-0.9978, -0.0134, 0.0067} - -- }, - -- ['1969-7-20T20:13:17'] = { - -- Type = "StaticRotation", - -- Rotation = {-0.9881, -0.0334, 0.0048} - -- }, - -- ['1969-7-20T20:13:17'] = { - -- Type = "StaticRotation", - -- Rotation = {-0.9881, -0.0449, 0.0023} - -- }, - -- ['1969-7-20T20:13:19'] = { - -- Type = "StaticRotation", - -- Rotation = {-0.9756, -0.0447, -0.0015} - -- }, - -- ['1969-7-20T20:13:19'] = { - -- Type = "StaticRotation", - -- Rotation = {-0.9804, -0.0351, -0.0034} - -- }, - -- ['1969-7-20T20:13:21'] = { - -- Type = "StaticRotation", - -- Rotation = {-0.9769, -0.0269, -0.0052} - -- }, - -- ['1969-7-20T20:13:21'] = { - -- Type = "StaticRotation", - -- Rotation = {-0.9816, -0.0182, -0.0073} - -- }, - -- ['1969-7-20T20:13:23'] = { - -- Type = "StaticRotation", - -- Rotation = {-0.9783, -0.0192, -0.0084} - -- }, - -- ['1969-7-20T20:13:23'] = { - -- Type = "StaticRotation", - -- Rotation = {-0.9808, -0.0149, -0.0103} - -- }, - -- ['1969-7-20T20:13:25'] = { - -- Type = "StaticRotation", - -- Rotation = {-0.9771, -0.0197, -0.0117} - -- }, - -- ['1969-7-20T20:13:25'] = { - -- Type = "StaticRotation", - -- Rotation = {-0.9748, -0.0171, -0.0127} - -- }, - -- ['1969-7-20T20:13:27'] = { - -- Type = "StaticRotation", - -- Rotation = {-0.9710, -0.0197, -0.0144} - -- }, - -- ['1969-7-20T20:13:27'] = { - -- Type = "StaticRotation", - -- Rotation = {-0.9643, -0.0186, -0.0146} - -- }, - -- ['1969-7-20T20:13:29'] = { - -- Type = "StaticRotation", - -- Rotation = {-0.9616, -0.0165, -0.0159} - -- }, - -- ['1969-7-20T20:13:29'] = { - -- Type = "StaticRotation", - -- Rotation = {-0.9534, -0.0163, -0.0159} - -- }, - -- ['1969-7-20T20:13:31'] = { - -- Type = "StaticRotation", - -- Rotation = {-0.9605, -0.0096, -0.0165} - -- }, - -- ['1969-7-20T20:13:41'] = { - -- Type = "StaticRotation", - -- Rotation = {-0.8092, -0.0297, -0.0155} - -- }, - -- ['1969-7-20T20:13:41'] = { - -- Type = "StaticRotation", - -- Rotation = {-0.8097, -0.0389, -0.0149} - -- }, - -- ['1969-7-20T20:13:43'] = { - -- Type = "StaticRotation", - -- Rotation = {-0.7923, -0.0358, -0.0138} - -- }, - -- ['1969-7-20T20:13:43'] = { - -- Type = "StaticRotation", - -- Rotation = {-0.7988, -0.0267, -0.0125} - -- }, - -- ['1969-7-20T20:13:45'] = { - -- Type = "StaticRotation", - -- Rotation = {-0.7909, -0.0128, -0.0094} - -- }, - -- ['1969-7-20T20:13:45'] = { - -- Type = "StaticRotation", - -- Rotation = {-0.7967, -0.0061, -0.0080} - -- }, - -- ['1969-7-20T20:13:47'] = { - -- Type = "StaticRotation", - -- Rotation = {-0.7748, -0.0207, -0.0056} - -- }, - -- ['1969-7-20T20:13:47'] = { - -- Type = "StaticRotation", - -- Rotation = {-0.7681, -0.0278, -0.0048} - -- }, - -- ['1969-7-20T20:13:49'] = { - -- Type = "StaticRotation", - -- Rotation = {-0.7574, -0.0426, -0.0027} - -- }, - -- ['1969-7-20T20:13:49'] = { - -- Type = "StaticRotation", - -- Rotation = {-0.7582, -0.0364, -0.0004} - -- }, - -- ['1969-7-20T20:13:51'] = { - -- Type = "StaticRotation", - -- Rotation = {-0.7699, -0.0324, 0.0036} - -- }, - -- ['1969-7-20T20:13:51'] = { - -- Type = "StaticRotation", - -- Rotation = {-0.7676, -0.0245, 0.0040} - -- }, - -- ['1969-7-20T20:13:53'] = { - -- Type = "StaticRotation", - -- Rotation = {-0.7733, -0.0194, 0.0023} - -- }, - -- ['1969-7-20T20:13:53'] = { - -- Type = "StaticRotation", - -- Rotation = {-0.7574, -0.0207, 0.0008} - -- }, - -- ['1969-7-20T20:13:55'] = { - -- Type = "StaticRotation", - -- Rotation = {-0.7440, -0.0310, -0.0017} - -- }, - -- ['1969-7-20T20:13:55'] = { - -- Type = "StaticRotation", - -- Rotation = {-0.7405, -0.0569, -0.0044} - -- }, - -- ['1969-7-20T20:13:57'] = { - -- Type = "StaticRotation", - -- Rotation = {-0.7549, -0.0587, -0.0054} - -- }, - -- ['1969-7-20T20:13:57'] = { - -- Type = "StaticRotation", - -- Rotation = {-0.7518, -0.0326, -0.0046} - -- }, - -- ['1969-7-20T20:13:59'] = { - -- Type = "StaticRotation", - -- Rotation = {-0.7465, 0.0040, -0.0050} - -- }, - -- ['1969-7-20T20:13:59'] = { - -- Type = "StaticRotation", - -- Rotation = {-0.7465, 0.0113, -0.0050} - -- }, - -- ['1969-7-20T20:14:1'] = { - -- Type = "StaticRotation", - -- Rotation = {-0.6939, 0.0029, -0.0063} - -- }, - -- ['1969-7-20T20:14:2'] = { - -- Type = "StaticRotation", - -- Rotation = {-0.6912, 0.0079, -0.0079} - -- }, - -- ['1969-7-20T20:14:3'] = { - -- Type = "StaticRotation", - -- Rotation = {-0.6793, 0.0048, -0.0077} - -- }, - -- ['1969-7-20T20:14:4'] = { - -- Type = "StaticRotation", - -- Rotation = {-0.6817, 0.0090, -0.0098} - -- }, - -- ['1969-7-20T20:14:5'] = { - -- Type = "StaticRotation", - -- Rotation = {-0.6730, 0.0117, -0.0090} - -- }, - -- ['1969-7-20T20:14:6'] = { - -- Type = "StaticRotation", - -- Rotation = {-0.6684, 0.0102, -0.0096} - -- }, - -- ['1969-7-20T20:14:7'] = { - -- Type = "StaticRotation", - -- Rotation = {-0.6604, 0.0115, -0.0109} - -- }, - -- ['1969-7-20T20:14:7'] = { - -- Type = "StaticRotation", - -- Rotation = {-0.6418, 0.0006, -0.0098} - -- }, - -- ['1969-7-20T20:14:9'] = { - -- Type = "StaticRotation", - -- Rotation = {-0.6301, -0.0067, -0.0121} - -- }, - -- ['1969-7-20T20:14:10'] = { - -- Type = "StaticRotation", - -- Rotation = {-0.6128, -0.0142, -0.0119} - -- }, - -- ['1969-7-20T20:14:11'] = { - -- Type = "StaticRotation", - -- Rotation = {-0.6180, -0.0134, -0.0119} - -- }, - -- ['1969-7-20T20:14:12'] = { - -- Type = "StaticRotation", - -- Rotation = {-0.6249, -0.0057, -0.0121} - -- }, - -- ['1969-7-20T20:14:13'] = { - -- Type = "StaticRotation", - -- Rotation = {-0.6299, -0.0057, -0.0098} - -- }, - -- ['1969-7-20T20:14:14'] = { - -- Type = "StaticRotation", - -- Rotation = {-0.6437, -0.0009, -0.0100} - -- }, - -- ['1969-7-20T20:14:15'] = { - -- Type = "StaticRotation", - -- Rotation = {-0.6328, -0.0105, -0.0100} - -- }, - -- ['1969-7-20T20:14:16'] = { - -- Type = "StaticRotation", - -- Rotation = {-0.6285, -0.0232, -0.0088} - -- }, - -- ['1969-7-20T20:14:17'] = { - -- Type = "StaticRotation", - -- Rotation = {-0.6195, -0.0291, -0.0117} - -- }, - -- ['1969-7-20T20:14:18'] = { - -- Type = "StaticRotation", - -- Rotation = {-0.6073, -0.0374, -0.0127} - -- }, - -- ['1969-7-20T20:14:19'] = { - -- Type = "StaticRotation", - -- Rotation = {-0.6027, -0.0362, -0.0132} - -- }, - -- ['1969-7-20T20:14:20'] = { - -- Type = "StaticRotation", - -- Rotation = {-0.5892, -0.0314, -0.0147} - -- }, - -- ['1969-7-20T20:14:21'] = { - -- Type = "StaticRotation", - -- Rotation = {-0.5829, -0.0096, -0.0157} - -- }, - -- ['1969-7-20T20:14:23'] = { - -- Type = "StaticRotation", - -- Rotation = {-0.5674, 0.0119, -0.0263} - -- }, - -- ['1969-7-20T20:14:23'] = { - -- Type = "StaticRotation", - -- Rotation = {-0.5674, 0.0261, -0.0324} - -- }, - -- ['1969-7-20T20:14:25'] = { - -- Type = "StaticRotation", - -- Rotation = {-0.5637, 0.0232, -0.0439} - -- }, - -- ['1969-7-20T20:14:26'] = { - -- Type = "StaticRotation", - -- Rotation = {-0.5670, 0.0081, -0.0525} - -- }, - -- ['1969-7-20T20:14:27'] = { - -- Type = "StaticRotation", - -- Rotation = {-0.5739, 0.0013, -0.0564} - -- }, - -- ['1969-7-20T20:14:28'] = { - -- Type = "StaticRotation", - -- Rotation = {-0.5660, -0.0021, -0.0587} - -- }, - -- ['1969-7-20T20:14:29'] = { - -- Type = "StaticRotation", - -- Rotation = {-0.5603, -0.0025, -0.0604} - -- }, - -- ['1969-7-20T20:14:30'] = { - -- Type = "StaticRotation", - -- Rotation = {-0.5394, 0.0092, -0.0562} - -- }, - ['1969-7-20T20:10:00'] = { - Type = "StaticRotation", - Rotation = {0, 0, 1.5708} - }, - ['1969-7-20T20:12:10'] = { - Type = "StaticRotation", - Rotation = {0, 0, 1.5708} - }, - ['1969-7-20T20:12:14'] = { - Type = "StaticRotation", - Rotation = {0, 0, 1.5708} - }, - ['1969-7-20T20:14:30'] = { - Type = "StaticRotation", - Rotation = {0, 0, 1.5708} - }, - - ['1969-7-20T20:14:31'] = { - Type = "StaticRotation", - Rotation = {-0.5133, 0.0131, -0.0531} - }, - ['1969-7-20T20:14:32'] = { - Type = "StaticRotation", - Rotation = {-0.5043, 0.0117, -0.0487} - }, - ['1969-7-20T20:14:33'] = { - Type = "StaticRotation", - Rotation = {-0.4893, 0.0090, -0.0447} - }, - ['1969-7-20T20:14:33'] = { - Type = "StaticRotation", - Rotation = {-0.4851, -0.0008, -0.0429} - }, - ['1969-7-20T20:14:35'] = { - Type = "StaticRotation", - Rotation = {-0.4865, -0.0057, -0.0382} - }, - ['1969-7-20T20:14:35'] = { - Type = "StaticRotation", - Rotation = {-0.4788, -0.0073, -0.0345} - }, - ['1969-7-20T20:14:37'] = { - Type = "StaticRotation", - Rotation = {-0.4824, -0.0130, -0.0307} - }, - ['1969-7-20T20:14:37'] = { - Type = "StaticRotation", - Rotation = {-0.4836, -0.0103, -0.0268} - }, - ['1969-7-20T20:14:39'] = { - Type = "StaticRotation", - Rotation = {-0.4792, -0.0121, -0.0203} - }, - ['1969-7-20T20:14:40'] = { - Type = "StaticRotation", - Rotation = {-0.4874, -0.0140, -0.0211} - }, - ['1969-7-20T20:14:41'] = { - Type = "StaticRotation", - Rotation = {-0.5030, 0.0002, -0.0209} - }, - ['1969-7-20T20:14:42'] = { - Type = "StaticRotation", - Rotation = {-0.5361, -0.0040, -0.0209} - }, - ['1969-7-20T20:14:44'] = { - Type = "StaticRotation", - Rotation = {-0.4715, -0.0040, -0.0234} - }, - ['1969-7-20T20:14:45'] = { - Type = "StaticRotation", - Rotation = {-0.4433, -0.0050, -0.0238} - }, - ['1969-7-20T20:14:46'] = { - Type = "StaticRotation", - Rotation = {-0.4280, -0.0019, -0.0268} - }, - ['1969-7-20T20:14:47'] = { - Type = "StaticRotation", - Rotation = {-0.4310, -0.0069, -0.0259} - }, - ['1969-7-20T20:14:48'] = { - Type = "StaticRotation", - Rotation = {-0.4389, -0.0147, -0.0257} - }, - ['1969-7-20T20:14:49'] = { - Type = "StaticRotation", - Rotation = {-0.4519, -0.0178, -0.0287} - }, - ['1969-7-20T20:14:50'] = { - Type = "StaticRotation", - Rotation = {-0.4579, -0.0201, -0.0278} - }, - ['1969-7-20T20:14:51'] = { - Type = "StaticRotation", - Rotation = {-0.4554, -0.0147, -0.0265} - }, - ['1969-7-20T20:14:52'] = { - Type = "StaticRotation", - Rotation = {-0.4468, -0.0084, -0.0284} - }, - ['1969-7-20T20:14:53'] = { - Type = "StaticRotation", - Rotation = {-0.4316, -0.0127, -0.0268} - }, - ['1969-7-20T20:14:53'] = { - Type = "StaticRotation", - Rotation = {-0.4228, -0.0171, -0.0255} - }, - ['1969-7-20T20:14:55'] = { - Type = "StaticRotation", - Rotation = {-0.4046, -0.0174, -0.0274} - }, - ['1969-7-20T20:14:57'] = { - Type = "StaticRotation", - Rotation = {-0.3806, -0.0211, -0.0243} - }, - ['1969-7-20T20:14:57'] = { - Type = "StaticRotation", - Rotation = {-0.3751, -0.0178, -0.0249} - }, - ['1969-7-20T20:14:59'] = { - Type = "StaticRotation", - Rotation = {-0.3670, -0.0153, -0.0230} - }, - ['1969-7-20T20:14:59'] = { - Type = "StaticRotation", - Rotation = {-0.3641, -0.0100, -0.0209} - }, - ['1969-7-20T20:15:1'] = { - Type = "StaticRotation", - Rotation = {-0.3526, -0.0021, -0.0207} - }, - ['1969-7-20T20:15:1'] = { - Type = "StaticRotation", - Rotation = {-0.3457, -0.0038, -0.0195} - }, - ['1969-7-20T20:15:3'] = { - Type = "StaticRotation", - Rotation = {-0.3371, -0.0038, -0.0161} - }, - ['1969-7-20T20:15:3'] = { - Type = "StaticRotation", - Rotation = {-0.3309, -0.0015, -0.0192} - }, - ['1969-7-20T20:15:5'] = { - Type = "StaticRotation", - Rotation = {-0.3263, -0.0096, -0.0232} - }, - ['1969-7-20T20:15:5'] = { - Type = "StaticRotation", - Rotation = {-0.3240, 0.0015, -0.0243} - }, - ['1969-7-20T20:15:7'] = { - Type = "StaticRotation", - Rotation = {-0.3160, 0.0061, -0.0295} - }, - ['1969-7-20T20:15:7'] = { - Type = "StaticRotation", - Rotation = {-0.3135, 0.0035, -0.0318} - }, - ['1969-7-20T20:15:9'] = { - Type = "StaticRotation", - Rotation = {-0.3074, 0.0108, -0.0341} - }, - ['1969-7-20T20:15:9'] = { - Type = "StaticRotation", - Rotation = {-0.3022, 0.0027, -0.0360} - }, - ['1969-7-20T20:15:11'] = { - Type = "StaticRotation", - Rotation = {-0.2995, -0.0061, -0.0406} - }, - ['1969-7-20T20:15:11'] = { - Type = "StaticRotation", - Rotation = {-0.2976, -0.0098, -0.0416} - }, - ['1969-7-20T20:15:13'] = { - Type = "StaticRotation", - Rotation = {-0.2901, -0.0127, -0.0447} - }, - ['1969-7-20T20:15:14'] = { - Type = "StaticRotation", - Rotation = {-0.2886, -0.0169, -0.0470} - }, - ['1969-7-20T20:15:15'] = { - Type = "StaticRotation", - Rotation = {-0.2700, -0.0174, -0.0491} - }, - ['1969-7-20T20:15:15'] = { - Type = "StaticRotation", - Rotation = {-0.2107, -0.0119, -0.0512} - }, - ['1969-7-20T20:15:17'] = { - Type = "StaticRotation", - Rotation = {-0.1630, -0.0123, -0.0560} - }, - ['1969-7-20T20:15:18'] = { - Type = "StaticRotation", - Rotation = {-0.1101, -0.0077, -0.0583} - }, - ['1969-7-20T20:15:19'] = { - Type = "StaticRotation", - Rotation = {-0.0868, -0.0029, -0.0613} - }, - ['1969-7-20T20:15:19'] = { - Type = "StaticRotation", - Rotation = {-0.0893, -0.0036, -0.0642} - }, - ['1969-7-20T20:15:21'] = { - Type = "StaticRotation", - Rotation = {-0.0892, -0.0029, -0.0675} - }, - ['1969-7-20T20:15:21'] = { - Type = "StaticRotation", - Rotation = {-0.0970, -0.0004, -0.0698} - }, - ['1969-7-20T20:15:23'] = { - Type = "StaticRotation", - Rotation = {-0.1020, -0.0079, -0.0736} - }, - ['1969-7-20T20:15:24'] = { - Type = "StaticRotation", - Rotation = {-0.0959, -0.0069, -0.0771} - }, - ['1969-7-20T20:15:25'] = { - Type = "StaticRotation", - Rotation = {-0.0999, -0.0057, -0.0794} - }, - ['1969-7-20T20:15:26'] = { - Type = "StaticRotation", - Rotation = {-0.1001, -0.0075, -0.0828} - }, - ['1969-7-20T20:15:27'] = { - Type = "StaticRotation", - Rotation = {-0.0966, -0.0067, -0.0849} - }, - ['1969-7-20T20:15:28'] = { - Type = "StaticRotation", - Rotation = {-0.1039, -0.0050, -0.0876} - }, - ['1969-7-20T20:15:29'] = { - Type = "StaticRotation", - Rotation = {-0.1055, -0.0059, -0.0893} - }, - ['1969-7-20T20:15:30'] = { - Type = "StaticRotation", - Rotation = {-0.1010, -0.0050, -0.0909} - }, - ['1969-7-20T20:15:31'] = { - Type = "StaticRotation", - Rotation = {-0.1066, -0.0036, -0.0903} - }, - ['1969-7-20T20:15:32'] = { - Type = "StaticRotation", - Rotation = {-0.1106, -0.0032, -0.0882} - }, - ['1969-7-20T20:15:33'] = { - Type = "StaticRotation", - Rotation = {-0.1074, -0.0019, -0.0874} - }, - ['1969-7-20T20:15:34'] = { - Type = "StaticRotation", - Rotation = {-0.1131, 0.0021, -0.0857} - }, - ['1969-7-20T20:15:35'] = { - Type = "StaticRotation", - Rotation = {-0.1193, 0.0036, -0.0842} - }, - ['1969-7-20T20:15:36'] = { - Type = "StaticRotation", - Rotation = {-0.1193, 0.0083, -0.0819} - }, - ['1969-7-20T20:15:37'] = { - Type = "StaticRotation", - Rotation = {-0.1233, 0.0129, -0.0809} - }, - ['1969-7-20T20:15:38'] = { - Type = "StaticRotation", - Rotation = {-0.1365, 0.0194, -0.0786} - }, - ['1969-7-20T20:15:39'] = { - Type = "StaticRotation", - Rotation = {-0.1334, 0.0230, -0.0765} - }, - ['1969-7-20T20:15:40'] = { - Type = "StaticRotation", - Rotation = {-0.1267, 0.0257, -0.0744} - }, - ['1969-7-20T20:15:41'] = { - Type = "StaticRotation", - Rotation = {-0.1271, 0.0288, -0.0732} - }, - ['1969-7-20T20:15:42'] = { - Type = "StaticRotation", - Rotation = {-0.1206, 0.0272, -0.0700} - }, - ['1969-7-20T20:15:43'] = { - Type = "StaticRotation", - Rotation = {-0.1465, 0.0244, -0.0692} - }, - ['1969-7-20T20:15:44'] = { - Type = "StaticRotation", - Rotation = {-0.1931, 0.0217, -0.0692} - }, - ['1969-7-20T20:15:45'] = { - Type = "StaticRotation", - Rotation = {-0.1981, 0.0205, -0.0679} - }, - ['1969-7-20T20:15:46'] = { - Type = "StaticRotation", - Rotation = {-0.2048, 0.0173, -0.0656} - }, - ['1969-7-20T20:15:47'] = { - Type = "StaticRotation", - Rotation = {-0.2151, 0.0169, -0.0650} - }, - ['1969-7-20T20:15:48'] = { - Type = "StaticRotation", - Rotation = {-0.2385, 0.0132, -0.0633} - }, - ['1969-7-20T20:15:49'] = { - Type = "StaticRotation", - Rotation = {-0.2590, 0.0092, -0.0623} - }, - ['1969-7-20T20:15:50'] = { - Type = "StaticRotation", - Rotation = {-0.2607, 0.0077, -0.0608} - }, - ['1969-7-20T20:15:51'] = { - Type = "StaticRotation", - Rotation = {-0.2646, 0.0056, -0.0600} - }, - ['1969-7-20T20:15:52'] = { - Type = "StaticRotation", - Rotation = {-0.2680, 0.0004, -0.0575} - }, - ['1969-7-20T20:15:53'] = { - Type = "StaticRotation", - Rotation = {-0.2682, -0.0011, -0.0560} - }, - ['1969-7-20T20:15:54'] = { - Type = "StaticRotation", - Rotation = {-0.2742, -0.0044, -0.0543} - }, - ['1969-7-20T20:15:55'] = { - Type = "StaticRotation", - Rotation = {-0.2757, -0.0061, -0.0522} - }, - ['1969-7-20T20:15:56'] = { - Type = "StaticRotation", - Rotation = {-0.2727, -0.0065, -0.0491} - }, - ['1969-7-20T20:15:57'] = { - Type = "StaticRotation", - Rotation = {-0.2724, -0.0063, -0.0474} - }, - ['1969-7-20T20:15:58'] = { - Type = "StaticRotation", - Rotation = {-0.2732, -0.0077, -0.0445} - }, - ['1969-7-20T20:15:59'] = { - Type = "StaticRotation", - Rotation = {-0.2709, -0.0092, -0.0420} - }, - ['1969-7-20T20:16:0'] = { - Type = "StaticRotation", - Rotation = {-0.2690, -0.0102, -0.0387} - }, - ['1969-7-20T20:16:1'] = { - Type = "StaticRotation", - Rotation = {-0.2704, -0.0115, -0.0368} - }, - ['1969-7-20T20:16:2'] = { - Type = "StaticRotation", - Rotation = {-0.2704, -0.0142, -0.0332} - }, - ['1969-7-20T20:16:3'] = { - Type = "StaticRotation", - Rotation = {-0.2700, -0.0153, -0.0305} - }, - ['1969-7-20T20:16:4'] = { - Type = "StaticRotation", - Rotation = {-0.2736, -0.0176, -0.0268} - }, - ['1969-7-20T20:16:5'] = { - Type = "StaticRotation", - Rotation = {-0.2752, -0.0199, -0.0243} - }, - ['1969-7-20T20:16:6'] = { - Type = "StaticRotation", - Rotation = {-0.2752, -0.0238, -0.0207} - }, - ['1969-7-20T20:16:7'] = { - Type = "StaticRotation", - Rotation = {-0.2702, -0.0245, -0.0205} - }, - ['1969-7-20T20:16:8'] = { - Type = "StaticRotation", - Rotation = {-0.1841, -0.0217, -0.0219} - }, - ['1969-7-20T20:16:9'] = { - Type = "StaticRotation", - Rotation = {-0.1632, -0.0217, -0.0226} - }, - ['1969-7-20T20:16:26'] = { - Type = "StaticRotation", - Rotation = {-0.0989, -0.0184, -0.0391} - }, - ['1969-7-20T20:16:27'] = { - Type = "StaticRotation", - Rotation = {-0.0968, -0.0167, -0.0393} - }, - ['1969-7-20T20:16:28'] = { - Type = "StaticRotation", - Rotation = {-0.0171, -0.0103, -0.0406} - }, - ['1969-7-20T20:16:29'] = { - Type = "StaticRotation", - Rotation = {-0.0157, -0.0105, -0.0412} - }, - ['1969-7-20T20:16:30'] = { - Type = "StaticRotation", - Rotation = {0.0127, -0.0103, -0.0427} - }, - ['1969-7-20T20:16:31'] = { - Type = "StaticRotation", - Rotation = {0.0134, -0.0147, -0.0433} - }, - ['1969-7-20T20:16:32'] = { - Type = "StaticRotation", - Rotation = {0.0042, -0.0370, -0.0470} - }, - ['1969-7-20T20:16:33'] = { - Type = "StaticRotation", - Rotation = {0.0092, -0.0506, -0.0487} - }, - ['1969-7-20T20:16:34'] = { - Type = "StaticRotation", - Rotation = {0.0244, -0.0512, -0.0510} - }, - ['1969-7-20T20:16:35'] = { - Type = "StaticRotation", - Rotation = {0.0042, -0.0546, -0.0512} - }, - ['1969-7-20T20:16:36'] = { - Type = "StaticRotation", - Rotation = {-0.0006, -0.0558, -0.0533} - }, - ['1969-7-20T20:16:37'] = { - Type = "StaticRotation", - Rotation = {0.0050, -0.0522, -0.0543} - }, - ['1969-7-20T20:16:38'] = { - Type = "StaticRotation", - Rotation = {0.0077, -0.0343, -0.0548} - }, - ['1969-7-20T20:16:39'] = { - Type = "StaticRotation", - Rotation = {-0.0004, -0.0155, -0.0550} - }, - ['1969-7-20T20:16:40'] = { - Type = "StaticRotation", - Rotation = {0.0036, -0.0105, -0.0571} - }, - ['1969-7-20T20:16:41'] = { - Type = "StaticRotation", - Rotation = {-0.0080, -0.0086, -0.0579} - }, - ['1969-7-20T20:16:42'] = { - Type = "StaticRotation", - Rotation = {-0.0698, -0.0140, -0.0604} - }, - ['1969-7-20T20:16:43'] = { - Type = "StaticRotation", - Rotation = {-0.0579, -0.0134, -0.0623} - }, - ['1969-7-20T20:16:44'] = { - Type = "StaticRotation", - Rotation = {-0.0462, -0.0090, -0.0648} - }, - ['1969-7-20T20:16:45'] = { - Type = "StaticRotation", - Rotation = {-0.0466, -0.0067, -0.0665} - }, - ['1969-7-20T20:16:46'] = { - Type = "StaticRotation", - Rotation = {-0.0529, -0.0027, -0.0694} - }, - ['1969-7-20T20:16:47'] = { - Type = "StaticRotation", - Rotation = {-0.0518, 0.0079, -0.0707} - }, - ['1969-7-20T20:16:48'] = { - Type = "StaticRotation", - Rotation = {-0.0602, 0.0299, -0.0729} - }, - ['1969-7-20T20:16:49'] = { - Type = "StaticRotation", - Rotation = {-0.0510, 0.0562, -0.0729} - }, - ['1969-7-20T20:16:50'] = { - Type = "StaticRotation", - Rotation = {-0.0539, 0.0562, -0.0765} - }, - ['1969-7-20T20:16:51'] = { - Type = "StaticRotation", - Rotation = {-0.0928, 0.0545, -0.0813} - }, - ['1969-7-20T20:16:52'] = { - Type = "StaticRotation", - Rotation = {-0.0886, 0.0560, -0.0844} - }, - ['1969-7-20T20:16:53'] = { - Type = "StaticRotation", - Rotation = {-0.0832, 0.0552, -0.0865} - }, - ['1969-7-20T20:16:54'] = { - Type = "StaticRotation", - Rotation = {-0.0805, 0.0573, -0.0899} - }, - ['1969-7-20T20:16:55'] = { - Type = "StaticRotation", - Rotation = {-0.0784, 0.0614, -0.0924} - }, - ['1969-7-20T20:16:56'] = { - Type = "StaticRotation", - Rotation = {-0.0729, 0.0635, -0.0945} - }, - ['1969-7-20T20:16:57'] = { - Type = "StaticRotation", - Rotation = {-0.0792, 0.0627, -0.0976} - }, - ['1969-7-20T20:17:7'] = { - Type = "StaticRotation", - Rotation = {-0.1056, -0.0366, -0.1402} - }, - ['1969-7-20T20:17:7'] = { - Type = "StaticRotation", - Rotation = {-0.1053, -0.0395, -0.1428} - }, - ['1969-7-20T20:17:9'] = { - Type = "StaticRotation", - Rotation = {-0.0725, -0.0314, -0.1503} - }, - ['1969-7-20T20:17:9'] = { - Type = "StaticRotation", - Rotation = {-0.0259, -0.0270, -0.1542} - }, - ['1969-7-20T20:17:11'] = { - Type = "StaticRotation", - Rotation = {0.0874, -0.0059, -0.1614} - }, - ['1969-7-20T20:17:12'] = { - Type = "StaticRotation", - Rotation = {0.0769, -0.0096, -0.1678} - }, - ['1969-7-20T20:17:13'] = { - Type = "StaticRotation", - Rotation = {0.0740, -0.0270, -0.1743} - }, - ['1969-7-20T20:17:14'] = { - Type = "StaticRotation", - Rotation = {0.0673, -0.0458, -0.1810} - }, - ['1969-7-20T20:17:15'] = { - Type = "StaticRotation", - Rotation = {0.0550, -0.0506, -0.1860} - }, - ['1969-7-20T20:17:16'] = { - Type = "StaticRotation", - Rotation = {0.0449, -0.0577, -0.1931} - }, - ['1969-7-20T20:17:17'] = { - Type = "StaticRotation", - Rotation = {0.0437, -0.0617, -0.1967} - }, - ['1969-7-20T20:17:18'] = { - Type = "StaticRotation", - Rotation = {0.0297, -0.0650, -0.2027} - }, - ['1969-7-20T20:17:19'] = { - Type = "StaticRotation", - Rotation = {0.0203, -0.0518, -0.2061} - }, - ['1969-7-20T20:17:20'] = { - Type = "StaticRotation", - Rotation = {0.0211, -0.0201, -0.2109} - }, - ['1969-7-20T20:17:21'] = { - Type = "StaticRotation", - Rotation = {0.0228, -0.0197, -0.2159} - }, - ['1969-7-20T20:17:22'] = { - Type = "StaticRotation", - Rotation = {-0.0201, -0.0257, -0.2230} - }, - ['1969-7-20T20:17:23'] = { - Type = "StaticRotation", - Rotation = {-0.0299, -0.0125, -0.2287} - }, - ['1969-7-20T20:17:24'] = { - Type = "StaticRotation", - Rotation = {-0.0368, -0.0025, -0.2355} - }, - ['1969-7-20T20:17:25'] = { - Type = "StaticRotation", - Rotation = {-0.0464, 0.0209, -0.2408} - }, - ['1969-7-20T20:17:26'] = { - Type = "StaticRotation", - Rotation = {-0.0548, 0.0474, -0.2472} - }, - ['1969-7-20T20:17:27'] = { - Type = "StaticRotation", - Rotation = {-0.0535, 0.0464, -0.2481} - }, - ['1969-7-20T20:17:28'] = { - Type = "StaticRotation", - Rotation = {-0.0512, 0.0508, -0.2491} - }, - ['1969-7-20T20:17:29'] = { - Type = "StaticRotation", - Rotation = {-0.0625, 0.0781, -0.2504} - }, - ['1969-7-20T20:17:30'] = { - Type = "StaticRotation", - Rotation = {-0.0811, 0.0711, -0.2531} - }, - ['1969-7-20T20:17:31'] = { - Type = "StaticRotation", - Rotation = {-0.0855, 0.0692, -0.2544} - }, - ['1969-7-20T20:17:32'] = { - Type = "StaticRotation", - Rotation = {-0.0940, 0.0673, -0.2569} - }, - ['1969-7-20T20:17:33'] = { - Type = "StaticRotation", - Rotation = {-0.0963, 0.0648, -0.2587} - }, - ['1969-7-20T20:17:34'] = { - Type = "StaticRotation", - Rotation = {-0.0909, 0.0619, -0.2587} - }, - ['1969-7-20T20:17:35'] = { - Type = "StaticRotation", - Rotation = {-0.0832, 0.0602, -0.2585} - }, - ['1969-7-20T20:17:36'] = { - Type = "StaticRotation", - Rotation = {-0.0761, 0.0326, -0.2602} - }, - ['1969-7-20T20:17:37'] = { - Type = "StaticRotation", - Rotation = {-0.0612, 0.0013, -0.2635} - }, - ['1969-7-20T20:17:38'] = { - Type = "StaticRotation", - Rotation = {-0.0274, -0.0079, -0.2727} - }, - ['1969-7-20T20:17:39'] = { - Type = "StaticRotation", - Rotation = {-0.0061, -0.0470, -0.2732} - }, - ['1969-7-20T20:17:40'] = { - Type = "StaticRotation", - Rotation = {-0.0794, -0.0088, -0.2447} - }, + -- ['1969-7-20T20:9:53'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.3815, -0.0048, -0.4891} + -- }, + -- ['1969-7-20T20:9:55'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.3773, 0.0042, -0.3557} + -- }, + -- ['1969-7-20T20:9:57'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.3677, 0.0184, -0.2218} + -- }, + -- ['1969-7-20T20:9:59'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.3606, -0.0117, -0.0861} + -- }, + -- ['1969-7-20T20:10:1'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.3587, -0.0222, -0.0219} + -- }, + -- ['1969-7-20T20:10:3'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.3622, -0.0207, -0.0533} + -- }, + -- ['1969-7-20T20:10:5'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.3639, -0.0032, -0.0640} + -- }, + -- ['1969-7-20T20:10:7'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.3612, 0.0178, -0.0685} + -- }, + -- ['1969-7-20T20:10:9'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.3571, 0.0196, -0.0796} + -- }, + -- ['1969-7-20T20:10:11'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.3484, 0.0029, -0.0913} + -- }, + -- ['1969-7-20T20:10:13'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.3597, -0.0149, -0.0832} + -- }, + -- ['1969-7-20T20:10:15'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.3587, -0.0220, -0.0679} + -- }, + -- ['1969-7-20T20:10:17'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.3482, -0.0121, -0.0736} + -- }, + -- ['1969-7-20T20:10:19'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.3520, -0.0098, -0.0876} + -- }, + -- ['1969-7-20T20:10:21'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.3503, -0.0240, -0.0872} + -- }, + -- ['1969-7-20T20:10:25'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.3470, 0.0245, -0.0545} + -- }, + -- ['1969-7-20T20:10:27'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.3420, 0.0115, -0.0518} + -- }, + -- ['1969-7-20T20:10:29'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.3294, -0.0153, -0.0556} + -- }, + -- ['1969-7-20T20:10:31'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.3399, -0.0136, -0.0573} + -- }, + -- ['1969-7-20T20:10:33'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.3459, 0.0002, -0.0569} + -- }, + -- ['1969-7-20T20:10:35'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.3440, 0.0012, -0.0542} + -- }, + -- ['1969-7-20T20:10:37'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.3230, -0.0096, -0.0527} + -- }, + -- ['1969-7-20T20:10:39'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.2966, -0.0119, -0.0510} + -- }, + -- ['1969-7-20T20:10:41'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.3146, -0.0040, -0.0504} + -- }, + -- ['1969-7-20T20:10:43'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.3355, -0.0015, -0.0514} + -- }, + -- ['1969-7-20T20:10:45'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.2916, 0.0061, -0.0516} + -- }, + -- ['1969-7-20T20:10:47'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.2901, -0.0257, -0.0516} + -- }, + -- ['1969-7-20T20:10:49'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.2818, -0.0123, -0.0495} + -- }, + -- ['1969-7-20T20:10:51'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.2682, 0.0058, -0.0477} + -- }, + -- ['1969-7-20T20:10:53'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.2732, 0.0035, -0.0195} + -- }, + -- ['1969-7-20T20:10:54'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.2740, 0.0029, 0.0123} + -- }, + -- ['1969-7-20T20:10:55'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.2778, 0.0035, 0.0234} + -- }, + -- ['1969-7-20T20:10:57'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.2573, 0.0069, 0.0174} + -- }, + -- ['1969-7-20T20:10:58'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.2515, -0.0023, 0.0115} + -- }, + -- ['1969-7-20T20:10:59'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.2333, -0.0092, 0.0092} + -- }, + -- ['1969-7-20T20:11:0'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.2191, -0.0157, 0.0056} + -- }, + -- ['1969-7-20T20:11:1'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.2246, -0.0195, 0.0029} + -- }, + -- ['1969-7-20T20:11:3'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.2419, -0.0146, -0.0019} + -- }, + -- ['1969-7-20T20:11:5'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.2274, -0.0054, -0.0048} + -- }, + -- ['1969-7-20T20:11:6'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.2218, -0.0042, -0.0056} + -- }, + -- ['1969-7-20T20:11:7'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.2047, 0.0010, -0.0065} + -- }, + -- ['1969-7-20T20:11:7'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.2042, -0.0054, -0.0069} + -- }, + -- ['1969-7-20T20:11:9'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.2007, -0.0100, -0.0077} + -- }, + -- ['1969-7-20T20:11:11'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.2136, -0.0173, -0.0077} + -- }, + -- ['1969-7-20T20:11:11'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.2013, -0.0021, -0.0077} + -- }, + -- ['1969-7-20T20:11:13'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.1928, 0.0102, -0.0056} + -- }, + -- ['1969-7-20T20:11:13'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.1854, 0.0090, -0.0057} + -- }, + -- ['1969-7-20T20:11:15'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.1856, -0.0075, -0.0044} + -- }, + -- ['1969-7-20T20:11:17'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.1670, -0.0157, -0.0023} + -- }, + -- ['1969-7-20T20:11:17'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.1599, -0.0149, 0.0012} + -- }, + -- ['1969-7-20T20:11:19'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.1514, -0.0119, 0.0012} + -- }, + -- ['1969-7-20T20:11:19'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.1465, -0.0094, 0.0040} + -- }, + -- ['1969-7-20T20:11:21'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.1593, -0.0176, 0.0063} + -- }, + -- ['1969-7-20T20:11:23'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.1712, -0.0144, 0.0132} + -- }, + -- ['1969-7-20T20:11:24'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.1727, -0.0052, 0.0176} + -- }, + -- ['1969-7-20T20:11:25'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.1652, 0.0083, 0.0190} + -- }, + -- ['1969-7-20T20:11:26'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.1827, -0.0044, 0.0178} + -- }, + -- ['1969-7-20T20:11:27'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.1942, -0.0172, 0.0180} + -- }, + -- ['1969-7-20T20:11:29'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.1788, -0.0071, 0.0188} + -- }, + -- ['1969-7-20T20:11:30'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.1639, 0.0035, 0.0176} + -- }, + -- ['1969-7-20T20:11:31'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.1614, 0.0048, 0.0178} + -- }, + -- ['1969-7-20T20:11:31'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.1551, 0.0083, 0.0169} + -- }, + -- ['1969-7-20T20:11:33'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.1643, 0.0060, 0.0175} + -- }, + -- ['1969-7-20T20:11:35'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.1746, 0.0006, 0.0173} + -- }, + -- ['1969-7-20T20:11:35'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.1679, -0.0008, 0.0178} + -- }, + -- ['1969-7-20T20:11:37'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.1735, -0.0127, 0.0173} + -- }, + -- ['1969-7-20T20:11:37'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.1599, -0.0044, 0.0186} + -- }, + -- ['1969-7-20T20:11:39'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.1545, 0.0012, 0.0167} + -- }, + -- ['1969-7-20T20:11:39'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.1461, 0.0075, 0.0169} + -- }, + -- ['1969-7-20T20:11:41'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.1470, 0.0012, 0.0155} + -- }, + -- ['1969-7-20T20:11:41'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.1442, -0.0086, 0.0148} + -- }, + -- ['1969-7-20T20:11:43'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.1411, -0.0236, 0.0142} + -- }, + -- ['1969-7-20T20:11:43'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.1302, -0.0240, 0.0131} + -- }, + -- ['1969-7-20T20:11:45'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.1098, -0.0115, 0.0140} + -- }, + -- ['1969-7-20T20:11:45'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.1043, -0.0088, 0.0134} + -- }, + -- ['1969-7-20T20:11:47'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.0979, -0.0025, 0.0144} + -- }, + -- ['1969-7-20T20:11:47'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.1092, -0.0125, 0.0144} + -- }, + -- ['1969-7-20T20:11:49'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.1175, -0.0205, 0.0146} + -- }, + -- ['1969-7-20T20:11:49'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.1230, -0.0249, 0.0157} + -- }, + -- ['1969-7-20T20:11:51'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.1099, -0.0119, 0.0161} + -- }, + -- ['1969-7-20T20:11:51'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.1056, -0.0071, 0.0167} + -- }, + -- ['1969-7-20T20:11:53'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.0916, 0.0044, 0.0131} + -- }, + -- ['1969-7-20T20:11:53'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.0901, 0.0073, 0.0111} + -- }, + -- ['1969-7-20T20:11:55'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.0839, 0.0040, 0.0075} + -- }, + -- ['1969-7-20T20:11:55'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.0832, 0.0015, 0.0050} + -- }, + -- ['1969-7-20T20:11:57'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.0831, -0.0109, 0.0003} + -- }, + -- ['1969-7-20T20:11:57'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.0812, -0.0147, -0.0009} + -- }, + -- ['1969-7-20T20:11:59'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.0814, -0.0278, -0.0031} + -- }, + -- ['1969-7-20T20:11:59'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.0696, -0.0224, -0.0050} + -- }, + -- ['1969-7-20T20:12:1'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.0617, -0.0242, -0.0067} + -- }, + -- ['1969-7-20T20:12:1'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.0508, -0.0174, -0.0075} + -- }, + -- ['1969-7-20T20:12:3'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.0523, -0.0174, -0.0094} + -- }, + -- ['1969-7-20T20:12:3'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.0466, -0.0117, -0.0094} + -- }, + -- ['1969-7-20T20:12:5'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.0565, -0.0107, -0.0109} + -- }, + -- ['1969-7-20T20:12:5'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.0559, -0.0080, -0.0109} + -- }, + -- ['1969-7-20T20:12:7'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.0686, -0.0065, -0.0113} + -- }, + -- ['1969-7-20T20:12:7'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.0692, -0.0082, -0.0115} + -- }, + -- ['1969-7-20T20:12:9'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.0722, -0.0075, -0.0107} + -- }, + -- ['1969-7-20T20:12:9'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.0707, -0.0144, -0.0113} + -- }, + -- ['1969-7-20T20:12:11'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.0630, -0.0153, -0.0103} + -- }, + -- ['1969-7-20T20:12:11'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.0605, -0.0261, -0.0102} + -- }, + -- ['1969-7-20T20:12:13'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.0441, -0.0305, -0.0096} + -- }, + -- ['1969-7-20T20:12:13'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.0427, -0.0410, -0.0086} + -- }, + -- ['1969-7-20T20:12:15'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.0283, -0.0228, -0.0075} + -- }, + -- ['1969-7-20T20:12:15'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.0329, -0.0178, -0.0050} + -- }, + -- ['1969-7-20T20:12:17'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.0260, -0.0009, -0.0027} + -- }, + -- ['1969-7-20T20:12:17'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.0404, -0.0059, -0.0004} + -- }, + -- ['1969-7-20T20:12:19'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.0467, -0.0140, 0.0023} + -- }, + -- ['1969-7-20T20:12:19'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.0584, -0.0220, 0.0044} + -- }, + -- ['1969-7-20T20:12:21'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.0416, -0.0176, 0.0088} + -- }, + -- ['1969-7-20T20:12:21'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.0370, -0.0102, 0.0104} + -- }, + -- ['1969-7-20T20:12:23'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.0222, -0.0063, 0.0121} + -- }, + -- ['1969-7-20T20:12:23'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.0193, 0.0006, 0.0108} + -- }, + -- ['1969-7-20T20:12:25'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.0166, -0.0059, 0.0098} + -- }, + -- ['1969-7-20T20:12:25'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.0164, -0.0038, 0.0092} + -- }, + -- ['1969-7-20T20:12:27'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.0237, -0.0188, 0.0081} + -- }, + -- ['1969-7-20T20:12:27'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.0249, -0.0199, 0.0081} + -- }, + -- ['1969-7-20T20:12:29'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.0329, -0.0330, 0.0077} + -- }, + -- ['1969-7-20T20:12:29'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.0209, -0.0255, 0.0079} + -- }, + -- ['1969-7-20T20:12:31'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.0157, -0.0205, 0.0084} + -- }, + -- ['1969-7-20T20:12:31'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.0034, -0.0159, 0.0092} + -- }, + -- ['1969-7-20T20:12:33'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.0044, -0.0136, 0.0106} + -- }, + -- ['1969-7-20T20:12:33'] = { + -- Type = "StaticRotation", + -- Rotation = {-0.9963, -0.0161, 0.0096} + -- }, + -- ['1969-7-20T20:12:35'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.0036, -0.0180, 0.0084} + -- }, + -- ['1969-7-20T20:12:35'] = { + -- Type = "StaticRotation", + -- Rotation = {-0.9998, -0.0253, 0.0073} + -- }, + -- ['1969-7-20T20:12:37'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.0088, -0.0265, 0.0065} + -- }, + -- ['1969-7-20T20:12:37'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.0105, -0.0339, 0.0065} + -- }, + -- ['1969-7-20T20:12:39'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.0230, -0.0280, 0.0060} + -- }, + -- ['1969-7-20T20:12:39'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.0253, -0.0282, 0.0067} + -- }, + -- ['1969-7-20T20:12:41'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.0216, -0.0071, 0.0067} + -- }, + -- ['1969-7-20T20:12:42'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.0118, -0.0115, 0.0079} + -- }, + -- ['1969-7-20T20:12:43'] = { + -- Type = "StaticRotation", + -- Rotation = {-0.9946, -0.0098, 0.0077} + -- }, + -- ['1969-7-20T20:12:43'] = { + -- Type = "StaticRotation", + -- Rotation = {-0.9927, -0.0172, 0.0081} + -- }, + -- ['1969-7-20T20:12:45'] = { + -- Type = "StaticRotation", + -- Rotation = {-0.9890, -0.0147, 0.0094} + -- }, + -- ['1969-7-20T20:12:45'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.0046, -0.0125, 0.0094} + -- }, + -- ['1969-7-20T20:12:47'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.0109, -0.0048, 0.0104} + -- }, + -- ['1969-7-20T20:12:47'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.0186, -0.0057, 0.0083} + -- }, + -- ['1969-7-20T20:12:49'] = { + -- Type = "StaticRotation", + -- Rotation = {-0.9940, -0.0226, 0.0048} + -- }, + -- ['1969-7-20T20:12:49'] = { + -- Type = "StaticRotation", + -- Rotation = {-0.9861, -0.0278, 0.0023} + -- }, + -- ['1969-7-20T20:12:51'] = { + -- Type = "StaticRotation", + -- Rotation = {-0.9712, -0.0301, 0.0000} + -- }, + -- ['1969-7-20T20:12:51'] = { + -- Type = "StaticRotation", + -- Rotation = {-0.9768, -0.0176, -0.0013} + -- }, + -- ['1969-7-20T20:12:53'] = { + -- Type = "StaticRotation", + -- Rotation = {-0.9791, -0.0088, -0.0025} + -- }, + -- ['1969-7-20T20:12:53'] = { + -- Type = "StaticRotation", + -- Rotation = {-0.9890, -0.0017, -0.0036} + -- }, + -- ['1969-7-20T20:12:55'] = { + -- Type = "StaticRotation", + -- Rotation = {-0.9906, -0.0245, -0.0056} + -- }, + -- ['1969-7-20T20:12:55'] = { + -- Type = "StaticRotation", + -- Rotation = {-0.9892, -0.0303, -0.0067} + -- }, + -- ['1969-7-20T20:12:57'] = { + -- Type = "StaticRotation", + -- Rotation = {-0.9852, -0.0470, -0.0086} + -- }, + -- ['1969-7-20T20:12:57'] = { + -- Type = "StaticRotation", + -- Rotation = {-0.9837, -0.0307, -0.0088} + -- }, + -- ['1969-7-20T20:12:59'] = { + -- Type = "StaticRotation", + -- Rotation = {-0.9873, -0.0128, -0.0090} + -- }, + -- ['1969-7-20T20:12:59'] = { + -- Type = "StaticRotation", + -- Rotation = {-0.9861, 0.0010, -0.0088} + -- }, + -- ['1969-7-20T20:13:1'] = { + -- Type = "StaticRotation", + -- Rotation = {-0.9944, -0.0117, -0.0094} + -- }, + -- ['1969-7-20T20:13:1'] = { + -- Type = "StaticRotation", + -- Rotation = {-0.9900, -0.0194, -0.0100} + -- }, + -- ['1969-7-20T20:13:3'] = { + -- Type = "StaticRotation", + -- Rotation = {-0.9917, -0.0355, -0.0103} + -- }, + -- ['1969-7-20T20:13:3'] = { + -- Type = "StaticRotation", + -- Rotation = {-0.9856, -0.0395, -0.0105} + -- }, + -- ['1969-7-20T20:13:5'] = { + -- Type = "StaticRotation", + -- Rotation = {-0.9969, -0.0299, -0.0096} + -- }, + -- ['1969-7-20T20:13:5'] = { + -- Type = "StaticRotation", + -- Rotation = {-0.9965, -0.0228, -0.0088} + -- }, + -- ['1969-7-20T20:13:7'] = { + -- Type = "StaticRotation", + -- Rotation = {-1.0015, -0.0073, -0.0075} + -- }, + -- ['1969-7-20T20:13:7'] = { + -- Type = "StaticRotation", + -- Rotation = {-0.9908, -0.0098, -0.0067} + -- }, + -- ['1969-7-20T20:13:9'] = { + -- Type = "StaticRotation", + -- Rotation = {-0.9814, -0.0034, -0.0057} + -- }, + -- ['1969-7-20T20:13:9'] = { + -- Type = "StaticRotation", + -- Rotation = {-0.9729, -0.0071, -0.0044} + -- }, + -- ['1969-7-20T20:13:11'] = { + -- Type = "StaticRotation", + -- Rotation = {-0.9716, -0.0002, -0.0029} + -- }, + -- ['1969-7-20T20:13:11'] = { + -- Type = "StaticRotation", + -- Rotation = {-0.9729, -0.0044, -0.0013} + -- }, + -- ['1969-7-20T20:13:13'] = { + -- Type = "StaticRotation", + -- Rotation = {-0.9793, 0.0010, 0.0006} + -- }, + -- ['1969-7-20T20:13:14'] = { + -- Type = "StaticRotation", + -- Rotation = {-0.9869, -0.0040, 0.0031} + -- }, + -- ['1969-7-20T20:13:15'] = { + -- Type = "StaticRotation", + -- Rotation = {-0.9938, -0.0031, 0.0048} + -- }, + -- ['1969-7-20T20:13:15'] = { + -- Type = "StaticRotation", + -- Rotation = {-0.9978, -0.0134, 0.0067} + -- }, + -- ['1969-7-20T20:13:17'] = { + -- Type = "StaticRotation", + -- Rotation = {-0.9881, -0.0334, 0.0048} + -- }, + -- ['1969-7-20T20:13:17'] = { + -- Type = "StaticRotation", + -- Rotation = {-0.9881, -0.0449, 0.0023} + -- }, + -- ['1969-7-20T20:13:19'] = { + -- Type = "StaticRotation", + -- Rotation = {-0.9756, -0.0447, -0.0015} + -- }, + -- ['1969-7-20T20:13:19'] = { + -- Type = "StaticRotation", + -- Rotation = {-0.9804, -0.0351, -0.0034} + -- }, + -- ['1969-7-20T20:13:21'] = { + -- Type = "StaticRotation", + -- Rotation = {-0.9769, -0.0269, -0.0052} + -- }, + -- ['1969-7-20T20:13:21'] = { + -- Type = "StaticRotation", + -- Rotation = {-0.9816, -0.0182, -0.0073} + -- }, + -- ['1969-7-20T20:13:23'] = { + -- Type = "StaticRotation", + -- Rotation = {-0.9783, -0.0192, -0.0084} + -- }, + -- ['1969-7-20T20:13:23'] = { + -- Type = "StaticRotation", + -- Rotation = {-0.9808, -0.0149, -0.0103} + -- }, + -- ['1969-7-20T20:13:25'] = { + -- Type = "StaticRotation", + -- Rotation = {-0.9771, -0.0197, -0.0117} + -- }, + -- ['1969-7-20T20:13:25'] = { + -- Type = "StaticRotation", + -- Rotation = {-0.9748, -0.0171, -0.0127} + -- }, + -- ['1969-7-20T20:13:27'] = { + -- Type = "StaticRotation", + -- Rotation = {-0.9710, -0.0197, -0.0144} + -- }, + -- ['1969-7-20T20:13:27'] = { + -- Type = "StaticRotation", + -- Rotation = {-0.9643, -0.0186, -0.0146} + -- }, + -- ['1969-7-20T20:13:29'] = { + -- Type = "StaticRotation", + -- Rotation = {-0.9616, -0.0165, -0.0159} + -- }, + -- ['1969-7-20T20:13:29'] = { + -- Type = "StaticRotation", + -- Rotation = {-0.9534, -0.0163, -0.0159} + -- }, + -- ['1969-7-20T20:13:31'] = { + -- Type = "StaticRotation", + -- Rotation = {-0.9605, -0.0096, -0.0165} + -- }, + -- ['1969-7-20T20:13:41'] = { + -- Type = "StaticRotation", + -- Rotation = {-0.8092, -0.0297, -0.0155} + -- }, + -- ['1969-7-20T20:13:41'] = { + -- Type = "StaticRotation", + -- Rotation = {-0.8097, -0.0389, -0.0149} + -- }, + -- ['1969-7-20T20:13:43'] = { + -- Type = "StaticRotation", + -- Rotation = {-0.7923, -0.0358, -0.0138} + -- }, + -- ['1969-7-20T20:13:43'] = { + -- Type = "StaticRotation", + -- Rotation = {-0.7988, -0.0267, -0.0125} + -- }, + -- ['1969-7-20T20:13:45'] = { + -- Type = "StaticRotation", + -- Rotation = {-0.7909, -0.0128, -0.0094} + -- }, + -- ['1969-7-20T20:13:45'] = { + -- Type = "StaticRotation", + -- Rotation = {-0.7967, -0.0061, -0.0080} + -- }, + -- ['1969-7-20T20:13:47'] = { + -- Type = "StaticRotation", + -- Rotation = {-0.7748, -0.0207, -0.0056} + -- }, + -- ['1969-7-20T20:13:47'] = { + -- Type = "StaticRotation", + -- Rotation = {-0.7681, -0.0278, -0.0048} + -- }, + -- ['1969-7-20T20:13:49'] = { + -- Type = "StaticRotation", + -- Rotation = {-0.7574, -0.0426, -0.0027} + -- }, + -- ['1969-7-20T20:13:49'] = { + -- Type = "StaticRotation", + -- Rotation = {-0.7582, -0.0364, -0.0004} + -- }, + -- ['1969-7-20T20:13:51'] = { + -- Type = "StaticRotation", + -- Rotation = {-0.7699, -0.0324, 0.0036} + -- }, + -- ['1969-7-20T20:13:51'] = { + -- Type = "StaticRotation", + -- Rotation = {-0.7676, -0.0245, 0.0040} + -- }, + -- ['1969-7-20T20:13:53'] = { + -- Type = "StaticRotation", + -- Rotation = {-0.7733, -0.0194, 0.0023} + -- }, + -- ['1969-7-20T20:13:53'] = { + -- Type = "StaticRotation", + -- Rotation = {-0.7574, -0.0207, 0.0008} + -- }, + -- ['1969-7-20T20:13:55'] = { + -- Type = "StaticRotation", + -- Rotation = {-0.7440, -0.0310, -0.0017} + -- }, + -- ['1969-7-20T20:13:55'] = { + -- Type = "StaticRotation", + -- Rotation = {-0.7405, -0.0569, -0.0044} + -- }, + -- ['1969-7-20T20:13:57'] = { + -- Type = "StaticRotation", + -- Rotation = {-0.7549, -0.0587, -0.0054} + -- }, + -- ['1969-7-20T20:13:57'] = { + -- Type = "StaticRotation", + -- Rotation = {-0.7518, -0.0326, -0.0046} + -- }, + -- ['1969-7-20T20:13:59'] = { + -- Type = "StaticRotation", + -- Rotation = {-0.7465, 0.0040, -0.0050} + -- }, + -- ['1969-7-20T20:13:59'] = { + -- Type = "StaticRotation", + -- Rotation = {-0.7465, 0.0113, -0.0050} + -- }, + -- ['1969-7-20T20:14:1'] = { + -- Type = "StaticRotation", + -- Rotation = {-0.6939, 0.0029, -0.0063} + -- }, + -- ['1969-7-20T20:14:2'] = { + -- Type = "StaticRotation", + -- Rotation = {-0.6912, 0.0079, -0.0079} + -- }, + -- ['1969-7-20T20:14:3'] = { + -- Type = "StaticRotation", + -- Rotation = {-0.6793, 0.0048, -0.0077} + -- }, + -- ['1969-7-20T20:14:4'] = { + -- Type = "StaticRotation", + -- Rotation = {-0.6817, 0.0090, -0.0098} + -- }, + -- ['1969-7-20T20:14:5'] = { + -- Type = "StaticRotation", + -- Rotation = {-0.6730, 0.0117, -0.0090} + -- }, + -- ['1969-7-20T20:14:6'] = { + -- Type = "StaticRotation", + -- Rotation = {-0.6684, 0.0102, -0.0096} + -- }, + -- ['1969-7-20T20:14:7'] = { + -- Type = "StaticRotation", + -- Rotation = {-0.6604, 0.0115, -0.0109} + -- }, + -- ['1969-7-20T20:14:7'] = { + -- Type = "StaticRotation", + -- Rotation = {-0.6418, 0.0006, -0.0098} + -- }, + -- ['1969-7-20T20:14:9'] = { + -- Type = "StaticRotation", + -- Rotation = {-0.6301, -0.0067, -0.0121} + -- }, + -- ['1969-7-20T20:14:10'] = { + -- Type = "StaticRotation", + -- Rotation = {-0.6128, -0.0142, -0.0119} + -- }, + -- ['1969-7-20T20:14:11'] = { + -- Type = "StaticRotation", + -- Rotation = {-0.6180, -0.0134, -0.0119} + -- }, + -- ['1969-7-20T20:14:12'] = { + -- Type = "StaticRotation", + -- Rotation = {-0.6249, -0.0057, -0.0121} + -- }, + -- ['1969-7-20T20:14:13'] = { + -- Type = "StaticRotation", + -- Rotation = {-0.6299, -0.0057, -0.0098} + -- }, + -- ['1969-7-20T20:14:14'] = { + -- Type = "StaticRotation", + -- Rotation = {-0.6437, -0.0009, -0.0100} + -- }, + -- ['1969-7-20T20:14:15'] = { + -- Type = "StaticRotation", + -- Rotation = {-0.6328, -0.0105, -0.0100} + -- }, + -- ['1969-7-20T20:14:16'] = { + -- Type = "StaticRotation", + -- Rotation = {-0.6285, -0.0232, -0.0088} + -- }, + -- ['1969-7-20T20:14:17'] = { + -- Type = "StaticRotation", + -- Rotation = {-0.6195, -0.0291, -0.0117} + -- }, + -- ['1969-7-20T20:14:18'] = { + -- Type = "StaticRotation", + -- Rotation = {-0.6073, -0.0374, -0.0127} + -- }, + -- ['1969-7-20T20:14:19'] = { + -- Type = "StaticRotation", + -- Rotation = {-0.6027, -0.0362, -0.0132} + -- }, + -- ['1969-7-20T20:14:20'] = { + -- Type = "StaticRotation", + -- Rotation = {-0.5892, -0.0314, -0.0147} + -- }, + -- ['1969-7-20T20:14:21'] = { + -- Type = "StaticRotation", + -- Rotation = {-0.5829, -0.0096, -0.0157} + -- }, + -- ['1969-7-20T20:14:23'] = { + -- Type = "StaticRotation", + -- Rotation = {-0.5674, 0.0119, -0.0263} + -- }, + -- ['1969-7-20T20:14:23'] = { + -- Type = "StaticRotation", + -- Rotation = {-0.5674, 0.0261, -0.0324} + -- }, + -- ['1969-7-20T20:14:25'] = { + -- Type = "StaticRotation", + -- Rotation = {-0.5637, 0.0232, -0.0439} + -- }, + -- ['1969-7-20T20:14:26'] = { + -- Type = "StaticRotation", + -- Rotation = {-0.5670, 0.0081, -0.0525} + -- }, + -- ['1969-7-20T20:14:27'] = { + -- Type = "StaticRotation", + -- Rotation = {-0.5739, 0.0013, -0.0564} + -- }, + -- ['1969-7-20T20:14:28'] = { + -- Type = "StaticRotation", + -- Rotation = {-0.5660, -0.0021, -0.0587} + -- }, + -- ['1969-7-20T20:14:29'] = { + -- Type = "StaticRotation", + -- Rotation = {-0.5603, -0.0025, -0.0604} + -- }, + -- ['1969-7-20T20:14:30'] = { + -- Type = "StaticRotation", + -- Rotation = {-0.5394, 0.0092, -0.0562} + -- }, + ['1969-7-20T20:10:00'] = { + Type = "StaticRotation", + Rotation = {0, 0, 1.5708} + }, + ['1969-7-20T20:12:10'] = { + Type = "StaticRotation", + Rotation = {0, 0, 1.5708} + }, + ['1969-7-20T20:12:14'] = { + Type = "StaticRotation", + Rotation = {0, 0, 1.5708} + }, + ['1969-7-20T20:14:30'] = { + Type = "StaticRotation", + Rotation = {0, 0, 1.5708} + }, + ['1969-7-20T20:14:31'] = { + Type = "StaticRotation", + Rotation = {-0.5133, 0.0131, -0.0531} + }, + ['1969-7-20T20:14:32'] = { + Type = "StaticRotation", + Rotation = {-0.5043, 0.0117, -0.0487} + }, + ['1969-7-20T20:14:33'] = { + Type = "StaticRotation", + Rotation = {-0.4893, 0.0090, -0.0447} + }, + ['1969-7-20T20:14:33'] = { + Type = "StaticRotation", + Rotation = {-0.4851, -0.0008, -0.0429} + }, + ['1969-7-20T20:14:35'] = { + Type = "StaticRotation", + Rotation = {-0.4865, -0.0057, -0.0382} + }, + ['1969-7-20T20:14:35'] = { + Type = "StaticRotation", + Rotation = {-0.4788, -0.0073, -0.0345} + }, + ['1969-7-20T20:14:37'] = { + Type = "StaticRotation", + Rotation = {-0.4824, -0.0130, -0.0307} + }, + ['1969-7-20T20:14:37'] = { + Type = "StaticRotation", + Rotation = {-0.4836, -0.0103, -0.0268} + }, + ['1969-7-20T20:14:39'] = { + Type = "StaticRotation", + Rotation = {-0.4792, -0.0121, -0.0203} + }, + ['1969-7-20T20:14:40'] = { + Type = "StaticRotation", + Rotation = {-0.4874, -0.0140, -0.0211} + }, + ['1969-7-20T20:14:41'] = { + Type = "StaticRotation", + Rotation = {-0.5030, 0.0002, -0.0209} + }, + ['1969-7-20T20:14:42'] = { + Type = "StaticRotation", + Rotation = {-0.5361, -0.0040, -0.0209} + }, + ['1969-7-20T20:14:44'] = { + Type = "StaticRotation", + Rotation = {-0.4715, -0.0040, -0.0234} + }, + ['1969-7-20T20:14:45'] = { + Type = "StaticRotation", + Rotation = {-0.4433, -0.0050, -0.0238} + }, + ['1969-7-20T20:14:46'] = { + Type = "StaticRotation", + Rotation = {-0.4280, -0.0019, -0.0268} + }, + ['1969-7-20T20:14:47'] = { + Type = "StaticRotation", + Rotation = {-0.4310, -0.0069, -0.0259} + }, + ['1969-7-20T20:14:48'] = { + Type = "StaticRotation", + Rotation = {-0.4389, -0.0147, -0.0257} + }, + ['1969-7-20T20:14:49'] = { + Type = "StaticRotation", + Rotation = {-0.4519, -0.0178, -0.0287} + }, + ['1969-7-20T20:14:50'] = { + Type = "StaticRotation", + Rotation = {-0.4579, -0.0201, -0.0278} + }, + ['1969-7-20T20:14:51'] = { + Type = "StaticRotation", + Rotation = {-0.4554, -0.0147, -0.0265} + }, + ['1969-7-20T20:14:52'] = { + Type = "StaticRotation", + Rotation = {-0.4468, -0.0084, -0.0284} + }, + ['1969-7-20T20:14:53'] = { + Type = "StaticRotation", + Rotation = {-0.4316, -0.0127, -0.0268} + }, + ['1969-7-20T20:14:53'] = { + Type = "StaticRotation", + Rotation = {-0.4228, -0.0171, -0.0255} + }, + ['1969-7-20T20:14:55'] = { + Type = "StaticRotation", + Rotation = {-0.4046, -0.0174, -0.0274} + }, + ['1969-7-20T20:14:57'] = { + Type = "StaticRotation", + Rotation = {-0.3806, -0.0211, -0.0243} + }, + ['1969-7-20T20:14:57'] = { + Type = "StaticRotation", + Rotation = {-0.3751, -0.0178, -0.0249} + }, + ['1969-7-20T20:14:59'] = { + Type = "StaticRotation", + Rotation = {-0.3670, -0.0153, -0.0230} + }, + ['1969-7-20T20:14:59'] = { + Type = "StaticRotation", + Rotation = {-0.3641, -0.0100, -0.0209} + }, + ['1969-7-20T20:15:1'] = { + Type = "StaticRotation", + Rotation = {-0.3526, -0.0021, -0.0207} + }, + ['1969-7-20T20:15:1'] = { + Type = "StaticRotation", + Rotation = {-0.3457, -0.0038, -0.0195} + }, + ['1969-7-20T20:15:3'] = { + Type = "StaticRotation", + Rotation = {-0.3371, -0.0038, -0.0161} + }, + ['1969-7-20T20:15:3'] = { + Type = "StaticRotation", + Rotation = {-0.3309, -0.0015, -0.0192} + }, + ['1969-7-20T20:15:5'] = { + Type = "StaticRotation", + Rotation = {-0.3263, -0.0096, -0.0232} + }, + ['1969-7-20T20:15:5'] = { + Type = "StaticRotation", + Rotation = {-0.3240, 0.0015, -0.0243} + }, + ['1969-7-20T20:15:7'] = { + Type = "StaticRotation", + Rotation = {-0.3160, 0.0061, -0.0295} + }, + ['1969-7-20T20:15:7'] = { + Type = "StaticRotation", + Rotation = {-0.3135, 0.0035, -0.0318} + }, + ['1969-7-20T20:15:9'] = { + Type = "StaticRotation", + Rotation = {-0.3074, 0.0108, -0.0341} + }, + ['1969-7-20T20:15:9'] = { + Type = "StaticRotation", + Rotation = {-0.3022, 0.0027, -0.0360} + }, + ['1969-7-20T20:15:11'] = { + Type = "StaticRotation", + Rotation = {-0.2995, -0.0061, -0.0406} + }, + ['1969-7-20T20:15:11'] = { + Type = "StaticRotation", + Rotation = {-0.2976, -0.0098, -0.0416} + }, + ['1969-7-20T20:15:13'] = { + Type = "StaticRotation", + Rotation = {-0.2901, -0.0127, -0.0447} + }, + ['1969-7-20T20:15:14'] = { + Type = "StaticRotation", + Rotation = {-0.2886, -0.0169, -0.0470} + }, + ['1969-7-20T20:15:15'] = { + Type = "StaticRotation", + Rotation = {-0.2700, -0.0174, -0.0491} + }, + ['1969-7-20T20:15:15'] = { + Type = "StaticRotation", + Rotation = {-0.2107, -0.0119, -0.0512} + }, + ['1969-7-20T20:15:17'] = { + Type = "StaticRotation", + Rotation = {-0.1630, -0.0123, -0.0560} + }, + ['1969-7-20T20:15:18'] = { + Type = "StaticRotation", + Rotation = {-0.1101, -0.0077, -0.0583} + }, + ['1969-7-20T20:15:19'] = { + Type = "StaticRotation", + Rotation = {-0.0868, -0.0029, -0.0613} + }, + ['1969-7-20T20:15:19'] = { + Type = "StaticRotation", + Rotation = {-0.0893, -0.0036, -0.0642} + }, + ['1969-7-20T20:15:21'] = { + Type = "StaticRotation", + Rotation = {-0.0892, -0.0029, -0.0675} + }, + ['1969-7-20T20:15:21'] = { + Type = "StaticRotation", + Rotation = {-0.0970, -0.0004, -0.0698} + }, + ['1969-7-20T20:15:23'] = { + Type = "StaticRotation", + Rotation = {-0.1020, -0.0079, -0.0736} + }, + ['1969-7-20T20:15:24'] = { + Type = "StaticRotation", + Rotation = {-0.0959, -0.0069, -0.0771} + }, + ['1969-7-20T20:15:25'] = { + Type = "StaticRotation", + Rotation = {-0.0999, -0.0057, -0.0794} + }, + ['1969-7-20T20:15:26'] = { + Type = "StaticRotation", + Rotation = {-0.1001, -0.0075, -0.0828} + }, + ['1969-7-20T20:15:27'] = { + Type = "StaticRotation", + Rotation = {-0.0966, -0.0067, -0.0849} + }, + ['1969-7-20T20:15:28'] = { + Type = "StaticRotation", + Rotation = {-0.1039, -0.0050, -0.0876} + }, + ['1969-7-20T20:15:29'] = { + Type = "StaticRotation", + Rotation = {-0.1055, -0.0059, -0.0893} + }, + ['1969-7-20T20:15:30'] = { + Type = "StaticRotation", + Rotation = {-0.1010, -0.0050, -0.0909} + }, + ['1969-7-20T20:15:31'] = { + Type = "StaticRotation", + Rotation = {-0.1066, -0.0036, -0.0903} + }, + ['1969-7-20T20:15:32'] = { + Type = "StaticRotation", + Rotation = {-0.1106, -0.0032, -0.0882} + }, + ['1969-7-20T20:15:33'] = { + Type = "StaticRotation", + Rotation = {-0.1074, -0.0019, -0.0874} + }, + ['1969-7-20T20:15:34'] = { + Type = "StaticRotation", + Rotation = {-0.1131, 0.0021, -0.0857} + }, + ['1969-7-20T20:15:35'] = { + Type = "StaticRotation", + Rotation = {-0.1193, 0.0036, -0.0842} + }, + ['1969-7-20T20:15:36'] = { + Type = "StaticRotation", + Rotation = {-0.1193, 0.0083, -0.0819} + }, + ['1969-7-20T20:15:37'] = { + Type = "StaticRotation", + Rotation = {-0.1233, 0.0129, -0.0809} + }, + ['1969-7-20T20:15:38'] = { + Type = "StaticRotation", + Rotation = {-0.1365, 0.0194, -0.0786} + }, + ['1969-7-20T20:15:39'] = { + Type = "StaticRotation", + Rotation = {-0.1334, 0.0230, -0.0765} + }, + ['1969-7-20T20:15:40'] = { + Type = "StaticRotation", + Rotation = {-0.1267, 0.0257, -0.0744} + }, + ['1969-7-20T20:15:41'] = { + Type = "StaticRotation", + Rotation = {-0.1271, 0.0288, -0.0732} + }, + ['1969-7-20T20:15:42'] = { + Type = "StaticRotation", + Rotation = {-0.1206, 0.0272, -0.0700} + }, + ['1969-7-20T20:15:43'] = { + Type = "StaticRotation", + Rotation = {-0.1465, 0.0244, -0.0692} + }, + ['1969-7-20T20:15:44'] = { + Type = "StaticRotation", + Rotation = {-0.1931, 0.0217, -0.0692} + }, + ['1969-7-20T20:15:45'] = { + Type = "StaticRotation", + Rotation = {-0.1981, 0.0205, -0.0679} + }, + ['1969-7-20T20:15:46'] = { + Type = "StaticRotation", + Rotation = {-0.2048, 0.0173, -0.0656} + }, + ['1969-7-20T20:15:47'] = { + Type = "StaticRotation", + Rotation = {-0.2151, 0.0169, -0.0650} + }, + ['1969-7-20T20:15:48'] = { + Type = "StaticRotation", + Rotation = {-0.2385, 0.0132, -0.0633} + }, + ['1969-7-20T20:15:49'] = { + Type = "StaticRotation", + Rotation = {-0.2590, 0.0092, -0.0623} + }, + ['1969-7-20T20:15:50'] = { + Type = "StaticRotation", + Rotation = {-0.2607, 0.0077, -0.0608} + }, + ['1969-7-20T20:15:51'] = { + Type = "StaticRotation", + Rotation = {-0.2646, 0.0056, -0.0600} + }, + ['1969-7-20T20:15:52'] = { + Type = "StaticRotation", + Rotation = {-0.2680, 0.0004, -0.0575} + }, + ['1969-7-20T20:15:53'] = { + Type = "StaticRotation", + Rotation = {-0.2682, -0.0011, -0.0560} + }, + ['1969-7-20T20:15:54'] = { + Type = "StaticRotation", + Rotation = {-0.2742, -0.0044, -0.0543} + }, + ['1969-7-20T20:15:55'] = { + Type = "StaticRotation", + Rotation = {-0.2757, -0.0061, -0.0522} + }, + ['1969-7-20T20:15:56'] = { + Type = "StaticRotation", + Rotation = {-0.2727, -0.0065, -0.0491} + }, + ['1969-7-20T20:15:57'] = { + Type = "StaticRotation", + Rotation = {-0.2724, -0.0063, -0.0474} + }, + ['1969-7-20T20:15:58'] = { + Type = "StaticRotation", + Rotation = {-0.2732, -0.0077, -0.0445} + }, + ['1969-7-20T20:15:59'] = { + Type = "StaticRotation", + Rotation = {-0.2709, -0.0092, -0.0420} + }, + ['1969-7-20T20:16:0'] = { + Type = "StaticRotation", + Rotation = {-0.2690, -0.0102, -0.0387} + }, + ['1969-7-20T20:16:1'] = { + Type = "StaticRotation", + Rotation = {-0.2704, -0.0115, -0.0368} + }, + ['1969-7-20T20:16:2'] = { + Type = "StaticRotation", + Rotation = {-0.2704, -0.0142, -0.0332} + }, + ['1969-7-20T20:16:3'] = { + Type = "StaticRotation", + Rotation = {-0.2700, -0.0153, -0.0305} + }, + ['1969-7-20T20:16:4'] = { + Type = "StaticRotation", + Rotation = {-0.2736, -0.0176, -0.0268} + }, + ['1969-7-20T20:16:5'] = { + Type = "StaticRotation", + Rotation = {-0.2752, -0.0199, -0.0243} + }, + ['1969-7-20T20:16:6'] = { + Type = "StaticRotation", + Rotation = {-0.2752, -0.0238, -0.0207} + }, + ['1969-7-20T20:16:7'] = { + Type = "StaticRotation", + Rotation = {-0.2702, -0.0245, -0.0205} + }, + ['1969-7-20T20:16:8'] = { + Type = "StaticRotation", + Rotation = {-0.1841, -0.0217, -0.0219} + }, + ['1969-7-20T20:16:9'] = { + Type = "StaticRotation", + Rotation = {-0.1632, -0.0217, -0.0226} + }, + ['1969-7-20T20:16:26'] = { + Type = "StaticRotation", + Rotation = {-0.0989, -0.0184, -0.0391} + }, + ['1969-7-20T20:16:27'] = { + Type = "StaticRotation", + Rotation = {-0.0968, -0.0167, -0.0393} + }, + ['1969-7-20T20:16:28'] = { + Type = "StaticRotation", + Rotation = {-0.0171, -0.0103, -0.0406} + }, + ['1969-7-20T20:16:29'] = { + Type = "StaticRotation", + Rotation = {-0.0157, -0.0105, -0.0412} + }, + ['1969-7-20T20:16:30'] = { + Type = "StaticRotation", + Rotation = {0.0127, -0.0103, -0.0427} + }, + ['1969-7-20T20:16:31'] = { + Type = "StaticRotation", + Rotation = {0.0134, -0.0147, -0.0433} + }, + ['1969-7-20T20:16:32'] = { + Type = "StaticRotation", + Rotation = {0.0042, -0.0370, -0.0470} + }, + ['1969-7-20T20:16:33'] = { + Type = "StaticRotation", + Rotation = {0.0092, -0.0506, -0.0487} + }, + ['1969-7-20T20:16:34'] = { + Type = "StaticRotation", + Rotation = {0.0244, -0.0512, -0.0510} + }, + ['1969-7-20T20:16:35'] = { + Type = "StaticRotation", + Rotation = {0.0042, -0.0546, -0.0512} + }, + ['1969-7-20T20:16:36'] = { + Type = "StaticRotation", + Rotation = {-0.0006, -0.0558, -0.0533} + }, + ['1969-7-20T20:16:37'] = { + Type = "StaticRotation", + Rotation = {0.0050, -0.0522, -0.0543} + }, + ['1969-7-20T20:16:38'] = { + Type = "StaticRotation", + Rotation = {0.0077, -0.0343, -0.0548} + }, + ['1969-7-20T20:16:39'] = { + Type = "StaticRotation", + Rotation = {-0.0004, -0.0155, -0.0550} + }, + ['1969-7-20T20:16:40'] = { + Type = "StaticRotation", + Rotation = {0.0036, -0.0105, -0.0571} + }, + ['1969-7-20T20:16:41'] = { + Type = "StaticRotation", + Rotation = {-0.0080, -0.0086, -0.0579} + }, + ['1969-7-20T20:16:42'] = { + Type = "StaticRotation", + Rotation = {-0.0698, -0.0140, -0.0604} + }, + ['1969-7-20T20:16:43'] = { + Type = "StaticRotation", + Rotation = {-0.0579, -0.0134, -0.0623} + }, + ['1969-7-20T20:16:44'] = { + Type = "StaticRotation", + Rotation = {-0.0462, -0.0090, -0.0648} + }, + ['1969-7-20T20:16:45'] = { + Type = "StaticRotation", + Rotation = {-0.0466, -0.0067, -0.0665} + }, + ['1969-7-20T20:16:46'] = { + Type = "StaticRotation", + Rotation = {-0.0529, -0.0027, -0.0694} + }, + ['1969-7-20T20:16:47'] = { + Type = "StaticRotation", + Rotation = {-0.0518, 0.0079, -0.0707} + }, + ['1969-7-20T20:16:48'] = { + Type = "StaticRotation", + Rotation = {-0.0602, 0.0299, -0.0729} + }, + ['1969-7-20T20:16:49'] = { + Type = "StaticRotation", + Rotation = {-0.0510, 0.0562, -0.0729} + }, + ['1969-7-20T20:16:50'] = { + Type = "StaticRotation", + Rotation = {-0.0539, 0.0562, -0.0765} + }, + ['1969-7-20T20:16:51'] = { + Type = "StaticRotation", + Rotation = {-0.0928, 0.0545, -0.0813} + }, + ['1969-7-20T20:16:52'] = { + Type = "StaticRotation", + Rotation = {-0.0886, 0.0560, -0.0844} + }, + ['1969-7-20T20:16:53'] = { + Type = "StaticRotation", + Rotation = {-0.0832, 0.0552, -0.0865} + }, + ['1969-7-20T20:16:54'] = { + Type = "StaticRotation", + Rotation = {-0.0805, 0.0573, -0.0899} + }, + ['1969-7-20T20:16:55'] = { + Type = "StaticRotation", + Rotation = {-0.0784, 0.0614, -0.0924} + }, + ['1969-7-20T20:16:56'] = { + Type = "StaticRotation", + Rotation = {-0.0729, 0.0635, -0.0945} + }, + ['1969-7-20T20:16:57'] = { + Type = "StaticRotation", + Rotation = {-0.0792, 0.0627, -0.0976} + }, + ['1969-7-20T20:17:7'] = { + Type = "StaticRotation", + Rotation = {-0.1056, -0.0366, -0.1402} + }, + ['1969-7-20T20:17:7'] = { + Type = "StaticRotation", + Rotation = {-0.1053, -0.0395, -0.1428} + }, + ['1969-7-20T20:17:9'] = { + Type = "StaticRotation", + Rotation = {-0.0725, -0.0314, -0.1503} + }, + ['1969-7-20T20:17:9'] = { + Type = "StaticRotation", + Rotation = {-0.0259, -0.0270, -0.1542} + }, + ['1969-7-20T20:17:11'] = { + Type = "StaticRotation", + Rotation = {0.0874, -0.0059, -0.1614} + }, + ['1969-7-20T20:17:12'] = { + Type = "StaticRotation", + Rotation = {0.0769, -0.0096, -0.1678} + }, + ['1969-7-20T20:17:13'] = { + Type = "StaticRotation", + Rotation = {0.0740, -0.0270, -0.1743} + }, + ['1969-7-20T20:17:14'] = { + Type = "StaticRotation", + Rotation = {0.0673, -0.0458, -0.1810} + }, + ['1969-7-20T20:17:15'] = { + Type = "StaticRotation", + Rotation = {0.0550, -0.0506, -0.1860} + }, + ['1969-7-20T20:17:16'] = { + Type = "StaticRotation", + Rotation = {0.0449, -0.0577, -0.1931} + }, + ['1969-7-20T20:17:17'] = { + Type = "StaticRotation", + Rotation = {0.0437, -0.0617, -0.1967} + }, + ['1969-7-20T20:17:18'] = { + Type = "StaticRotation", + Rotation = {0.0297, -0.0650, -0.2027} + }, + ['1969-7-20T20:17:19'] = { + Type = "StaticRotation", + Rotation = {0.0203, -0.0518, -0.2061} + }, + ['1969-7-20T20:17:20'] = { + Type = "StaticRotation", + Rotation = {0.0211, -0.0201, -0.2109} + }, + ['1969-7-20T20:17:21'] = { + Type = "StaticRotation", + Rotation = {0.0228, -0.0197, -0.2159} + }, + ['1969-7-20T20:17:22'] = { + Type = "StaticRotation", + Rotation = {-0.0201, -0.0257, -0.2230} + }, + ['1969-7-20T20:17:23'] = { + Type = "StaticRotation", + Rotation = {-0.0299, -0.0125, -0.2287} + }, + ['1969-7-20T20:17:24'] = { + Type = "StaticRotation", + Rotation = {-0.0368, -0.0025, -0.2355} + }, + ['1969-7-20T20:17:25'] = { + Type = "StaticRotation", + Rotation = {-0.0464, 0.0209, -0.2408} + }, + ['1969-7-20T20:17:26'] = { + Type = "StaticRotation", + Rotation = {-0.0548, 0.0474, -0.2472} + }, + ['1969-7-20T20:17:27'] = { + Type = "StaticRotation", + Rotation = {-0.0535, 0.0464, -0.2481} + }, + ['1969-7-20T20:17:28'] = { + Type = "StaticRotation", + Rotation = {-0.0512, 0.0508, -0.2491} + }, + ['1969-7-20T20:17:29'] = { + Type = "StaticRotation", + Rotation = {-0.0625, 0.0781, -0.2504} + }, + ['1969-7-20T20:17:30'] = { + Type = "StaticRotation", + Rotation = {-0.0811, 0.0711, -0.2531} + }, + ['1969-7-20T20:17:31'] = { + Type = "StaticRotation", + Rotation = {-0.0855, 0.0692, -0.2544} + }, + ['1969-7-20T20:17:32'] = { + Type = "StaticRotation", + Rotation = {-0.0940, 0.0673, -0.2569} + }, + ['1969-7-20T20:17:33'] = { + Type = "StaticRotation", + Rotation = {-0.0963, 0.0648, -0.2587} + }, + ['1969-7-20T20:17:34'] = { + Type = "StaticRotation", + Rotation = {-0.0909, 0.0619, -0.2587} + }, + ['1969-7-20T20:17:35'] = { + Type = "StaticRotation", + Rotation = {-0.0832, 0.0602, -0.2585} + }, + ['1969-7-20T20:17:36'] = { + Type = "StaticRotation", + Rotation = {-0.0761, 0.0326, -0.2602} + }, + ['1969-7-20T20:17:37'] = { + Type = "StaticRotation", + Rotation = {-0.0612, 0.0013, -0.2635} + }, + ['1969-7-20T20:17:38'] = { + Type = "StaticRotation", + Rotation = {-0.0274, -0.0079, -0.2727} + }, + ['1969-7-20T20:17:39'] = { + Type = "StaticRotation", + Rotation = {-0.0061, -0.0470, -0.2732} + }, + ['1969-7-20T20:17:40'] = { + Type = "StaticRotation", + Rotation = {-0.0794, -0.0088, -0.2447} + }, }) diff --git a/data/assets/scene/solarsystem/missions/apollo/11/lem_flipbook.asset b/data/assets/scene/solarsystem/missions/apollo/11/lem_flipbook.asset index 06e4259d50..d158311265 100644 --- a/data/assets/scene/solarsystem/missions/apollo/11/lem_flipbook.asset +++ b/data/assets/scene/solarsystem/missions/apollo/11/lem_flipbook.asset @@ -8,27 +8,27 @@ local flipbookCount = 19; local flipbook = nil; local vrts = asset.syncedResource({ - Name = "Apollo 11 Flipbook", - Type = "HttpSynchronization", - Identifier = "apollo_11_flipbook", - Version = 1 + Name = "Apollo 11 Flipbook", + Type = "HttpSynchronization", + Identifier = "apollo_11_flipbook", + Version = 1 }) asset.onInitialize(function () - openspace.globebrowsing.addBlendingLayersFromDirectory(vrts, assetGlobe); - flipbook = helper.createFlipbook(assetPrefix, assetGlobe, 19); + openspace.globebrowsing.addBlendingLayersFromDirectory(vrts, assetGlobe); + flipbook = helper.createFlipbook(assetPrefix, assetGlobe, 19); - rawset(_G, "nextFlip", function() helper.nextFlipbookPage(flipbook) end) - rawset(_G, "previousFlip", function() helper.previousFlipbookPage(flipbook) end) + rawset(_G, "nextFlip", function() helper.nextFlipbookPage(flipbook) end) + rawset(_G, "previousFlip", function() helper.previousFlipbookPage(flipbook) end) - openspace.bindKey("p", "nextFlip()", "Show the next Apollo 11 flipbook image.", "Next A11 flip", "/Missions/Apollo/11") - openspace.bindKey("o", "previousFlip()","Show the previous Apollo 11 flipbook image.", "Prev A11 flip", "/Missions/Apollo/11") + openspace.bindKey("p", "nextFlip()", "Show the next Apollo 11 flipbook image.", "Next A11 flip", "/Missions/Apollo/11") + openspace.bindKey("o", "previousFlip()","Show the previous Apollo 11 flipbook image.", "Prev A11 flip", "/Missions/Apollo/11") end) asset.onDeinitialize(function () - flipbook = nil; + flipbook = nil; - openspace.clearKey("o") - openspace.clearKey("p") + openspace.clearKey("o") + openspace.clearKey("p") end) diff --git a/data/assets/scene/solarsystem/missions/apollo/11/models.asset b/data/assets/scene/solarsystem/missions/apollo/11/models.asset index 36b3d25a94..46b87d9ba3 100644 --- a/data/assets/scene/solarsystem/missions/apollo/11/models.asset +++ b/data/assets/scene/solarsystem/missions/apollo/11/models.asset @@ -1,8 +1,8 @@ local modelFolder = asset.syncedResource({ - Name = "Apollo Models", - Type = "HttpSynchronization", - Identifier = "apollo_11_models", - Version = 1 + Name = "Apollo Models", + Type = "HttpSynchronization", + Identifier = "apollo_11_models", + Version = 1 }) asset.export('models', modelFolder) diff --git a/data/assets/scene/solarsystem/missions/apollo/15/apollo15.asset b/data/assets/scene/solarsystem/missions/apollo/15/apollo15.asset index 900a9631af..01e7a4183f 100644 --- a/data/assets/scene/solarsystem/missions/apollo/15/apollo15.asset +++ b/data/assets/scene/solarsystem/missions/apollo/15/apollo15.asset @@ -8,111 +8,91 @@ local kernels = asset.require('scene/solarsystem/missions/apollo/15/kernels').ke -- local models = asset.syncedResource({ --- Name = "Apollo 15 Models", --- Type = "HttpSynchronization", --- Identifier = "apollo_models", --- Version = 1 +-- Name = "Apollo 15 Models", +-- Type = "HttpSynchronization", +-- Identifier = "apollo_models", +-- Version = 1 -- }) local LightSources = { - { - Type = "SceneGraphLightSource", - Identifier = "Sun", - Node = sun_transforms.SolarSystemBarycenter.Identifier, - Intensity = 1.0 - }, - -- { - -- Identifier = "Camera", - -- Type = "CameraLightSource", - -- Intensity = 0.5, - -- Enabled = false - -- } + { + Type = "SceneGraphLightSource", + Identifier = "Sun", + Node = sun_transforms.SolarSystemBarycenter.Identifier, + Intensity = 1.0 + }, +-- { +-- Identifier = "Camera", +-- Type = "CameraLightSource", +-- Intensity = 0.5, +-- Enabled = false +-- } } local Apollo15 = { - Identifier = "Apollo15", - Parent = moon_transforms.Moon.Identifier, - Transform = { - Translation = { - Type = "SpiceTranslation", - Target = "APOLLO 15", - Observer = "MOON", - Frame = "IAU_MOON", - Kernels = kernels - }, - Rotation = { - Type = "SpiceRotation", - SourceFrame = "A15_METRIC", - DestinationFrame = "GALACTIC" - } + Identifier = "Apollo15", + Parent = moon_transforms.Moon.Identifier, + Transform = { + Translation = { + Type = "SpiceTranslation", + Target = "APOLLO 15", + Observer = "MOON", + Frame = "IAU_MOON", + Kernels = kernels }, - Renderable = { - Type = "RenderableModel", - GeometryFile = models .. "/ApolloCSM.fbx", - LightSources = { - { - Type = "SceneGraphLightSource", - Identifier = "Sun", - Node = sun_transforms.SolarSystemBarycenter.Identifier, - Intensity = 1.0 - } - }, - PerformShading = true, - DisableFaceCulling = true - }, - TimeFrame = { - Type = "TimeFrameInterval", - Start = "1971-07-30T02:22:00.00", - End = "1971-08-01T18:05:00.00" - }, - GUI = { - Name = "Apollo 15", - Path = "/Solar System/Missions/Apollo/15" + Rotation = { + Type = "SpiceRotation", + SourceFrame = "A15_METRIC", + DestinationFrame = "GALACTIC" } + }, + Renderable = { + Type = "RenderableModel", + GeometryFile = models .. "/ApolloCSM.fbx", + LightSources = { + { + Type = "SceneGraphLightSource", + Identifier = "Sun", + Node = sun_transforms.SolarSystemBarycenter.Identifier, + Intensity = 1.0 + } + }, + PerformShading = true, + DisableFaceCulling = true + }, + TimeFrame = { + Type = "TimeFrameInterval", + Start = "1971-07-30T02:22:00.00", + End = "1971-08-01T18:05:00.00" + }, + GUI = { + Name = "Apollo 15", + Path = "/Solar System/Missions/Apollo/15" + } } --- local Apollo15Main = { --- Identifier = "Apollo15Main", --- Parent = Apollo15.Identifier, --- Renderable = { --- Type = "RenderableModel", --- Geometry = {{ --- Type = "MultiModelGeometry", --- -- GeometryFile = models .. "/Apollo_Spacecraft.obj" --- GeometryFile = models .. "/Apollo_CSM_shrunk_rotated_xy_doubble_size.obj", - -- ColorTexture = models .. "/gray.png" --- }}, --- LightSources = LightSources, --- DisableFaceCulling = true --- }, --- GUI = { --- Name = "Apollo 15 Main", --- Path = "/Solar System/Missions/Apollo 15" --- } --- } - local Apollo15Trail = { - Identifier = "Apollo15Trail", - Parent = moon_transforms.Moon.Identifier, - Renderable = { - Type = "RenderableTrailTrajectory", - Translation = { - Type = "SpiceTranslation", - Target = "APOLLO 15", - Observer = "MOON", - Frame = "IAU_MOON", - Kernels = kernels - }, - Color = { 0.70, 0.50, 0.20 }, - StartTime = "1971 JUL 26", - EndTime = "1971 AUG 01 14:30:41.680", - SampleInterval = 2 + Identifier = "Apollo15Trail", + Parent = moon_transforms.Moon.Identifier, + Renderable = { + Type = "RenderableTrailTrajectory", + Translation = { + Type = "SpiceTranslation", + Target = "APOLLO 15", + Observer = "MOON", + Frame = "IAU_MOON", + Kernels = kernels }, - GUI = { - Name = "Apollo 15 Trail", - Path = "/Solar System/Missions/Apollo/15" - } + Color = { 0.70, 0.50, 0.20 }, + StartTime = "1971 JUL 26", + EndTime = "1971 AUG 01 14:30:41.680", + SampleInterval = 2 + }, + GUI = { + Name = "Apollo 15 Trail", + Path = "/Solar System/Missions/Apollo/15" + } } local list = { Apollo15, Apollo15Trail } diff --git a/data/assets/scene/solarsystem/missions/apollo/15/kernels.asset b/data/assets/scene/solarsystem/missions/apollo/15/kernels.asset index 1b00fd7596..385565429b 100644 --- a/data/assets/scene/solarsystem/missions/apollo/15/kernels.asset +++ b/data/assets/scene/solarsystem/missions/apollo/15/kernels.asset @@ -1,92 +1,92 @@ local folder = asset.syncedResource({ - Name = "Apollo Kernels", - Type = "HttpSynchronization", - Identifier = "apollo_spice", - Version = 1 + Name = "Apollo Kernels", + Type = "HttpSynchronization", + Identifier = "apollo_spice", + Version = 1 }) local kernels = { - folder .. "/apollo15.0001.tsc", + folder .. "/apollo15.0001.tsc", - -- folder .. '/AS15-P_v01.bc', - folder .. '/apollo15.0001.tf', - folder .. '/apollo15MetricAddendum002.ti', - -- folder .. '/apollo15PanoramicAddendum001.ti', - folder .. '/apollo15_metric.0002.ti', - -- folder .. '/apollo15_panoramic.0001.ti', - folder .. '/apollo15-1.bsp', - folder .. '/AS15-M_v01.bc', - -- folder .. '/AS15-M_v01.bsp', + -- folder .. '/AS15-P_v01.bc', + folder .. '/apollo15.0001.tf', + folder .. '/apollo15MetricAddendum002.ti', + -- folder .. '/apollo15PanoramicAddendum001.ti', + folder .. '/apollo15_metric.0002.ti', + -- folder .. '/apollo15_panoramic.0001.ti', + folder .. '/apollo15-1.bsp', + folder .. '/AS15-M_v01.bc', + -- folder .. '/AS15-M_v01.bsp', } -- local kernels = { --- --sclk --- folder .. "apollo15.0001.tsc", +-- --sclk +-- folder .. "apollo15.0001.tsc", --- --pck --- folder .. "moon_080317.tf", --- folder .. "moon_assoc_me.tf", +-- --pck +-- folder .. "moon_080317.tf", +-- folder .. "moon_assoc_me.tf", --- --ik --- folder .. "apollo15_metric_v2.0001.ti", --- folder .. "apollo15_panoramic.0001.ti", +-- --ik +-- folder .. "apollo15_metric_v2.0001.ti", +-- folder .. "apollo15_panoramic.0001.ti", --- --tspk --- folder .. "de421.bsp", --- folder .. "moon_pa_de421_1900-2050.bpc", +-- --tspk +-- folder .. "de421.bsp", +-- folder .. "moon_pa_de421_1900-2050.bpc", --- --iak --- folder .. "apollo15MetricAddendum002.ti", --- folder .. "apolloPanAddendum001.ti", +-- --iak +-- folder .. "apollo15MetricAddendum002.ti", +-- folder .. "apolloPanAddendum001.ti", --- --fk --- folder .. "apollo15_v2.0001.tf", --- folder .. "apollo15_v2.0002.tf", +-- --fk +-- folder .. "apollo15_v2.0001.tf", +-- folder .. "apollo15_v2.0002.tf", --- --spk --- folder .. "AS15_M_REV23_SMITHED_V01.bsp", --- folder .. "AS15_M_REV4.bsp ", --- folder .. "AS15_M_REV70_SMITHED_V01.bsp", --- folder .. "AS15_M_REV04_v2.bsp ", --- folder .. "AS15_M_REV27_SMITHED_V01.bsp", --- folder .. "AS15_M_REV44_SMITHED_V01.bsp", --- folder .. "AS15_M_REV71_SMITHED_V01.bsp", --- folder .. "AS15_M_REV15_SMITHED_V01.bsp", --- folder .. "AS15_M_REV33_SMITHED_V01.bsp", --- folder .. "AS15_M_REV50_SMITHED_V01.bsp", --- folder .. "AS15_M_REV71_SMITHED_V02.bsp", --- folder .. "AS15_M_REV15_v2.bsp ", --- folder .. "AS15_M_REV34_SMITHED_V01.bsp", --- folder .. "AS15_M_REV60_SMITHED_V01.bsp", --- folder .. "AS15_M_REV72_v2.bsp", --- folder .. "AS15_M_REV16_SMITHED_V01.bsp", --- folder .. "AS15_M_REV35_SMITHED_V02.bsp", --- folder .. "AS15_M_REV62_SMITHED_V01.bsp", --- folder .. "AS15_M_REV22_SMITHED_V01.bsp", --- folder .. "AS15_M_REV38_SMITHED_V01.bsp", --- folder .. "AS15_M_REV63_SMITHED_V01.bsp", +-- --spk +-- folder .. "AS15_M_REV23_SMITHED_V01.bsp", +-- folder .. "AS15_M_REV4.bsp ", +-- folder .. "AS15_M_REV70_SMITHED_V01.bsp", +-- folder .. "AS15_M_REV04_v2.bsp ", +-- folder .. "AS15_M_REV27_SMITHED_V01.bsp", +-- folder .. "AS15_M_REV44_SMITHED_V01.bsp", +-- folder .. "AS15_M_REV71_SMITHED_V01.bsp", +-- folder .. "AS15_M_REV15_SMITHED_V01.bsp", +-- folder .. "AS15_M_REV33_SMITHED_V01.bsp", +-- folder .. "AS15_M_REV50_SMITHED_V01.bsp", +-- folder .. "AS15_M_REV71_SMITHED_V02.bsp", +-- folder .. "AS15_M_REV15_v2.bsp ", +-- folder .. "AS15_M_REV34_SMITHED_V01.bsp", +-- folder .. "AS15_M_REV60_SMITHED_V01.bsp", +-- folder .. "AS15_M_REV72_v2.bsp", +-- folder .. "AS15_M_REV16_SMITHED_V01.bsp", +-- folder .. "AS15_M_REV35_SMITHED_V02.bsp", +-- folder .. "AS15_M_REV62_SMITHED_V01.bsp", +-- folder .. "AS15_M_REV22_SMITHED_V01.bsp", +-- folder .. "AS15_M_REV38_SMITHED_V01.bsp", +-- folder .. "AS15_M_REV63_SMITHED_V01.bsp", --- --ck --- folder .. "AS15_M_REV04_SMITHED_V01.bc", --- folder .. "AS15_M_REV15_SMITHED_V01.bc", --- folder .. "AS15_M_REV16_SMITHED_V01.bc", --- folder .. "AS15_M_REV22_SMITHED_V01.bc", --- folder .. "AS15_M_REV23_SMITHED_V01.bc", --- folder .. "AS15_M_REV27_SMITHED_V01.bc", --- folder .. "AS15_M_REV33_SMITHED_V01.bc", --- folder .. "AS15_M_REV34_SMITHED_V01.bc", --- folder .. "AS15_M_REV35_SMITHED_V01.bc", --- folder .. "AS15_M_REV35_SMITHED_V02.bc", --- folder .. "AS15_M_REV38_SMITHED_V01.bc", --- folder .. "AS15_M_REV44_SMITHED_V01.bc", --- folder .. "AS15_M_REV50_SMITHED_V01.bc", --- folder .. "AS15_M_REV60_SMITHED_V01.bc", --- folder .. "AS15_M_REV62_SMITHED_V01.bc", --- folder .. "AS15_M_REV63_SMITHED_V01.bc", --- folder .. "AS15_M_REV70_SMITHED_V01.bc", --- folder .. "AS15_M_REV71_SMITHED_V01.bc", --- folder .. "AS15_M_REV71_SMITHED_V02.bc", --- folder .. "AS15_M_REV72_v2.bc", +-- --ck +-- folder .. "AS15_M_REV04_SMITHED_V01.bc", +-- folder .. "AS15_M_REV15_SMITHED_V01.bc", +-- folder .. "AS15_M_REV16_SMITHED_V01.bc", +-- folder .. "AS15_M_REV22_SMITHED_V01.bc", +-- folder .. "AS15_M_REV23_SMITHED_V01.bc", +-- folder .. "AS15_M_REV27_SMITHED_V01.bc", +-- folder .. "AS15_M_REV33_SMITHED_V01.bc", +-- folder .. "AS15_M_REV34_SMITHED_V01.bc", +-- folder .. "AS15_M_REV35_SMITHED_V01.bc", +-- folder .. "AS15_M_REV35_SMITHED_V02.bc", +-- folder .. "AS15_M_REV38_SMITHED_V01.bc", +-- folder .. "AS15_M_REV44_SMITHED_V01.bc", +-- folder .. "AS15_M_REV50_SMITHED_V01.bc", +-- folder .. "AS15_M_REV60_SMITHED_V01.bc", +-- folder .. "AS15_M_REV62_SMITHED_V01.bc", +-- folder .. "AS15_M_REV63_SMITHED_V01.bc", +-- folder .. "AS15_M_REV70_SMITHED_V01.bc", +-- folder .. "AS15_M_REV71_SMITHED_V01.bc", +-- folder .. "AS15_M_REV71_SMITHED_V02.bc", +-- folder .. "AS15_M_REV72_v2.bc", -- } asset.export("kernels", kernels) diff --git a/data/assets/scene/solarsystem/missions/apollo/17/boulder_models.asset b/data/assets/scene/solarsystem/missions/apollo/17/boulder_models.asset index 7868bae468..79e51abc09 100644 --- a/data/assets/scene/solarsystem/missions/apollo/17/boulder_models.asset +++ b/data/assets/scene/solarsystem/missions/apollo/17/boulder_models.asset @@ -1,8 +1,8 @@ local models = asset.syncedResource({ - Name = "Apollo Boulders Models", - Type = "HttpSynchronization", - Identifier = "apollo_boulders", - Version = 1 + Name = "Apollo Boulders Models", + Type = "HttpSynchronization", + Identifier = "apollo_boulders", + Version = 1 }) asset.export('models', models) diff --git a/data/assets/scene/solarsystem/missions/apollo/17/bouldersstation2.asset b/data/assets/scene/solarsystem/missions/apollo/17/bouldersstation2.asset index 343b6859ff..ecf428a649 100644 --- a/data/assets/scene/solarsystem/missions/apollo/17/bouldersstation2.asset +++ b/data/assets/scene/solarsystem/missions/apollo/17/bouldersstation2.asset @@ -4,159 +4,159 @@ local moon_asset = asset.require('scene/solarsystem/planets/earth/moon/moon') local models = asset.require('./boulder_models').models local LightSources = { - { - Type = "SceneGraphLightSource", - Identifier = "Sun", - Node = sun_transforms.SolarSystemBarycenter.Identifier, - Intensity = 1.0 - }, - { - Identifier = "Camera", - Type = "CameraLightSource", - Intensity = 0.5 - } + { + Type = "SceneGraphLightSource", + Identifier = "Sun", + Node = sun_transforms.SolarSystemBarycenter.Identifier, + Intensity = 1.0 + }, + { + Identifier = "Camera", + Type = "CameraLightSource", + Intensity = 0.5 + } } local Station2Boulder1Holder = { - Identifier = "Station_2_Boulder1", - Parent = moon_asset.Moon.Identifier, - Transform = { - Translation = { - Type = "GlobeTranslation", - Globe = moon_asset.Moon.Identifier, - Longitude = -360+30.5294692, - Latitude = 20.098824, - Altitude = -2442.8, - UseHeightMap = false - } - }, - GUI = { - Name = "Station 2 Boulder 1", - Path = "/Solar System/Missions/Apollo/17/Station 2" + Identifier = "Station_2_Boulder1", + Parent = moon_asset.Moon.Identifier, + Transform = { + Translation = { + Type = "GlobeTranslation", + Globe = moon_asset.Moon.Identifier, + Longitude = -360+30.5294692, + Latitude = 20.098824, + Altitude = -2442.8, + UseHeightMap = false } + }, + GUI = { + Name = "Station 2 Boulder 1", + Path = "/Solar System/Missions/Apollo/17/Station 2" + } } local Station2Boulder1Model = { - Identifier = "Station2Boulder1Model", - Parent = Station2Boulder1Holder.Identifier, - Transform = { - Scale = { - Type = "StaticScale", - Scale = 0.06 - }, - }, - Renderable = { - Type = "RenderableModel", - Geometry = {{ - Type = "MultiModelGeometry", - GeometryFile = models .. "/b1-v2.obj", - ColorTexture = models .. "/b1-v2_u1_v1.jpeg" - }}, - RotationVector = { 243.243256 ,206.270264, 309.677429 }, - LightSources = LightSources, - PerformShading = false, - DisableFaceCulling = true - }, - GUI = { - Name = "Station 2 Boulder 1 Model", - Path = "/Solar System/Missions/Apollo/17/Station 2" + Identifier = "Station2Boulder1Model", + Parent = Station2Boulder1Holder.Identifier, + Transform = { + Scale = { + Type = "StaticScale", + Scale = 0.06 } + }, + Renderable = { + Type = "RenderableModel", + Geometry = {{ + Type = "MultiModelGeometry", + GeometryFile = models .. "/b1-v2.obj", + ColorTexture = models .. "/b1-v2_u1_v1.jpeg" + }}, + RotationVector = { 243.243256 ,206.270264, 309.677429 }, + LightSources = LightSources, + PerformShading = false, + DisableFaceCulling = true + }, + GUI = { + Name = "Station 2 Boulder 1 Model", + Path = "/Solar System/Missions/Apollo/17/Station 2" + } } local Station2Boulder2Holder = { - Identifier = "Station_2_Boulder2", - Parent = moon_asset.Moon.Identifier, - Transform = { - Translation = { - Type = "GlobeTranslation", - Globe = moon_asset.Moon.Identifier, - Longitude = -360+30.5287892, - Latitude = 20.098240, - Altitude = -2434.6, - UseHeightMap = false - } - }, - GUI = { - Name = "Station 2 Boulder 2", - Path = "/Solar System/Missions/Apollo/17/Station 2" + Identifier = "Station_2_Boulder2", + Parent = moon_asset.Moon.Identifier, + Transform = { + Translation = { + Type = "GlobeTranslation", + Globe = moon_asset.Moon.Identifier, + Longitude = -360+30.5287892, + Latitude = 20.098240, + Altitude = -2434.6, + UseHeightMap = false } + }, + GUI = { + Name = "Station 2 Boulder 2", + Path = "/Solar System/Missions/Apollo/17/Station 2" + } } local Station2Boulder2Model = { - Identifier = "Station2Boulder2Model", - Parent = Station2Boulder2Holder.Identifier, - Transform = { - Scale = { - Type = "StaticScale", - Scale = 0.06 - }, - }, - Renderable = { - Type = "RenderableModel", - Geometry = {{ - Type = "MultiModelGeometry", - GeometryFile = models .. "/b2model.obj", - ColorTexture = models .. "/b2model_u1_v1.jpeg" - }}, - RotationVector = { 66.162155, 7.783780, 114.193550 }, - LightSources = LightSources, - PerformShading = false, - DisableFaceCulling = true - }, - GUI = { - Name = "Station 2 Boulder 2 Model", - Path = "/Solar System/Missions/Apollo/17/Station 2" + Identifier = "Station2Boulder2Model", + Parent = Station2Boulder2Holder.Identifier, + Transform = { + Scale = { + Type = "StaticScale", + Scale = 0.06 } + }, + Renderable = { + Type = "RenderableModel", + Geometry = {{ + Type = "MultiModelGeometry", + GeometryFile = models .. "/b2model.obj", + ColorTexture = models .. "/b2model_u1_v1.jpeg" + }}, + RotationVector = { 66.162155, 7.783780, 114.193550 }, + LightSources = LightSources, + PerformShading = false, + DisableFaceCulling = true + }, + GUI = { + Name = "Station 2 Boulder 2 Model", + Path = "/Solar System/Missions/Apollo/17/Station 2" + } } local Station2Boulder3Holder = { - Identifier = "Station_2_Boulder3", - Parent = moon_asset.Moon.Identifier, - Transform = { - Translation = { - Type = "GlobeTranslation", - Globe = moon_asset.Moon.Identifier, - Longitude = -360+30.5294692, - Latitude = 20.098610, - Altitude = -2441.55, - UseHeightMap = false - } - }, - GUI = { - Name = "Station 2 Boulder 3", - Path = "/Solar System/Missions/Apollo/17/Station 2" + Identifier = "Station_2_Boulder3", + Parent = moon_asset.Moon.Identifier, + Transform = { + Translation = { + Type = "GlobeTranslation", + Globe = moon_asset.Moon.Identifier, + Longitude = -360+30.5294692, + Latitude = 20.098610, + Altitude = -2441.55, + UseHeightMap = false } + }, + GUI = { + Name = "Station 2 Boulder 3", + Path = "/Solar System/Missions/Apollo/17/Station 2" + } } local Station2Boulder3Model = { - Identifier = "Station2Boulder3Model", - Parent = Station2Boulder3Holder.Identifier, - Transform = { - Scale = { - Type = "StaticScale", - Scale = 0.06 - }, - }, - Renderable = { - Type = "RenderableModel", - Geometry = {{ - Type = "MultiModelGeometry", - GeometryFile = models .. "/b3model.obj", - ColorTexture = models .. "/b3model_u1_v1.jpeg" - }}, - RotationVector = { 161.513519 ,243.243256, 65.806450 }, - LightSources = LightSources, - PerformShading = false, - DisableFaceCulling = true - }, - GUI = { - Name = "Station 2 Boulder 3 Model", - Path = "/Solar System/Missions/Apollo/17/Station 2" + Identifier = "Station2Boulder3Model", + Parent = Station2Boulder3Holder.Identifier, + Transform = { + Scale = { + Type = "StaticScale", + Scale = 0.06 } + }, + Renderable = { + Type = "RenderableModel", + Geometry = {{ + Type = "MultiModelGeometry", + GeometryFile = models .. "/b3model.obj", + ColorTexture = models .. "/b3model_u1_v1.jpeg" + }}, + RotationVector = { 161.513519 ,243.243256, 65.806450 }, + LightSources = LightSources, + PerformShading = false, + DisableFaceCulling = true + }, + GUI = { + Name = "Station 2 Boulder 3 Model", + Path = "/Solar System/Missions/Apollo/17/Station 2" + } } asset_helper.registerSceneGraphNodesAndExport(asset, { - Station2Boulder1Holder, Station2Boulder1Model, - Station2Boulder2Holder, Station2Boulder2Model, - Station2Boulder3Holder, Station2Boulder3Model + Station2Boulder1Holder, Station2Boulder1Model, + Station2Boulder2Holder, Station2Boulder2Model, + Station2Boulder3Holder, Station2Boulder3Model }) diff --git a/data/assets/scene/solarsystem/missions/apollo/17/bouldersstation6.asset b/data/assets/scene/solarsystem/missions/apollo/17/bouldersstation6.asset index 54dd555a22..4f476305d2 100644 --- a/data/assets/scene/solarsystem/missions/apollo/17/bouldersstation6.asset +++ b/data/assets/scene/solarsystem/missions/apollo/17/bouldersstation6.asset @@ -4,158 +4,158 @@ local moon_asset = asset.require('scene/solarsystem/planets/earth/moon/moon') local models = asset.require('./boulder_models').models local LightSources = { - { - Type = "SceneGraphLightSource", - Identifier = "Sun", - Node = sun_transforms.SolarSystemBarycenter.Identifier, - Intensity = 1.0 - }, - { - Identifier = "Camera", - Type = "CameraLightSource", - Intensity = 0.5 - } + { + Type = "SceneGraphLightSource", + Identifier = "Sun", + Node = sun_transforms.SolarSystemBarycenter.Identifier, + Intensity = 1.0 + }, + { + Identifier = "Camera", + Type = "CameraLightSource", + Intensity = 0.5 + } } local Station6Frag1Holder = { - Identifier = "Station_6_Fragment1", - Parent = moon_asset.Moon.Identifier, - Transform = { - Translation = { - Type = "GlobeTranslation", - Globe = moon_asset.Moon.Identifier, - Longitude = -360+30.80068, - Latitude = 20.2903, - Altitude = -2562.6, - UseHeightmap = false - } - }, - GUI = { - Name = "Station 6 Fragment 1", - Path = "/Solar System/Missions/Apollo/17/Station 6" + Identifier = "Station_6_Fragment1", + Parent = moon_asset.Moon.Identifier, + Transform = { + Translation = { + Type = "GlobeTranslation", + Globe = moon_asset.Moon.Identifier, + Longitude = -360+30.80068, + Latitude = 20.2903, + Altitude = -2562.6, + UseHeightmap = false } + }, + GUI = { + Name = "Station 6 Fragment 1", + Path = "/Solar System/Missions/Apollo/17/Station 6" + } } local Station6Frag1Model = { - Identifier = "Station6Frag1Model", - Parent = Station6Frag1Holder.Identifier, - Transform = { - Translation = { - Type = "GlobeTranslation", - Globe = moon_asset.Moon.Identifier, - Longitude = -360+30.8007, - Latitude = 20.2903, - Altitude = -2562.6, - UseHeightmap = false - } - }, - Transform = { - Scale = { - Type = "StaticScale", - Scale = 0.1 - } - }, - Renderable = { - Type = "RenderableModel", - Geometry = {{ - Type = "MultiModelGeometry", - GeometryFile = models .. "/A17-S6-frag1.obj", - ColorTexture = models .. "/A17-S6-frag1.png" - }}, - RotationVector = { 235.909088,165.000000,286.299194 }, - LightSources = LightSources, - PerformShading = false, - DisableFaceCulling = true - }, - GUI = { - Name = "Station 6 Fragment 1 Model", - Path = "/Solar System/Missions/Apollo/17/Station 6" + Identifier = "Station6Frag1Model", + Parent = Station6Frag1Holder.Identifier, + Transform = { + Translation = { + Type = "GlobeTranslation", + Globe = moon_asset.Moon.Identifier, + Longitude = -360+30.8007, + Latitude = 20.2903, + Altitude = -2562.6, + UseHeightmap = false } + }, + Transform = { + Scale = { + Type = "StaticScale", + Scale = 0.1 + } + }, + Renderable = { + Type = "RenderableModel", + Geometry = {{ + Type = "MultiModelGeometry", + GeometryFile = models .. "/A17-S6-frag1.obj", + ColorTexture = models .. "/A17-S6-frag1.png" + }}, + RotationVector = { 235.909088,165.000000,286.299194 }, + LightSources = LightSources, + PerformShading = false, + DisableFaceCulling = true + }, + GUI = { + Name = "Station 6 Fragment 1 Model", + Path = "/Solar System/Missions/Apollo/17/Station 6" + } } local Station6Frag23Holder = { - Identifier = "Station_6_Fragments_2_3", - Parent = moon_asset.Moon.Identifier, - GUI = { - Name = "Station 6 Fragments 2 & 3 Holder", - Path = "/Solar System/Missions/Apollo/17/Station 6" - } + Identifier = "Station_6_Fragments_2_3", + Parent = moon_asset.Moon.Identifier, + GUI = { + Name = "Station 6 Fragments 2 & 3 Holder", + Path = "/Solar System/Missions/Apollo/17/Station 6" + } } local Station6Frag2Model = { - Identifier = "A17S6F5", - Parent = Station6Frag23Holder.Identifier, - Transform = { - Scale = { - Type = "StaticScale", - Scale = 0.14 - }, - Translation = { - Type = "GlobeTranslation", - Globe = moon_asset.Moon.Identifier, - Longitude = -360+30.80055, - Latitude = 20.289808, - Altitude = -2566.5, - UseHeightmap = false - } + Identifier = "A17S6F5", + Parent = Station6Frag23Holder.Identifier, + Transform = { + Scale = { + Type = "StaticScale", + Scale = 0.14 }, - Renderable = { - Type = "RenderableModel", - Geometry = {{ - Type = "MultiModelGeometry", - GeometryFile = models .. "/station6_boulder_frag2.obj", - ColorTexture = models .. "/frag2crop_u1_v1.jpeg" - }}, - RotationVector = { 336.959991,210.239990,325.984253 }, - LightSources = LightSources, - PerformShading = false, - DisableFaceCulling = true, - }, - GUI = { - Name = "Station 6 Fragment 2 Model", - Path = "/Solar System/Missions/Apollo/17/Station 6" + Translation = { + Type = "GlobeTranslation", + Globe = moon_asset.Moon.Identifier, + Longitude = -360+30.80055, + Latitude = 20.289808, + Altitude = -2566.5, + UseHeightmap = false } + }, + Renderable = { + Type = "RenderableModel", + Geometry = {{ + Type = "MultiModelGeometry", + GeometryFile = models .. "/station6_boulder_frag2.obj", + ColorTexture = models .. "/frag2crop_u1_v1.jpeg" + }}, + RotationVector = { 336.959991,210.239990,325.984253 }, + LightSources = LightSources, + PerformShading = false, + DisableFaceCulling = true, + }, + GUI = { + Name = "Station 6 Fragment 2 Model", + Path = "/Solar System/Missions/Apollo/17/Station 6" + } } local Station6Frag3Model = { - Identifier = "A17S6F3", - Parent = Station6Frag23Holder.Identifier, - Transform = { - Scale = { - Type = "StaticScale", - Scale = 0.14 - }, - Translation = { - Type = "GlobeTranslation", - Globe = moon_asset.Moon.Identifier, - Longitude = -360+30.80053, - Latitude = 20.29030, - Altitude = -2563.0, - UseHeightMap = false - } + Identifier = "A17S6F3", + Parent = Station6Frag23Holder.Identifier, + Transform = { + Scale = { + Type = "StaticScale", + Scale = 0.14 }, - Renderable = { - Type = "RenderableModel", - Geometry = {{ - Type = "MultiModelGeometry", - GeometryFile = models .. "/station6_boulder_frag3.obj", - ColorTexture = models .. "/frag3crop_u1_v1.jpeg" - }}, - RotationVector = { 293.181824,255.000000,4.090910 }, - LightSources = LightSources, - PerformShading = false, - DisableFaceCulling = true - }, - GUI = { - Name = "Station 6 Fragment 3 Model", - Path = "/Solar System/Missions/Apollo/17/Station 6" + Translation = { + Type = "GlobeTranslation", + Globe = moon_asset.Moon.Identifier, + Longitude = -360+30.80053, + Latitude = 20.29030, + Altitude = -2563.0, + UseHeightMap = false } + }, + Renderable = { + Type = "RenderableModel", + Geometry = {{ + Type = "MultiModelGeometry", + GeometryFile = models .. "/station6_boulder_frag3.obj", + ColorTexture = models .. "/frag3crop_u1_v1.jpeg" + }}, + RotationVector = { 293.181824,255.000000,4.090910 }, + LightSources = LightSources, + PerformShading = false, + DisableFaceCulling = true + }, + GUI = { + Name = "Station 6 Fragment 3 Model", + Path = "/Solar System/Missions/Apollo/17/Station 6" + } } asset_helper.registerSceneGraphNodesAndExport(asset, { - Station6Frag1Holder, Station6Frag1Model, Station6Frag23Holder, Station6Frag2Model, Station6Frag3Model, + Station6Frag1Holder, Station6Frag1Model, Station6Frag23Holder, Station6Frag2Model, Station6Frag3Model, }) diff --git a/data/assets/scene/solarsystem/missions/apollo/17/bouldersstation7.asset b/data/assets/scene/solarsystem/missions/apollo/17/bouldersstation7.asset index f15fc34f93..26605a4a2a 100644 --- a/data/assets/scene/solarsystem/missions/apollo/17/bouldersstation7.asset +++ b/data/assets/scene/solarsystem/missions/apollo/17/bouldersstation7.asset @@ -4,65 +4,65 @@ local moon_asset = asset.require('scene/solarsystem/planets/earth/moon/moon') local models = asset.require('./boulder_models').models local LightSources = { - { - Type = "SceneGraphLightSource", - Identifier = "Sun", - Node = sun_transforms.SolarSystemBarycenter.Identifier, - Intensity = 1.0 - }, - { - Identifier = "Camera", - Type = "CameraLightSource", - Intensity = 0.5 - } + { + Type = "SceneGraphLightSource", + Identifier = "Sun", + Node = sun_transforms.SolarSystemBarycenter.Identifier, + Intensity = 1.0 + }, + { + Identifier = "Camera", + Type = "CameraLightSource", + Intensity = 0.5 + } } local Station7BoulderHolder = { - Identifier = "Station_7_Boulder", - Parent = moon_asset.Moon.Identifier, - Transform = { - Translation = { - Type = "GlobeTranslation", - Globe = moon_asset.Moon.Identifier, - Longitude = -360+30.8165882, - Latitude = 20.2908556, - Altitude = -2593.5, - UseHeightMap = true - } - }, - GUI = { - Name = "Station 7 Boulder", - Path = "/Solar System/Missions/Apollo/17/Station 7" + Identifier = "Station_7_Boulder", + Parent = moon_asset.Moon.Identifier, + Transform = { + Translation = { + Type = "GlobeTranslation", + Globe = moon_asset.Moon.Identifier, + Longitude = -360+30.8165882, + Latitude = 20.2908556, + Altitude = -2593.5, + UseHeightMap = true } + }, + GUI = { + Name = "Station 7 Boulder", + Path = "/Solar System/Missions/Apollo/17/Station 7" + } } local Station7BoulderModel = { - Identifier = "Station7BoulderModel", - Parent = Station7BoulderHolder.Identifier, - Transform = { - Scale = { - Type = "StaticScale", - Scale = 0.1 - }, + Identifier = "Station7BoulderModel", + Parent = Station7BoulderHolder.Identifier, + Transform = { + Scale = { + Type = "StaticScale", + Scale = 0.1 }, - Renderable = { - Type = "RenderableModel", - Geometry = {{ - Type = "MultiModelGeometry", - GeometryFile = models .. "/b7model.obj", - ColorTexture = models .. "/b7model_u1_v1.jpeg" - }}, - RotationVector = { 1.945950,274.378387,212.903214 }, - LightSources = LightSources, - PerformShading = false, - DisableFaceCulling = true - }, - GUI = { - Name = "Station 7 Boulder Model", - Path = "/Solar System/Missions/Apollo/17/Station 7" - } + }, + Renderable = { + Type = "RenderableModel", + Geometry = {{ + Type = "MultiModelGeometry", + GeometryFile = models .. "/b7model.obj", + ColorTexture = models .. "/b7model_u1_v1.jpeg" + }}, + RotationVector = { 1.945950,274.378387,212.903214 }, + LightSources = LightSources, + PerformShading = false, + DisableFaceCulling = true + }, + GUI = { + Name = "Station 7 Boulder Model", + Path = "/Solar System/Missions/Apollo/17/Station 7" + } } asset_helper.registerSceneGraphNodesAndExport(asset, { - Station7BoulderHolder, Station7BoulderModel + Station7BoulderHolder, Station7BoulderModel }) diff --git a/data/assets/scene/solarsystem/missions/apollo/17/lem.asset b/data/assets/scene/solarsystem/missions/apollo/17/lem.asset index 4811c90b77..74dc722275 100644 --- a/data/assets/scene/solarsystem/missions/apollo/17/lem.asset +++ b/data/assets/scene/solarsystem/missions/apollo/17/lem.asset @@ -5,44 +5,44 @@ local moon_asset = asset.require('scene/solarsystem/planets/earth/moon/moon') local model = asset.require('scene/solarsystem/missions/apollo/lem_model') local Apollo17Lem = { - Identifier = "Apollo17Lem", - Parent = moon_asset.Moon.Identifier, - Transform = { - Translation = { - Type = "GlobeTranslation", - Globe = moon_asset.Moon.Identifier, - Longitude = -329.22833, - Latitude = 20.19092, - UseHeightmap = true - }, - }, - GUI = { - Hidden = true, - Name = "Apollo 17 Lem Position", - Path = "/Solar System/Missions/Apollo/17" + Identifier = "Apollo17Lem", + Parent = moon_asset.Moon.Identifier, + Transform = { + Translation = { + Type = "GlobeTranslation", + Globe = moon_asset.Moon.Identifier, + Longitude = -329.22833, + Latitude = 20.19092, + UseHeightmap = true } + }, + GUI = { + Hidden = true, + Name = "Apollo 17 Lem Position", + Path = "/Solar System/Missions/Apollo/17" + } } local Apollo17LemModel = { - Identifier = "Apollo17LemModel", - Parent = Apollo17Lem.Identifier, - Transform = { - Scale = { - Type = "StaticScale", - Scale = 0.24 - } - }, - Renderable = { - Type = "RenderableModel", - GeometryFile = model.modelFolder .. "/LM-2_ver2clean.obj", - SpecularIntensity = 0.0, - RotationVector = { 110.255219,171.229706,126.666664 }, - LightSources = asset_helper.getDefaultLightSources(sun_transforms.SolarSystemBarycenter.Identifier) - }, - GUI = { - Name = "Apollo 17 Lem", - Path = "/Solar System/Missions/Apollo/17" + Identifier = "Apollo17LemModel", + Parent = Apollo17Lem.Identifier, + Transform = { + Scale = { + Type = "StaticScale", + Scale = 0.24 } + }, + Renderable = { + Type = "RenderableModel", + GeometryFile = model.modelFolder .. "/LM-2_ver2clean.obj", + SpecularIntensity = 0.0, + RotationVector = { 110.255219,171.229706,126.666664 }, + LightSources = asset_helper.getDefaultLightSources(sun_transforms.SolarSystemBarycenter.Identifier) + }, + GUI = { + Name = "Apollo 17 Lem", + Path = "/Solar System/Missions/Apollo/17" + } } asset_helper.registerSceneGraphNodesAndExport(asset, { Apollo17Lem, Apollo17LemModel }) diff --git a/data/assets/scene/solarsystem/missions/apollo/8/kernels.asset b/data/assets/scene/solarsystem/missions/apollo/8/kernels.asset index 5baf800205..7b2e464bf7 100644 --- a/data/assets/scene/solarsystem/missions/apollo/8/kernels.asset +++ b/data/assets/scene/solarsystem/missions/apollo/8/kernels.asset @@ -1,17 +1,17 @@ local kernelsFolder = asset.syncedResource({ - Name = "Apollo Kernels", - Type = "HttpSynchronization", - Identifier = "apollo_spice", - Version = 1 + Name = "Apollo Kernels", + Type = "HttpSynchronization", + Identifier = "apollo_spice", + Version = 1 }) local kernels = { - kernelsFolder .. "/moon_080317.tf", - kernelsFolder .. "/apollo8.tf", - kernelsFolder .. "/moon_pa_de421_1900-2050.bpc", - kernelsFolder .. '/apollo8.tsc', - kernelsFolder .. '/apollo8.bsp', - kernelsFolder .. '/apollo8_earthrise.bc', + kernelsFolder .. "/moon_080317.tf", + kernelsFolder .. "/apollo8.tf", + kernelsFolder .. "/moon_pa_de421_1900-2050.bpc", + kernelsFolder .. '/apollo8.tsc', + kernelsFolder .. '/apollo8.bsp', + kernelsFolder .. '/apollo8_earthrise.bc', } asset.export('kernels', kernels) diff --git a/data/assets/scene/solarsystem/missions/apollo/8/launch_model.asset b/data/assets/scene/solarsystem/missions/apollo/8/launch_model.asset index 9e5b749c17..f1f8660e8e 100644 --- a/data/assets/scene/solarsystem/missions/apollo/8/launch_model.asset +++ b/data/assets/scene/solarsystem/missions/apollo/8/launch_model.asset @@ -7,66 +7,66 @@ local models = asset.require('scene/solarsystem/missions/apollo/csm_model').mode local apolloSpiceId = "-908" local Apollo8Launch = { - Identifier = "Apollo8Launch", - Parent = earth_transforms.EarthIAU.Identifier, - TimeFrame = { - Type = "TimeFrameInterval", - Start = "1968 DEC 21", - End = "1968 DEC 28" - }, - Transform = { - Translation = { - Type = "SpiceTranslation", - Target = apolloSpiceId, - Observer = "EARTH", - Frame = "IAU_EARTH", - Kernels = kernels - }, - }, - GUI = { - Name = "Apollo 8 Launch Capsule", - Path = "/Solar System/Missions/Apollo" + Identifier = "Apollo8Launch", + Parent = earth_transforms.EarthIAU.Identifier, + TimeFrame = { + Type = "TimeFrameInterval", + Start = "1968 DEC 21", + End = "1968 DEC 28" + }, + Transform = { + Translation = { + Type = "SpiceTranslation", + Target = apolloSpiceId, + Observer = "EARTH", + Frame = "IAU_EARTH", + Kernels = kernels } + }, + GUI = { + Name = "Apollo 8 Launch Capsule", + Path = "/Solar System/Missions/Apollo" + } } local Apollo8LaunchModel = { - Identifier = "Apollo8LaunchModel", - Parent = Apollo8Launch.Identifier, - TimeFrame = { - Type = "TimeFrameInterval", - Start = "1968 DEC 21", - End = "1968 DEC 22" + Identifier = "Apollo8LaunchModel", + Parent = Apollo8Launch.Identifier, + TimeFrame = { + Type = "TimeFrameInterval", + Start = "1968 DEC 21", + End = "1968 DEC 22" + }, + Transform = { + Scale = { + Type = "StaticScale", + -- The scale of the model is in cm; OpenSpace is in m + Scale = 0.01 }, - Transform = { - Scale = { - Type = "StaticScale", - -- The scale of the model is in cm; OpenSpace is in m - Scale = 0.01 - }, - Rotation = { - Type = "StaticRotation", - Rotation = {0.0, 0.0, -3.1415 / 2} - } - }, - Renderable = { - Type = "RenderableModel", - GeometryFile = models .. "/ApolloCSM.fbx", - LightSources = { - { - Type = "SceneGraphLightSource", - Identifier = "Sun", - Node = sun_transforms.SolarSystemBarycenter.Identifier, - Intensity = 1.0 - } - }, - PerformShading = true, - DisableFaceCulling = true - }, - GUI = { - Hidden = true, - Name = "Apollo 8 Launch Model", - Path = "/Solar System/Missions/Apollo/8" + Rotation = { + Type = "StaticRotation", + Rotation = {0.0, 0.0, -3.1415 / 2} } + }, + Renderable = { + Type = "RenderableModel", + GeometryFile = models .. "/ApolloCSM.fbx", + LightSources = { + { + Type = "SceneGraphLightSource", + Identifier = "Sun", + Node = sun_transforms.SolarSystemBarycenter.Identifier, + Intensity = 1.0 + } + }, + PerformShading = true, + DisableFaceCulling = true + }, + GUI = { + Hidden = true, + Name = "Apollo 8 Launch Model", + Path = "/Solar System/Missions/Apollo/8" + } } local list = { Apollo8Launch, Apollo8LaunchModel } diff --git a/data/assets/scene/solarsystem/missions/apollo/8/model.asset b/data/assets/scene/solarsystem/missions/apollo/8/model.asset index 00036a697a..ee208139d8 100644 --- a/data/assets/scene/solarsystem/missions/apollo/8/model.asset +++ b/data/assets/scene/solarsystem/missions/apollo/8/model.asset @@ -7,94 +7,94 @@ local models = asset.require('scene/solarsystem/missions/apollo/csm_model').mode local apolloSpiceId = "-908" local Apollo8 = { - Identifier = "Apollo8", - Parent = earth_transforms.EarthBarycenter.Identifier, - TimeFrame = { + Identifier = "Apollo8", + Parent = earth_transforms.EarthBarycenter.Identifier, + TimeFrame = { + Type = "TimeFrameInterval", + Start = "1968 DEC 21", + End = "1968 DEC 28" + }, + Transform = { + Translation = { + Type = "SpiceTranslation", + Target = apolloSpiceId, + Observer = "EARTH BARYCENTER", + Frame = "GALACTIC", + Kernels = kernels + }, + Rotation = { + Type = "SpiceRotation", + SourceFrame = "A8_EARTHRISE", + DestinationFrame = "GALACTIC", + TimeFrame = { + -- The orientation of Apollo 8 is only available during the few minutes + -- when the Earthrise picture was taken. Type = "TimeFrameInterval", - Start = "1968 DEC 21", - End = "1968 DEC 28" - }, - Transform = { - Translation = { - Type = "SpiceTranslation", - Target = apolloSpiceId, - Observer = "EARTH BARYCENTER", - Frame = "GALACTIC", - Kernels = kernels - }, - Rotation = { - Type = "SpiceRotation", - SourceFrame = "A8_EARTHRISE", - DestinationFrame = "GALACTIC", - TimeFrame = { - -- The orientation of Apollo 8 is only available during the few minutes - -- when the Earthrise picture was taken. - Type = "TimeFrameInterval", - Start = "1968 DEC 24 16:37:19", - End = "1968 DEC 24 16:40:15" - } - } - }, - GUI = { - Name = "Apollo 8", - Path = "/Solar System/Missions/Apollo" + Start = "1968 DEC 24 16:37:19", + End = "1968 DEC 24 16:40:15" + } } + }, + GUI = { + Name = "Apollo 8", + Path = "/Solar System/Missions/Apollo" + } } local Apollo8Model = { - Identifier = "Apollo8Model", - Parent = Apollo8.Identifier, - TimeFrame = { - Type = "TimeFrameInterval", - Start = "1968 DEC 22", - End = "1968 DEC 28" + Identifier = "Apollo8Model", + Parent = Apollo8.Identifier, + TimeFrame = { + Type = "TimeFrameInterval", + Start = "1968 DEC 22", + End = "1968 DEC 28" + }, + Transform = { + Scale = { + Type = "StaticScale", + -- The scale of the model is in cm; OpenSpace is in m + Scale = 0.01 }, - Transform = { - Scale = { - Type = "StaticScale", - -- The scale of the model is in cm; OpenSpace is in m - Scale = 0.01 - }, - Rotation = { - Type = "StaticRotation", - Rotation = {0.0, 0.0, -3.1415 / 2} - } - }, - Renderable = { - Type = "RenderableModel", - GeometryFile = models .. "/ApolloCSM.fbx", - LightSources = { - { - Type = "SceneGraphLightSource", - Identifier = "Sun", - Node = sun_transforms.SolarSystemBarycenter.Identifier, - Intensity = 1.0 - } - }, - PerformShading = true, - DisableFaceCulling = true - }, - GUI = { - Hidden = true, - Name = "Apollo 8 Model", - Path = "/Solar System/Missions/Apollo" + Rotation = { + Type = "StaticRotation", + Rotation = {0.0, 0.0, -3.1415 / 2} } + }, + Renderable = { + Type = "RenderableModel", + GeometryFile = models .. "/ApolloCSM.fbx", + LightSources = { + { + Type = "SceneGraphLightSource", + Identifier = "Sun", + Node = sun_transforms.SolarSystemBarycenter.Identifier, + Intensity = 1.0 + } + }, + PerformShading = true, + DisableFaceCulling = true + }, + GUI = { + Hidden = true, + Name = "Apollo 8 Model", + Path = "/Solar System/Missions/Apollo" + } } -- The pivot node is used for navigation inside the spacecraft local Apollo8Pivot = { - Identifier = "Apollo8Pivot", - Parent = Apollo8.Identifier, - Transform = { - Translation = { - Type = "StaticTranslation", - Position = { 0, 2.5, 0 } - }, - }, - GUI = { - Name = "Apollo 8 Pivot", - Path = "/Solar System/Missions/Apollo" + Identifier = "Apollo8Pivot", + Parent = Apollo8.Identifier, + Transform = { + Translation = { + Type = "StaticTranslation", + Position = { 0, 2.5, 0 } } + }, + GUI = { + Name = "Apollo 8 Pivot", + Path = "/Solar System/Missions/Apollo" + } } local list = { Apollo8, Apollo8Model, Apollo8Pivot } diff --git a/data/assets/scene/solarsystem/missions/apollo/8/trails.asset b/data/assets/scene/solarsystem/missions/apollo/8/trails.asset index fa04cd7f83..dfe3d02b88 100644 --- a/data/assets/scene/solarsystem/missions/apollo/8/trails.asset +++ b/data/assets/scene/solarsystem/missions/apollo/8/trails.asset @@ -8,75 +8,75 @@ local apolloSpiceId = "-908" local LaunchTrail = { - Identifier = "Apollo8LaunchTrail", - Parent = earth_transforms.EarthIAU.Identifier, - Renderable = { - Type = "RenderableTrailTrajectory", - Translation = { - Type = "SpiceTranslation", - Target = apolloSpiceId, - Observer = "EARTH", - Frame = "IAU_EARTH", - Kernels = kernels - }, - Color = { 0.70, 0.50, 0.20 }, - StartTime = "1968 DEC 21 12:51:00", - EndTime = "1968 DEC 21 23:23:22", - SampleInterval = 30, - RenderBinMode = "PostDeferredTransparent" + Identifier = "Apollo8LaunchTrail", + Parent = earth_transforms.EarthIAU.Identifier, + Renderable = { + Type = "RenderableTrailTrajectory", + Translation = { + Type = "SpiceTranslation", + Target = apolloSpiceId, + Observer = "EARTH", + Frame = "IAU_EARTH", + Kernels = kernels }, - GUI = { - Name = "Apollo 8 Launch Trail", - Path = "/Solar System/Missions/Apollo" - } + Color = { 0.70, 0.50, 0.20 }, + StartTime = "1968 DEC 21 12:51:00", + EndTime = "1968 DEC 21 23:23:22", + SampleInterval = 30, + RenderBinMode = "PostDeferredTransparent" + }, + GUI = { + Name = "Apollo 8 Launch Trail", + Path = "/Solar System/Missions/Apollo" + } } local MoonTrail = { - Identifier = "Apollo8MoonTrail", - Parent = moon_transforms.Moon.Identifier, - Renderable = { - Type = "RenderableTrailTrajectory", - Translation = { - Type = "SpiceTranslation", - Target = apolloSpiceId, - Observer = "MOON", - Frame = "IAU_MOON", - Kernels = kernels - }, - Color = { 0.70, 0.50, 0.20 }, - StartTime = "1968 DEC 23", - EndTime = "1968 DEC 26", - SampleInterval = 30, - Enabled = false, + Identifier = "Apollo8MoonTrail", + Parent = moon_transforms.Moon.Identifier, + Renderable = { + Type = "RenderableTrailTrajectory", + Translation = { + Type = "SpiceTranslation", + Target = apolloSpiceId, + Observer = "MOON", + Frame = "IAU_MOON", + Kernels = kernels }, - GUI = { - Name = "Apollo 8 Moon Trail", - Path = "/Solar System/Missions/Apollo" - } + Color = { 0.70, 0.50, 0.20 }, + StartTime = "1968 DEC 23", + EndTime = "1968 DEC 26", + SampleInterval = 30, + Enabled = false, + }, + GUI = { + Name = "Apollo 8 Moon Trail", + Path = "/Solar System/Missions/Apollo" + } } local EarthBarycenterTrail = { - Identifier = "Apollo8EarthBarycenterTrail", - Parent = earth_transforms.EarthCenter.Identifier, - Renderable = { - Type = "RenderableTrailTrajectory", - Translation = { - Type = "SpiceTranslation", - Target = apolloSpiceId, - Observer = "EARTH", - Frame = "GALACTIC", - Kernels = kernels - }, - Color = { 0.8, 0.2, 0.2 }, - StartTime = "1968 DEC 21", - EndTime = "1968 DEC 28", - SampleInterval = 30, - Enabled = false, + Identifier = "Apollo8EarthBarycenterTrail", + Parent = earth_transforms.EarthCenter.Identifier, + Renderable = { + Type = "RenderableTrailTrajectory", + Translation = { + Type = "SpiceTranslation", + Target = apolloSpiceId, + Observer = "EARTH", + Frame = "GALACTIC", + Kernels = kernels }, - GUI = { - Name = "Apollo 8 Earth Barycenter Trail", - Path = "/Solar System/Missions/Apollo" - } + Color = { 0.8, 0.2, 0.2 }, + StartTime = "1968 DEC 21", + EndTime = "1968 DEC 28", + SampleInterval = 30, + Enabled = false, + }, + GUI = { + Name = "Apollo 8 Earth Barycenter Trail", + Path = "/Solar System/Missions/Apollo" + } } assetHelper.registerSceneGraphNodesAndExport(asset, { LaunchTrail, MoonTrail, EarthBarycenterTrail }) diff --git a/data/assets/scene/solarsystem/missions/apollo/apollo_globebrowsing.asset b/data/assets/scene/solarsystem/missions/apollo/apollo_globebrowsing.asset index c9664a8eeb..d32a695d9f 100644 --- a/data/assets/scene/solarsystem/missions/apollo/apollo_globebrowsing.asset +++ b/data/assets/scene/solarsystem/missions/apollo/apollo_globebrowsing.asset @@ -2,36 +2,36 @@ local moon_transforms = asset.require('scene/solarsystem/planets/earth/moon/moon') local heightmaps = asset.syncedResource({ - Name = "Apollo Globebrowsing Heightmaps", - Type = "HttpSynchronization", - Identifier = "apollo_globebrowsing_heightmaps", - Version = 1 + Name = "Apollo Globebrowsing Heightmaps", + Type = "HttpSynchronization", + Identifier = "apollo_globebrowsing_heightmaps", + Version = 1 }) local basemaps = asset.syncedResource({ - Name = "Apollo Globebrowsing Basemaps", - Type = "HttpSynchronization", - Identifier = "apollo_globebrowsing_basemaps", - Version = 1 + Name = "Apollo Globebrowsing Basemaps", + Type = "HttpSynchronization", + Identifier = "apollo_globebrowsing_basemaps", + Version = 1 }) local naclighting = asset.syncedResource({ - Name = "Apollo Globebrowsing NAC Lighting", - Type = "HttpSynchronization", - Identifier = "apollo_globebrowsing_naclighting", - Version = 1 + Name = "Apollo Globebrowsing NAC Lighting", + Type = "HttpSynchronization", + Identifier = "apollo_globebrowsing_naclighting", + Version = 1 }) local stations = asset.syncedResource({ - Name = "Apollo 17 Globebrowsing Stations", - Type = "HttpSynchronization", - Identifier = "apollo_17_stations", - Version = 1 + Name = "Apollo 17 Globebrowsing Stations", + Type = "HttpSynchronization", + Identifier = "apollo_17_stations", + Version = 1 }) asset.onInitialize(function () - openspace.globebrowsing.addBlendingLayersFromDirectory(heightmaps, moon_transforms.Moon.Identifier) - openspace.globebrowsing.addBlendingLayersFromDirectory(basemaps, moon_transforms.Moon.Identifier) - openspace.globebrowsing.addBlendingLayersFromDirectory(naclighting, moon_transforms.Moon.Identifier) - openspace.globebrowsing.addBlendingLayersFromDirectory(stations, moon_transforms.Moon.Identifier) + openspace.globebrowsing.addBlendingLayersFromDirectory(heightmaps, moon_transforms.Moon.Identifier) + openspace.globebrowsing.addBlendingLayersFromDirectory(basemaps, moon_transforms.Moon.Identifier) + openspace.globebrowsing.addBlendingLayersFromDirectory(naclighting, moon_transforms.Moon.Identifier) + openspace.globebrowsing.addBlendingLayersFromDirectory(stations, moon_transforms.Moon.Identifier) end) diff --git a/data/assets/scene/solarsystem/missions/apollo/csm_model.asset b/data/assets/scene/solarsystem/missions/apollo/csm_model.asset index 298640354c..048332b7d7 100644 --- a/data/assets/scene/solarsystem/missions/apollo/csm_model.asset +++ b/data/assets/scene/solarsystem/missions/apollo/csm_model.asset @@ -1,8 +1,8 @@ local models = asset.syncedResource({ - Name = "Apollo Models", - Type = "HttpSynchronization", - Identifier = "apollo_models", - Version = 2 + Name = "Apollo Models", + Type = "HttpSynchronization", + Identifier = "apollo_models", + Version = 2 }) asset.export('models', models) diff --git a/data/assets/scene/solarsystem/missions/apollo/insignias_map.asset b/data/assets/scene/solarsystem/missions/apollo/insignias_map.asset index 6df2f26d4b..acd33f0daa 100644 --- a/data/assets/scene/solarsystem/missions/apollo/insignias_map.asset +++ b/data/assets/scene/solarsystem/missions/apollo/insignias_map.asset @@ -5,116 +5,116 @@ local asset_helper = asset.require('util/asset_helper') local insigniasPath = asset.syncedResource({ - Name = "Apollo Insignias", - Type = "HttpSynchronization", - Identifier = "apollo_insignias", - Version = 1 + Name = "Apollo Insignias", + Type = "HttpSynchronization", + Identifier = "apollo_insignias", + Version = 1 }) local moon = asset.require('scene/solarsystem/planets/earth/moon/moon') local landingData = { - { - Identifier = "Apollo11", - Name = "Apollo 11", - Name = "Apollo 11", - Texture = "apollo11.png", - LunarModule = { 0.67409, 23.47298, 0.0 } - }, - { - Identifier = "Apollo12", - Name = "Apollo 12", - Texture = "apollo12.png", - LunarModule = { -3.01381, -23.41930, 0.0 } - }, - { - Identifier = "Apollo14", - Name = "Apollo 14", - Texture = "apollo14.png", - LunarModule = { -3.64544, -17.47139, 0.0 } - }, - { - Identifier = "Apollo15", - Name = "Apollo 15", - Texture = "apollo15.png", - LunarModule = { 26.13224, 3.63400, 0.0 } - }, - { - Identifier = "Apollo16", - Name = "Apollo 16", - Texture = "apollo16.png", - LunarModule = { -8.97341, 15.49859, 0.0 } - }, - { - Identifier = "Apollo17", - Name = "Apollo 17", - Texture = "apollo17.png", - LunarModule = { 20.18809, 30.77475, 0.0 } - } + { + Identifier = "Apollo11", + Name = "Apollo 11", + Name = "Apollo 11", + Texture = "apollo11.png", + LunarModule = { 0.67409, 23.47298, 0.0 } + }, + { + Identifier = "Apollo12", + Name = "Apollo 12", + Texture = "apollo12.png", + LunarModule = { -3.01381, -23.41930, 0.0 } + }, + { + Identifier = "Apollo14", + Name = "Apollo 14", + Texture = "apollo14.png", + LunarModule = { -3.64544, -17.47139, 0.0 } + }, + { + Identifier = "Apollo15", + Name = "Apollo 15", + Texture = "apollo15.png", + LunarModule = { 26.13224, 3.63400, 0.0 } + }, + { + Identifier = "Apollo16", + Name = "Apollo 16", + Texture = "apollo16.png", + LunarModule = { -8.97341, 15.49859, 0.0 } + }, + { + Identifier = "Apollo17", + Name = "Apollo 17", + Texture = "apollo17.png", + LunarModule = { 20.18809, 30.77475, 0.0 } + } } local nodes = {} local size = 100000; for i = 1, #landingData do - local entry = landingData[i] - nodes[i] = { - Identifier = entry.Identifier .. "Insignia", - Parent = moon.Moon.Identifier, - Transform = { - Translation = { - Type = "GlobeTranslation", - Globe = moon.Moon.Identifier, - Latitude = entry.LunarModule[1], - Longitude = entry.LunarModule[2], - Altitude = entry.LunarModule[3] + size * 1.1, - UseHeightmap = false - }, - }, - Renderable = { - Type = "RenderablePlaneImageLocal", - Size = size, - Origin = "Center", - Billboard = true, - Texture = insigniasPath .. "/" .. entry.Texture, - Opacity = 0.0 - }, - GUI = { - Path = "/Other/Labels", - Name = entry.Name .. " Insignia" - } + local entry = landingData[i] + nodes[i] = { + Identifier = entry.Identifier .. "Insignia", + Parent = moon.Moon.Identifier, + Transform = { + Translation = { + Type = "GlobeTranslation", + Globe = moon.Moon.Identifier, + Latitude = entry.LunarModule[1], + Longitude = entry.LunarModule[2], + Altitude = entry.LunarModule[3] + size * 1.1, + UseHeightmap = false + } + }, + Renderable = { + Type = "RenderablePlaneImageLocal", + Size = size, + Origin = "Center", + Billboard = true, + Texture = insigniasPath .. "/" .. entry.Texture, + Opacity = 0.0 + }, + GUI = { + Path = "/Other/Labels", + Name = entry.Name .. " Insignia" } + } end asset.onInitialize(function () - openspace.bindShortcut( - 'Show Apollo Landing Labels', - 'openspace.setPropertyValue("Scene.Apollo*Insignia.Renderable.Opacity", 1, 0.5)', - 'Show patches of the Apollo missions on their respective landing sites', - '/Missions/Apollo' - ) + openspace.bindShortcut( + 'Show Apollo Landing Labels', + 'openspace.setPropertyValue("Scene.Apollo*Insignia.Renderable.Opacity", 1, 0.5)', + 'Show patches of the Apollo missions on their respective landing sites', + '/Missions/Apollo' + ) - openspace.bindShortcut( - 'Hide Apollo Landing Labels', - 'openspace.setPropertyValue("Scene.Apollo*Insignia.Renderable.Opacity", 0, 0.5)', - 'Hide patches of the Apollo missions on their respective landing sites', - '/Missions/Apollo' - ) + openspace.bindShortcut( + 'Hide Apollo Landing Labels', + 'openspace.setPropertyValue("Scene.Apollo*Insignia.Renderable.Opacity", 0, 0.5)', + 'Hide patches of the Apollo missions on their respective landing sites', + '/Missions/Apollo' + ) end) asset.export('showInsignia', function (missinNumber, interpolationDuration) - openspace.setPropertyValue("Scene.Apollo" .. missionNumber .. "Insignia.Renderable.Opacity", 1, interpolationDuration) + openspace.setPropertyValue("Scene.Apollo" .. missionNumber .. "Insignia.Renderable.Opacity", 1, interpolationDuration) end) asset.export('hideInsignia', function (missinNumber, interpolationDuration) - openspace.setPropertyValue("Scene.Apollo" .. missionNumber .. "Insignia.Renderable.Opacity", 0, interpolationDuration) + openspace.setPropertyValue("Scene.Apollo" .. missionNumber .. "Insignia.Renderable.Opacity", 0, interpolationDuration) end) asset.export('showInsignias', function (interpolationDuration) - openspace.setPropertyValue("Scene.Apollo*Insignia.Renderable.Opacity", 1, interpolationDuration) + openspace.setPropertyValue("Scene.Apollo*Insignia.Renderable.Opacity", 1, interpolationDuration) end) asset.export('hideInsignias', function (interpolationDuration) - openspace.setPropertyValue("Scene.Apollo*Insignia.Renderable.Opacity", 0, interpolationDuration) + openspace.setPropertyValue("Scene.Apollo*Insignia.Renderable.Opacity", 0, interpolationDuration) end) asset_helper.registerSceneGraphNodesAndExport(asset, nodes) diff --git a/data/assets/scene/solarsystem/missions/apollo/lem_model.asset b/data/assets/scene/solarsystem/missions/apollo/lem_model.asset index 4bd5506e7c..5490471d7e 100644 --- a/data/assets/scene/solarsystem/missions/apollo/lem_model.asset +++ b/data/assets/scene/solarsystem/missions/apollo/lem_model.asset @@ -1,8 +1,8 @@ local modelFolder = asset.syncedResource({ - Name = "Apollo Lem Models", - Type = "HttpSynchronization", - Identifier = "apollo_lem_model", - Version = 4 + Name = "Apollo Lem Models", + Type = "HttpSynchronization", + Identifier = "apollo_lem_model", + Version = 4 }) asset.export('modelFolder', modelFolder) diff --git a/data/assets/scene/solarsystem/missions/dawn/ceres.asset b/data/assets/scene/solarsystem/missions/dawn/ceres.asset index 7e3d54f8d8..900df2e071 100644 --- a/data/assets/scene/solarsystem/missions/dawn/ceres.asset +++ b/data/assets/scene/solarsystem/missions/dawn/ceres.asset @@ -5,78 +5,78 @@ local kernels = asset.require('./dawn_kernels').Kernels local textures = asset.syncedResource({ - Name = "Ceres Textures", - Type = "HttpSynchronization", - Identifier = "ceres_textures", - Version = 1 + Name = "Ceres Textures", + Type = "HttpSynchronization", + Identifier = "ceres_textures", + Version = 1 }) local Ceres = { - Identifier = "Ceres", - Parent = transforms.SolarSystemBarycenter.Identifier, - Transform = { - Rotation = { - Type = "SpiceRotation", - SourceFrame = "IAU_CERES", - DestinationFrame = "GALACTIC", - Kernels = { - kernels .. "/dawn_ceres_v01.tpc", - kernels .. "/sb_ceres_140724.bsp", - kernels .. "/sb_ceres_110211.bsp" - } - }, - Translation = { - Type = "SpiceTranslation", - Target = "CERES", - Observer = "SUN", - Kernels = { - kernels .. "/dawn_ceres_v01.tpc", - kernels .. "/sb_ceres_140724.bsp", - kernels .. "/sb_ceres_110211.bsp" - } - } + Identifier = "Ceres", + Parent = transforms.SolarSystemBarycenter.Identifier, + Transform = { + Rotation = { + Type = "SpiceRotation", + SourceFrame = "IAU_CERES", + DestinationFrame = "GALACTIC", + Kernels = { + kernels .. "/dawn_ceres_v01.tpc", + kernels .. "/sb_ceres_140724.bsp", + kernels .. "/sb_ceres_110211.bsp" + } }, - Renderable = { - Type = "RenderableGlobe", - Radii = { 6.390E5, 6.390E5, 6.390E5 }, - SegmentsPerPatch = 64, - Layers = { - ColorLayers = { - { - Name = "Texture", - Identifier = "CeresTexture", - FilePath = textures .. "/gray.png", - Enabled = true, - } - } - } - }, - GUI = { - Path = "/Solar System/Dwarf Planets/Ceres" + Translation = { + Type = "SpiceTranslation", + Target = "CERES", + Observer = "SUN", + Kernels = { + kernels .. "/dawn_ceres_v01.tpc", + kernels .. "/sb_ceres_140724.bsp", + kernels .. "/sb_ceres_110211.bsp" + } } + }, + Renderable = { + Type = "RenderableGlobe", + Radii = { 6.390E5, 6.390E5, 6.390E5 }, + SegmentsPerPatch = 64, + Layers = { + ColorLayers = { + { + Name = "Texture", + Identifier = "CeresTexture", + FilePath = textures .. "/gray.png", + Enabled = true + } + } + } + }, + GUI = { + Path = "/Solar System/Dwarf Planets/Ceres" + } } local CeresTrail = { - Identifier = "CeresTrail", - Parent = transforms.SolarSystemBarycenter.Identifier, - Renderable = { - Type = "RenderableTrailOrbit", - Translation = { - Type = "SpiceTranslation", - Target = "CERES", - Observer = "SUN" - }, - Color = { 0.7, 0.8, 0.7 }, - StartTime = "2010 JAN 01 00:00:00.000", - EndTime = "2100 JAN 01 00:00:00.000", - Period = 1325.0, - Resolution = 3600 * 24 + Identifier = "CeresTrail", + Parent = transforms.SolarSystemBarycenter.Identifier, + Renderable = { + Type = "RenderableTrailOrbit", + Translation = { + Type = "SpiceTranslation", + Target = "CERES", + Observer = "SUN" }, - GUI = { - Name = "Ceres Trail", - Path = "/Solar System/Asteroid Belt/Vesta" - } + Color = { 0.7, 0.8, 0.7 }, + StartTime = "2010 JAN 01 00:00:00.000", + EndTime = "2100 JAN 01 00:00:00.000", + Period = 1325.0, + Resolution = 3600 * 24 + }, + GUI = { + Name = "Ceres Trail", + Path = "/Solar System/Asteroid Belt/Vesta" + } } diff --git a/data/assets/scene/solarsystem/missions/dawn/dawn.asset b/data/assets/scene/solarsystem/missions/dawn/dawn.asset index c296c68afe..96d8464328 100644 --- a/data/assets/scene/solarsystem/missions/dawn/dawn.asset +++ b/data/assets/scene/solarsystem/missions/dawn/dawn.asset @@ -5,789 +5,789 @@ local sunTransforms = asset.require('scene/solarsystem/sun/transforms') local textures = asset.syncedResource({ - Name = "Dawn Textures", - Type = "HttpSynchronization", - Identifier = "dawn_textures", - Version = 1 + Name = "Dawn Textures", + Type = "HttpSynchronization", + Identifier = "dawn_textures", + Version = 1 }) local models = asset.syncedResource({ - Name = "Dawn Models", - Type = "HttpSynchronization", - Identifier = "dawn_model", - Version = 1 + Name = "Dawn Models", + Type = "HttpSynchronization", + Identifier = "dawn_model", + Version = 1 }) local KernelFiles = { - kernels .. "/dawn_ref_070926-150201_070829.bsp", + kernels .. "/dawn_ref_070926-150201_070829.bsp", - --ik - kernels .. "/dawn_fc_v10.ti", + --ik + kernels .. "/dawn_fc_v10.ti", - -- SPK - kernels .. "/sb_ceres_110211.bsp", - kernels .. "/sb_ceres_140724.bsp", - kernels .. "/sb_vesta_071107.bsp", + -- SPK + kernels .. "/sb_ceres_110211.bsp", + kernels .. "/sb_ceres_140724.bsp", + kernels .. "/sb_vesta_071107.bsp", - kernels .. "/dawn_rec_070927_070930_081218_v1.bsp", - --[[kernels .. "/dawn_rec_070930_071201_081218_v1.bsp", - kernels .. "/dawn_rec_071201_080205_081218_v1.bsp", - kernels .. "/dawn_rec_080205_080325_081218_v1.bsp", - kernels .. "/dawn_rec_080325_080503_081218_v1.bsp", - kernels .. "/dawn_rec_080503_080601_081218_v1.bsp", - kernels .. "/dawn_rec_080601_080718_081218_v1.bsp", - kernels .. "/dawn_rec_080718_080910_081218_v1.bsp", - kernels .. "/dawn_rec_080910_081022_090218_v1.bsp", - kernels .. "/dawn_rec_081022_081109_090218_v1.bsp", - kernels .. "/dawn_rec_081109_090228_090306_v1.bsp", - kernels .. "/dawn_rec_090228_090501_090702_v1.bsp", - kernels .. "/dawn_rec_090501_090801_090916_v1.bsp", - kernels .. "/dawn_rec_090801_090915_090923_v1.bsp", - kernels .. "/dawn_rec_090915_091201_091202_v1.bsp", - kernels .. "/dawn_rec_091201_100208_100209_v1.bsp", - kernels .. "/dawn_rec_100208_100316_100323_v1.bsp", - kernels .. "/dawn_rec_100316_100413_100422_v1.bsp", - kernels .. "/dawn_rec_100413_100622_100830_v1.bsp", - kernels .. "/dawn_rec_100622_100824_100830_v1.bsp", - kernels .. "/dawn_rec_100824_101130_101202_v1.bsp", - kernels .. "/dawn_rec_101130_110201_110201_v1.bsp", - kernels .. "/dawn_rec_110201_110328_110328_v1.bsp", - kernels .. "/dawn_rec_110328_110419_110420_v1.bsp",--]] - - kernels .. "/dawn_rec_110416_110802_110913_v1.bsp", - kernels .. "/dawn_rec_110802_110831_110922_v1.bsp", - --[[kernels .. "/spk/dawn_rec_110831_110928_111221_v1.bsp", - kernels .. "/dawn_rec_110928_111102_120615_v1.bsp", - kernels .. "/dawn_rec_111102_111210_120618_v1.bsp", - kernels .. "/dawn_rec_111211_120501_120620_v1.bsp", - kernels .. "/dawn_rec_120501_120611_120625_v1.bsp", - kernels .. "/dawn_rec_120611_120724_121101_v1.bsp",--]] - kernels .. "/dawn_rec_120724_120913_121213_v1.bsp", + kernels .. "/dawn_rec_070927_070930_081218_v1.bsp", + --[[kernels .. "/dawn_rec_070930_071201_081218_v1.bsp", + kernels .. "/dawn_rec_071201_080205_081218_v1.bsp", + kernels .. "/dawn_rec_080205_080325_081218_v1.bsp", + kernels .. "/dawn_rec_080325_080503_081218_v1.bsp", + kernels .. "/dawn_rec_080503_080601_081218_v1.bsp", + kernels .. "/dawn_rec_080601_080718_081218_v1.bsp", + kernels .. "/dawn_rec_080718_080910_081218_v1.bsp", + kernels .. "/dawn_rec_080910_081022_090218_v1.bsp", + kernels .. "/dawn_rec_081022_081109_090218_v1.bsp", + kernels .. "/dawn_rec_081109_090228_090306_v1.bsp", + kernels .. "/dawn_rec_090228_090501_090702_v1.bsp", + kernels .. "/dawn_rec_090501_090801_090916_v1.bsp", + kernels .. "/dawn_rec_090801_090915_090923_v1.bsp", + kernels .. "/dawn_rec_090915_091201_091202_v1.bsp", + kernels .. "/dawn_rec_091201_100208_100209_v1.bsp", + kernels .. "/dawn_rec_100208_100316_100323_v1.bsp", + kernels .. "/dawn_rec_100316_100413_100422_v1.bsp", + kernels .. "/dawn_rec_100413_100622_100830_v1.bsp", + kernels .. "/dawn_rec_100622_100824_100830_v1.bsp", + kernels .. "/dawn_rec_100824_101130_101202_v1.bsp", + kernels .. "/dawn_rec_101130_110201_110201_v1.bsp", + kernels .. "/dawn_rec_110201_110328_110328_v1.bsp", + kernels .. "/dawn_rec_110328_110419_110420_v1.bsp",--]] + + kernels .. "/dawn_rec_110416_110802_110913_v1.bsp", + kernels .. "/dawn_rec_110802_110831_110922_v1.bsp", + --[[kernels .. "/spk/dawn_rec_110831_110928_111221_v1.bsp", + kernels .. "/dawn_rec_110928_111102_120615_v1.bsp", + kernels .. "/dawn_rec_111102_111210_120618_v1.bsp", + kernels .. "/dawn_rec_111211_120501_120620_v1.bsp", + kernels .. "/dawn_rec_120501_120611_120625_v1.bsp", + kernels .. "/dawn_rec_120611_120724_121101_v1.bsp",--]] + kernels .. "/dawn_rec_120724_120913_121213_v1.bsp", - --PCK - --kernels .. "/dawn_vesta_v06.tpc", - --kernels .. "/dawn_ceres_v01.tpc", - --kernels .. "/pck00008.tpc", + --PCK + --kernels .. "/dawn_vesta_v06.tpc", + --kernels .. "/dawn_ceres_v01.tpc", + --kernels .. "/pck00008.tpc", - -- FK - kernels .. "/dawn_vesta_v00.tf", - kernels .. "/dawn_v12.tf", + -- FK + kernels .. "/dawn_vesta_v00.tf", + kernels .. "/dawn_v12.tf", - --SCLK - kernels .. "/dawn_203_sclkscet_00039.tsc", + --SCLK + kernels .. "/dawn_203_sclkscet_00039.tsc", - -- CK - kernels .. "/dawn_sc_070927_070930.bc", - kernels .. "/dawn_sc_110801_110807.bc", - kernels .. "/dawn_sc_110808_110814.bc", - kernels .. "/dawn_sc_120910_120916.bc", - -- kernels .. "/dawn_sc_111226_120101.bc", - -- kernels .. "/dawn_sc_120102_120108.bc", - -- kernels .. "/dawn_sc_120109_120115.bc", - -- kernels .. "/dawn_sc_120116_120122.bc", - -- kernels .. "/dawn_sc_120123_120129.bc", + -- CK + kernels .. "/dawn_sc_070927_070930.bc", + kernels .. "/dawn_sc_110801_110807.bc", + kernels .. "/dawn_sc_110808_110814.bc", + kernels .. "/dawn_sc_120910_120916.bc", + -- kernels .. "/dawn_sc_111226_120101.bc", + -- kernels .. "/dawn_sc_120102_120108.bc", + -- kernels .. "/dawn_sc_120109_120115.bc", + -- kernels .. "/dawn_sc_120116_120122.bc", + -- kernels .. "/dawn_sc_120123_120129.bc", - -- all space craft CK files, ~10 gb - -- kernels .. "/dawn_sc_120123_120129.bc", - -- kernels .. "/dawn_sc_070927_070930.bc", - --[[kernels .. "/ck/dawn_sc_071001_071007.bc", - kernels .. "/dawn_sc_071008_071014_v2.bc", - kernels .. "/dawn_sc_071015_071021.bc", - kernels .. "/dawn_sc_071022_071028_v2.bc", - kernels .. "/dawn_sc_071029_071104.bc", - kernels .. "/dawn_sc_071105_071111.bc", - kernels .. "/dawn_sc_071112_071118.bc", - kernels .. "/dawn_sc_071119_071125.bc", - kernels .. "/dawn_sc_071126_071202.bc", - kernels .. "/dawn_sc_071203_071209.bc", - kernels .. "/dawn_sc_071210_071216.bc", - kernels .. "/dawn_sc_071217_071223.bc", - kernels .. "/dawn_sc_071224_071230.bc", - kernels .. "/dawn_sc_071231_080106.bc", - kernels .. "/dawn_sc_080107_080113.bc", - kernels .. "/dawn_sc_080114_080120.bc", - kernels .. "/dawn_sc_080121_080127.bc", - kernels .. "/dawn_sc_080128_080203.bc", - kernels .. "/dawn_sc_080204_080210.bc", - kernels .. "/dawn_sc_080211_080217.bc", - kernels .. "/dawn_sc_080218_080224.bc", - kernels .. "/dawn_sc_080225_080302.bc", - kernels .. "/dawn_sc_080303_080309.bc", - kernels .. "/dawn_sc_080310_080316.bc", - kernels .. "/dawn_sc_080317_080323.bc", - kernels .. "/dawn_sc_080324_080330.bc", - kernels .. "/dawn_sc_080331_080406.bc", - kernels .. "/dawn_sc_080407_080413.bc", - kernels .. "/dawn_sc_080414_080420.bc", - kernels .. "/dawn_sc_080421_080427.bc", - kernels .. "/dawn_sc_080428_080504.bc", - kernels .. "/dawn_sc_080505_080511.bc", - kernels .. "/dawn_sc_080512_080518.bc", - kernels .. "/dawn_sc_080519_080525.bc", - kernels .. "/dawn_sc_080526_080601.bc", - kernels .. "/dawn_sc_080602_080608.bc", - kernels .. "/dawn_sc_080609_080615.bc", - kernels .. "/dawn_sc_080616_080622.bc", - kernels .. "/dawn_sc_080623_080629.bc", - kernels .. "/dawn_sc_080630_080706.bc", - kernels .. "/dawn_sc_080707_080713.bc", - kernels .. "/dawn_sc_080714_080720.bc", - kernels .. "/dawn_sc_080721_080727.bc", - kernels .. "/dawn_sc_080728_080803.bc", - kernels .. "/dawn_sc_080804_080810.bc", - kernels .. "/dawn_sc_080811_080817.bc", - kernels .. "/dawn_sc_080818_080824.bc", - kernels .. "/dawn_sc_080825_080831.bc", - kernels .. "/dawn_sc_080901_080907.bc", - kernels .. "/dawn_sc_080908_080914.bc", - kernels .. "/dawn_sc_080915_080921.bc", - kernels .. "/dawn_sc_080922_080928.bc", - kernels .. "/dawn_sc_080929_081005.bc", - kernels .. "/dawn_sc_081006_081012.bc", - kernels .. "/dawn_sc_081013_081019.bc", - kernels .. "/dawn_sc_081020_081026.bc", - kernels .. "/dawn_sc_081027_081102.bc", - kernels .. "/dawn_sc_081103_081109.bc", - kernels .. "/dawn_sc_081110_081116.bc", - kernels .. "/dawn_sc_081117_081123.bc", - kernels .. "/dawn_sc_081124_081130.bc", - kernels .. "/dawn_sc_081201_081207.bc", - kernels .. "/dawn_sc_081208_081214.bc", - kernels .. "/dawn_sc_081215_081221.bc", - kernels .. "/dawn_sc_081222_081228.bc", - kernels .. "/dawn_sc_081229_090104.bc", - kernels .. "/dawn_sc_090105_090111.bc", - kernels .. "/dawn_sc_090112_090118.bc", - kernels .. "/dawn_sc_090119_090125.bc", - kernels .. "/dawn_sc_090126_090201.bc", - kernels .. "/dawn_sc_090202_090208.bc", - kernels .. "/dawn_sc_090209_090215.bc", - kernels .. "/dawn_sc_090216_090222.bc", - kernels .. "/dawn_sc_090223_090301.bc", - kernels .. "/dawn_sc_090302_090308.bc", - kernels .. "/dawn_sc_090309_090315.bc", - kernels .. "/dawn_sc_090316_090322.bc", - kernels .. "/dawn_sc_090323_090329.bc", - kernels .. "/dawn_sc_090330_090405.bc", - kernels .. "/dawn_sc_090406_090412.bc", - kernels .. "/dawn_sc_090413_090419.bc", - kernels .. "/dawn_sc_090420_090426.bc", - kernels .. "/dawn_sc_090427_090503.bc", - kernels .. "/dawn_sc_090504_090510.bc", - kernels .. "/dawn_sc_090511_090517.bc", - kernels .. "/dawn_sc_090518_090524.bc", - kernels .. "/dawn_sc_090525_090531.bc", - kernels .. "/dawn_sc_090601_090607.bc", - kernels .. "/dawn_sc_090608_090614.bc", - kernels .. "/dawn_sc_090615_090621.bc", - kernels .. "/dawn_sc_090622_090628.bc", - kernels .. "/dawn_sc_090629_090705.bc", - kernels .. "/dawn_sc_090706_090712.bc", - kernels .. "/dawn_sc_090713_090719.bc", - kernels .. "/dawn_sc_090720_090726.bc", - kernels .. "/dawn_sc_090727_090802.bc", - kernels .. "/dawn_sc_090803_090809.bc", - kernels .. "/dawn_sc_090810_090816.bc", - kernels .. "/dawn_sc_090817_090823.bc", - kernels .. "/dawn_sc_090824_090830.bc", - kernels .. "/dawn_sc_090831_090906.bc", - kernels .. "/dawn_sc_090907_090913.bc", - kernels .. "/dawn_sc_090914_090920.bc", - kernels .. "/dawn_sc_090921_090927.bc", - kernels .. "/dawn_sc_090928_091004.bc", - kernels .. "/dawn_sc_091005_091011.bc", - kernels .. "/dawn_sc_091012_091018.bc", - kernels .. "/dawn_sc_091019_091025.bc", - kernels .. "/dawn_sc_091026_091101.bc", - kernels .. "/dawn_sc_091102_091108.bc", - kernels .. "/dawn_sc_091109_091115.bc", - kernels .. "/dawn_sc_091116_091122.bc", - kernels .. "/dawn_sc_091123_091129.bc", - kernels .. "/dawn_sc_091130_091206.bc", - kernels .. "/dawn_sc_091207_091213.bc", - kernels .. "/dawn_sc_091214_091220.bc", - kernels .. "/dawn_sc_091221_091227.bc", - kernels .. "/dawn_sc_091228_100103.bc", - kernels .. "/dawn_sc_100104_100110_v2.bc", - kernels .. "/dawn_sc_100111_100117_v2.bc",--]] - -- kernels .. "/dawn_sc_100118_100124.bc", - -- kernels .. "/dawn_sc_100125_100131.bc", - -- kernels .. "/dawn_sc_100201_100207.bc", - -- kernels .. "/dawn_sc_100208_100214.bc", - -- kernels .. "/dawn_sc_100215_100221.bc", - -- kernels .. "/dawn_sc_100222_100228.bc", - -- kernels .. "/dawn_sc_100301_100307.bc", - -- kernels .. "/dawn_sc_100308_100314.bc", - -- kernels .. "/dawn_sc_100315_100321.bc", - -- kernels .. "/dawn_sc_100322_100328.bc", - -- kernels .. "/dawn_sc_100329_100404.bc", - -- kernels .. "/dawn_sc_100405_100411.bc", - -- kernels .. "/dawn_sc_100412_100418.bc", - -- kernels .. "/dawn_sc_100419_100425.bc", - -- kernels .. "/dawn_sc_100426_100502.bc", - -- kernels .. "/dawn_sc_100503_100509.bc", - -- kernels .. "/dawn_sc_100510_100516.bc", - -- kernels .. "/dawn_sc_100517_100523.bc", - -- kernels .. "/dawn_sc_100524_100530.bc", - -- kernels .. "/dawn_sc_100531_100606.bc", - -- kernels .. "/dawn_sc_100607_100613.bc", - -- kernels .. "/dawn_sc_100614_100620.bc", - -- kernels .. "/dawn_sc_100621_100627.bc", - -- kernels .. "/dawn_sc_100628_100704.bc", - -- kernels .. "/dawn_sc_100705_100711.bc", - -- kernels .. "/dawn_sc_100712_100718.bc", - -- kernels .. "/dawn_sc_100719_100725.bc", - -- kernels .. "/dawn_sc_100726_100801.bc", - -- kernels .. "/dawn_sc_100802_100808.bc", - -- kernels .. "/dawn_sc_100809_100815.bc", - -- kernels .. "/dawn_sc_100816_100822.bc", - -- kernels .. "/dawn_sc_100823_100829.bc", - -- kernels .. "/dawn_sc_100830_100905.bc", - -- kernels .. "/dawn_sc_100906_100912.bc", - -- kernels .. "/dawn_sc_100913_100919.bc", - -- kernels .. "/dawn_sc_100920_100926.bc", - -- kernels .. "/dawn_sc_100927_101003.bc", - -- kernels .. "/dawn_sc_101004_101010.bc", - -- kernels .. "/dawn_sc_101011_101017.bc", - -- kernels .. "/dawn_sc_101018_101024.bc", - -- kernels .. "/dawn_sc_101025_101031.bc", - -- kernels .. "/dawn_sc_101101_101107.bc", - -- kernels .. "/dawn_sc_101108_101114.bc", - -- kernels .. "/dawn_sc_101115_101121.bc", - -- kernels .. "/dawn_sc_101122_101128.bc", - -- kernels .. "/dawn_sc_101129_101205.bc", - -- kernels .. "/dawn_sc_101206_101212.bc", - -- kernels .. "/dawn_sc_101213_101219.bc", - -- kernels .. "/dawn_sc_101220_101226.bc", - -- kernels .. "/dawn_sc_101227_110102.bc", - -- kernels .. "/dawn_sc_110103_110109.bc", - -- kernels .. "/dawn_sc_110110_110116.bc", - -- kernels .. "/dawn_sc_110117_110123.bc", - -- kernels .. "/dawn_sc_110124_110130.bc", - -- kernels .. "/dawn_sc_110131_110206.bc", - -- kernels .. "/dawn_sc_110207_110213.bc", - -- kernels .. "/dawn_sc_110214_110220.bc", - -- kernels .. "/dawn_sc_110221_110227.bc", - -- kernels .. "/dawn_sc_110228_110306.bc", - -- kernels .. "/dawn_sc_110307_110313.bc", - -- kernels .. "/dawn_sc_110314_110320.bc", - -- kernels .. "/dawn_sc_110321_110327.bc", - -- kernels .. "/dawn_sc_110328_110403.bc", - -- kernels .. "/dawn_sc_110404_110410.bc", - -- kernels .. "/dawn_sc_110411_110417.bc", - -- kernels .. "/dawn_sc_110418_110424.bc", - -- kernels .. "/dawn_sc_110425_110501.bc", - -- kernels .. "/dawn_sc_110502_110508.bc", - -- kernels .. "/dawn_sc_110509_110515.bc", - -- kernels .. "/dawn_sc_110516_110522.bc", - -- kernels .. "/dawn_sc_110523_110529.bc", - -- kernels .. "/dawn_sc_110530_110605.bc", - -- kernels .. "/dawn_sc_110606_110612.bc", - -- kernels .. "/dawn_sc_110613_110619.bc", - -- kernels .. "/dawn_sc_110620_110626.bc", - -- kernels .. "/dawn_sc_110627_110703.bc", - -- kernels .. "/dawn_sc_110704_110710.bc", - -- kernels .. "/dawn_sc_110711_110717.bc", - -- kernels .. "/dawn_sc_110718_110724.bc", - -- kernels .. "/dawn_sc_110725_110731.bc", - -- kernels .. "/dawn_sc_110801_110807.bc", - -- kernels .. "/dawn_sc_110808_110814.bc", - -- kernels .. "/dawn_sc_110815_110821.bc", - -- kernels .. "/dawn_sc_110822_110828.bc", - -- kernels .. "/dawn_sc_110829_110904.bc", - -- kernels .. "/dawn_sc_110905_110911.bc", - -- kernels .. "/dawn_sc_110912_110918.bc", - -- kernels .. "/dawn_sc_110919_110925.bc", - -- kernels .. "/dawn_sc_110926_111002.bc", - -- kernels .. "/dawn_sc_111003_111009.bc", - -- kernels .. "/dawn_sc_111010_111016.bc", - -- kernels .. "/dawn_sc_111017_111023.bc", - -- kernels .. "/dawn_sc_111024_111030.bc", - -- kernels .. "/dawn_sc_111031_111106.bc", - -- kernels .. "/dawn_sc_111107_111113.bc", - -- kernels .. "/dawn_sc_111114_111120.bc", - -- kernels .. "/dawn_sc_111121_111127.bc", - -- kernels .. "/dawn_sc_111128_111204.bc", - -- kernels .. "/dawn_sc_111205_111211.bc", - -- kernels .. "/dawn_sc_111212_111218.bc", - -- kernels .. "/dawn_sc_111219_111225.bc", - -- kernels .. "/dawn_sc_111226_120101.bc", - -- kernels .. "/dawn_sc_120102_120108.bc", - -- kernels .. "/dawn_sc_120109_120115.bc", - -- kernels .. "/dawn_sc_120116_120122.bc", - -- kernels .. "/dawn_sc_120123_120129.bc", - -- kernels .. "/dawn_sc_120130_120205.bc", - -- kernels .. "/dawn_sc_120206_120212.bc", - -- kernels .. "/dawn_sc_120213_120219.bc", - -- kernels .. "/dawn_sc_120220_120226.bc", - -- kernels .. "/dawn_sc_120227_120304.bc", - -- kernels .. "/dawn_sc_120305_120311.bc", - -- kernels .. "/dawn_sc_120312_120318.bc", - -- kernels .. "/dawn_sc_120319_120325.bc", - -- kernels .. "/dawn_sc_120326_120401.bc", - -- kernels .. "/dawn_sc_120402_120408.bc", - -- kernels .. "/dawn_sc_120409_120415.bc", - -- kernels .. "/dawn_sc_120416_120422.bc", - -- kernels .. "/dawn_sc_120423_120429.bc", - -- kernels .. "/dawn_sc_120430_120506.bc", - -- kernels .. "/dawn_sc_120507_120513.bc", - -- kernels .. "/dawn_sc_120514_120520.bc", - -- kernels .. "/dawn_sc_120521_120527.bc", - -- kernels .. "/dawn_sc_120528_120603.bc", - -- kernels .. "/dawn_sc_120604_120610.bc", - -- kernels .. "/dawn_sc_120611_120617.bc", - -- kernels .. "/dawn_sc_120618_120624.bc", - -- kernels .. "/dawn_sc_120625_120701.bc", - -- kernels .. "/dawn_sc_120702_120708.bc", - -- kernels .. "/dawn_sc_120709_120715.bc", - -- kernels .. "/dawn_sc_120716_120722.bc", - -- kernels .. "/dawn_sc_120723_120729.bc", - -- kernels .. "/dawn_sc_120730_120805.bc", - -- kernels .. "/dawn_sc_120806_120812.bc", - -- kernels .. "/dawn_sc_120813_120819.bc", - -- kernels .. "/dawn_sc_120820_120826.bc", - -- kernels .. "/dawn_sc_120827_120902.bc", - -- kernels .. "/dawn_sc_120903_120909.bc", - -- kernels .. "/dawn_sc_120910_120916.bc", - -- kernels .. "/dawn_sc_f2_3942xxxxx.bc", - -- kernels .. "/dawn_sc_pred_da028b_00_eu.bc", - -- kernels .. "/dawn_sc_pred_dc041a_00.bc", + -- all space craft CK files, ~10 gb + -- kernels .. "/dawn_sc_120123_120129.bc", + -- kernels .. "/dawn_sc_070927_070930.bc", + --[[kernels .. "/ck/dawn_sc_071001_071007.bc", + kernels .. "/dawn_sc_071008_071014_v2.bc", + kernels .. "/dawn_sc_071015_071021.bc", + kernels .. "/dawn_sc_071022_071028_v2.bc", + kernels .. "/dawn_sc_071029_071104.bc", + kernels .. "/dawn_sc_071105_071111.bc", + kernels .. "/dawn_sc_071112_071118.bc", + kernels .. "/dawn_sc_071119_071125.bc", + kernels .. "/dawn_sc_071126_071202.bc", + kernels .. "/dawn_sc_071203_071209.bc", + kernels .. "/dawn_sc_071210_071216.bc", + kernels .. "/dawn_sc_071217_071223.bc", + kernels .. "/dawn_sc_071224_071230.bc", + kernels .. "/dawn_sc_071231_080106.bc", + kernels .. "/dawn_sc_080107_080113.bc", + kernels .. "/dawn_sc_080114_080120.bc", + kernels .. "/dawn_sc_080121_080127.bc", + kernels .. "/dawn_sc_080128_080203.bc", + kernels .. "/dawn_sc_080204_080210.bc", + kernels .. "/dawn_sc_080211_080217.bc", + kernels .. "/dawn_sc_080218_080224.bc", + kernels .. "/dawn_sc_080225_080302.bc", + kernels .. "/dawn_sc_080303_080309.bc", + kernels .. "/dawn_sc_080310_080316.bc", + kernels .. "/dawn_sc_080317_080323.bc", + kernels .. "/dawn_sc_080324_080330.bc", + kernels .. "/dawn_sc_080331_080406.bc", + kernels .. "/dawn_sc_080407_080413.bc", + kernels .. "/dawn_sc_080414_080420.bc", + kernels .. "/dawn_sc_080421_080427.bc", + kernels .. "/dawn_sc_080428_080504.bc", + kernels .. "/dawn_sc_080505_080511.bc", + kernels .. "/dawn_sc_080512_080518.bc", + kernels .. "/dawn_sc_080519_080525.bc", + kernels .. "/dawn_sc_080526_080601.bc", + kernels .. "/dawn_sc_080602_080608.bc", + kernels .. "/dawn_sc_080609_080615.bc", + kernels .. "/dawn_sc_080616_080622.bc", + kernels .. "/dawn_sc_080623_080629.bc", + kernels .. "/dawn_sc_080630_080706.bc", + kernels .. "/dawn_sc_080707_080713.bc", + kernels .. "/dawn_sc_080714_080720.bc", + kernels .. "/dawn_sc_080721_080727.bc", + kernels .. "/dawn_sc_080728_080803.bc", + kernels .. "/dawn_sc_080804_080810.bc", + kernels .. "/dawn_sc_080811_080817.bc", + kernels .. "/dawn_sc_080818_080824.bc", + kernels .. "/dawn_sc_080825_080831.bc", + kernels .. "/dawn_sc_080901_080907.bc", + kernels .. "/dawn_sc_080908_080914.bc", + kernels .. "/dawn_sc_080915_080921.bc", + kernels .. "/dawn_sc_080922_080928.bc", + kernels .. "/dawn_sc_080929_081005.bc", + kernels .. "/dawn_sc_081006_081012.bc", + kernels .. "/dawn_sc_081013_081019.bc", + kernels .. "/dawn_sc_081020_081026.bc", + kernels .. "/dawn_sc_081027_081102.bc", + kernels .. "/dawn_sc_081103_081109.bc", + kernels .. "/dawn_sc_081110_081116.bc", + kernels .. "/dawn_sc_081117_081123.bc", + kernels .. "/dawn_sc_081124_081130.bc", + kernels .. "/dawn_sc_081201_081207.bc", + kernels .. "/dawn_sc_081208_081214.bc", + kernels .. "/dawn_sc_081215_081221.bc", + kernels .. "/dawn_sc_081222_081228.bc", + kernels .. "/dawn_sc_081229_090104.bc", + kernels .. "/dawn_sc_090105_090111.bc", + kernels .. "/dawn_sc_090112_090118.bc", + kernels .. "/dawn_sc_090119_090125.bc", + kernels .. "/dawn_sc_090126_090201.bc", + kernels .. "/dawn_sc_090202_090208.bc", + kernels .. "/dawn_sc_090209_090215.bc", + kernels .. "/dawn_sc_090216_090222.bc", + kernels .. "/dawn_sc_090223_090301.bc", + kernels .. "/dawn_sc_090302_090308.bc", + kernels .. "/dawn_sc_090309_090315.bc", + kernels .. "/dawn_sc_090316_090322.bc", + kernels .. "/dawn_sc_090323_090329.bc", + kernels .. "/dawn_sc_090330_090405.bc", + kernels .. "/dawn_sc_090406_090412.bc", + kernels .. "/dawn_sc_090413_090419.bc", + kernels .. "/dawn_sc_090420_090426.bc", + kernels .. "/dawn_sc_090427_090503.bc", + kernels .. "/dawn_sc_090504_090510.bc", + kernels .. "/dawn_sc_090511_090517.bc", + kernels .. "/dawn_sc_090518_090524.bc", + kernels .. "/dawn_sc_090525_090531.bc", + kernels .. "/dawn_sc_090601_090607.bc", + kernels .. "/dawn_sc_090608_090614.bc", + kernels .. "/dawn_sc_090615_090621.bc", + kernels .. "/dawn_sc_090622_090628.bc", + kernels .. "/dawn_sc_090629_090705.bc", + kernels .. "/dawn_sc_090706_090712.bc", + kernels .. "/dawn_sc_090713_090719.bc", + kernels .. "/dawn_sc_090720_090726.bc", + kernels .. "/dawn_sc_090727_090802.bc", + kernels .. "/dawn_sc_090803_090809.bc", + kernels .. "/dawn_sc_090810_090816.bc", + kernels .. "/dawn_sc_090817_090823.bc", + kernels .. "/dawn_sc_090824_090830.bc", + kernels .. "/dawn_sc_090831_090906.bc", + kernels .. "/dawn_sc_090907_090913.bc", + kernels .. "/dawn_sc_090914_090920.bc", + kernels .. "/dawn_sc_090921_090927.bc", + kernels .. "/dawn_sc_090928_091004.bc", + kernels .. "/dawn_sc_091005_091011.bc", + kernels .. "/dawn_sc_091012_091018.bc", + kernels .. "/dawn_sc_091019_091025.bc", + kernels .. "/dawn_sc_091026_091101.bc", + kernels .. "/dawn_sc_091102_091108.bc", + kernels .. "/dawn_sc_091109_091115.bc", + kernels .. "/dawn_sc_091116_091122.bc", + kernels .. "/dawn_sc_091123_091129.bc", + kernels .. "/dawn_sc_091130_091206.bc", + kernels .. "/dawn_sc_091207_091213.bc", + kernels .. "/dawn_sc_091214_091220.bc", + kernels .. "/dawn_sc_091221_091227.bc", + kernels .. "/dawn_sc_091228_100103.bc", + kernels .. "/dawn_sc_100104_100110_v2.bc", + kernels .. "/dawn_sc_100111_100117_v2.bc",--]] + -- kernels .. "/dawn_sc_100118_100124.bc", + -- kernels .. "/dawn_sc_100125_100131.bc", + -- kernels .. "/dawn_sc_100201_100207.bc", + -- kernels .. "/dawn_sc_100208_100214.bc", + -- kernels .. "/dawn_sc_100215_100221.bc", + -- kernels .. "/dawn_sc_100222_100228.bc", + -- kernels .. "/dawn_sc_100301_100307.bc", + -- kernels .. "/dawn_sc_100308_100314.bc", + -- kernels .. "/dawn_sc_100315_100321.bc", + -- kernels .. "/dawn_sc_100322_100328.bc", + -- kernels .. "/dawn_sc_100329_100404.bc", + -- kernels .. "/dawn_sc_100405_100411.bc", + -- kernels .. "/dawn_sc_100412_100418.bc", + -- kernels .. "/dawn_sc_100419_100425.bc", + -- kernels .. "/dawn_sc_100426_100502.bc", + -- kernels .. "/dawn_sc_100503_100509.bc", + -- kernels .. "/dawn_sc_100510_100516.bc", + -- kernels .. "/dawn_sc_100517_100523.bc", + -- kernels .. "/dawn_sc_100524_100530.bc", + -- kernels .. "/dawn_sc_100531_100606.bc", + -- kernels .. "/dawn_sc_100607_100613.bc", + -- kernels .. "/dawn_sc_100614_100620.bc", + -- kernels .. "/dawn_sc_100621_100627.bc", + -- kernels .. "/dawn_sc_100628_100704.bc", + -- kernels .. "/dawn_sc_100705_100711.bc", + -- kernels .. "/dawn_sc_100712_100718.bc", + -- kernels .. "/dawn_sc_100719_100725.bc", + -- kernels .. "/dawn_sc_100726_100801.bc", + -- kernels .. "/dawn_sc_100802_100808.bc", + -- kernels .. "/dawn_sc_100809_100815.bc", + -- kernels .. "/dawn_sc_100816_100822.bc", + -- kernels .. "/dawn_sc_100823_100829.bc", + -- kernels .. "/dawn_sc_100830_100905.bc", + -- kernels .. "/dawn_sc_100906_100912.bc", + -- kernels .. "/dawn_sc_100913_100919.bc", + -- kernels .. "/dawn_sc_100920_100926.bc", + -- kernels .. "/dawn_sc_100927_101003.bc", + -- kernels .. "/dawn_sc_101004_101010.bc", + -- kernels .. "/dawn_sc_101011_101017.bc", + -- kernels .. "/dawn_sc_101018_101024.bc", + -- kernels .. "/dawn_sc_101025_101031.bc", + -- kernels .. "/dawn_sc_101101_101107.bc", + -- kernels .. "/dawn_sc_101108_101114.bc", + -- kernels .. "/dawn_sc_101115_101121.bc", + -- kernels .. "/dawn_sc_101122_101128.bc", + -- kernels .. "/dawn_sc_101129_101205.bc", + -- kernels .. "/dawn_sc_101206_101212.bc", + -- kernels .. "/dawn_sc_101213_101219.bc", + -- kernels .. "/dawn_sc_101220_101226.bc", + -- kernels .. "/dawn_sc_101227_110102.bc", + -- kernels .. "/dawn_sc_110103_110109.bc", + -- kernels .. "/dawn_sc_110110_110116.bc", + -- kernels .. "/dawn_sc_110117_110123.bc", + -- kernels .. "/dawn_sc_110124_110130.bc", + -- kernels .. "/dawn_sc_110131_110206.bc", + -- kernels .. "/dawn_sc_110207_110213.bc", + -- kernels .. "/dawn_sc_110214_110220.bc", + -- kernels .. "/dawn_sc_110221_110227.bc", + -- kernels .. "/dawn_sc_110228_110306.bc", + -- kernels .. "/dawn_sc_110307_110313.bc", + -- kernels .. "/dawn_sc_110314_110320.bc", + -- kernels .. "/dawn_sc_110321_110327.bc", + -- kernels .. "/dawn_sc_110328_110403.bc", + -- kernels .. "/dawn_sc_110404_110410.bc", + -- kernels .. "/dawn_sc_110411_110417.bc", + -- kernels .. "/dawn_sc_110418_110424.bc", + -- kernels .. "/dawn_sc_110425_110501.bc", + -- kernels .. "/dawn_sc_110502_110508.bc", + -- kernels .. "/dawn_sc_110509_110515.bc", + -- kernels .. "/dawn_sc_110516_110522.bc", + -- kernels .. "/dawn_sc_110523_110529.bc", + -- kernels .. "/dawn_sc_110530_110605.bc", + -- kernels .. "/dawn_sc_110606_110612.bc", + -- kernels .. "/dawn_sc_110613_110619.bc", + -- kernels .. "/dawn_sc_110620_110626.bc", + -- kernels .. "/dawn_sc_110627_110703.bc", + -- kernels .. "/dawn_sc_110704_110710.bc", + -- kernels .. "/dawn_sc_110711_110717.bc", + -- kernels .. "/dawn_sc_110718_110724.bc", + -- kernels .. "/dawn_sc_110725_110731.bc", + -- kernels .. "/dawn_sc_110801_110807.bc", + -- kernels .. "/dawn_sc_110808_110814.bc", + -- kernels .. "/dawn_sc_110815_110821.bc", + -- kernels .. "/dawn_sc_110822_110828.bc", + -- kernels .. "/dawn_sc_110829_110904.bc", + -- kernels .. "/dawn_sc_110905_110911.bc", + -- kernels .. "/dawn_sc_110912_110918.bc", + -- kernels .. "/dawn_sc_110919_110925.bc", + -- kernels .. "/dawn_sc_110926_111002.bc", + -- kernels .. "/dawn_sc_111003_111009.bc", + -- kernels .. "/dawn_sc_111010_111016.bc", + -- kernels .. "/dawn_sc_111017_111023.bc", + -- kernels .. "/dawn_sc_111024_111030.bc", + -- kernels .. "/dawn_sc_111031_111106.bc", + -- kernels .. "/dawn_sc_111107_111113.bc", + -- kernels .. "/dawn_sc_111114_111120.bc", + -- kernels .. "/dawn_sc_111121_111127.bc", + -- kernels .. "/dawn_sc_111128_111204.bc", + -- kernels .. "/dawn_sc_111205_111211.bc", + -- kernels .. "/dawn_sc_111212_111218.bc", + -- kernels .. "/dawn_sc_111219_111225.bc", + -- kernels .. "/dawn_sc_111226_120101.bc", + -- kernels .. "/dawn_sc_120102_120108.bc", + -- kernels .. "/dawn_sc_120109_120115.bc", + -- kernels .. "/dawn_sc_120116_120122.bc", + -- kernels .. "/dawn_sc_120123_120129.bc", + -- kernels .. "/dawn_sc_120130_120205.bc", + -- kernels .. "/dawn_sc_120206_120212.bc", + -- kernels .. "/dawn_sc_120213_120219.bc", + -- kernels .. "/dawn_sc_120220_120226.bc", + -- kernels .. "/dawn_sc_120227_120304.bc", + -- kernels .. "/dawn_sc_120305_120311.bc", + -- kernels .. "/dawn_sc_120312_120318.bc", + -- kernels .. "/dawn_sc_120319_120325.bc", + -- kernels .. "/dawn_sc_120326_120401.bc", + -- kernels .. "/dawn_sc_120402_120408.bc", + -- kernels .. "/dawn_sc_120409_120415.bc", + -- kernels .. "/dawn_sc_120416_120422.bc", + -- kernels .. "/dawn_sc_120423_120429.bc", + -- kernels .. "/dawn_sc_120430_120506.bc", + -- kernels .. "/dawn_sc_120507_120513.bc", + -- kernels .. "/dawn_sc_120514_120520.bc", + -- kernels .. "/dawn_sc_120521_120527.bc", + -- kernels .. "/dawn_sc_120528_120603.bc", + -- kernels .. "/dawn_sc_120604_120610.bc", + -- kernels .. "/dawn_sc_120611_120617.bc", + -- kernels .. "/dawn_sc_120618_120624.bc", + -- kernels .. "/dawn_sc_120625_120701.bc", + -- kernels .. "/dawn_sc_120702_120708.bc", + -- kernels .. "/dawn_sc_120709_120715.bc", + -- kernels .. "/dawn_sc_120716_120722.bc", + -- kernels .. "/dawn_sc_120723_120729.bc", + -- kernels .. "/dawn_sc_120730_120805.bc", + -- kernels .. "/dawn_sc_120806_120812.bc", + -- kernels .. "/dawn_sc_120813_120819.bc", + -- kernels .. "/dawn_sc_120820_120826.bc", + -- kernels .. "/dawn_sc_120827_120902.bc", + -- kernels .. "/dawn_sc_120903_120909.bc", + -- kernels .. "/dawn_sc_120910_120916.bc", + -- kernels .. "/dawn_sc_f2_3942xxxxx.bc", + -- kernels .. "/dawn_sc_pred_da028b_00_eu.bc", + -- kernels .. "/dawn_sc_pred_dc041a_00.bc", - -- Solar array rotation kernels ~ 2gb - kernels .. "/dawn_sa_070927_070930.bc", - --[[kernels .. "/ck/dawn_sa_071001_071007.bc", - kernels .. "/dawn_sa_071008_071014.bc", - kernels .. "/dawn_sa_071015_071021.bc", - kernels .. "/dawn_sa_071022_071028_v2.bc", - kernels .. "/dawn_sa_071029_071104.bc", - kernels .. "/dawn_sa_071105_071111.bc", - kernels .. "/dawn_sa_071112_071118.bc", - kernels .. "/dawn_sa_071119_071125.bc", - kernels .. "/dawn_sa_071126_071202.bc", - kernels .. "/dawn_sa_071203_071209.bc", - kernels .. "/dawn_sa_071210_071216.bc", - kernels .. "/dawn_sa_071217_071223.bc", - kernels .. "/dawn_sa_071224_071230.bc", - kernels .. "/dawn_sa_071231_080106.bc", - kernels .. "/dawn_sa_080107_080113.bc", - kernels .. "/dawn_sa_080114_080120.bc", - kernels .. "/dawn_sa_080121_080127.bc", - kernels .. "/dawn_sa_080128_080203.bc", - kernels .. "/dawn_sa_080204_080210.bc", - kernels .. "/dawn_sa_080211_080217.bc", - kernels .. "/dawn_sa_080218_080224.bc", - kernels .. "/dawn_sa_080225_080302.bc", - kernels .. "/dawn_sa_080303_080309.bc", - kernels .. "/dawn_sa_080310_080316.bc", - kernels .. "/dawn_sa_080317_080323.bc", - kernels .. "/dawn_sa_080324_080330.bc", - kernels .. "/dawn_sa_080331_080406.bc", - kernels .. "/dawn_sa_080407_080413.bc", - kernels .. "/dawn_sa_080414_080420.bc", - kernels .. "/dawn_sa_080421_080427.bc", - kernels .. "/dawn_sa_080428_080504.bc", - kernels .. "/dawn_sa_080505_080511.bc", - kernels .. "/dawn_sa_080512_080518.bc", - kernels .. "/dawn_sa_080519_080525.bc", - kernels .. "/dawn_sa_080526_080601.bc", - kernels .. "/dawn_sa_080602_080608.bc", - kernels .. "/dawn_sa_080609_080615.bc", - kernels .. "/dawn_sa_080616_080622.bc", - kernels .. "/dawn_sa_080623_080629.bc", - kernels .. "/dawn_sa_080630_080706.bc", - kernels .. "/dawn_sa_080707_080713.bc", - kernels .. "/dawn_sa_080714_080720.bc", - kernels .. "/dawn_sa_080721_080727.bc", - kernels .. "/dawn_sa_080728_080803.bc", - kernels .. "/dawn_sa_080804_080810.bc", - kernels .. "/dawn_sa_080811_080817.bc", - kernels .. "/dawn_sa_080818_080824.bc", - kernels .. "/dawn_sa_080825_080831.bc", - kernels .. "/dawn_sa_080901_080907.bc", - kernels .. "/dawn_sa_080908_080914.bc", - kernels .. "/dawn_sa_080915_080921.bc", - kernels .. "/dawn_sa_080922_080928.bc", - kernels .. "/dawn_sa_080929_081005.bc", - kernels .. "/dawn_sa_081006_081012.bc", - kernels .. "/dawn_sa_081013_081019.bc", - kernels .. "/dawn_sa_081020_081026.bc", - kernels .. "/dawn_sa_081027_081102.bc", - kernels .. "/dawn_sa_081103_081109.bc", - kernels .. "/dawn_sa_081110_081116.bc", - kernels .. "/dawn_sa_081117_081123.bc", - kernels .. "/dawn_sa_081124_081130.bc", - kernels .. "/dawn_sa_081201_081207.bc", - kernels .. "/dawn_sa_081208_081214.bc", - kernels .. "/dawn_sa_081215_081221.bc", - kernels .. "/dawn_sa_081222_081228.bc", - kernels .. "/dawn_sa_081229_090104.bc", - kernels .. "/dawn_sa_090105_090111.bc", - kernels .. "/dawn_sa_090112_090118.bc", - kernels .. "/dawn_sa_090119_090125.bc", - kernels .. "/dawn_sa_090126_090201.bc", - kernels .. "/dawn_sa_090202_090208.bc", - kernels .. "/dawn_sa_090209_090215.bc", - kernels .. "/dawn_sa_090216_090222.bc", - kernels .. "/dawn_sa_090223_090301.bc", - kernels .. "/dawn_sa_090302_090308.bc", - kernels .. "/dawn_sa_090309_090315.bc", - kernels .. "/dawn_sa_090316_090322.bc", - kernels .. "/dawn_sa_090323_090329.bc", - kernels .. "/dawn_sa_090330_090405.bc", - kernels .. "/dawn_sa_090406_090412.bc", - kernels .. "/dawn_sa_090413_090419.bc", - kernels .. "/dawn_sa_090420_090426.bc", - kernels .. "/dawn_sa_090427_090503.bc", - kernels .. "/dawn_sa_090504_090510.bc", - kernels .. "/dawn_sa_090511_090517.bc", - kernels .. "/dawn_sa_090518_090524.bc", - kernels .. "/dawn_sa_090525_090531.bc", - kernels .. "/dawn_sa_090601_090607.bc", - kernels .. "/dawn_sa_090608_090614.bc", - kernels .. "/dawn_sa_090615_090621.bc", - kernels .. "/dawn_sa_090622_090628.bc", - kernels .. "/dawn_sa_090629_090705.bc", - kernels .. "/dawn_sa_090706_090712.bc", - kernels .. "/dawn_sa_090713_090719.bc", - kernels .. "/dawn_sa_090720_090726.bc", - kernels .. "/dawn_sa_090727_090802.bc", - kernels .. "/dawn_sa_090803_090809.bc", - kernels .. "/dawn_sa_090810_090816.bc", - kernels .. "/dawn_sa_090817_090823.bc", - kernels .. "/dawn_sa_090824_090830.bc", - kernels .. "/dawn_sa_090831_090906.bc", - kernels .. "/dawn_sa_090907_090913.bc", - kernels .. "/dawn_sa_090914_090920.bc", - kernels .. "/dawn_sa_090921_090927.bc", - kernels .. "/dawn_sa_090928_091004.bc", - kernels .. "/dawn_sa_091005_091011.bc", - kernels .. "/dawn_sa_091012_091018.bc", - kernels .. "/dawn_sa_091019_091025.bc", - kernels .. "/dawn_sa_091026_091101.bc", - kernels .. "/dawn_sa_091102_091108.bc", - kernels .. "/dawn_sa_091109_091115.bc", - kernels .. "/dawn_sa_091116_091122.bc", - kernels .. "/dawn_sa_091123_091129.bc", - kernels .. "/dawn_sa_091130_091206.bc", - kernels .. "/dawn_sa_091207_091213.bc", - kernels .. "/dawn_sa_091214_091220.bc", - kernels .. "/dawn_sa_091221_091227.bc", - kernels .. "/dawn_sa_091228_100103.bc", - kernels .. "/dawn_sa_100104_100110_v2.bc", - kernels .. "/dawn_sa_100111_100117_v2.bc", - kernels .. "/dawn_sa_100118_100124.bc", - kernels .. "/dawn_sa_100125_100131.bc", - kernels .. "/dawn_sa_100201_100207.bc", - kernels .. "/dawn_sa_100208_100214.bc", - kernels .. "/dawn_sa_100215_100221.bc", - kernels .. "/dawn_sa_100222_100228.bc", - kernels .. "/dawn_sa_100301_100307.bc", - kernels .. "/dawn_sa_100308_100314.bc", - kernels .. "/dawn_sa_100315_100321.bc", - kernels .. "/dawn_sa_100322_100328.bc", - kernels .. "/dawn_sa_100329_100404.bc", - kernels .. "/dawn_sa_100405_100411.bc", - kernels .. "/dawn_sa_100412_100418.bc", - kernels .. "/dawn_sa_100419_100425.bc", - kernels .. "/dawn_sa_100426_100502.bc", - kernels .. "/dawn_sa_100503_100509.bc", - kernels .. "/dawn_sa_100510_100516.bc", - kernels .. "/dawn_sa_100517_100523.bc", - kernels .. "/dawn_sa_100524_100530.bc", - kernels .. "/dawn_sa_100531_100606.bc", - kernels .. "/dawn_sa_100607_100613.bc", - kernels .. "/dawn_sa_100614_100620.bc", - kernels .. "/dawn_sa_100621_100627.bc", - kernels .. "/dawn_sa_100628_100704.bc", - kernels .. "/dawn_sa_100705_100711.bc", - kernels .. "/dawn_sa_100712_100718.bc", - kernels .. "/dawn_sa_100719_100725.bc", - kernels .. "/dawn_sa_100726_100801.bc", - kernels .. "/dawn_sa_100802_100808.bc", - kernels .. "/dawn_sa_100809_100815.bc", - kernels .. "/dawn_sa_100816_100822.bc", - kernels .. "/dawn_sa_100823_100829.bc", - kernels .. "/dawn_sa_100830_100905.bc", - kernels .. "/dawn_sa_100906_100912.bc", - kernels .. "/dawn_sa_100913_100919.bc", - kernels .. "/dawn_sa_100920_100926.bc", - kernels .. "/dawn_sa_100927_101003.bc", - kernels .. "/dawn_sa_101004_101010.bc", - kernels .. "/dawn_sa_101011_101017.bc", --]] - -- kernels .. "/dawn_sa_101018_101024.bc", - -- kernels .. "/dawn_sa_101025_101031.bc", - -- kernels .. "/dawn_sa_101101_101107.bc", - -- kernels .. "/dawn_sa_101108_101114.bc", - -- kernels .. "/dawn_sa_101115_101121.bc", - -- kernels .. "/dawn_sa_101122_101128.bc", - -- kernels .. "/dawn_sa_101129_101205.bc", - -- kernels .. "/dawn_sa_101206_101212.bc", - -- kernels .. "/dawn_sa_101213_101219.bc", - -- kernels .. "/dawn_sa_101220_101226.bc", - -- kernels .. "/dawn_sa_101227_110102.bc", - -- kernels .. "/dawn_sa_110103_110109.bc", - -- kernels .. "/dawn_sa_110110_110116.bc", - -- kernels .. "/dawn_sa_110117_110123.bc", - -- kernels .. "/dawn_sa_110124_110130.bc", - -- kernels .. "/dawn_sa_110131_110206.bc", - -- kernels .. "/dawn_sa_110207_110213.bc", - -- kernels .. "/dawn_sa_110214_110220.bc", - -- kernels .. "/dawn_sa_110221_110227.bc", - -- kernels .. "/dawn_sa_110228_110306.bc", - -- kernels .. "/dawn_sa_110307_110313.bc", - -- kernels .. "/dawn_sa_110314_110320.bc", - -- kernels .. "/dawn_sa_110321_110327.bc", - -- kernels .. "/dawn_sa_110328_110403.bc", - -- kernels .. "/dawn_sa_110404_110410.bc", - -- kernels .. "/dawn_sa_110411_110417.bc", - -- kernels .. "/dawn_sa_110418_110424.bc", - -- kernels .. "/dawn_sa_110425_110501.bc", - -- kernels .. "/dawn_sa_110502_110508.bc", - -- kernels .. "/dawn_sa_110509_110515.bc", - -- kernels .. "/dawn_sa_110516_110522.bc", - -- kernels .. "/dawn_sa_110523_110529.bc", - -- kernels .. "/dawn_sa_110530_110605.bc", - -- kernels .. "/dawn_sa_110606_110612.bc", - -- kernels .. "/dawn_sa_110613_110619.bc", - -- kernels .. "/dawn_sa_110620_110626.bc", - -- kernels .. "/dawn_sa_110627_110703.bc", - -- kernels .. "/dawn_sa_110704_110710.bc", - -- kernels .. "/dawn_sa_110711_110717.bc", - -- kernels .. "/dawn_sa_110718_110724.bc", - -- kernels .. "/dawn_sa_110725_110731.bc", - -- kernels .. "/dawn_sa_110801_110807.bc", - -- kernels .. "/dawn_sa_110808_110814.bc", - -- kernels .. "/dawn_sa_110815_110821.bc", - -- kernels .. "/dawn_sa_110822_110828.bc", - -- kernels .. "/dawn_sa_110829_110904.bc", - -- kernels .. "/dawn_sa_110905_110911.bc", - -- kernels .. "/dawn_sa_110912_110918.bc", - -- kernels .. "/dawn_sa_110919_110925.bc", - -- kernels .. "/dawn_sa_110926_111002.bc", - -- kernels .. "/dawn_sa_111003_111009.bc", - -- kernels .. "/dawn_sa_111010_111016.bc", - -- kernels .. "/dawn_sa_111017_111023.bc", - -- kernels .. "/dawn_sa_111024_111030.bc", - -- kernels .. "/dawn_sa_111031_111106.bc", - -- kernels .. "/dawn_sa_111107_111113.bc", - -- kernels .. "/dawn_sa_111114_111120.bc", - -- kernels .. "/dawn_sa_111121_111127.bc", - -- kernels .. "/dawn_sa_111128_111204.bc", - -- kernels .. "/dawn_sa_111205_111211.bc", - -- kernels .. "/dawn_sa_111212_111218.bc", - -- kernels .. "/dawn_sa_111219_111225.bc", - -- kernels .. "/dawn_sa_111226_120101.bc", - -- kernels .. "/dawn_sa_120102_120108.bc", - -- kernels .. "/dawn_sa_120109_120115.bc", - -- kernels .. "/dawn_sa_120116_120122.bc", - -- kernels .. "/dawn_sa_120123_120129.bc", - -- kernels .. "/dawn_sa_120130_120205.bc", - -- kernels .. "/dawn_sa_120206_120212.bc", - -- kernels .. "/dawn_sa_120213_120219.bc", - -- kernels .. "/dawn_sa_120220_120226.bc", - -- kernels .. "/dawn_sa_120227_120304.bc", - -- kernels .. "/dawn_sa_120305_120311.bc", - -- kernels .. "/dawn_sa_120312_120318.bc", - -- kernels .. "/dawn_sa_120319_120325.bc", - -- kernels .. "/dawn_sa_120326_120401.bc", - -- kernels .. "/dawn_sa_120402_120408.bc", - -- kernels .. "/dawn_sa_120409_120415.bc", - -- kernels .. "/dawn_sa_120416_120422.bc", - -- kernels .. "/dawn_sa_120423_120429.bc", - -- kernels .. "/dawn_sa_120430_120506.bc", - -- kernels .. "/dawn_sa_120507_120513.bc", - -- kernels .. "/dawn_sa_120514_120520.bc", - -- kernels .. "/dawn_sa_120521_120527.bc", - -- kernels .. "/dawn_sa_120528_120603.bc", - -- kernels .. "/dawn_sa_120604_120610.bc", - -- kernels .. "/dawn_sa_120611_120617.bc", - -- kernels .. "/dawn_sa_120618_120624.bc", - -- kernels .. "/dawn_sa_120625_120701.bc", - -- kernels .. "/dawn_sa_120702_120708.bc", - -- kernels .. "/dawn_sa_120709_120715.bc", - -- kernels .. "/dawn_sa_120716_120722.bc", - -- kernels .. "/dawn_sa_120723_120729.bc", - -- kernels .. "/dawn_sa_120730_120805.bc", - -- kernels .. "/dawn_sa_120806_120812.bc", - -- kernels .. "/dawn_sa_120813_120819.bc", - -- kernels .. "/dawn_sa_120820_120826.bc", - -- kernels .. "/dawn_sa_120827_120902.bc", - -- kernels .. "/dawn_sa_120903_120909.bc", - -- kernels .. "/dawn_sa_120910_120916.bc", + -- Solar array rotation kernels ~ 2gb + kernels .. "/dawn_sa_070927_070930.bc", + --[[kernels .. "/ck/dawn_sa_071001_071007.bc", + kernels .. "/dawn_sa_071008_071014.bc", + kernels .. "/dawn_sa_071015_071021.bc", + kernels .. "/dawn_sa_071022_071028_v2.bc", + kernels .. "/dawn_sa_071029_071104.bc", + kernels .. "/dawn_sa_071105_071111.bc", + kernels .. "/dawn_sa_071112_071118.bc", + kernels .. "/dawn_sa_071119_071125.bc", + kernels .. "/dawn_sa_071126_071202.bc", + kernels .. "/dawn_sa_071203_071209.bc", + kernels .. "/dawn_sa_071210_071216.bc", + kernels .. "/dawn_sa_071217_071223.bc", + kernels .. "/dawn_sa_071224_071230.bc", + kernels .. "/dawn_sa_071231_080106.bc", + kernels .. "/dawn_sa_080107_080113.bc", + kernels .. "/dawn_sa_080114_080120.bc", + kernels .. "/dawn_sa_080121_080127.bc", + kernels .. "/dawn_sa_080128_080203.bc", + kernels .. "/dawn_sa_080204_080210.bc", + kernels .. "/dawn_sa_080211_080217.bc", + kernels .. "/dawn_sa_080218_080224.bc", + kernels .. "/dawn_sa_080225_080302.bc", + kernels .. "/dawn_sa_080303_080309.bc", + kernels .. "/dawn_sa_080310_080316.bc", + kernels .. "/dawn_sa_080317_080323.bc", + kernels .. "/dawn_sa_080324_080330.bc", + kernels .. "/dawn_sa_080331_080406.bc", + kernels .. "/dawn_sa_080407_080413.bc", + kernels .. "/dawn_sa_080414_080420.bc", + kernels .. "/dawn_sa_080421_080427.bc", + kernels .. "/dawn_sa_080428_080504.bc", + kernels .. "/dawn_sa_080505_080511.bc", + kernels .. "/dawn_sa_080512_080518.bc", + kernels .. "/dawn_sa_080519_080525.bc", + kernels .. "/dawn_sa_080526_080601.bc", + kernels .. "/dawn_sa_080602_080608.bc", + kernels .. "/dawn_sa_080609_080615.bc", + kernels .. "/dawn_sa_080616_080622.bc", + kernels .. "/dawn_sa_080623_080629.bc", + kernels .. "/dawn_sa_080630_080706.bc", + kernels .. "/dawn_sa_080707_080713.bc", + kernels .. "/dawn_sa_080714_080720.bc", + kernels .. "/dawn_sa_080721_080727.bc", + kernels .. "/dawn_sa_080728_080803.bc", + kernels .. "/dawn_sa_080804_080810.bc", + kernels .. "/dawn_sa_080811_080817.bc", + kernels .. "/dawn_sa_080818_080824.bc", + kernels .. "/dawn_sa_080825_080831.bc", + kernels .. "/dawn_sa_080901_080907.bc", + kernels .. "/dawn_sa_080908_080914.bc", + kernels .. "/dawn_sa_080915_080921.bc", + kernels .. "/dawn_sa_080922_080928.bc", + kernels .. "/dawn_sa_080929_081005.bc", + kernels .. "/dawn_sa_081006_081012.bc", + kernels .. "/dawn_sa_081013_081019.bc", + kernels .. "/dawn_sa_081020_081026.bc", + kernels .. "/dawn_sa_081027_081102.bc", + kernels .. "/dawn_sa_081103_081109.bc", + kernels .. "/dawn_sa_081110_081116.bc", + kernels .. "/dawn_sa_081117_081123.bc", + kernels .. "/dawn_sa_081124_081130.bc", + kernels .. "/dawn_sa_081201_081207.bc", + kernels .. "/dawn_sa_081208_081214.bc", + kernels .. "/dawn_sa_081215_081221.bc", + kernels .. "/dawn_sa_081222_081228.bc", + kernels .. "/dawn_sa_081229_090104.bc", + kernels .. "/dawn_sa_090105_090111.bc", + kernels .. "/dawn_sa_090112_090118.bc", + kernels .. "/dawn_sa_090119_090125.bc", + kernels .. "/dawn_sa_090126_090201.bc", + kernels .. "/dawn_sa_090202_090208.bc", + kernels .. "/dawn_sa_090209_090215.bc", + kernels .. "/dawn_sa_090216_090222.bc", + kernels .. "/dawn_sa_090223_090301.bc", + kernels .. "/dawn_sa_090302_090308.bc", + kernels .. "/dawn_sa_090309_090315.bc", + kernels .. "/dawn_sa_090316_090322.bc", + kernels .. "/dawn_sa_090323_090329.bc", + kernels .. "/dawn_sa_090330_090405.bc", + kernels .. "/dawn_sa_090406_090412.bc", + kernels .. "/dawn_sa_090413_090419.bc", + kernels .. "/dawn_sa_090420_090426.bc", + kernels .. "/dawn_sa_090427_090503.bc", + kernels .. "/dawn_sa_090504_090510.bc", + kernels .. "/dawn_sa_090511_090517.bc", + kernels .. "/dawn_sa_090518_090524.bc", + kernels .. "/dawn_sa_090525_090531.bc", + kernels .. "/dawn_sa_090601_090607.bc", + kernels .. "/dawn_sa_090608_090614.bc", + kernels .. "/dawn_sa_090615_090621.bc", + kernels .. "/dawn_sa_090622_090628.bc", + kernels .. "/dawn_sa_090629_090705.bc", + kernels .. "/dawn_sa_090706_090712.bc", + kernels .. "/dawn_sa_090713_090719.bc", + kernels .. "/dawn_sa_090720_090726.bc", + kernels .. "/dawn_sa_090727_090802.bc", + kernels .. "/dawn_sa_090803_090809.bc", + kernels .. "/dawn_sa_090810_090816.bc", + kernels .. "/dawn_sa_090817_090823.bc", + kernels .. "/dawn_sa_090824_090830.bc", + kernels .. "/dawn_sa_090831_090906.bc", + kernels .. "/dawn_sa_090907_090913.bc", + kernels .. "/dawn_sa_090914_090920.bc", + kernels .. "/dawn_sa_090921_090927.bc", + kernels .. "/dawn_sa_090928_091004.bc", + kernels .. "/dawn_sa_091005_091011.bc", + kernels .. "/dawn_sa_091012_091018.bc", + kernels .. "/dawn_sa_091019_091025.bc", + kernels .. "/dawn_sa_091026_091101.bc", + kernels .. "/dawn_sa_091102_091108.bc", + kernels .. "/dawn_sa_091109_091115.bc", + kernels .. "/dawn_sa_091116_091122.bc", + kernels .. "/dawn_sa_091123_091129.bc", + kernels .. "/dawn_sa_091130_091206.bc", + kernels .. "/dawn_sa_091207_091213.bc", + kernels .. "/dawn_sa_091214_091220.bc", + kernels .. "/dawn_sa_091221_091227.bc", + kernels .. "/dawn_sa_091228_100103.bc", + kernels .. "/dawn_sa_100104_100110_v2.bc", + kernels .. "/dawn_sa_100111_100117_v2.bc", + kernels .. "/dawn_sa_100118_100124.bc", + kernels .. "/dawn_sa_100125_100131.bc", + kernels .. "/dawn_sa_100201_100207.bc", + kernels .. "/dawn_sa_100208_100214.bc", + kernels .. "/dawn_sa_100215_100221.bc", + kernels .. "/dawn_sa_100222_100228.bc", + kernels .. "/dawn_sa_100301_100307.bc", + kernels .. "/dawn_sa_100308_100314.bc", + kernels .. "/dawn_sa_100315_100321.bc", + kernels .. "/dawn_sa_100322_100328.bc", + kernels .. "/dawn_sa_100329_100404.bc", + kernels .. "/dawn_sa_100405_100411.bc", + kernels .. "/dawn_sa_100412_100418.bc", + kernels .. "/dawn_sa_100419_100425.bc", + kernels .. "/dawn_sa_100426_100502.bc", + kernels .. "/dawn_sa_100503_100509.bc", + kernels .. "/dawn_sa_100510_100516.bc", + kernels .. "/dawn_sa_100517_100523.bc", + kernels .. "/dawn_sa_100524_100530.bc", + kernels .. "/dawn_sa_100531_100606.bc", + kernels .. "/dawn_sa_100607_100613.bc", + kernels .. "/dawn_sa_100614_100620.bc", + kernels .. "/dawn_sa_100621_100627.bc", + kernels .. "/dawn_sa_100628_100704.bc", + kernels .. "/dawn_sa_100705_100711.bc", + kernels .. "/dawn_sa_100712_100718.bc", + kernels .. "/dawn_sa_100719_100725.bc", + kernels .. "/dawn_sa_100726_100801.bc", + kernels .. "/dawn_sa_100802_100808.bc", + kernels .. "/dawn_sa_100809_100815.bc", + kernels .. "/dawn_sa_100816_100822.bc", + kernels .. "/dawn_sa_100823_100829.bc", + kernels .. "/dawn_sa_100830_100905.bc", + kernels .. "/dawn_sa_100906_100912.bc", + kernels .. "/dawn_sa_100913_100919.bc", + kernels .. "/dawn_sa_100920_100926.bc", + kernels .. "/dawn_sa_100927_101003.bc", + kernels .. "/dawn_sa_101004_101010.bc", + kernels .. "/dawn_sa_101011_101017.bc", --]] + -- kernels .. "/dawn_sa_101018_101024.bc", + -- kernels .. "/dawn_sa_101025_101031.bc", + -- kernels .. "/dawn_sa_101101_101107.bc", + -- kernels .. "/dawn_sa_101108_101114.bc", + -- kernels .. "/dawn_sa_101115_101121.bc", + -- kernels .. "/dawn_sa_101122_101128.bc", + -- kernels .. "/dawn_sa_101129_101205.bc", + -- kernels .. "/dawn_sa_101206_101212.bc", + -- kernels .. "/dawn_sa_101213_101219.bc", + -- kernels .. "/dawn_sa_101220_101226.bc", + -- kernels .. "/dawn_sa_101227_110102.bc", + -- kernels .. "/dawn_sa_110103_110109.bc", + -- kernels .. "/dawn_sa_110110_110116.bc", + -- kernels .. "/dawn_sa_110117_110123.bc", + -- kernels .. "/dawn_sa_110124_110130.bc", + -- kernels .. "/dawn_sa_110131_110206.bc", + -- kernels .. "/dawn_sa_110207_110213.bc", + -- kernels .. "/dawn_sa_110214_110220.bc", + -- kernels .. "/dawn_sa_110221_110227.bc", + -- kernels .. "/dawn_sa_110228_110306.bc", + -- kernels .. "/dawn_sa_110307_110313.bc", + -- kernels .. "/dawn_sa_110314_110320.bc", + -- kernels .. "/dawn_sa_110321_110327.bc", + -- kernels .. "/dawn_sa_110328_110403.bc", + -- kernels .. "/dawn_sa_110404_110410.bc", + -- kernels .. "/dawn_sa_110411_110417.bc", + -- kernels .. "/dawn_sa_110418_110424.bc", + -- kernels .. "/dawn_sa_110425_110501.bc", + -- kernels .. "/dawn_sa_110502_110508.bc", + -- kernels .. "/dawn_sa_110509_110515.bc", + -- kernels .. "/dawn_sa_110516_110522.bc", + -- kernels .. "/dawn_sa_110523_110529.bc", + -- kernels .. "/dawn_sa_110530_110605.bc", + -- kernels .. "/dawn_sa_110606_110612.bc", + -- kernels .. "/dawn_sa_110613_110619.bc", + -- kernels .. "/dawn_sa_110620_110626.bc", + -- kernels .. "/dawn_sa_110627_110703.bc", + -- kernels .. "/dawn_sa_110704_110710.bc", + -- kernels .. "/dawn_sa_110711_110717.bc", + -- kernels .. "/dawn_sa_110718_110724.bc", + -- kernels .. "/dawn_sa_110725_110731.bc", + -- kernels .. "/dawn_sa_110801_110807.bc", + -- kernels .. "/dawn_sa_110808_110814.bc", + -- kernels .. "/dawn_sa_110815_110821.bc", + -- kernels .. "/dawn_sa_110822_110828.bc", + -- kernels .. "/dawn_sa_110829_110904.bc", + -- kernels .. "/dawn_sa_110905_110911.bc", + -- kernels .. "/dawn_sa_110912_110918.bc", + -- kernels .. "/dawn_sa_110919_110925.bc", + -- kernels .. "/dawn_sa_110926_111002.bc", + -- kernels .. "/dawn_sa_111003_111009.bc", + -- kernels .. "/dawn_sa_111010_111016.bc", + -- kernels .. "/dawn_sa_111017_111023.bc", + -- kernels .. "/dawn_sa_111024_111030.bc", + -- kernels .. "/dawn_sa_111031_111106.bc", + -- kernels .. "/dawn_sa_111107_111113.bc", + -- kernels .. "/dawn_sa_111114_111120.bc", + -- kernels .. "/dawn_sa_111121_111127.bc", + -- kernels .. "/dawn_sa_111128_111204.bc", + -- kernels .. "/dawn_sa_111205_111211.bc", + -- kernels .. "/dawn_sa_111212_111218.bc", + -- kernels .. "/dawn_sa_111219_111225.bc", + -- kernels .. "/dawn_sa_111226_120101.bc", + -- kernels .. "/dawn_sa_120102_120108.bc", + -- kernels .. "/dawn_sa_120109_120115.bc", + -- kernels .. "/dawn_sa_120116_120122.bc", + -- kernels .. "/dawn_sa_120123_120129.bc", + -- kernels .. "/dawn_sa_120130_120205.bc", + -- kernels .. "/dawn_sa_120206_120212.bc", + -- kernels .. "/dawn_sa_120213_120219.bc", + -- kernels .. "/dawn_sa_120220_120226.bc", + -- kernels .. "/dawn_sa_120227_120304.bc", + -- kernels .. "/dawn_sa_120305_120311.bc", + -- kernels .. "/dawn_sa_120312_120318.bc", + -- kernels .. "/dawn_sa_120319_120325.bc", + -- kernels .. "/dawn_sa_120326_120401.bc", + -- kernels .. "/dawn_sa_120402_120408.bc", + -- kernels .. "/dawn_sa_120409_120415.bc", + -- kernels .. "/dawn_sa_120416_120422.bc", + -- kernels .. "/dawn_sa_120423_120429.bc", + -- kernels .. "/dawn_sa_120430_120506.bc", + -- kernels .. "/dawn_sa_120507_120513.bc", + -- kernels .. "/dawn_sa_120514_120520.bc", + -- kernels .. "/dawn_sa_120521_120527.bc", + -- kernels .. "/dawn_sa_120528_120603.bc", + -- kernels .. "/dawn_sa_120604_120610.bc", + -- kernels .. "/dawn_sa_120611_120617.bc", + -- kernels .. "/dawn_sa_120618_120624.bc", + -- kernels .. "/dawn_sa_120625_120701.bc", + -- kernels .. "/dawn_sa_120702_120708.bc", + -- kernels .. "/dawn_sa_120709_120715.bc", + -- kernels .. "/dawn_sa_120716_120722.bc", + -- kernels .. "/dawn_sa_120723_120729.bc", + -- kernels .. "/dawn_sa_120730_120805.bc", + -- kernels .. "/dawn_sa_120806_120812.bc", + -- kernels .. "/dawn_sa_120813_120819.bc", + -- kernels .. "/dawn_sa_120820_120826.bc", + -- kernels .. "/dawn_sa_120827_120902.bc", + -- kernels .. "/dawn_sa_120903_120909.bc", + -- kernels .. "/dawn_sa_120910_120916.bc", } local LightSources = { - { - Type = "SceneGraphLightSource", - Identifier = "Sun", - Node = sunTransforms.SolarSystemBarycenter.Identifier, - Intensity = 1.0 - }, - { - Identifier = "Camera", - Type = "CameraLightSource", - Intensity = 0.5 - } + { + Type = "SceneGraphLightSource", + Identifier = "Sun", + Node = sunTransforms.SolarSystemBarycenter.Identifier, + Intensity = 1.0 + }, + { + Identifier = "Camera", + Type = "CameraLightSource", + Intensity = 0.5 + } } local Dawn = { - Identifier = "Dawn", - Parent = transforms.SolarSystemBarycenter.Identifier, - Transform = { - Translation = { - Type = "SpiceTranslation", - Target = "DAWN", - Observer = "SUN", - Kernels = KernelFiles - }, - Rotation = { - Type = "SpiceRotation", - SourceFrame = "DAWN_SPACECRAFT", - DestinationFrame = "GALACTIC", - Kernels = KernelFiles - } + Identifier = "Dawn", + Parent = transforms.SolarSystemBarycenter.Identifier, + Transform = { + Translation = { + Type = "SpiceTranslation", + Target = "DAWN", + Observer = "SUN", + Kernels = KernelFiles }, - Renderable = { - Type = "RenderableModel", - Body = "DAWN", - GeometryFile = models .. "/mainbodydawn.obj", - LightSources = LightSources - }, - GUI = { - Path = "/Solar System/Missions/Dawn" + Rotation = { + Type = "SpiceRotation", + SourceFrame = "DAWN_SPACECRAFT", + DestinationFrame = "GALACTIC", + Kernels = KernelFiles } + }, + Renderable = { + Type = "RenderableModel", + Body = "DAWN", + GeometryFile = models .. "/mainbodydawn.obj", + LightSources = LightSources + }, + GUI = { + Path = "/Solar System/Missions/Dawn" + } } -- Dawn Solar Array module 1 local DawnSolarArray1 = { - Identifier = "DawnSolar1", - Parent = Dawn.Identifier, - Transform = { - -- JCC: Spice rotations are commented because spice ck files - -- are not present. - -- Rotation = { - -- Type = "SpiceRotation", - -- SourceFrame = "DAWN_SA-Y", - -- DestinationFrame = "DAWN_SPACECRAFT" - -- } - Rotation = { - Type = "StaticRotation", - Rotation = {0.0, 4.71225, 0.0} - } - }, - Renderable = { - Type = "RenderableModel", - Body = "DAWN", - GeometryFile = models .. "/solarpanelleft.obj", - LightSources = LightSources - }, - GUI = { - Name = "Dawn Solar 1", - Path = "/Solar System/Missions/Dawn" + Identifier = "DawnSolar1", + Parent = Dawn.Identifier, + Transform = { + -- JCC: Spice rotations are commented because spice ck files + -- are not present. + -- Rotation = { + -- Type = "SpiceRotation", + -- SourceFrame = "DAWN_SA-Y", + -- DestinationFrame = "DAWN_SPACECRAFT" + -- } + Rotation = { + Type = "StaticRotation", + Rotation = {0.0, 4.71225, 0.0} } + }, + Renderable = { + Type = "RenderableModel", + Body = "DAWN", + GeometryFile = models .. "/solarpanelleft.obj", + LightSources = LightSources + }, + GUI = { + Name = "Dawn Solar 1", + Path = "/Solar System/Missions/Dawn" + } } -- Dawn Solar Array module 2 local DawnSolarArray2 = { - Identifier = "DawnSolar2", - Parent = Dawn.Identifier, - Transform = { - -- Rotation = { - -- Type = "SpiceRotation", - -- SourceFrame = "DAWN_SA+Y", - -- DestinationFrame = "DAWN_SPACECRAFT" - -- } - Rotation = { - Type = "StaticRotation", - Rotation = {3.1415, 1.57075, 0.0} - } - }, - Renderable = { - Type = "RenderableModel", - Body = "DAWN", - GeometryFile = models .. "/solarpanelright.obj", - LightSources = LightSources - }, - GUI = { - Name = "Dawn Solar 2", - Path = "/Solar System/Missions/Dawn" + Identifier = "DawnSolar2", + Parent = Dawn.Identifier, + Transform = { + -- Rotation = { + -- Type = "SpiceRotation", + -- SourceFrame = "DAWN_SA+Y", + -- DestinationFrame = "DAWN_SPACECRAFT" + -- } + Rotation = { + Type = "StaticRotation", + Rotation = {3.1415, 1.57075, 0.0} } + }, + Renderable = { + Type = "RenderableModel", + Body = "DAWN", + GeometryFile = models .. "/solarpanelright.obj", + LightSources = LightSources + }, + GUI = { + Name = "Dawn Solar 2", + Path = "/Solar System/Missions/Dawn" + } } local DawnTrail = { - Identifier = "DawnTrail", - Parent = transforms.SolarSystemBarycenter.Identifier, - Renderable = { - Type = "RenderableTrailTrajectory", - Translation = { - Type = "SpiceTranslation", - Target = "DAWN", - Observer = "SUN" - }, - Color = { 1.0, 0.8, 0.4 }, - ShowFullTrail = false, - StartTime = "2007 SEP 26 13:28:00", - EndTime = "2012 SEP 12 12:00:00", - PointSize = 5, - SampleInterval = 3600, - TimeStampSubsampleFactor = 4, - EnableFade = true, - Rendering = "Lines+Points" + Identifier = "DawnTrail", + Parent = transforms.SolarSystemBarycenter.Identifier, + Renderable = { + Type = "RenderableTrailTrajectory", + Translation = { + Type = "SpiceTranslation", + Target = "DAWN", + Observer = "SUN" }, - GUI = { - Name = "Dawn Trail", - Path = "/Solar System/Missions/Dawn" - } + Color = { 1.0, 0.8, 0.4 }, + ShowFullTrail = false, + StartTime = "2007 SEP 26 13:28:00", + EndTime = "2012 SEP 12 12:00:00", + PointSize = 5, + SampleInterval = 3600, + TimeStampSubsampleFactor = 4, + EnableFade = true, + Rendering = "Lines+Points" + }, + GUI = { + Name = "Dawn Trail", + Path = "/Solar System/Missions/Dawn" + } } -- DawnFov 1 local DawnFramingCamera1 = { - Identifier = "Dawn_framing_camera_1", - Parent = Dawn.Identifier, - Renderable = { - Type = "RenderableFov", - Body = "DAWN", - Frame = "DAWN_SPACECRAFT", - Color = { 0.8, 0.7, 0.7 }, - Instrument = { - Name = "DAWN_FC1", - Method = "ELLIPSOID", - Aberration = "NONE" - }, - PotentialTargets = { "VESTA", "CERES" } + Identifier = "Dawn_framing_camera_1", + Parent = Dawn.Identifier, + Renderable = { + Type = "RenderableFov", + Body = "DAWN", + Frame = "DAWN_SPACECRAFT", + Color = { 0.8, 0.7, 0.7 }, + Instrument = { + Name = "DAWN_FC1", + Method = "ELLIPSOID", + Aberration = "NONE" }, - GUI = { - Name = "Dawn Framing Camera 1", - Path = "/Solar System/Missions/Dawn" - } + PotentialTargets = { "VESTA", "CERES" } + }, + GUI = { + Name = "Dawn Framing Camera 1", + Path = "/Solar System/Missions/Dawn" + } } local DawnFramingCamera2 = { - Identifier = "Dawn_framing_camera_2", - Parent = Dawn.Identifier, - Renderable = { - Type = "RenderableFov", - Body = "DAWN", - Frame = "DAWN_SPACECRAFT", - Color = { 0.8, 0.7, 0.7 }, - Instrument = { - Name = "DAWN_FC2", - Method = "ELLIPSOID", - Aberration = "NONE" - }, - PotentialTargets = { "VESTA", "CERES" } + Identifier = "Dawn_framing_camera_2", + Parent = Dawn.Identifier, + Renderable = { + Type = "RenderableFov", + Body = "DAWN", + Frame = "DAWN_SPACECRAFT", + Color = { 0.8, 0.7, 0.7 }, + Instrument = { + Name = "DAWN_FC2", + Method = "ELLIPSOID", + Aberration = "NONE" }, - GUI = { - Name = "Dawn Framing Camera 2", - Path = "/Solar System/Missions/Dawn" - } + PotentialTargets = { "VESTA", "CERES" } + }, + GUI = { + Name = "Dawn Framing Camera 2", + Path = "/Solar System/Missions/Dawn" + } } assetHelper.registerSceneGraphNodesAndExport(asset, { - Dawn, - DawnSolarArray1, - DawnSolarArray2, - DawnTrail, - DawnFramingCamera1, - DawnFramingCamera2 + Dawn, + DawnSolarArray1, + DawnSolarArray2, + DawnTrail, + DawnFramingCamera1, + DawnFramingCamera2 }) diff --git a/data/assets/scene/solarsystem/missions/dawn/dawn_kernels.asset b/data/assets/scene/solarsystem/missions/dawn/dawn_kernels.asset index c559946178..ab4e5d4c2e 100644 --- a/data/assets/scene/solarsystem/missions/dawn/dawn_kernels.asset +++ b/data/assets/scene/solarsystem/missions/dawn/dawn_kernels.asset @@ -1,8 +1,8 @@ local Kernels = asset.syncedResource({ - Name = "Dawn Kernels", - Type = "HttpSynchronization", - Identifier = "dawn_kernels", - Version = 2 + Name = "Dawn Kernels", + Type = "HttpSynchronization", + Identifier = "dawn_kernels", + Version = 2 }) asset.export("Kernels", Kernels) diff --git a/data/assets/scene/solarsystem/missions/dawn/vesta.asset b/data/assets/scene/solarsystem/missions/dawn/vesta.asset index 642f5591b3..99f3b082ff 100644 --- a/data/assets/scene/solarsystem/missions/dawn/vesta.asset +++ b/data/assets/scene/solarsystem/missions/dawn/vesta.asset @@ -4,132 +4,132 @@ local kernels = asset.require('./dawn_kernels').Kernels local textures = asset.syncedResource({ - Name = "Vesta Textures", - Type = "HttpSynchronization", - Identifier = "vesta_textures", - Version = 1 + Name = "Vesta Textures", + Type = "HttpSynchronization", + Identifier = "vesta_textures", + Version = 1 }) local images = asset.syncedResource({ - Name = "Vesta Images", - Type = "HttpSynchronization", - Identifier = "vesta_images", - Version = 1 + Name = "Vesta Images", + Type = "HttpSynchronization", + Identifier = "vesta_images", + Version = 1 }) local models = asset.syncedResource({ - Name = "Vesta Models", - Type = "HttpSynchronization", - Identifier = "vesta_model", - Version = 1 + Name = "Vesta Models", + Type = "HttpSynchronization", + Identifier = "vesta_model", + Version = 1 }) local Vesta = { - Identifier = "Vesta", - Parent = transforms.SolarSystemBarycenter.Identifier, - Transform = { - Translation = { - Type = "SpiceTranslation", - Target = "VESTA", - Observer = "SUN", - Kernels = { - --kernels .. "/dawn_vesta_v06.tpc", - kernels .. "/sb_vesta_071107.bsp" - } - }, - Rotation = { - Type = "SpiceRotation", - SourceFrame = "IAU_VESTA", - DestinationFrame = "GALACTIC" - } + Identifier = "Vesta", + Parent = transforms.SolarSystemBarycenter.Identifier, + Transform = { + Translation = { + Type = "SpiceTranslation", + Target = "VESTA", + Observer = "SUN", + Kernels = { + --kernels .. "/dawn_vesta_v06.tpc", + kernels .. "/sb_vesta_071107.bsp" + } }, - Renderable = { - Type = "RenderableModelProjection", - GeometryFile = models .. "/VestaComet_5000.obj", - BoundingSphereRadius = 10.0, - Projection = { - Sequence = images, - SequenceType = "image-sequence", - Observer = "DAWN", - Target = "VESTA", - Aberration = "NONE", - - DataInputTranslation = { - Instrument = { - -- FC1 = { - -- DetectorType = "Camera", - -- Spice = { "DAWN_FC1" }, - -- }, - FC2 = { - DetectorType = "Camera", - Spice = { "DAWN_FC2" } - } - }, - Target = { - Read = { - "TARGET_NAME", - "INSTRUMENT_HOST_NAME", - "INSTRUMENT_ID", - "START_TIME", - "STOP_TIME", - --"DETECTOR_TYPE", - --"SEQUENCE_ID" - }, - Convert = { - VESTA = { "VESTA" }, - DAWN = { "DAWN" }, - --FRAMINGCAMERA1 = { "DAWN_FC1" }, - FRAMINGCAMERA2 = { "DAWN_FC2" }, - --FC1 = { "DAWN_FC1" }, - FC2 = { "DAWN_FC2" } - } - } - }, - Instrument = { - Name = "DAWN_FC2", - Method = "ELLIPSOID", - Aberration = "NONE", - Fovy = 5.46, - Aspect = 1 - }, - - --[[ Instrument = { - Name = "DAWN_FC1", - Method = "ELLIPSOID", - Aberration = "NONE", - Fovy = 5.46, - Aspect = 1, - Near = 0.2, - Far = 10000 - },--]] - PotentialTargets = { "VESTA" } - } - }, - GUI = { - Path = "/Solar System/Asteroid Belt/Vesta" + Rotation = { + Type = "SpiceRotation", + SourceFrame = "IAU_VESTA", + DestinationFrame = "GALACTIC" } + }, + Renderable = { + Type = "RenderableModelProjection", + GeometryFile = models .. "/VestaComet_5000.obj", + BoundingSphereRadius = 10.0, + Projection = { + Sequence = images, + SequenceType = "image-sequence", + Observer = "DAWN", + Target = "VESTA", + Aberration = "NONE", + + DataInputTranslation = { + Instrument = { + -- FC1 = { + -- DetectorType = "Camera", + -- Spice = { "DAWN_FC1" }, + -- }, + FC2 = { + DetectorType = "Camera", + Spice = { "DAWN_FC2" } + } + }, + Target = { + Read = { + "TARGET_NAME", + "INSTRUMENT_HOST_NAME", + "INSTRUMENT_ID", + "START_TIME", + "STOP_TIME", + --"DETECTOR_TYPE", + --"SEQUENCE_ID" + }, + Convert = { + VESTA = { "VESTA" }, + DAWN = { "DAWN" }, + --FRAMINGCAMERA1 = { "DAWN_FC1" }, + FRAMINGCAMERA2 = { "DAWN_FC2" }, + --FC1 = { "DAWN_FC1" }, + FC2 = { "DAWN_FC2" } + } + } + }, + Instrument = { + Name = "DAWN_FC2", + Method = "ELLIPSOID", + Aberration = "NONE", + Fovy = 5.46, + Aspect = 1 + }, + + --[[ Instrument = { + Name = "DAWN_FC1", + Method = "ELLIPSOID", + Aberration = "NONE", + Fovy = 5.46, + Aspect = 1, + Near = 0.2, + Far = 10000 + },--]] + PotentialTargets = { "VESTA" } + } + }, + GUI = { + Path = "/Solar System/Asteroid Belt/Vesta" + } } local VestaTrail = { - Identifier = "VestaTrail", - Parent = transforms.SolarSystemBarycenter.Identifier, - Renderable = { - Type = "RenderableTrailOrbit", - Translation = { - Type = "SpiceTranslation", - Target = "VESTA", - Observer = "SUN" - }, - Color = { 0.7, 0.8, 0.7 }, - StartTime = "2007 JUL 20 12:00:00", - EndTime = "2018 JAN 22 12:00:00", - Period = 1325.0, - Resolution = 3600 * 24 + Identifier = "VestaTrail", + Parent = transforms.SolarSystemBarycenter.Identifier, + Renderable = { + Type = "RenderableTrailOrbit", + Translation = { + Type = "SpiceTranslation", + Target = "VESTA", + Observer = "SUN" }, - GUI = { - Name = "Vesta Trail", - Path = "/Solar System/Asteroid Belt/Vesta" - } + Color = { 0.7, 0.8, 0.7 }, + StartTime = "2007 JUL 20 12:00:00", + EndTime = "2018 JAN 22 12:00:00", + Period = 1325.0, + Resolution = 3600 * 24 + }, + GUI = { + Name = "Vesta Trail", + Path = "/Solar System/Asteroid Belt/Vesta" + } } assetHelper.registerSceneGraphNodesAndExport(asset, { Vesta, VestaTrail }) diff --git a/data/assets/scene/solarsystem/missions/gaia/dashboard.asset b/data/assets/scene/solarsystem/missions/gaia/dashboard.asset index bac51a5ad2..73f1c54413 100644 --- a/data/assets/scene/solarsystem/missions/gaia/dashboard.asset +++ b/data/assets/scene/solarsystem/missions/gaia/dashboard.asset @@ -1,12 +1,12 @@ local assetHelper = asset.require('util/asset_helper') assetHelper.registerDashboardItems(asset, { - { - Type = "DashboardItemDistance", - Identifier = "GaiaEarthDistance", - GuiName = "Gaia Earth Distance", - SourceType = "Node", - SourceNodeName = "Gaia", - DestinationType = "Node Surface", - DestinationNodeName = "Earth" - } + { + Type = "DashboardItemDistance", + Identifier = "GaiaEarthDistance", + GuiName = "Gaia Earth Distance", + SourceType = "Node", + SourceNodeName = "Gaia", + DestinationType = "Node Surface", + DestinationNodeName = "Earth" + } }) diff --git a/data/assets/scene/solarsystem/missions/gaia/gaia.asset b/data/assets/scene/solarsystem/missions/gaia/gaia.asset index f1fddb74ee..2268aa01bd 100644 --- a/data/assets/scene/solarsystem/missions/gaia/gaia.asset +++ b/data/assets/scene/solarsystem/missions/gaia/gaia.asset @@ -3,53 +3,53 @@ local transforms = asset.require('./transforms') local sunTransforms = asset.require('scene/solarsystem/sun/transforms') local model = asset.syncedResource({ - Name = "Gaia Model", - Type = "HttpSynchronization", - Identifier = "gaia_model", - Version = 2 + Name = "Gaia Model", + Type = "HttpSynchronization", + Identifier = "gaia_model", + Version = 2 }) local Gaia = { - Identifier = "Gaia", - Parent = transforms.GaiaPosition.Identifier, - Transform = { - Rotation = { - Type = "FixedRotation", - Attached = "Gaia", - XAxis = { 1.0, 0.0, 0.0 }, - XAxisOrthogonal = true, - YAxis = "Sun", - YAxisInverted = true - }, - Scale = { - Type = "StaticScale", - Scale = 10.0 - } + Identifier = "Gaia", + Parent = transforms.GaiaPosition.Identifier, + Transform = { + Rotation = { + Type = "FixedRotation", + Attached = "Gaia", + XAxis = { 1.0, 0.0, 0.0 }, + XAxisOrthogonal = true, + YAxis = "Sun", + YAxisInverted = true }, - -- X Orthogonal - Renderable = { - Type = "RenderableModel", - Body = "GAIA", - GeometryFile = model .. "/gaia.obj", - LightSources = { - { - Type = "SceneGraphLightSource", - Identifier = "Sun", - Node = sunTransforms.SolarSystemBarycenter.Identifier, - Intensity = 0.3 - }, - { - Identifier = "Camera", - Type = "CameraLightSource", - Intensity = 0.4 - } - } - }, - GUI = { - Name = "Gaia", - Path = "/Solar System/Missions/Gaia" + Scale = { + Type = "StaticScale", + Scale = 10.0 } + }, + -- X Orthogonal + Renderable = { + Type = "RenderableModel", + Body = "GAIA", + GeometryFile = model .. "/gaia.obj", + LightSources = { + { + Type = "SceneGraphLightSource", + Identifier = "Sun", + Node = sunTransforms.SolarSystemBarycenter.Identifier, + Intensity = 0.3 + }, + { + Identifier = "Camera", + Type = "CameraLightSource", + Intensity = 0.4 + } + } + }, + GUI = { + Name = "Gaia", + Path = "/Solar System/Missions/Gaia" + } } assetHelper.registerSceneGraphNodesAndExport(asset, { Gaia }) diff --git a/data/assets/scene/solarsystem/missions/gaia/trail.asset b/data/assets/scene/solarsystem/missions/gaia/trail.asset index 6ba49f5d9f..ee00ea2a6c 100644 --- a/data/assets/scene/solarsystem/missions/gaia/trail.asset +++ b/data/assets/scene/solarsystem/missions/gaia/trail.asset @@ -3,61 +3,61 @@ local earthTransforms = asset.require('scene/solarsystem/planets/earth/transform local sunTransforms = asset.require('scene/solarsystem/sun/transforms') local trail = asset.syncedResource({ - Name = "Gaia Trail", - Type = "HttpSynchronization", - Identifier = "gaia_trail", - Version = 2 + Name = "Gaia Trail", + Type = "HttpSynchronization", + Identifier = "gaia_trail", + Version = 2 }) local GaiaTrail = { - Identifier = "GaiaTrail", - Parent = earthTransforms.EarthBarycenter.Identifier, - Renderable = { - Type = "RenderableTrailTrajectory", - Translation = { - Type = "HorizonsTranslation", - HorizonsTextFile = trail .. "/gaia_orbit_horizons.dat" - }, - Color = { 0.0, 0.8, 0.7 }, - ShowFullTrail = false, - StartTime = "2013 DEC 19 09:55:10", - EndTime = "2019 JUN 20 05:55:10", - PointSize = 5, - SampleInterval = 12000, - TimeStampSubsampleFactor = 1, - EnableFade = true, - Rendering = "Lines" + Identifier = "GaiaTrail", + Parent = earthTransforms.EarthBarycenter.Identifier, + Renderable = { + Type = "RenderableTrailTrajectory", + Translation = { + Type = "HorizonsTranslation", + HorizonsTextFile = trail .. "/gaia_orbit_horizons.dat" }, - GUI = { - Name = "Gaia Trail", - Path = "/Solar System/Missions/Gaia" - } + Color = { 0.0, 0.8, 0.7 }, + ShowFullTrail = false, + StartTime = "2013 DEC 19 09:55:10", + EndTime = "2019 JUN 20 05:55:10", + PointSize = 5, + SampleInterval = 12000, + TimeStampSubsampleFactor = 1, + EnableFade = true, + Rendering = "Lines" + }, + GUI = { + Name = "Gaia Trail", + Path = "/Solar System/Missions/Gaia" + } } local GaiaTrailEclip = { - Identifier = "GaiaTrail_Eclip", - Parent = sunTransforms.SolarSystemBarycenter.Identifier, - Renderable = { - Type = "RenderableTrailTrajectory", - Enabled = false, - Translation = { - Type = "HorizonsTranslation", - HorizonsTextFile = trail .. "/gaia_orbit_horizons_sun.dat" - }, - Color = { 1.0, 0.0, 0.0 }, - ShowFullTrail = false, - StartTime = "2013 DEC 19 09:55:10", - EndTime = "2019 JUN 20 05:55:10", - PointSize = 5, - SampleInterval = 6000, - TimeStampSubsampleFactor = 1, - EnableFade = true, - Rendering = "Lines" + Identifier = "GaiaTrail_Eclip", + Parent = sunTransforms.SolarSystemBarycenter.Identifier, + Renderable = { + Type = "RenderableTrailTrajectory", + Enabled = false, + Translation = { + Type = "HorizonsTranslation", + HorizonsTextFile = trail .. "/gaia_orbit_horizons_sun.dat" }, - GUI = { - Name = "Gaia Ecliptic Trail", - Path = "/Solar System/Missions/Gaia" - } + Color = { 1.0, 0.0, 0.0 }, + ShowFullTrail = false, + StartTime = "2013 DEC 19 09:55:10", + EndTime = "2019 JUN 20 05:55:10", + PointSize = 5, + SampleInterval = 6000, + TimeStampSubsampleFactor = 1, + EnableFade = true, + Rendering = "Lines" + }, + GUI = { + Name = "Gaia Ecliptic Trail", + Path = "/Solar System/Missions/Gaia" + } } assetHelper.registerSceneGraphNodesAndExport(asset, { GaiaTrail, GaiaTrailEclip } ) diff --git a/data/assets/scene/solarsystem/missions/gaia/transforms.asset b/data/assets/scene/solarsystem/missions/gaia/transforms.asset index a06ed09a95..5db3a1205c 100644 --- a/data/assets/scene/solarsystem/missions/gaia/transforms.asset +++ b/data/assets/scene/solarsystem/missions/gaia/transforms.asset @@ -3,25 +3,25 @@ local earthTransforms = asset.require('scene/solarsystem/planets/earth/transform local trail = asset.syncedResource({ - Name = "Gaia Trail", - Type = "HttpSynchronization", - Identifier = "gaia_trail", - Version = 1 + Name = "Gaia Trail", + Type = "HttpSynchronization", + Identifier = "gaia_trail", + Version = 1 }) local GaiaPosition = { - Identifier = "GaiaPosition", - Parent = earthTransforms.EarthBarycenter.Identifier, - Transform = { - Translation = { - Type = "HorizonsTranslation", - HorizonsTextFile = trail .. "/gaia_orbit_horizons.dat" - }, + Identifier = "GaiaPosition", + Parent = earthTransforms.EarthBarycenter.Identifier, + Transform = { + Translation = { + Type = "HorizonsTranslation", + HorizonsTextFile = trail .. "/gaia_orbit_horizons.dat" }, - GUI = { - Name = "Position", - Path = "/Solar System/Missions/Gaia" - } + }, + GUI = { + Name = "Position", + Path = "/Solar System/Missions/Gaia" + } } assetHelper.registerSceneGraphNodesAndExport(asset, { GaiaPosition }) diff --git a/data/assets/scene/solarsystem/missions/insight/edl.asset b/data/assets/scene/solarsystem/missions/insight/edl.asset index d15aa48282..6a2b046a66 100644 --- a/data/assets/scene/solarsystem/missions/insight/edl.asset +++ b/data/assets/scene/solarsystem/missions/insight/edl.asset @@ -3,51 +3,51 @@ local sunTransforms = asset.require('scene/solarsystem/sun/transforms') local assetHelper = asset.require('util/asset_helper') local models = asset.syncedResource({ - Name = "Insight Models Chutes", - Type = "HttpSynchronization", - Identifier = "insight_models", - Version = 2 + Name = "Insight Models Chutes", + Type = "HttpSynchronization", + Identifier = "insight_models", + Version = 2 }) local ikernels = asset.syncedResource({ - Name = "Insight Kernels", - Type = "HttpSynchronization", - Identifier = "insight_kernels", - Version = 1 + Name = "Insight Kernels", + Type = "HttpSynchronization", + Identifier = "insight_kernels", + Version = 1 }) local iKernels = { - ikernels .. '/nsyt_spk_cruise_od063_v1_approach2surface_SC_Lander.tsc', - ikernels .. '/insight_v02.tfr', - ikernels .. '/mar085s.bsp', - ikernels .. '/nsyt_spk_cruise_POST_approach2surface_SC_Lander.bsp', - ikernels .. '/nsyt_spk_cruise_POST_approach2surface_SC_Lander.bck', + ikernels .. '/nsyt_spk_cruise_od063_v1_approach2surface_SC_Lander.tsc', + ikernels .. '/insight_v02.tfr', + ikernels .. '/mar085s.bsp', + ikernels .. '/nsyt_spk_cruise_POST_approach2surface_SC_Lander.bsp', + ikernels .. '/nsyt_spk_cruise_POST_approach2surface_SC_Lander.bck', } local RotationMatrix = { - -1, 0, 0, - 0, 0, -1, - 0, -1, 0 + -1, 0, 0, + 0, 0, -1, + 0, -1, 0 } local LightSources = { - { - Type = "SceneGraphLightSource", - Identifier = "Sun", - Node = sunTransforms.SolarSystemBarycenter.Identifier, - Intensity = 1.0 - }, - { - Type = "SceneGraphLightSource", - Identifier = "Mars", - Node = "Mars", - Intensity = 1.0 - }, - { - Identifier = "Camera", - Type = "CameraLightSource", - Intensity = 0.5 - } + { + Type = "SceneGraphLightSource", + Identifier = "Sun", + Node = sunTransforms.SolarSystemBarycenter.Identifier, + Intensity = 1.0 + }, + { + Type = "SceneGraphLightSource", + Identifier = "Mars", + Node = "Mars", + Intensity = 1.0 + }, + { + Identifier = "Camera", + Type = "CameraLightSource", + Intensity = 0.5 + } } --expected timeline @@ -66,740 +66,740 @@ local kernelTouchdownTime = "2018 NOV 26 19:45:32.3" local spiceRotationEndTime = "2018 NOV 26 19:51:39" local InsightParent = { - Identifier = "InsightParent", - Parent = "MarsBarycenter", - Transform = { - Translation = { - Type = "SpiceTranslation", - Target = "INSIGHT", - Observer = "MARS", - Frame = "GALACTIC", - Kernels = iKernels - }, - Rotation = { - Type = "SpiceRotation", - SourceFrame = "INSIGHT_LANDER_CRUISE", - DestinationFrame = "GALACTIC" - }, + Identifier = "InsightParent", + Parent = "MarsBarycenter", + Transform = { + Translation = { + Type = "SpiceTranslation", + Target = "INSIGHT", + Observer = "MARS", + Frame = "GALACTIC", + Kernels = iKernels }, - TimeFrame = { - Type = "TimeFrameInterval", - Start = entryTimeStart, - End = spiceRotationEndTime - }, - GUI = { - Hidden = true, - Name = "InsightParent", - Path = "/Solar System/Missions/Insight" + Rotation = { + Type = "SpiceRotation", + SourceFrame = "INSIGHT_LANDER_CRUISE", + DestinationFrame = "GALACTIC" } + }, + TimeFrame = { + Type = "TimeFrameInterval", + Start = entryTimeStart, + End = spiceRotationEndTime + }, + GUI = { + Hidden = true, + Name = "InsightParent", + Path = "/Solar System/Missions/Insight" + } } -- -1397 offset for MOLA local Insight = { - Identifier = "Insight", - Parent = "InsightParent", - Transform = { - Rotation = { - Type = "StaticRotation", - Rotation = {0.0, 0.0, -3.1415} - } - }, - GUI = { - Name = "Insight", - Path = "/Solar System/Missions/Insight" + Identifier = "Insight", + Parent = "InsightParent", + Transform = { + Rotation = { + Type = "StaticRotation", + Rotation = {0.0, 0.0, -3.1415} } + }, + GUI = { + Name = "Insight", + Path = "/Solar System/Missions/Insight" + } } local Insight_Entry_CapsuleA = { - Identifier = "Insight_Entry_CapsuleA", - Parent = Insight.Identifier, - Renderable = { - Type = "RenderableModel", - GeometryFile = models .. "/cruise_insight_doubleside2_newcapsule_diffuse.obj", - ModelTransform = RotationMatrix, - LightSources = LightSources, - }, - TimeFrame = { - Type = "TimeFrameInterval", - Start = entryTimeStart, - End = landerSeperationTime - }, - GUI = { - Hidden = true, - Name = "Insight Entry CapsuleA", - Path = "/Solar System/Missions/Insight" - } + Identifier = "Insight_Entry_CapsuleA", + Parent = Insight.Identifier, + Renderable = { + Type = "RenderableModel", + GeometryFile = models .. "/cruise_insight_doubleside2_newcapsule_diffuse.obj", + ModelTransform = RotationMatrix, + LightSources = LightSources, + }, + TimeFrame = { + Type = "TimeFrameInterval", + Start = entryTimeStart, + End = landerSeperationTime + }, + GUI = { + Hidden = true, + Name = "Insight Entry CapsuleA", + Path = "/Solar System/Missions/Insight" + } } local Insight_Entry_Capsule_Ring = { - Identifier = "Insight_Entry_Capsule_Ring", - Parent = Insight.Identifier, - Renderable = { - Type = "RenderableModel", - GeometryFile = models .. "/insight_cruise_cone_ring_foil_gold.obj", - ModelTransform = RotationMatrix, - LightSources = LightSources, - }, - TimeFrame = { - Type = "TimeFrameInterval", - Start = entryTimeStart, - End = landerSeperationTime - }, - GUI = { - Hidden = true, - Name = "Insight Entry Capsule Ring", - Path = "/Solar System/Missions/Insight" - } + Identifier = "Insight_Entry_Capsule_Ring", + Parent = Insight.Identifier, + Renderable = { + Type = "RenderableModel", + GeometryFile = models .. "/insight_cruise_cone_ring_foil_gold.obj", + ModelTransform = RotationMatrix, + LightSources = LightSources, + }, + TimeFrame = { + Type = "TimeFrameInterval", + Start = entryTimeStart, + End = landerSeperationTime + }, + GUI = { + Hidden = true, + Name = "Insight Entry Capsule Ring", + Path = "/Solar System/Missions/Insight" + } } local Insight_Entry_Capsule_Plugs = { - Identifier = "Insight_Entry_Capsule_Plugs", - Parent = Insight.Identifier, - Renderable = { - Type = "RenderableModel", - GeometryFile = models .. "/insight_cruise_cone_capsule_diffuse.obj", - ModelTransform = RotationMatrix, - LightSources = LightSources, - }, - TimeFrame = { - Type = "TimeFrameInterval", - Start = entryTimeStart, - End = landerSeperationTime - }, - GUI = { - Hidden = true, - Name = "Insight Entry Capsule Plugs", - Path = "/Solar System/Missions/Insight" - } + Identifier = "Insight_Entry_Capsule_Plugs", + Parent = Insight.Identifier, + Renderable = { + Type = "RenderableModel", + GeometryFile = models .. "/insight_cruise_cone_capsule_diffuse.obj", + ModelTransform = RotationMatrix, + LightSources = LightSources, + }, + TimeFrame = { + Type = "TimeFrameInterval", + Start = entryTimeStart, + End = landerSeperationTime + }, + GUI = { + Hidden = true, + Name = "Insight Entry Capsule Plugs", + Path = "/Solar System/Missions/Insight" + } } local Insight_Entry_Heatshield = { - Identifier = "Insight_Entry_Heatshield", - Parent = Insight.Identifier, - Renderable = { - Type = "RenderableModel", - GeometryFile = models .. "/insight_cruise_heatshield_foil_gold.obj", - ModelTransform = RotationMatrix, - LightSources = LightSources, - }, - TimeFrame = { - Type = "TimeFrameInterval", - Start = entryTimeStart, - End = heatShieldSeperationTime - }, - GUI = { - Hidden = true, - Name = "Insight Entry Heatshield", - Path = "/Solar System/Missions/Insight" - } + Identifier = "Insight_Entry_Heatshield", + Parent = Insight.Identifier, + Renderable = { + Type = "RenderableModel", + GeometryFile = models .. "/insight_cruise_heatshield_foil_gold.obj", + ModelTransform = RotationMatrix, + LightSources = LightSources, + }, + TimeFrame = { + Type = "TimeFrameInterval", + Start = entryTimeStart, + End = heatShieldSeperationTime + }, + GUI = { + Hidden = true, + Name = "Insight Entry Heatshield", + Path = "/Solar System/Missions/Insight" + } } local Insight_Parachute_0 = { - Identifier = "Insight_Parachute_0", - Parent = Insight.Identifier, - Renderable = { - Type = "RenderableModel", - GeometryFile = models .. "/insight_chute_frame01_diff1.obj", - ModelTransform = RotationMatrix, - LightSources = LightSources, - }, - TimeFrame = { - Type = "TimeFrameInterval", - Start = parachuteDeployTime1, - End = parachuteDeployTime20 - }, - GUI = { - Hidden = true, - Name = "Insight Parachute0", - Path = "/Solar System/Missions/Insight" - } + Identifier = "Insight_Parachute_0", + Parent = Insight.Identifier, + Renderable = { + Type = "RenderableModel", + GeometryFile = models .. "/insight_chute_frame01_diff1.obj", + ModelTransform = RotationMatrix, + LightSources = LightSources, + }, + TimeFrame = { + Type = "TimeFrameInterval", + Start = parachuteDeployTime1, + End = parachuteDeployTime20 + }, + GUI = { + Hidden = true, + Name = "Insight Parachute0", + Path = "/Solar System/Missions/Insight" + } } local Insight_Parachute_Cords_0 = { - Identifier = "Insight_Parachute_Cords_0", - Parent = Insight.Identifier, - Renderable = { - Type = "RenderableModel", - GeometryFile = models .. "/insight_chute_frame01_cords1.obj", - ModelTransform = RotationMatrix, - LightSources = LightSources, - }, - TimeFrame = { - Type = "TimeFrameInterval", - Start = parachuteDeployTime1, - End = parachuteDeployTime20 - }, - GUI = { - Hidden = true, - Name = "Insight ParachuteC0", - Path = "/Solar System/Missions/Insight" - } + Identifier = "Insight_Parachute_Cords_0", + Parent = Insight.Identifier, + Renderable = { + Type = "RenderableModel", + GeometryFile = models .. "/insight_chute_frame01_cords1.obj", + ModelTransform = RotationMatrix, + LightSources = LightSources, + }, + TimeFrame = { + Type = "TimeFrameInterval", + Start = parachuteDeployTime1, + End = parachuteDeployTime20 + }, + GUI = { + Hidden = true, + Name = "Insight ParachuteC0", + Path = "/Solar System/Missions/Insight" + } } local Insight_Parachute_20 = { - Identifier = "Insight_Parachute_20", - Parent = Insight.Identifier, - Renderable = { - Type = "RenderableModel", - GeometryFile = models .. "/insight_chute_frame20_diff1.obj", - ModelTransform = RotationMatrix, - LightSources = LightSources, - }, - TimeFrame = { - Type = "TimeFrameInterval", - Start = parachuteDeployTime20, - End = parachuteDeployTime40 - }, - GUI = { - Hidden = true, - Name = "Insight Parachute20", - Path = "/Solar System/Missions/Insight" - } + Identifier = "Insight_Parachute_20", + Parent = Insight.Identifier, + Renderable = { + Type = "RenderableModel", + GeometryFile = models .. "/insight_chute_frame20_diff1.obj", + ModelTransform = RotationMatrix, + LightSources = LightSources, + }, + TimeFrame = { + Type = "TimeFrameInterval", + Start = parachuteDeployTime20, + End = parachuteDeployTime40 + }, + GUI = { + Hidden = true, + Name = "Insight Parachute20", + Path = "/Solar System/Missions/Insight" + } } local Insight_Parachute_Cords_20 = { - Identifier = "Insight_Parachute_Cords_20", - Parent = Insight.Identifier, - Renderable = { - Type = "RenderableModel", - GeometryFile = models .. "/insight_chute_frame20_cords1.obj", - ModelTransform = RotationMatrix, - LightSources = LightSources, - }, - TimeFrame = { - Type = "TimeFrameInterval", - Start = parachuteDeployTime20, - End = parachuteDeployTime40 - }, - GUI = { - Hidden = true, - Name = "Insight ParachuteC20", - Path = "/Solar System/Missions/Insight" - } + Identifier = "Insight_Parachute_Cords_20", + Parent = Insight.Identifier, + Renderable = { + Type = "RenderableModel", + GeometryFile = models .. "/insight_chute_frame20_cords1.obj", + ModelTransform = RotationMatrix, + LightSources = LightSources, + }, + TimeFrame = { + Type = "TimeFrameInterval", + Start = parachuteDeployTime20, + End = parachuteDeployTime40 + }, + GUI = { + Hidden = true, + Name = "Insight ParachuteC20", + Path = "/Solar System/Missions/Insight" + } } local Insight_Parachute_40 = { - Identifier = "Insight_Parachute_40", - Parent = Insight.Identifier, - Renderable = { - Type = "RenderableModel", - GeometryFile = models .. "/chute_doubleside_frame40_diff.obj", - ModelTransform = RotationMatrix, - LightSources = LightSources, - }, - TimeFrame = { - Type = "TimeFrameInterval", - Start = parachuteDeployTime40, - End = landerSeperationTime - }, - GUI = { - Hidden = true, - Name = "Insight Parachute40", - Path = "/Solar System/Missions/Insight" - } + Identifier = "Insight_Parachute_40", + Parent = Insight.Identifier, + Renderable = { + Type = "RenderableModel", + GeometryFile = models .. "/chute_doubleside_frame40_diff.obj", + ModelTransform = RotationMatrix, + LightSources = LightSources, + }, + TimeFrame = { + Type = "TimeFrameInterval", + Start = parachuteDeployTime40, + End = landerSeperationTime + }, + GUI = { + Hidden = true, + Name = "Insight Parachute40", + Path = "/Solar System/Missions/Insight" + } } local Insight_Parachute_Cords_40 = { - Identifier = "Insight_Parachute_Cords_40", - Parent = Insight.Identifier, - Renderable = { - Type = "RenderableModel", - GeometryFile = models .. "/insight_chute_frame40_cords1.obj", - ModelTransform = RotationMatrix, - LightSources = LightSources, - }, - TimeFrame = { - Type = "TimeFrameInterval", - Start = parachuteDeployTime40, - End = landerSeperationTime - }, - GUI = { - Hidden = true, - Name = "Insight ParachuteC40", - Path = "/Solar System/Missions/Insight" - } + Identifier = "Insight_Parachute_Cords_40", + Parent = Insight.Identifier, + Renderable = { + Type = "RenderableModel", + GeometryFile = models .. "/insight_chute_frame40_cords1.obj", + ModelTransform = RotationMatrix, + LightSources = LightSources, + }, + TimeFrame = { + Type = "TimeFrameInterval", + Start = parachuteDeployTime40, + End = landerSeperationTime + }, + GUI = { + Hidden = true, + Name = "Insight ParachuteC40", + Path = "/Solar System/Missions/Insight" + } } local Insight_Lander_A001 = { - Identifier = "Insight_Lander_A001", - Parent = Insight.Identifier, - Renderable = { - Type = "RenderableModel", - GeometryFile = models .. "/insight_lander_deck_AO01.obj", - ModelTransform = RotationMatrix, - LightSources = LightSources, - }, - TimeFrame = { - Type = "TimeFrameInterval", - Start = entryTimeStart, - End = foreverTime - }, - GUI = { - Hidden = true, - Name = "Insight Lander A001", - Path = "/Solar System/Missions/Insight" - } + Identifier = "Insight_Lander_A001", + Parent = Insight.Identifier, + Renderable = { + Type = "RenderableModel", + GeometryFile = models .. "/insight_lander_deck_AO01.obj", + ModelTransform = RotationMatrix, + LightSources = LightSources, + }, + TimeFrame = { + Type = "TimeFrameInterval", + Start = entryTimeStart, + End = foreverTime + }, + GUI = { + Hidden = true, + Name = "Insight Lander A001", + Path = "/Solar System/Missions/Insight" + } } local Insight_Lander_A002 = { - Identifier = "Insight_Lander_A002", - Parent = Insight.Identifier, - Renderable = { - Type = "RenderableModel", - GeometryFile = models .. "/insight_lander_deck_AO02.obj", - ModelTransform = RotationMatrix, - LightSources = LightSources, - }, - TimeFrame = { - Type = "TimeFrameInterval", - Start = entryTimeStart, - End = foreverTime - }, - GUI = { - Hidden = true, - Name = "Insight Lander A002", - Path = "/Solar System/Missions/Insight" - } + Identifier = "Insight_Lander_A002", + Parent = Insight.Identifier, + Renderable = { + Type = "RenderableModel", + GeometryFile = models .. "/insight_lander_deck_AO02.obj", + ModelTransform = RotationMatrix, + LightSources = LightSources, + }, + TimeFrame = { + Type = "TimeFrameInterval", + Start = entryTimeStart, + End = foreverTime + }, + GUI = { + Hidden = true, + Name = "Insight Lander A002", + Path = "/Solar System/Missions/Insight" + } } local Insight_Lander_A003 = { - Identifier = "Insight_Lander_A003", - Parent = Insight.Identifier, - Renderable = { - Type = "RenderableModel", - GeometryFile = models .. "/insight_lander_deck_AO03.obj", - ModelTransform = RotationMatrix, - LightSources = LightSources, - }, - TimeFrame = { - Type = "TimeFrameInterval", - Start = entryTimeStart, - End = foreverTime - }, - GUI = { - Hidden = true, - Name = "Insight Lander A003", - Path = "/Solar System/Missions/Insight" - } + Identifier = "Insight_Lander_A003", + Parent = Insight.Identifier, + Renderable = { + Type = "RenderableModel", + GeometryFile = models .. "/insight_lander_deck_AO03.obj", + ModelTransform = RotationMatrix, + LightSources = LightSources, + }, + TimeFrame = { + Type = "TimeFrameInterval", + Start = entryTimeStart, + End = foreverTime + }, + GUI = { + Hidden = true, + Name = "Insight Lander A003", + Path = "/Solar System/Missions/Insight" + } } local Insight_Lander_A004 = { - Identifier = "Insight_Lander_A004", - Parent = Insight.Identifier, - Renderable = { - Type = "RenderableModel", - GeometryFile = models .. "/insight_lander_deck_AO04.obj", - ModelTransform = RotationMatrix, - LightSources = LightSources, - }, - TimeFrame = { - Type = "TimeFrameInterval", - Start = entryTimeStart, - End = foreverTime - }, - GUI = { - Hidden = true, - Name = "Insight Lander A004", - Path = "/Solar System/Missions/Insight" - } + Identifier = "Insight_Lander_A004", + Parent = Insight.Identifier, + Renderable = { + Type = "RenderableModel", + GeometryFile = models .. "/insight_lander_deck_AO04.obj", + ModelTransform = RotationMatrix, + LightSources = LightSources, + }, + TimeFrame = { + Type = "TimeFrameInterval", + Start = entryTimeStart, + End = foreverTime + }, + GUI = { + Hidden = true, + Name = "Insight Lander A004", + Path = "/Solar System/Missions/Insight" + } } local Insight_Lander_A005 = { - Identifier = "Insight_Lander_A005", - Parent = Insight.Identifier, - Renderable = { - Type = "RenderableModel", - GeometryFile = models .. "/insight_lander_deck_AO05.obj", - ModelTransform = RotationMatrix, - LightSources = LightSources, - }, - TimeFrame = { - Type = "TimeFrameInterval", - Start = entryTimeStart, - End = foreverTime - }, - GUI = { - Hidden = true, - Name = "Insight Lander A005", - Path = "/Solar System/Missions/Insight" - } + Identifier = "Insight_Lander_A005", + Parent = Insight.Identifier, + Renderable = { + Type = "RenderableModel", + GeometryFile = models .. "/insight_lander_deck_AO05.obj", + ModelTransform = RotationMatrix, + LightSources = LightSources, + }, + TimeFrame = { + Type = "TimeFrameInterval", + Start = entryTimeStart, + End = foreverTime + }, + GUI = { + Hidden = true, + Name = "Insight Lander A005", + Path = "/Solar System/Missions/Insight" + } } local Insight_Lander_A006 = { - Identifier = "Insight_Lander_A006", - Parent = Insight.Identifier, - Renderable = { - Type = "RenderableModel", - GeometryFile = models .. "/insight_lander_deck_AO06.obj", - ModelTransform = RotationMatrix, - LightSources = LightSources, - }, - TimeFrame = { - Type = "TimeFrameInterval", - Start = entryTimeStart, - End = foreverTime - }, - GUI = { - Hidden = true, - Name = "Insight Lander A006", - Path = "/Solar System/Missions/Insight" - } + Identifier = "Insight_Lander_A006", + Parent = Insight.Identifier, + Renderable = { + Type = "RenderableModel", + GeometryFile = models .. "/insight_lander_deck_AO06.obj", + ModelTransform = RotationMatrix, + LightSources = LightSources, + }, + TimeFrame = { + Type = "TimeFrameInterval", + Start = entryTimeStart, + End = foreverTime + }, + GUI = { + Hidden = true, + Name = "Insight Lander A006", + Path = "/Solar System/Missions/Insight" + } } local Insight_Lander_A007 = { - Identifier = "Insight_Lander_A007", - Parent = Insight.Identifier, - Renderable = { - Type = "RenderableModel", - GeometryFile = models .. "/insight_lander_deck_AO07.obj", - ModelTransform = RotationMatrix, - LightSources = LightSources, - }, - TimeFrame = { - Type = "TimeFrameInterval", - Start = entryTimeStart, - End = foreverTime - }, - GUI = { - Hidden = true, - Name = "Insight Lander A007", - Path = "/Solar System/Missions/Insight" - } + Identifier = "Insight_Lander_A007", + Parent = Insight.Identifier, + Renderable = { + Type = "RenderableModel", + GeometryFile = models .. "/insight_lander_deck_AO07.obj", + ModelTransform = RotationMatrix, + LightSources = LightSources, + }, + TimeFrame = { + Type = "TimeFrameInterval", + Start = entryTimeStart, + End = foreverTime + }, + GUI = { + Hidden = true, + Name = "Insight Lander A007", + Path = "/Solar System/Missions/Insight" + } } local Insight_Lander_A008 = { - Identifier = "Insight_Lander_A008", - Parent = Insight.Identifier, - Renderable = { - Type = "RenderableModel", - GeometryFile = models .. "/insight_lander_deck_AO08.obj", - ModelTransform = RotationMatrix, - LightSources = LightSources, - }, - TimeFrame = { - Type = "TimeFrameInterval", - Start = entryTimeStart, - End = foreverTime - }, - GUI = { - Hidden = true, - Name = "Insight Lander A008", - Path = "/Solar System/Missions/Insight" - } + Identifier = "Insight_Lander_A008", + Parent = Insight.Identifier, + Renderable = { + Type = "RenderableModel", + GeometryFile = models .. "/insight_lander_deck_AO08.obj", + ModelTransform = RotationMatrix, + LightSources = LightSources, + }, + TimeFrame = { + Type = "TimeFrameInterval", + Start = entryTimeStart, + End = foreverTime + }, + GUI = { + Hidden = true, + Name = "Insight Lander A008", + Path = "/Solar System/Missions/Insight" + } } local Insight_Lander_foil1 = { - Identifier = "Insight_Lander_foil1", - Parent = Insight.Identifier, - Renderable = { - Type = "RenderableModel", - GeometryFile = models .. "/insight_lander_deck_foil1.obj", - ModelTransform = RotationMatrix, - LightSources = LightSources, - }, - TimeFrame = { - Type = "TimeFrameInterval", - Start = entryTimeStart, - End = foreverTime - }, - GUI = { - Hidden = true, - Name = "Insight Lander foil", - Path = "/Solar System/Missions/Insight" - } + Identifier = "Insight_Lander_foil1", + Parent = Insight.Identifier, + Renderable = { + Type = "RenderableModel", + GeometryFile = models .. "/insight_lander_deck_foil1.obj", + ModelTransform = RotationMatrix, + LightSources = LightSources, + }, + TimeFrame = { + Type = "TimeFrameInterval", + Start = entryTimeStart, + End = foreverTime + }, + GUI = { + Hidden = true, + Name = "Insight Lander foil", + Path = "/Solar System/Missions/Insight" + } } local Insight_Lander_Tex01 = { - Identifier = "Insight_Lander_Tex01", - Parent = Insight.Identifier, - Renderable = { - Type = "RenderableModel", - GeometryFile = models .. "/insight_lander_deck_tex01.obj", - ModelTransform = RotationMatrix, - LightSources = LightSources, - }, - TimeFrame = { - Type = "TimeFrameInterval", - Start = entryTimeStart, - End = foreverTime - }, - GUI = { - Hidden = true, - Name = "Insight Lander Tex01", - Path = "/Solar System/Missions/Insight" - } + Identifier = "Insight_Lander_Tex01", + Parent = Insight.Identifier, + Renderable = { + Type = "RenderableModel", + GeometryFile = models .. "/insight_lander_deck_tex01.obj", + ModelTransform = RotationMatrix, + LightSources = LightSources, + }, + TimeFrame = { + Type = "TimeFrameInterval", + Start = entryTimeStart, + End = foreverTime + }, + GUI = { + Hidden = true, + Name = "Insight Lander Tex01", + Path = "/Solar System/Missions/Insight" + } } local Insight_Lander_Tex02 = { - Identifier = "Insight_Lander_Tex02", - Parent = Insight.Identifier, - Renderable = { - Type = "RenderableModel", - GeometryFile = models .. "/insight_lander_deck_tex02.obj", - ModelTransform = RotationMatrix, - LightSources = LightSources, - }, - TimeFrame = { - Type = "TimeFrameInterval", - Start = entryTimeStart, - End = foreverTime - }, - GUI = { - Hidden = true, - Name = "Insight Lander Tex02", - Path = "/Solar System/Missions/Insight" - } + Identifier = "Insight_Lander_Tex02", + Parent = Insight.Identifier, + Renderable = { + Type = "RenderableModel", + GeometryFile = models .. "/insight_lander_deck_tex02.obj", + ModelTransform = RotationMatrix, + LightSources = LightSources, + }, + TimeFrame = { + Type = "TimeFrameInterval", + Start = entryTimeStart, + End = foreverTime + }, + GUI = { + Hidden = true, + Name = "Insight Lander Tex02", + Path = "/Solar System/Missions/Insight" + } } local Insight_Legs_Stowed_tex = { - Identifier = "Insight_Legs_Stowed_tex", - Parent = Insight.Identifier, - Renderable = { - Type = "RenderableModel", - GeometryFile = models .. "/insight_lander_legs_stow_tex01.obj", - ModelTransform = RotationMatrix, - LightSources = LightSources, - }, - TimeFrame = { - Type = "TimeFrameInterval", - Start = heatShieldSeperationTime, - End = legDeployTime - }, - GUI = { - Hidden = true, - Name = "Insight legs_stow_tex", - Path = "/Solar System/Missions/Insight" - } + Identifier = "Insight_Legs_Stowed_tex", + Parent = Insight.Identifier, + Renderable = { + Type = "RenderableModel", + GeometryFile = models .. "/insight_lander_legs_stow_tex01.obj", + ModelTransform = RotationMatrix, + LightSources = LightSources, + }, + TimeFrame = { + Type = "TimeFrameInterval", + Start = heatShieldSeperationTime, + End = legDeployTime + }, + GUI = { + Hidden = true, + Name = "Insight legs_stow_tex", + Path = "/Solar System/Missions/Insight" + } } local Insight_Legs_Stowed_AO06 = { - Identifier = "Insight_Legs_Stowed_AO", - Parent = Insight.Identifier, - Renderable = { - Type = "RenderableModel", - GeometryFile = models .. "/insight_lander_legs_stow_AO06.obj", - ModelTransform = RotationMatrix, - LightSources = LightSources, - }, - TimeFrame = { - Type = "TimeFrameInterval", - Start = heatShieldSeperationTime, - End = legDeployTime - }, - GUI = { - Hidden = true, - Name = "Insight legs_stow_AO", - Path = "/Solar System/Missions/Insight" - } + Identifier = "Insight_Legs_Stowed_AO", + Parent = Insight.Identifier, + Renderable = { + Type = "RenderableModel", + GeometryFile = models .. "/insight_lander_legs_stow_AO06.obj", + ModelTransform = RotationMatrix, + LightSources = LightSources, + }, + TimeFrame = { + Type = "TimeFrameInterval", + Start = heatShieldSeperationTime, + End = legDeployTime + }, + GUI = { + Hidden = true, + Name = "Insight legs_stow_AO", + Path = "/Solar System/Missions/Insight" + } } local Insight_Legs_Deployed_tex = { - Identifier = "Insight_Legs_Deployed_tex", - Parent = Insight.Identifier, - Renderable = { - Type = "RenderableModel", - GeometryFile = models .. "/insight_lander_legs_deploy_tex01.obj", - ModelTransform = RotationMatrix, - LightSources = LightSources, - }, - TimeFrame = { - Type = "TimeFrameInterval", - Start = legDeployTime, - End = foreverTime - }, - GUI = { - Hidden = true, - Name = "Insight legs_deploy_tex", - Path = "/Solar System/Missions/Insight" - } + Identifier = "Insight_Legs_Deployed_tex", + Parent = Insight.Identifier, + Renderable = { + Type = "RenderableModel", + GeometryFile = models .. "/insight_lander_legs_deploy_tex01.obj", + ModelTransform = RotationMatrix, + LightSources = LightSources, + }, + TimeFrame = { + Type = "TimeFrameInterval", + Start = legDeployTime, + End = foreverTime + }, + GUI = { + Hidden = true, + Name = "Insight legs_deploy_tex", + Path = "/Solar System/Missions/Insight" + } } local Insight_Legs_Deployed_AO06 = { - Identifier = "Insight_Legs_Deployed_AO", - Parent = Insight.Identifier, - Renderable = { - Type = "RenderableModel", - GeometryFile = models .. "/insight_lander_legs_deploy_AO06.obj", - ModelTransform = RotationMatrix, - LightSources = LightSources, - }, - TimeFrame = { - Type = "TimeFrameInterval", - Start = legDeployTime, - End = foreverTime - }, - GUI = { - Hidden = true, - Name = "Insight legs_deploy_AO", - Path = "/Solar System/Missions/Insight" - } + Identifier = "Insight_Legs_Deployed_AO", + Parent = Insight.Identifier, + Renderable = { + Type = "RenderableModel", + GeometryFile = models .. "/insight_lander_legs_deploy_AO06.obj", + ModelTransform = RotationMatrix, + LightSources = LightSources + }, + TimeFrame = { + Type = "TimeFrameInterval", + Start = legDeployTime, + End = foreverTime + }, + GUI = { + Hidden = true, + Name = "Insight legs_deploy_AO", + Path = "/Solar System/Missions/Insight" + } } local Insight_Panels_Stowed_tex = { - Identifier = "Insight_Panels_Stowed_tex", - Parent = Insight.Identifier, - Renderable = { - Type = "RenderableModel", - GeometryFile = models .. "/insight_lander_panels_stow_tex01.obj", - ModelTransform = RotationMatrix, - LightSources = LightSources, - }, - TimeFrame = { - Type = "TimeFrameInterval", - Start = entryTimeStart, - End = foreverTime - }, - GUI = { - Hidden = true, - Name = "Insight panels_stow_tex", - Path = "/Solar System/Missions/Insight" - } + Identifier = "Insight_Panels_Stowed_tex", + Parent = Insight.Identifier, + Renderable = { + Type = "RenderableModel", + GeometryFile = models .. "/insight_lander_panels_stow_tex01.obj", + ModelTransform = RotationMatrix, + LightSources = LightSources + }, + TimeFrame = { + Type = "TimeFrameInterval", + Start = entryTimeStart, + End = foreverTime + }, + GUI = { + Hidden = true, + Name = "Insight panels_stow_tex", + Path = "/Solar System/Missions/Insight" + } } local Insight_Panels_Stowed_tex2 = { - Identifier = "Insight_Panels_Stowed_tex2", - Parent = Insight.Identifier, - Renderable = { - Type = "RenderableModel", - GeometryFile = models .. "/insight_lander_panels_stow_tex02.obj", - ModelTransform = RotationMatrix, - LightSources = LightSources, - }, - TimeFrame = { - Type = "TimeFrameInterval", - Start = entryTimeStart, - End = foreverTime - }, - GUI = { - Hidden = true, - Name = "Insight panels_stow_tex2", - Path = "/Solar System/Missions/Insight" - } + Identifier = "Insight_Panels_Stowed_tex2", + Parent = Insight.Identifier, + Renderable = { + Type = "RenderableModel", + GeometryFile = models .. "/insight_lander_panels_stow_tex02.obj", + ModelTransform = RotationMatrix, + LightSources = LightSources + }, + TimeFrame = { + Type = "TimeFrameInterval", + Start = entryTimeStart, + End = foreverTime + }, + GUI = { + Hidden = true, + Name = "Insight panels_stow_tex2", + Path = "/Solar System/Missions/Insight" + } } local Insight_Panels_Stowed_AO01 = { - Identifier = "Insight_Panels_Stowed_AO", - Parent = Insight.Identifier, - Renderable = { - Type = "RenderableModel", - GeometryFile = models .. "/insight_lander_panels_stow_AO01.obj", - ModelTransform = RotationMatrix, - LightSources = LightSources, - }, - TimeFrame = { - Type = "TimeFrameInterval", - Start = entryTimeStart, - End = foreverTime - }, - GUI = { - Hidden = true, - Name = "Insight panels_stow_AO", - Path = "/Solar System/Missions/Insight" - } + Identifier = "Insight_Panels_Stowed_AO", + Parent = Insight.Identifier, + Renderable = { + Type = "RenderableModel", + GeometryFile = models .. "/insight_lander_panels_stow_AO01.obj", + ModelTransform = RotationMatrix, + LightSources = LightSources + }, + TimeFrame = { + Type = "TimeFrameInterval", + Start = entryTimeStart, + End = foreverTime + }, + GUI = { + Hidden = true, + Name = "Insight panels_stow_AO", + Path = "/Solar System/Missions/Insight" + } } local Insight_Panels_Deployed_tex = { - Identifier = "Insight_panels_Deployed_tex", - Parent = Insight.Identifier, - Renderable = { - Type = "RenderableModel", - GeometryFile = models .. "/insight_lander_panels_deploy_tex01.obj", - ModelTransform = RotationMatrix, - LightSources = LightSources, - }, - TimeFrame = { - Type = "TimeFrameInterval", - Start = panelDeployTime, - End = foreverTime - }, - GUI = { - Hidden = true, - Name = "Insight panels_deploy_tex", - Path = "/Solar System/Missions/Insight" - } + Identifier = "Insight_panels_Deployed_tex", + Parent = Insight.Identifier, + Renderable = { + Type = "RenderableModel", + GeometryFile = models .. "/insight_lander_panels_deploy_tex01.obj", + ModelTransform = RotationMatrix, + LightSources = LightSources + }, + TimeFrame = { + Type = "TimeFrameInterval", + Start = panelDeployTime, + End = foreverTime + }, + GUI = { + Hidden = true, + Name = "Insight panels_deploy_tex", + Path = "/Solar System/Missions/Insight" + } } local Insight_Panels_Deployed_tex2 = { - Identifier = "Insight_panels_Deployed_tex2", - Parent = Insight.Identifier, - Renderable = { - Type = "RenderableModel", - GeometryFile = models .. "/insight_lander_panels_deploy_tex02.obj", - ModelTransform = RotationMatrix, - LightSources = LightSources, - }, - TimeFrame = { - Type = "TimeFrameInterval", - Start = panelDeployTime, - End = foreverTime - }, - GUI = { - Hidden = true, - Name = "Insight panels_deploy_tex2", - Path = "/Solar System/Missions/Insight" - } + Identifier = "Insight_panels_Deployed_tex2", + Parent = Insight.Identifier, + Renderable = { + Type = "RenderableModel", + GeometryFile = models .. "/insight_lander_panels_deploy_tex02.obj", + ModelTransform = RotationMatrix, + LightSources = LightSources + }, + TimeFrame = { + Type = "TimeFrameInterval", + Start = panelDeployTime, + End = foreverTime + }, + GUI = { + Hidden = true, + Name = "Insight panels_deploy_tex2", + Path = "/Solar System/Missions/Insight" + } } local Insight_Panels_Deployed_AO06 = { - Identifier = "Insight_panels_Deployed_AO", - Parent = Insight.Identifier, - Renderable = { - Type = "RenderableModel", - GeometryFile = models .. "/insight_lander_panels_deploy_AO01.obj", - ModelTransform = RotationMatrix, - LightSources = LightSources, - }, - TimeFrame = { - Type = "TimeFrameInterval", - Start = panelDeployTime, - End = foreverTime - }, - GUI = { - Hidden = true, - Name = "Insight panels_deploy_AO", - Path = "/Solar System/Missions/Insight" - } + Identifier = "Insight_panels_Deployed_AO", + Parent = Insight.Identifier, + Renderable = { + Type = "RenderableModel", + GeometryFile = models .. "/insight_lander_panels_deploy_AO01.obj", + ModelTransform = RotationMatrix, + LightSources = LightSources + }, + TimeFrame = { + Type = "TimeFrameInterval", + Start = panelDeployTime, + End = foreverTime + }, + GUI = { + Hidden = true, + Name = "Insight panels_deploy_AO", + Path = "/Solar System/Missions/Insight" + } } local Insight_Trail = { - Identifier = "InsightTrail", - Parent = "Mars", - Renderable = { - Enabled = false, - Type = "RenderableTrailTrajectory", - Translation = { - Type = "SpiceTranslation", - Target = "-189", - Observer = "MARS", - Frame = "IAU_MARS", - Kernels = iKernels - }, - Color = { 0.70, 0.50, 0.20 }, - StartTime = "2018 NOV 26 19:30:13.390", - EndTime = "2018 NOV 26 19:51:40.890", - SampleInterval = 2 + Identifier = "InsightTrail", + Parent = "Mars", + Renderable = { + Enabled = false, + Type = "RenderableTrailTrajectory", + Translation = { + Type = "SpiceTranslation", + Target = "-189", + Observer = "MARS", + Frame = "IAU_MARS", + Kernels = iKernels }, - TimeFrame = { - Type = "TimeFrameInterval", - Start = entryTimeStart, - End = landerSeperationTime - }, - GUI = { - Name = "Insight Trail", - Path = "/Solar System/Missions/Insight" - } + Color = { 0.70, 0.50, 0.20 }, + StartTime = "2018 NOV 26 19:30:13.390", + EndTime = "2018 NOV 26 19:51:40.890", + SampleInterval = 2 + }, + TimeFrame = { + Type = "TimeFrameInterval", + Start = entryTimeStart, + End = landerSeperationTime + }, + GUI = { + Name = "Insight Trail", + Path = "/Solar System/Missions/Insight" + } } assetHelper.registerSceneGraphNodesAndExport(asset, { - InsightParent, Insight, Insight_Entry_CapsuleA, Insight_Entry_Capsule_Ring, - Insight_Entry_Capsule_Plugs, Insight_Entry_Heatshield, Insight_Parachute_0, - Insight_Parachute_Cords_0, Insight_Parachute_20, Insight_Parachute_Cords_20, - Insight_Parachute_40, Insight_Parachute_Cords_40, Insight_Lander_A001, - Insight_Lander_A002, Insight_Lander_A003, Insight_Lander_A004, Insight_Lander_A005, - Insight_Lander_A006, Insight_Lander_A007, Insight_Lander_A008, Insight_Lander_foil1, - Insight_Lander_Tex01, Insight_Lander_Tex02, Insight_Legs_Stowed_tex, - Insight_Legs_Stowed_AO06, Insight_Legs_Deployed_tex, Insight_Legs_Deployed_AO06, - Insight_Panels_Stowed_tex, Insight_Panels_Stowed_tex2, Insight_Panels_Stowed_AO01, - Insight_Panels_Deployed_tex, Insight_Panels_Deployed_tex2, - Insight_Panels_Deployed_AO06, Insight_Trail + InsightParent, Insight, Insight_Entry_CapsuleA, Insight_Entry_Capsule_Ring, + Insight_Entry_Capsule_Plugs, Insight_Entry_Heatshield, Insight_Parachute_0, + Insight_Parachute_Cords_0, Insight_Parachute_20, Insight_Parachute_Cords_20, + Insight_Parachute_40, Insight_Parachute_Cords_40, Insight_Lander_A001, + Insight_Lander_A002, Insight_Lander_A003, Insight_Lander_A004, Insight_Lander_A005, + Insight_Lander_A006, Insight_Lander_A007, Insight_Lander_A008, Insight_Lander_foil1, + Insight_Lander_Tex01, Insight_Lander_Tex02, Insight_Legs_Stowed_tex, + Insight_Legs_Stowed_AO06, Insight_Legs_Deployed_tex, Insight_Legs_Deployed_AO06, + Insight_Panels_Stowed_tex, Insight_Panels_Stowed_tex2, Insight_Panels_Stowed_AO01, + Insight_Panels_Deployed_tex, Insight_Panels_Deployed_tex2, + Insight_Panels_Deployed_AO06, Insight_Trail }) diff --git a/data/assets/scene/solarsystem/missions/insight/shortcuts.asset b/data/assets/scene/solarsystem/missions/insight/shortcuts.asset index a5154e9fca..00d5cbf3c1 100644 --- a/data/assets/scene/solarsystem/missions/insight/shortcuts.asset +++ b/data/assets/scene/solarsystem/missions/insight/shortcuts.asset @@ -2,61 +2,61 @@ local InsightEntryTime = "2018 NOV 26 19:39:03.68" -local insightNavigationSate = "{" .. - "Anchor = 'Insight'," .. - "Pitch = 0.567457E-4," .. - "Position = { 1.240506E1,-1.369270E1,-2.423553E0 }," .. - "ReferenceFrame = 'Root',".. - "Up = { 0.441211E0,0.247019E0,0.862737E0 }," .. - "Yaw = -0.446853E-4}" +local insightNavigationState = "{" .. + "Anchor = 'Insight'," .. + "Pitch = 0.567457E-4," .. + "Position = { 1.240506E1,-1.369270E1,-2.423553E0 }," .. + "ReferenceFrame = 'Root',".. + "Up = { 0.441211E0,0.247019E0,0.862737E0 }," .. + "Yaw = -0.446853E-4}" local Shortcuts = { - { - Command = "openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.HeightLayers.Mola_Utah.Settings.Offset', -469.300000);" .. - "openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.HeightLayers.OnMarsHiRISELS.Settings.Offset', -470.800006);", - Documentation = "Enable Insight landing height layer offset", - Name = "Insight Height Offset", - GuiPath = "/Missions/Insight", - Local = false - }, - { - Command = "openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.HeightLayers.Mola_Utah.Settings.Offset', 0);" .. - "openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.HeightLayers.OnMarsHiRISELS.Settings.Offset', 0);", - Documentation = "Disable Insight landing height layer offset", - Name = "Default Height Offset", - GuiPath = "/Missions/Insight", - Local = false - }, - { - Command = "openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.HeightLayers.OnMarsHiRISELS.Enabled', true);" .. - "openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.ColorLayers.OnMarsHiRISELS.Enabled', true);", - Documentation = "Enables HiRISE layer for insight landing", - Name = "Enable HiRISE", - GuiPath = "/Missions/Insight", - Local = false - }, - { - Command = "openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.HeightLayers.OnMarsHiRISELS.Enabled', false);" .. - "openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.ColorLayers.OnMarsHiRISELS.Enabled', false);", - Documentation = "Disables HiRISE layer used for insight landing", - Name = "Disable HiRISE", - GuiPath = "/Missions/Insight", - Local = false - }, - { - Command = "openspace.navigation.setNavigationState(" .. insightNavigationSate .. ");", - Documentation = "Change the camera state for the start of Insight EDL", - Name = "Insight EDL NavigationState", - GuiPath = "/Missions/Insight", - Local = false - }, - { - Command = "openspace.time.setPause(true);openspace.time.setTime('" .. InsightEntryTime .. "');", - Documentation = "Change the time for the start of Insight EDL", - Name = "Insight EDL Time", - GuiPath = "/Missions/Insight", - Local = false - }, + { + Command = "openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.HeightLayers.Mola_Utah.Settings.Offset', -469.300000);" .. + "openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.HeightLayers.OnMarsHiRISELS.Settings.Offset', -470.800006);", + Documentation = "Enable Insight landing height layer offset", + Name = "Insight Height Offset", + GuiPath = "/Missions/Insight", + Local = false + }, + { + Command = "openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.HeightLayers.Mola_Utah.Settings.Offset', 0);" .. + "openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.HeightLayers.OnMarsHiRISELS.Settings.Offset', 0);", + Documentation = "Disable Insight landing height layer offset", + Name = "Default Height Offset", + GuiPath = "/Missions/Insight", + Local = false + }, + { + Command = "openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.HeightLayers.OnMarsHiRISELS.Enabled', true);" .. + "openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.ColorLayers.OnMarsHiRISELS.Enabled', true);", + Documentation = "Enables HiRISE layer for insight landing", + Name = "Enable HiRISE", + GuiPath = "/Missions/Insight", + Local = false + }, + { + Command = "openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.HeightLayers.OnMarsHiRISELS.Enabled', false);" .. + "openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.ColorLayers.OnMarsHiRISELS.Enabled', false);", + Documentation = "Disables HiRISE layer used for insight landing", + Name = "Disable HiRISE", + GuiPath = "/Missions/Insight", + Local = false + }, + { + Command = "openspace.navigation.setNavigationState(" .. insightNavigationState .. ");", + Documentation = "Change the camera state for the start of Insight EDL", + Name = "Insight EDL NavigationState", + GuiPath = "/Missions/Insight", + Local = false + }, + { + Command = "openspace.time.setPause(true);openspace.time.setTime('" .. InsightEntryTime .. "');", + Documentation = "Change the time for the start of Insight EDL", + Name = "Insight EDL Time", + GuiPath = "/Missions/Insight", + Local = false + } } asset.export("Shortcuts", Shortcuts) diff --git a/data/assets/scene/solarsystem/missions/juno/juno.asset b/data/assets/scene/solarsystem/missions/juno/juno.asset index 83dffb776b..dfa44f584f 100644 --- a/data/assets/scene/solarsystem/missions/juno/juno.asset +++ b/data/assets/scene/solarsystem/missions/juno/juno.asset @@ -4,186 +4,186 @@ local sunTransforms = asset.require('scene/solarsystem/sun/transforms') local model = asset.syncedResource({ - Name = "Juno Model", - Type = "HttpSynchronization", - Identifier = "juno_model", - Version = 2 + Name = "Juno Model", + Type = "HttpSynchronization", + Identifier = "juno_model", + Version = 2 }) local kernels = asset.syncedResource({ - Name = "Juno Kernels", - Type = "HttpSynchronization", - Identifier = "juno_kernels", - Version = 2 + Name = "Juno Kernels", + Type = "HttpSynchronization", + Identifier = "juno_kernels", + Version = 2 }) local JunoKernels = { - kernels .. "/juno_v12.tf", - kernels .. "/JNO_SCLKSCET.00039.tsc", - kernels .. "/juno_jade_v00.ti", - kernels .. "/juno_jedi_v00.ti", - kernels .. "/juno_jiram_v01.ti", - kernels .. "/juno_junocam_v00.ti", - kernels .. "/juno_mag_v00.ti", - kernels .. "/juno_mwr_v01.ti", - kernels .. "/juno_struct_v01.ti", - kernels .. "/juno_uvs_v00.ti", - kernels .. "/juno_waves_v00.ti", - kernels .. "/juno_mwr_v01.ti", - kernels .. "/spk_merge_110805_171017_130515.bsp", - kernels .. "/juno_sc_nom_110807_171016_v01.bc", - kernels .. "/juno_sc_prl_110930_111028_jc003c01_v01.bc", - kernels .. "/juno_sc_prl_111028_111125_jc004b00_v01.bc", - kernels .. "/juno_sc_prl_111125_111223_jc005b00_v01.bc", - kernels .. "/juno_sc_prl_111223_120127_jc006a02_v01.bc", - kernels .. "/juno_sc_prl_120127_120217_jc007a00_v01.bc", - kernels .. "/juno_sc_prl_120217_120316_jc008b00_v02.bc", - kernels .. "/juno_sc_prl_120316_120413_jc009a00_v01.bc", - kernels .. "/juno_sc_prl_120413_120511_jc010a04_v01.bc", - kernels .. "/juno_sc_prl_120511_120608_jc011a01_v02.bc", - kernels .. "/juno_sc_prl_120608_120706_jc012b01_v01.bc", - kernels .. "/juno_sc_prl_120706_120802_jc013a01_v01.bc", - kernels .. "/juno_sc_prl_120802_120824_jc014b01_v01.bc", - kernels .. "/juno_sc_prl_120824_120928_jc015m00_v01.bc", - kernels .. "/juno_sc_prl_120919_120928_jc015o00_v01.bc", - kernels .. "/juno_sc_prl_120928_121026_jc016c03_v01.bc", - kernels .. "/juno_sc_prl_121026_121123_jc017a01_v01.bc", - kernels .. "/juno_sc_prl_121123_121221_jc018b01_v01.bc", - kernels .. "/juno_sc_prl_121221_130118_jc019a01_v01.bc", - kernels .. "/juno_sc_prl_130118_130215_jc020b01_v01.bc", - kernels .. "/juno_sc_prl_130315_130412_jc022b01_v01.bc", - kernels .. "/juno_sc_prl_130412_130510_jc023b03_v01.bc", - kernels .. "/juno_sc_prl_130510_130607_jc024a01_v01.bc", - kernels .. "/juno_sc_prl_130607_130705_jc025a00_v01.bc", - kernels .. "/juno_sc_prl_130705_130802_jc026a01_v01.bc", - kernels .. "/juno_sc_prl_130726_131020_jx024a02_EFB_v03.bc", - kernels .. "/juno_sc_prl_130802_130830_jc027a02_v01.bc", - kernels .. "/juno_sc_prl_130830_130927_jc028a01_v01.bc", - kernels .. "/juno_sc_prl_130926_131025_jc029a00_v01.bc", - kernels .. "/juno_sc_prl_130927_131025_jc029c01_v01.bc", - kernels .. "/juno_sc_prl_131022_131025_jc029f00_v01.bc", - kernels .. "/juno_sc_prl_131025_131122_jc030b04_v01.bc", - kernels .. "/juno_sc_prl_131122_131220_jc031b01_v01.bc", - kernels .. "/juno_sc_prl_131220_140124_jc032a01_v01.bc", - kernels .. "/juno_sc_prl_140124_140214_jc033a01_v01.bc", - kernels .. "/juno_sc_prl_140214_140314_jc034b01_v01.bc", - kernels .. "/juno_sc_prl_140314_140411_jc035a01_v01.bc", - kernels .. "/juno_sc_prl_140411_140509_jc036b01_v01.bc", - kernels .. "/juno_sc_prl_140509_140606_jc037b02_v01.bc", - kernels .. "/juno_sc_prl_140606_140704_jc038a01_v01.bc", - kernels .. "/juno_sc_prl_140704_140801_jc039b01_v01.bc", - kernels .. "/juno_sc_prl_140801_140829_jc040a01_v01.bc", - kernels .. "/juno_sc_prl_140829_140926_jc041a01_v01.bc", - kernels .. "/juno_sc_prl_140926_141024_jc042a01_v01.bc", - kernels .. "/juno_sc_prl_141024_141121_jc043a01_v01.bc", - kernels .. "/juno_sc_prl_141105_141121_jc043m01_v01.bc", - kernels .. "/juno_sc_prl_141107_141121_jc043s01_v01.bc", - kernels .. "/juno_sc_prl_141121_141219_jc044a01_v01.bc", - kernels .. "/juno_sc_prl_141219_150123_jc045a01_v01.bc", - kernels .. "/juno_sc_prl_150123_150213_jc046a01_v01.bc", - kernels .. "/juno_sc_prl_150213_150313_jc047a01_v01.bc", - kernels .. "/juno_sc_prl_150312_150409_jc048a01_v01.bc", - kernels .. "/juno_sc_prl_150410_150508_jc049a01_v01.bc", - kernels .. "/juno_sc_prl_150508_150605_jc050a01_v01.bc", - kernels .. "/juno_sc_prl_150605_150703_jc051a01_v01.bc", - kernels .. "/juno_sc_prl_150703_150731_jc052a01_v01.bc", - kernels .. "/juno_sc_prl_150731_150828_jc053a01_v01.bc", - kernels .. "/juno_sc_prl_150805_150828_jc053m00_v01.bc", - kernels .. "/juno_sc_prl_150807_150828_jc053s00_v01.bc", - kernels .. "/juno_sc_prl_150828_150924_jc054a00_v01.bc", - kernels .. "/juno_sc_prl_150924_151023_jc055a00_v01.bc", - kernels .. "/juno_sc_prl_151023_151120_jc056a00_v01.bc", - kernels .. "/juno_sc_prl_151120_151218_jc057a00_v01.bc", - kernels .. "/juno_sc_prl_151218_160115_jc058a00_v01.bc", - kernels .. "/juno_sc_prl_160115_160212_jc059a00_v01.bc", - kernels .. "/juno_sc_prl_160212_160311_jc060a00_v01.bc", - kernels .. "/juno_sc_prl_160311_160408_jc061a00_v01.bc", - kernels .. "/juno_sc_prl_160408_160506_jc062a00_v01.bc", - kernels .. "/juno_sc_prl_160506_160603_jc063a00_v01.bc", - kernels .. "/juno_sc_prl_160603_160630_jc064a00_v01.bc", - kernels .. "/juno_sc_prl_160708_160729_jm0001rp_v02.bc", - kernels .. "/juno_sc_prl_160729_160826_jm0002rp_v01.bc", - kernels .. "/juno_sc_prl_160827_160920_jm0003a00_v01.bc", - kernels .. "/juno_sc_prl_160924_161019_jm0004a00_v01.bc", - kernels .. "/juno_sc_prl_161014_161115_jm0005a00_v01.bc", - kernels .. "/juno_sc_prl_161022_161115_jm0005b00_v01.bc", - kernels .. "/juno_sc_prl_161115_161213_jx0405rp_v01.bc", - kernels .. "/juno_sc_prl_161210_170115_jm0031a00_v01.bc", - kernels .. "/juno_sc_prl_170115_170201_jm0032a00_v01.bc", - kernels .. "/juno_sc_prl_170201_170309_jm0041a00_v01.bc", - kernels .. "/juno_sc_prl_170309_170326_jm0042rp_v01.bc", - kernels .. "/juno_sc_prl_170326_170427_jm0051rp_v01.bc", - kernels .. "/juno_sc_prl_170427_170518_jm0052rp_v01.bc", - kernels .. "/juno_sc_prl_170518_170615_jm0061a00_v01.bc", - kernels .. "/juno_sc_prl_170615_170710_jm0062a00_v01.bc", - kernels .. "/juno_sc_prl_170710_170805_jm0071a00_v01.bc", - kernels .. "/juno_sc_prl_170805_170831_jm0072a00_v01.bc", - kernels .. "/juno_sc_prl_170831_170927_jm0081a00_v01.bc", - kernels .. "/juno_sc_prl_170927_171023_jm0082a00_v01.bc", - kernels .. "/juno_sc_prl_171023_171030_jm0091a00_v01.bc", - kernels .. "/juno_sc_prl_171023_171030_jm0091a00_v01.bc" + kernels .. "/juno_v12.tf", + kernels .. "/JNO_SCLKSCET.00039.tsc", + kernels .. "/juno_jade_v00.ti", + kernels .. "/juno_jedi_v00.ti", + kernels .. "/juno_jiram_v01.ti", + kernels .. "/juno_junocam_v00.ti", + kernels .. "/juno_mag_v00.ti", + kernels .. "/juno_mwr_v01.ti", + kernels .. "/juno_struct_v01.ti", + kernels .. "/juno_uvs_v00.ti", + kernels .. "/juno_waves_v00.ti", + kernels .. "/juno_mwr_v01.ti", + kernels .. "/spk_merge_110805_171017_130515.bsp", + kernels .. "/juno_sc_nom_110807_171016_v01.bc", + kernels .. "/juno_sc_prl_110930_111028_jc003c01_v01.bc", + kernels .. "/juno_sc_prl_111028_111125_jc004b00_v01.bc", + kernels .. "/juno_sc_prl_111125_111223_jc005b00_v01.bc", + kernels .. "/juno_sc_prl_111223_120127_jc006a02_v01.bc", + kernels .. "/juno_sc_prl_120127_120217_jc007a00_v01.bc", + kernels .. "/juno_sc_prl_120217_120316_jc008b00_v02.bc", + kernels .. "/juno_sc_prl_120316_120413_jc009a00_v01.bc", + kernels .. "/juno_sc_prl_120413_120511_jc010a04_v01.bc", + kernels .. "/juno_sc_prl_120511_120608_jc011a01_v02.bc", + kernels .. "/juno_sc_prl_120608_120706_jc012b01_v01.bc", + kernels .. "/juno_sc_prl_120706_120802_jc013a01_v01.bc", + kernels .. "/juno_sc_prl_120802_120824_jc014b01_v01.bc", + kernels .. "/juno_sc_prl_120824_120928_jc015m00_v01.bc", + kernels .. "/juno_sc_prl_120919_120928_jc015o00_v01.bc", + kernels .. "/juno_sc_prl_120928_121026_jc016c03_v01.bc", + kernels .. "/juno_sc_prl_121026_121123_jc017a01_v01.bc", + kernels .. "/juno_sc_prl_121123_121221_jc018b01_v01.bc", + kernels .. "/juno_sc_prl_121221_130118_jc019a01_v01.bc", + kernels .. "/juno_sc_prl_130118_130215_jc020b01_v01.bc", + kernels .. "/juno_sc_prl_130315_130412_jc022b01_v01.bc", + kernels .. "/juno_sc_prl_130412_130510_jc023b03_v01.bc", + kernels .. "/juno_sc_prl_130510_130607_jc024a01_v01.bc", + kernels .. "/juno_sc_prl_130607_130705_jc025a00_v01.bc", + kernels .. "/juno_sc_prl_130705_130802_jc026a01_v01.bc", + kernels .. "/juno_sc_prl_130726_131020_jx024a02_EFB_v03.bc", + kernels .. "/juno_sc_prl_130802_130830_jc027a02_v01.bc", + kernels .. "/juno_sc_prl_130830_130927_jc028a01_v01.bc", + kernels .. "/juno_sc_prl_130926_131025_jc029a00_v01.bc", + kernels .. "/juno_sc_prl_130927_131025_jc029c01_v01.bc", + kernels .. "/juno_sc_prl_131022_131025_jc029f00_v01.bc", + kernels .. "/juno_sc_prl_131025_131122_jc030b04_v01.bc", + kernels .. "/juno_sc_prl_131122_131220_jc031b01_v01.bc", + kernels .. "/juno_sc_prl_131220_140124_jc032a01_v01.bc", + kernels .. "/juno_sc_prl_140124_140214_jc033a01_v01.bc", + kernels .. "/juno_sc_prl_140214_140314_jc034b01_v01.bc", + kernels .. "/juno_sc_prl_140314_140411_jc035a01_v01.bc", + kernels .. "/juno_sc_prl_140411_140509_jc036b01_v01.bc", + kernels .. "/juno_sc_prl_140509_140606_jc037b02_v01.bc", + kernels .. "/juno_sc_prl_140606_140704_jc038a01_v01.bc", + kernels .. "/juno_sc_prl_140704_140801_jc039b01_v01.bc", + kernels .. "/juno_sc_prl_140801_140829_jc040a01_v01.bc", + kernels .. "/juno_sc_prl_140829_140926_jc041a01_v01.bc", + kernels .. "/juno_sc_prl_140926_141024_jc042a01_v01.bc", + kernels .. "/juno_sc_prl_141024_141121_jc043a01_v01.bc", + kernels .. "/juno_sc_prl_141105_141121_jc043m01_v01.bc", + kernels .. "/juno_sc_prl_141107_141121_jc043s01_v01.bc", + kernels .. "/juno_sc_prl_141121_141219_jc044a01_v01.bc", + kernels .. "/juno_sc_prl_141219_150123_jc045a01_v01.bc", + kernels .. "/juno_sc_prl_150123_150213_jc046a01_v01.bc", + kernels .. "/juno_sc_prl_150213_150313_jc047a01_v01.bc", + kernels .. "/juno_sc_prl_150312_150409_jc048a01_v01.bc", + kernels .. "/juno_sc_prl_150410_150508_jc049a01_v01.bc", + kernels .. "/juno_sc_prl_150508_150605_jc050a01_v01.bc", + kernels .. "/juno_sc_prl_150605_150703_jc051a01_v01.bc", + kernels .. "/juno_sc_prl_150703_150731_jc052a01_v01.bc", + kernels .. "/juno_sc_prl_150731_150828_jc053a01_v01.bc", + kernels .. "/juno_sc_prl_150805_150828_jc053m00_v01.bc", + kernels .. "/juno_sc_prl_150807_150828_jc053s00_v01.bc", + kernels .. "/juno_sc_prl_150828_150924_jc054a00_v01.bc", + kernels .. "/juno_sc_prl_150924_151023_jc055a00_v01.bc", + kernels .. "/juno_sc_prl_151023_151120_jc056a00_v01.bc", + kernels .. "/juno_sc_prl_151120_151218_jc057a00_v01.bc", + kernels .. "/juno_sc_prl_151218_160115_jc058a00_v01.bc", + kernels .. "/juno_sc_prl_160115_160212_jc059a00_v01.bc", + kernels .. "/juno_sc_prl_160212_160311_jc060a00_v01.bc", + kernels .. "/juno_sc_prl_160311_160408_jc061a00_v01.bc", + kernels .. "/juno_sc_prl_160408_160506_jc062a00_v01.bc", + kernels .. "/juno_sc_prl_160506_160603_jc063a00_v01.bc", + kernels .. "/juno_sc_prl_160603_160630_jc064a00_v01.bc", + kernels .. "/juno_sc_prl_160708_160729_jm0001rp_v02.bc", + kernels .. "/juno_sc_prl_160729_160826_jm0002rp_v01.bc", + kernels .. "/juno_sc_prl_160827_160920_jm0003a00_v01.bc", + kernels .. "/juno_sc_prl_160924_161019_jm0004a00_v01.bc", + kernels .. "/juno_sc_prl_161014_161115_jm0005a00_v01.bc", + kernels .. "/juno_sc_prl_161022_161115_jm0005b00_v01.bc", + kernels .. "/juno_sc_prl_161115_161213_jx0405rp_v01.bc", + kernels .. "/juno_sc_prl_161210_170115_jm0031a00_v01.bc", + kernels .. "/juno_sc_prl_170115_170201_jm0032a00_v01.bc", + kernels .. "/juno_sc_prl_170201_170309_jm0041a00_v01.bc", + kernels .. "/juno_sc_prl_170309_170326_jm0042rp_v01.bc", + kernels .. "/juno_sc_prl_170326_170427_jm0051rp_v01.bc", + kernels .. "/juno_sc_prl_170427_170518_jm0052rp_v01.bc", + kernels .. "/juno_sc_prl_170518_170615_jm0061a00_v01.bc", + kernels .. "/juno_sc_prl_170615_170710_jm0062a00_v01.bc", + kernels .. "/juno_sc_prl_170710_170805_jm0071a00_v01.bc", + kernels .. "/juno_sc_prl_170805_170831_jm0072a00_v01.bc", + kernels .. "/juno_sc_prl_170831_170927_jm0081a00_v01.bc", + kernels .. "/juno_sc_prl_170927_171023_jm0082a00_v01.bc", + kernels .. "/juno_sc_prl_171023_171030_jm0091a00_v01.bc", + kernels .. "/juno_sc_prl_171023_171030_jm0091a00_v01.bc" } local RotationMatrix = { - 0, 1, 0, - 0, 0, 1, - 1, 0, 0 + 0, 1, 0, + 0, 0, 1, + 1, 0, 0 } local Juno = { - Identifier = "Juno", - Parent = transforms.JupiterBarycenter.Identifier, - Transform = { - Translation = { - Type = "SpiceTranslation", - Target = "JUNO", - Observer = "JUPITER BARYCENTER", - Kernels = JunoKernels - }, - Rotation = { - Type = "SpiceRotation", - SourceFrame = "JUNO_SPACECRAFT", - DestinationFrame = "GALACTIC", - Kernels = JunoKernels - } + Identifier = "Juno", + Parent = transforms.JupiterBarycenter.Identifier, + Transform = { + Translation = { + Type = "SpiceTranslation", + Target = "JUNO", + Observer = "JUPITER BARYCENTER", + Kernels = JunoKernels }, - Renderable = { - Type = "RenderableModel", - GeometryFile = model .. "/Juno.obj", - ModelTransform = RotationMatrix, - LightSources = assetHelper.getDefaultLightSources(sunTransforms.SolarSystemBarycenter.Identifier) - }, - TimeFrame = { - Type = "TimeFrameInterval", - Start = "2011-08-07T17:15:00", - End = "2017-10-16T19:29:24" - }, - GUI = { - Path = "/Solar System/Missions/Juno" + Rotation = { + Type = "SpiceRotation", + SourceFrame = "JUNO_SPACECRAFT", + DestinationFrame = "GALACTIC", + Kernels = JunoKernels } + }, + Renderable = { + Type = "RenderableModel", + GeometryFile = model .. "/Juno.obj", + ModelTransform = RotationMatrix, + LightSources = assetHelper.getDefaultLightSources(sunTransforms.SolarSystemBarycenter.Identifier) + }, + TimeFrame = { + Type = "TimeFrameInterval", + Start = "2011-08-07T17:15:00", + End = "2017-10-16T19:29:24" + }, + GUI = { + Path = "/Solar System/Missions/Juno" + } } local JunoTrail = { - Identifier = "JunoTrail", - Parent = transforms.JupiterBarycenter.Identifier, - Renderable = { - Type = "RenderableTrailTrajectory", - Translation = { - Type = "SpiceTranslation", - Target = "JUNO", - Observer = "JUPITER BARYCENTER", - Kernels = JunoKernels - }, - Color = { 0.70, 0.50, 0.20 }, - StartTime = "2016 JUL 01", - EndTime = "2016 DEC 13", - SampleInterval = 3600 + Identifier = "JunoTrail", + Parent = transforms.JupiterBarycenter.Identifier, + Renderable = { + Type = "RenderableTrailTrajectory", + Translation = { + Type = "SpiceTranslation", + Target = "JUNO", + Observer = "JUPITER BARYCENTER", + Kernels = JunoKernels }, - GUI = { - Name = "Juno Trail", - Path = "/Solar System/Missions/Juno" - } + Color = { 0.70, 0.50, 0.20 }, + StartTime = "2016 JUL 01", + EndTime = "2016 DEC 13", + SampleInterval = 3600 + }, + GUI = { + Name = "Juno Trail", + Path = "/Solar System/Missions/Juno" + } } assetHelper.registerSceneGraphNodesAndExport(asset, { Juno, JunoTrail }) diff --git a/data/assets/scene/solarsystem/missions/messenger/dashboard.asset b/data/assets/scene/solarsystem/missions/messenger/dashboard.asset index d271c312ba..d38410c140 100644 --- a/data/assets/scene/solarsystem/missions/messenger/dashboard.asset +++ b/data/assets/scene/solarsystem/missions/messenger/dashboard.asset @@ -1,13 +1,13 @@ local assetHelper = asset.require('util/asset_helper') assetHelper.registerDashboardItems(asset, { - { - Type = "DashboardItemDistance", - Identifier = "MessengerDistance", - GuiName = "Messenger - Mercury Distance", - SourceType = "Node", - SourceNodeName = "Messenger", - DestinationType = "Node", - DestinationNodeName = "Mercury" - } + { + Type = "DashboardItemDistance", + Identifier = "MessengerDistance", + GuiName = "Messenger - Mercury Distance", + SourceType = "Node", + SourceNodeName = "Messenger", + DestinationType = "Node", + DestinationNodeName = "Mercury" + } }) diff --git a/data/assets/scene/solarsystem/missions/messenger/mercurymagnetosphere.asset b/data/assets/scene/solarsystem/missions/messenger/mercurymagnetosphere.asset index 3098de18a3..8bc88d57f2 100644 --- a/data/assets/scene/solarsystem/missions/messenger/mercurymagnetosphere.asset +++ b/data/assets/scene/solarsystem/missions/messenger/mercurymagnetosphere.asset @@ -3,57 +3,55 @@ local assetHelper = asset.require('util/asset_helper') local mercuryTransforms = asset.require('scene/solarsystem/planets/mercury/transforms') local localFolder = asset.syncedResource({ - Name = "Mercury Magnetosphere", - Type = "HttpSynchronization", - Identifier = "mercury_magnetosphere", - Version = 3 + Name = "Mercury Magnetosphere", + Type = "HttpSynchronization", + Identifier = "mercury_magnetosphere", + Version = 3 }) local MercuryRadius = 2.4397E6 local Magnetosphere = { - Name = "Mercury Magnetosphere", - Identifier = "MercuryMagnetosphere", - Parent = mercuryTransforms.MercuryBarycenter.Identifier, - SceneRadius = 0.8E+5, - Renderable = { - Type = "RenderableTimeVaryingVolume", - SourceDirectory = localFolder, - TransferFunction = localFolder .. "/transferfunction.txt", - Variable = "rho", - StepSize = 0.003, - Dimensions = {64, 64, 64}, - GridType = "Cartesian", - SecondsBefore = 24*60*60*365*100, - SecondsAfter = 24*60*60*365*100, - Enabled = false + Name = "Mercury Magnetosphere", + Identifier = "MercuryMagnetosphere", + Parent = mercuryTransforms.MercuryBarycenter.Identifier, + SceneRadius = 0.8E+5, + Renderable = { + Type = "RenderableTimeVaryingVolume", + SourceDirectory = localFolder, + TransferFunction = localFolder .. "/transferfunction.txt", + Variable = "rho", + StepSize = 0.003, + Dimensions = {64, 64, 64}, + GridType = "Cartesian", + SecondsBefore = 24*60*60*365*100, + SecondsAfter = 24*60*60*365*100, + Enabled = false + }, + Transform = { + Translation = { + Type = "SpiceTranslation", + Target = "MERCURY", + Observer = "MERCURY BARYCENTER" }, - Transform = { - Translation = { - Type = "SpiceTranslation", - Target = "MERCURY", - Observer = "MERCURY BARYCENTER", - }, - Rotation = { - Type = "SpiceRotation", - SourceFrame = "MERCURYSE", - DestinationFrame = "GALACTIC", - Kernels = { - localFolder .. "/openspace_mercury.ti" - } - }, - Scale = { - Type = "StaticScale", - Scale = MercuryRadius, - }, + Rotation = { + Type = "SpiceRotation", + SourceFrame = "MERCURYSE", + DestinationFrame = "GALACTIC", + Kernels = { + localFolder .. "/openspace_mercury.ti" + } }, - GUI = { - Name = "Mercury Magnetosphere", - Path = "/Solar System/Missions/Messenger" + Scale = { + Type = "StaticScale", + Scale = MercuryRadius } + }, + GUI = { + Name = "Mercury Magnetosphere", + Path = "/Solar System/Missions/Messenger" + } } -assetHelper.registerSceneGraphNodesAndExport(asset, { - Magnetosphere -}) +assetHelper.registerSceneGraphNodesAndExport(asset, { Magnetosphere }) diff --git a/data/assets/scene/solarsystem/missions/messenger/messengerSC.asset b/data/assets/scene/solarsystem/missions/messenger/messengerSC.asset index 68e23b4742..7b46f16645 100644 --- a/data/assets/scene/solarsystem/missions/messenger/messengerSC.asset +++ b/data/assets/scene/solarsystem/missions/messenger/messengerSC.asset @@ -4,197 +4,195 @@ local mercuryTransforms = asset.require('scene/solarsystem/planets/mercury/trans local models = asset.syncedResource({ - Name = "Messenger Models", - Type = "HttpSynchronization", - Identifier = "messenger_model", - Version = 2 + Name = "Messenger Models", + Type = "HttpSynchronization", + Identifier = "messenger_model", + Version = 2 }) local kernels = asset.syncedResource({ - Name = "Messenger Kernels", - Type = "HttpSynchronization", - Identifier = "messenger_spice", - Version = 2 + Name = "Messenger Kernels", + Type = "HttpSynchronization", + Identifier = "messenger_spice", + Version = 2 }) local LocalKernels = { - kernels .. '/messenger_2548.tsc', - kernels .. '/msgr_v231.tf', + kernels .. '/messenger_2548.tsc', + kernels .. '/msgr_v231.tf', - kernels .. '/de405.bsp', - kernels .. '/msgr_040803_150430_150430_od431sc_2.bsp', - kernels .. '/msgr_antenna_v000.bsp', - kernels .. '/msgr_de405_de423s.bsp', + kernels .. '/de405.bsp', + kernels .. '/msgr_040803_150430_150430_od431sc_2.bsp', + kernels .. '/msgr_antenna_v000.bsp', + kernels .. '/msgr_de405_de423s.bsp', - kernels .. '/msgr_epps_v100.ti', - kernels .. '/msgr_grns_v110.ti', - kernels .. '/msgr_mag_v021.ti', - kernels .. '/msgr_mascs_v100.ti', - kernels .. '/msgr_mdis_v160.ti', - kernels .. '/msgr_mla_v010.ti', - kernels .. '/msgr_rs_v111.ti', - kernels .. '/msgr_xrs_v001.ti', + kernels .. '/msgr_epps_v100.ti', + kernels .. '/msgr_grns_v110.ti', + kernels .. '/msgr_mag_v021.ti', + kernels .. '/msgr_mascs_v100.ti', + kernels .. '/msgr_mdis_v160.ti', + kernels .. '/msgr_mla_v010.ti', + kernels .. '/msgr_rs_v111.ti', + kernels .. '/msgr_xrs_v001.ti', - kernels .. '/pck00008.tpc', - kernels .. '/pck00008_msgr.tpc', - kernels .. '/pck00009_msgr_v10.tpc', - kernels .. '/pck00010_msgr_v10.tpc', - kernels .. '/pck00010_msgr_v23.tpc', - kernels .. '/pck00010.tpc', + kernels .. '/pck00008.tpc', + kernels .. '/pck00008_msgr.tpc', + kernels .. '/pck00009_msgr_v10.tpc', + kernels .. '/pck00010_msgr_v10.tpc', + kernels .. '/pck00010_msgr_v23.tpc', + kernels .. '/pck00010.tpc', - kernels .. '/msgr_1103_v02.bc', - kernels .. '/msgr_1104_v02.bc', - kernels .. '/msgr_1105_v02.bc', - kernels .. '/msgr_1106_v02.bc', + kernels .. '/msgr_1103_v02.bc', + kernels .. '/msgr_1104_v02.bc', + kernels .. '/msgr_1105_v02.bc', + kernels .. '/msgr_1106_v02.bc', } local RotationMatrix = { - 1, 0, 0, - 0, 0, -1, - 0, 1, 0 + 1, 0, 0, + 0, 0, -1, + 0, 1, 0 } local LightSources = assetHelper.getDefaultLightSources(sunTransforms.SolarSystemBarycenter.Identifier) local Messenger = { - Identifier = "Messenger", - Parent = sunTransforms.SolarSystemBarycenter.Identifier, - Transform = { - Translation = { - Type = "SpiceTranslation", - Target = "MESSENGER", - Observer = "SUN", - Kernels = LocalKernels - }, - Rotation = { - Type = "SpiceRotation", - SourceFrame = "MSGR_SPACECRAFT", - DestinationFrame = "GALACTIC", - }, + Identifier = "Messenger", + Parent = sunTransforms.SolarSystemBarycenter.Identifier, + Transform = { + Translation = { + Type = "SpiceTranslation", + Target = "MESSENGER", + Observer = "SUN", + Kernels = LocalKernels }, - TimeFrame = { - Type = "TimeFrameInterval", - Start = "2011-03-01", - End = "2011-06-30" - }, - GUI = { - Name = "Messenger", - Path = "/Solar System/Missions/Messenger" + Rotation = { + Type = "SpiceRotation", + SourceFrame = "MSGR_SPACECRAFT", + DestinationFrame = "GALACTIC" } + }, + TimeFrame = { + Type = "TimeFrameInterval", + Start = "2011-03-01", + End = "2011-06-30" + }, + GUI = { + Name = "Messenger", + Path = "/Solar System/Missions/Messenger" + } } local MessengerProbeBlack = { - Identifier = "MessengerProbe_black", - Parent = Messenger.Identifier, - Renderable = { - Type = "RenderableModel", - GeometryFile = models .. "/MessengerProbe_black.obj", - ModelTransform = RotationMatrix, - LightSources = LightSources - }, - GUI = { - Name = "MessengerProbe Black", - Path = "/Solar System/Missions/Messenger" - } + Identifier = "MessengerProbe_black", + Parent = Messenger.Identifier, + Renderable = { + Type = "RenderableModel", + GeometryFile = models .. "/MessengerProbe_black.obj", + ModelTransform = RotationMatrix, + LightSources = LightSources + }, + GUI = { + Name = "MessengerProbe Black", + Path = "/Solar System/Missions/Messenger" + } } local MessengerProbeFoil = { - Identifier = "MessengerProbe_foil", - Parent = Messenger.Identifier, - Renderable = { - Type = "RenderableModel", - GeometryFile = models .. "/MessengerProbe_foil.obj", - ModelTransform = RotationMatrix, - LightSources = LightSources - }, - GUI = { - Name = "MessengerProbe foil", - Path = "/Solar System/Missions/Messenger" - } + Identifier = "MessengerProbe_foil", + Parent = Messenger.Identifier, + Renderable = { + Type = "RenderableModel", + GeometryFile = models .. "/MessengerProbe_foil.obj", + ModelTransform = RotationMatrix, + LightSources = LightSources + }, + GUI = { + Name = "MessengerProbe foil", + Path = "/Solar System/Missions/Messenger" + } } local MessengerProbeHeatShield = { - Identifier = "MessengerProbe_heatShield", - Parent = Messenger.Identifier, - Renderable = { - Type = "RenderableModel", - GeometryFile = models .. "/MessengerProbe_heatShield.obj", - ModelTransform = RotationMatrix, - LightSources = LightSources - }, - GUI = { - Name = "MessengerProbe Heat Sheild", - Path = "/Solar System/Missions/Messenger" - } + Identifier = "MessengerProbe_heatShield", + Parent = Messenger.Identifier, + Renderable = { + Type = "RenderableModel", + GeometryFile = models .. "/MessengerProbe_heatShield.obj", + ModelTransform = RotationMatrix, + LightSources = LightSources + }, + GUI = { + Name = "MessengerProbe Heat Sheild", + Path = "/Solar System/Missions/Messenger" + } } local MessengerProbeMetal = { - Identifier = "MessengerProbe_Metal", - Parent = Messenger.Identifier, - Renderable = { - Type = "RenderableModel", - GeometryFile = models .. "/MessengerProbe_metal.obj", - ModelTransform = RotationMatrix, - LightSources = LightSources - }, - GUI = { - Name = "MessengerProbe Metal", - Path = "/Solar System/Missions/Messenger" - } + Identifier = "MessengerProbe_Metal", + Parent = Messenger.Identifier, + Renderable = { + Type = "RenderableModel", + GeometryFile = models .. "/MessengerProbe_metal.obj", + ModelTransform = RotationMatrix, + LightSources = LightSources + }, + GUI = { + Name = "MessengerProbe Metal", + Path = "/Solar System/Missions/Messenger" + } } - local MessengerProbePanels = { - Identifier = "MessengerProbe_panels", - Parent = Messenger.Identifier, - Renderable = { - Type = "RenderableModel", - GeometryFile = models .. "/MessengerProbe_panels.obj", - ModelTransform = RotationMatrix, - LightSources = LightSources - }, - GUI = { - Name = "MessengerProbe Panels", - Path = "/Solar System/Missions/Messenger" - } + Identifier = "MessengerProbe_panels", + Parent = Messenger.Identifier, + Renderable = { + Type = "RenderableModel", + GeometryFile = models .. "/MessengerProbe_panels.obj", + ModelTransform = RotationMatrix, + LightSources = LightSources + }, + GUI = { + Name = "MessengerProbe Panels", + Path = "/Solar System/Missions/Messenger" + } } local MessengerTrail = { - Identifier = "MessengerTrail", - Parent = mercuryTransforms.MercuryBarycenter.Identifier, - Renderable = { - Type = "RenderableTrailOrbit", - Translation = { - Type = "SpiceTranslation", - Target = "MESSENGER", - Observer = "MERCURY BARYCENTER", - Kernels = LocalKernels - }, - Color = { 0.288, 0.375, 0.934 }, - EnableFade = false, - StartTime = "2011 MARCH 01 12:00:00", - EndTime = "2011 MAY 30 12:00:00", - Period = 12, - Resolution = 10000 - + Identifier = "MessengerTrail", + Parent = mercuryTransforms.MercuryBarycenter.Identifier, + Renderable = { + Type = "RenderableTrailOrbit", + Translation = { + Type = "SpiceTranslation", + Target = "MESSENGER", + Observer = "MERCURY BARYCENTER", + Kernels = LocalKernels }, - GUI = { - Name = "Messenger Trail", - Path = "/Solar System/Missions/Messenger" - } + Color = { 0.288, 0.375, 0.934 }, + EnableFade = false, + StartTime = "2011 MARCH 01 12:00:00", + EndTime = "2011 MAY 30 12:00:00", + Period = 12, + Resolution = 10000 + }, + GUI = { + Name = "Messenger Trail", + Path = "/Solar System/Missions/Messenger" + } } assetHelper.registerSceneGraphNodesAndExport(asset, { - Messenger, - MessengerProbeBlack, - MessengerProbeFoil, - MessengerProbeHeatShield, - MessengerProbeMetal, - MessengerProbePanels, - MessengerTrail + Messenger, + MessengerProbeBlack, + MessengerProbeFoil, + MessengerProbeHeatShield, + MessengerProbeMetal, + MessengerProbePanels, + MessengerTrail }) diff --git a/data/assets/scene/solarsystem/missions/newhorizons/charon.asset b/data/assets/scene/solarsystem/missions/newhorizons/charon.asset index c8982b7f48..858edb1bc4 100644 --- a/data/assets/scene/solarsystem/missions/newhorizons/charon.asset +++ b/data/assets/scene/solarsystem/missions/newhorizons/charon.asset @@ -5,117 +5,117 @@ local sunTransforms = asset.require('scene/solarsystem/sun/transforms') local textures = asset.syncedResource({ - Name = "Charon Textures", - Type = "HttpSynchronization", - Identifier = "charon_textures", - Version = 3 + Name = "Charon Textures", + Type = "HttpSynchronization", + Identifier = "charon_textures", + Version = 3 }) local charonRadius = 6.035E5 local CharonProjection = { - Identifier = "CharonProjection", - Parent = transforms.PlutoBarycenterAccurate.Identifier, - Transform = { - Translation = { - Type = "SpiceTranslation", - Target = "CHARON", - Observer = "PLUTO BARYCENTER" - }, - Rotation = { - Type = "SpiceRotation", - SourceFrame = "IAU_CHARON", - DestinationFrame = "GALACTIC" - } + Identifier = "CharonProjection", + Parent = transforms.PlutoBarycenterAccurate.Identifier, + Transform = { + Translation = { + Type = "SpiceTranslation", + Target = "CHARON", + Observer = "PLUTO BARYCENTER" }, - Renderable = { - Type = "RenderablePlanetProjection", - Geometry = { - Type = "SimpleSphere", - Radius = charonRadius, - Segments = 350 - }, - ColorTexturePaths = { - textures .. "/NH_Charon_mosaic.png", - textures .. "/NH_Charon_mosaic_8192.png" - }, - HeightTexturePaths = { - textures .. "/NH_Charon_DTM.png", - textures .. "/NH_Charon_DTM_8192.png" - }, - MeridianShift = true, - Projection = { - Observer = "NEW HORIZONS", - Target = "CHARON", - Aberration = "NONE", - AspectRatio = 2, - - Instrument = { - Name = "NH_LORRI", - Method = "ELLIPSOID", - Aberration = "NONE", - Fovy = 0.2907, - Aspect = 1, - Near = 0.2, - Far = 10000 - }, - - PotentialTargets = { - "PLUTO", - "CHARON" - } - } - }, - GUI = { - Path = "/Solar System/Dwarf Planets/Pluto", - Name = "Charon Projection" + Rotation = { + Type = "SpiceRotation", + SourceFrame = "IAU_CHARON", + DestinationFrame = "GALACTIC" } + }, + Renderable = { + Type = "RenderablePlanetProjection", + Geometry = { + Type = "SimpleSphere", + Radius = charonRadius, + Segments = 350 + }, + ColorTexturePaths = { + textures .. "/NH_Charon_mosaic.png", + textures .. "/NH_Charon_mosaic_8192.png" + }, + HeightTexturePaths = { + textures .. "/NH_Charon_DTM.png", + textures .. "/NH_Charon_DTM_8192.png" + }, + MeridianShift = true, + Projection = { + Observer = "NEW HORIZONS", + Target = "CHARON", + Aberration = "NONE", + AspectRatio = 2, + + Instrument = { + Name = "NH_LORRI", + Method = "ELLIPSOID", + Aberration = "NONE", + Fovy = 0.2907, + Aspect = 1, + Near = 0.2, + Far = 10000 + }, + + PotentialTargets = { + "PLUTO", + "CHARON" + } + } + }, + GUI = { + Path = "/Solar System/Dwarf Planets/Pluto", + Name = "Charon Projection" + } } local CharonText = { - Identifier = "CharonText", - Parent = CharonProjection.Identifier, - Transform = { - Translation = { - Type = "StaticTranslation", - Position = {0, -1000000.0, 0} - } - }, - Renderable = { - Type = "RenderablePlaneImageLocal", - Size = 10^6.3, - Origin = "Center", - Billboard = true, - Texture = textures .. "/Charon-Text.png", - BlendMode = "Additive" - }, - GUI = { - Name = "Charon Text", - Path = "/Solar System/Dwarf Planets/Pluto" + Identifier = "CharonText", + Parent = CharonProjection.Identifier, + Transform = { + Translation = { + Type = "StaticTranslation", + Position = {0, -1000000.0, 0} } + }, + Renderable = { + Type = "RenderablePlaneImageLocal", + Size = 10^6.3, + Origin = "Center", + Billboard = true, + Texture = textures .. "/Charon-Text.png", + BlendMode = "Additive" + }, + GUI = { + Name = "Charon Text", + Path = "/Solar System/Dwarf Planets/Pluto" + } } local CharonShadow = { - Identifier = "CharonShadow", - Parent = CharonProjection.Identifier, - Renderable = { - Type = "RenderableShadowCylinder", - Opacity = 0.25, - TerminatorType = "PENUMBRAL", - LightSource = "SUN", - Observer = "NEW HORIZONS", - Body = "CHARON", - BodyFrame = "IAU_CHARON", - Aberration = "NONE" - }, - GUI = { - Name = "Charon Shadow", - Path = "/Solar System/Dwarf Planets/Pluto" - } + Identifier = "CharonShadow", + Parent = CharonProjection.Identifier, + Renderable = { + Type = "RenderableShadowCylinder", + Opacity = 0.25, + TerminatorType = "PENUMBRAL", + LightSource = "SUN", + Observer = "NEW HORIZONS", + Body = "CHARON", + BodyFrame = "IAU_CHARON", + Aberration = "NONE" + }, + GUI = { + Name = "Charon Shadow", + Path = "/Solar System/Dwarf Planets/Pluto" + } } assetHelper.registerSceneGraphNodesAndExport(asset, { - CharonProjection, - CharonText, - CharonShadow + CharonProjection, + CharonText, + CharonShadow }) diff --git a/data/assets/scene/solarsystem/missions/newhorizons/dashboard.asset b/data/assets/scene/solarsystem/missions/newhorizons/dashboard.asset index 477303bc06..e64ee000ed 100644 --- a/data/assets/scene/solarsystem/missions/newhorizons/dashboard.asset +++ b/data/assets/scene/solarsystem/missions/newhorizons/dashboard.asset @@ -1,24 +1,24 @@ local assetHelper = asset.require('util/asset_helper') assetHelper.registerDashboardItems(asset, { - { - Type = "DashboardItemSpacing", - Identifier = "NewHorizonsSpacing", - GuiName = "New Horizons Spacing", - Spacing = 25 - }, - { - Type = "DashboardItemDistance", - Identifier = "NewHorizonsPlutoDistance", - GuiName = "New Horizons Pluto Distance", - SourceType = "Node", - SourceNodeName = "NewHorizons", - DestinationType = "Node Surface", - DestinationNodeName = "PlutoProjection" - }, - { - Type = "DashboardItemInstruments", - Identifier = "NewHorizonsInstruments", - GuiName = "NewHorizons Instruments", - } + { + Type = "DashboardItemSpacing", + Identifier = "NewHorizonsSpacing", + GuiName = "New Horizons Spacing", + Spacing = 25 + }, + { + Type = "DashboardItemDistance", + Identifier = "NewHorizonsPlutoDistance", + GuiName = "New Horizons Pluto Distance", + SourceType = "Node", + SourceNodeName = "NewHorizons", + DestinationType = "Node Surface", + DestinationNodeName = "PlutoProjection" + }, + { + Type = "DashboardItemInstruments", + Identifier = "NewHorizonsInstruments", + GuiName = "NewHorizons Instruments" + } }) diff --git a/data/assets/scene/solarsystem/missions/newhorizons/fov.asset b/data/assets/scene/solarsystem/missions/newhorizons/fov.asset index 093ee19356..5bdaef3e93 100644 --- a/data/assets/scene/solarsystem/missions/newhorizons/fov.asset +++ b/data/assets/scene/solarsystem/missions/newhorizons/fov.asset @@ -9,376 +9,376 @@ local AliceOffset = { -7.9, -1.7, 8.3 } local RexOffset = { 0, 0, 0 } local Lorri = { - Identifier = "NH_LORRI", - Parent = transforms.NewHorizonsPosition.Identifier, - Renderable = { - Type = "RenderableFov", - Body = "NEW HORIZONS", - Frame = "NH_SPACECRAFT", - Color = { 0.8, 0.7, 0.7 }, - Instrument = { - Name = "NH_LORRI", - Aberration = "NONE" - }, - PotentialTargets = { - "Pluto", - "Charon", - -- "Jupiter", "Io", "Europa", "Ganymede", "Callisto" - } + Identifier = "NH_LORRI", + Parent = transforms.NewHorizonsPosition.Identifier, + Renderable = { + Type = "RenderableFov", + Body = "NEW HORIZONS", + Frame = "NH_SPACECRAFT", + Color = { 0.8, 0.7, 0.7 }, + Instrument = { + Name = "NH_LORRI", + Aberration = "NONE" }, - Transform = { - Translation = { - Type = "StaticTranslation", - Position = LorriOffset - } - }, - GUI = { - Name = "LORRI", - Path = "/Solar System/Missions/New Horizons/Instruments" + PotentialTargets = { + "Pluto", + "Charon", + -- "Jupiter", "Io", "Europa", "Ganymede", "Callisto" } + }, + Transform = { + Translation = { + Type = "StaticTranslation", + Position = LorriOffset + } + }, + GUI = { + Name = "LORRI", + Path = "/Solar System/Missions/New Horizons/Instruments" + } } local RalphLeisa = { - Identifier = "NH_RALPH_LEISA", - Parent = transforms.NewHorizonsPosition.Identifier, - Renderable = { - Type = "RenderableFov", - Body = "NEW HORIZONS", - Frame = "NH_SPACECRAFT", - RGB = { 0.8, 0.7, 0.7 }, - Instrument = { - Name = "NH_RALPH_LEISA", - Aberration = "NONE" - }, - PotentialTargets = { - "Pluto", - "Charon", - -- "Jupiter", "Io", "Europa", "Ganymede", "Callisto" - } + Identifier = "NH_RALPH_LEISA", + Parent = transforms.NewHorizonsPosition.Identifier, + Renderable = { + Type = "RenderableFov", + Body = "NEW HORIZONS", + Frame = "NH_SPACECRAFT", + RGB = { 0.8, 0.7, 0.7 }, + Instrument = { + Name = "NH_RALPH_LEISA", + Aberration = "NONE" }, - Transform = { - Translation = { - Type = "StaticTranslation", - Position = RalphOffset - } - }, - GUI = { - Name = "RALPH LEISA", - Path = "/Solar System/Missions/New Horizons/Instruments" + PotentialTargets = { + "Pluto", + "Charon", + -- "Jupiter", "Io", "Europa", "Ganymede", "Callisto" } + }, + Transform = { + Translation = { + Type = "StaticTranslation", + Position = RalphOffset + } + }, + GUI = { + Name = "RALPH LEISA", + Path = "/Solar System/Missions/New Horizons/Instruments" + } } local RalphMvicPan1 = { - Identifier = "NH_RALPH_MVIC_PAN1", - Parent = transforms.NewHorizonsPosition.Identifier, - Renderable = { - Type = "RenderableFov", - Body = "NEW HORIZONS", - Frame = "NH_SPACECRAFT", - RGB = { 0.8, 0.7, 0.7 }, - Instrument = { - Name = "NH_RALPH_MVIC_PAN1", - Aberration = "NONE" - }, - PotentialTargets = { - "Pluto", - "Charon", - -- "Jupiter", "Io", "Europa", "Ganymede", "Callisto" - } + Identifier = "NH_RALPH_MVIC_PAN1", + Parent = transforms.NewHorizonsPosition.Identifier, + Renderable = { + Type = "RenderableFov", + Body = "NEW HORIZONS", + Frame = "NH_SPACECRAFT", + RGB = { 0.8, 0.7, 0.7 }, + Instrument = { + Name = "NH_RALPH_MVIC_PAN1", + Aberration = "NONE" }, - Transform = { - Translation = { - Type = "StaticTranslation", - Position = RalphOffset - } - }, - GUI = { - Name = "RALPH MVIC PAN 1", - Path = "/Solar System/Missions/New Horizons/Instruments" + PotentialTargets = { + "Pluto", + "Charon", + -- "Jupiter", "Io", "Europa", "Ganymede", "Callisto" } + }, + Transform = { + Translation = { + Type = "StaticTranslation", + Position = RalphOffset + } + }, + GUI = { + Name = "RALPH MVIC PAN 1", + Path = "/Solar System/Missions/New Horizons/Instruments" + } } local RalphMvicPan2 = { - Identifier = "NH_RALPH_MVIC_PAN2", - Parent = transforms.NewHorizonsPosition.Identifier, - Renderable = { - Type = "RenderableFov", - Body = "NEW HORIZONS", - Frame = "NH_SPACECRAFT", - RGB = { 0.8, 0.7, 0.7 }, - Instrument = { - Name = "NH_RALPH_MVIC_PAN2", - Aberration = "NONE" - }, - PotentialTargets = { - "Pluto", - "Charon", - -- "Jupiter", "Io", "Europa", "Ganymede", "Callisto" - } + Identifier = "NH_RALPH_MVIC_PAN2", + Parent = transforms.NewHorizonsPosition.Identifier, + Renderable = { + Type = "RenderableFov", + Body = "NEW HORIZONS", + Frame = "NH_SPACECRAFT", + RGB = { 0.8, 0.7, 0.7 }, + Instrument = { + Name = "NH_RALPH_MVIC_PAN2", + Aberration = "NONE" }, - Transform = { - Translation = { - Type = "StaticTranslation", - Position = RalphOffset - } - }, - GUI = { - Name = "RALPH MVIC PAN 2", - Path = "/Solar System/Missions/New Horizons/Instruments" + PotentialTargets = { + "Pluto", + "Charon", + -- "Jupiter", "Io", "Europa", "Ganymede", "Callisto" } + }, + Transform = { + Translation = { + Type = "StaticTranslation", + Position = RalphOffset + } + }, + GUI = { + Name = "RALPH MVIC PAN 2", + Path = "/Solar System/Missions/New Horizons/Instruments" + } } local RalphMvicRed = { - Identifier = "NH_RALPH_MVIC_RED", - Parent = transforms.NewHorizonsPosition.Identifier, - Renderable = { - Type = "RenderableFov", - Body = "NEW HORIZONS", - Frame = "NH_SPACECRAFT", - RGB = { 0.8, 0.7, 0.7 }, - Instrument = { - Name = "NH_RALPH_MVIC_RED", - Aberration = "NONE" - }, - PotentialTargets = { - "Pluto", - "Charon", - -- "Jupiter", "Io", "Europa", "Ganymede", "Callisto" - } + Identifier = "NH_RALPH_MVIC_RED", + Parent = transforms.NewHorizonsPosition.Identifier, + Renderable = { + Type = "RenderableFov", + Body = "NEW HORIZONS", + Frame = "NH_SPACECRAFT", + RGB = { 0.8, 0.7, 0.7 }, + Instrument = { + Name = "NH_RALPH_MVIC_RED", + Aberration = "NONE" }, - Transform = { - Translation = { - Type = "StaticTranslation", - Position = RalphOffset - } - }, - GUI = { - Name = "RALPH MVIC RED", - Path = "/Solar System/Missions/New Horizons/Instruments" + PotentialTargets = { + "Pluto", + "Charon", + -- "Jupiter", "Io", "Europa", "Ganymede", "Callisto" } + }, + Transform = { + Translation = { + Type = "StaticTranslation", + Position = RalphOffset + } + }, + GUI = { + Name = "RALPH MVIC RED", + Path = "/Solar System/Missions/New Horizons/Instruments" + } } local RalphMvicBlue = { - Identifier = "NH_RALPH_MVIC_BLUE", - Parent = transforms.NewHorizonsPosition.Identifier, - Renderable = { - Type = "RenderableFov", - Body = "NEW HORIZONS", - Frame = "NH_SPACECRAFT", - RGB = { 0.8, 0.7, 0.7 }, - Instrument = { - Name = "NH_RALPH_MVIC_BLUE", - Aberration = "NONE" - }, - PotentialTargets = { - "Pluto", - "Charon", - -- "Jupiter", "Io", "Europa", "Ganymede", "Callisto" - } + Identifier = "NH_RALPH_MVIC_BLUE", + Parent = transforms.NewHorizonsPosition.Identifier, + Renderable = { + Type = "RenderableFov", + Body = "NEW HORIZONS", + Frame = "NH_SPACECRAFT", + RGB = { 0.8, 0.7, 0.7 }, + Instrument = { + Name = "NH_RALPH_MVIC_BLUE", + Aberration = "NONE" }, - Transform = { - Translation = { - Type = "StaticTranslation", - Position = RalphOffset - } - }, - GUI = { - Name = "RALPH MVIC BLUE", - Path = "/Solar System/Missions/New Horizons/Instruments" + PotentialTargets = { + "Pluto", + "Charon", + -- "Jupiter", "Io", "Europa", "Ganymede", "Callisto" } + }, + Transform = { + Translation = { + Type = "StaticTranslation", + Position = RalphOffset + } + }, + GUI = { + Name = "RALPH MVIC BLUE", + Path = "/Solar System/Missions/New Horizons/Instruments" + } } local RalphMvicFt = { - Identifier = "NH_RALPH_MVIC_FT", - Parent = transforms.NewHorizonsPosition.Identifier, - Renderable = { - Type = "RenderableFov", - Body = "NEW HORIZONS", - Frame = "NH_SPACECRAFT", - RGB = { 0.8, 0.7, 0.7 }, - Instrument = { - Name = "NH_RALPH_MVIC_FT", - Aberration = "NONE" - }, - PotentialTargets = { - "Pluto", - "Charon", - -- "Jupiter", "Io", "Europa", "Ganymede", "Callisto" - } + Identifier = "NH_RALPH_MVIC_FT", + Parent = transforms.NewHorizonsPosition.Identifier, + Renderable = { + Type = "RenderableFov", + Body = "NEW HORIZONS", + Frame = "NH_SPACECRAFT", + RGB = { 0.8, 0.7, 0.7 }, + Instrument = { + Name = "NH_RALPH_MVIC_FT", + Aberration = "NONE" }, - Transform = { - Translation = { - Type = "StaticTranslation", - Position = RalphOffset - } - }, - GUI = { - Name = "RALPH MVIC FT", - Path = "/Solar System/Missions/New Horizons/Instruments" + PotentialTargets = { + "Pluto", + "Charon", + -- "Jupiter", "Io", "Europa", "Ganymede", "Callisto" } + }, + Transform = { + Translation = { + Type = "StaticTranslation", + Position = RalphOffset + } + }, + GUI = { + Name = "RALPH MVIC FT", + Path = "/Solar System/Missions/New Horizons/Instruments" + } } local RalphMvicMethane = { - Identifier = "NH_RALPH_MVIC_METHANE", - Parent = transforms.NewHorizonsPosition.Identifier, - Renderable = { - Type = "RenderableFov", - Body = "NEW HORIZONS", - Frame = "NH_SPACECRAFT", - RGB = { 0.8, 0.7, 0.7 }, - Instrument = { - Name = "NH_RALPH_MVIC_METHANE", - Aberration = "NONE" - }, - PotentialTargets = { - "Pluto", - "Charon", - -- "Jupiter", "Io", "Europa", "Ganymede", "Callisto" - } + Identifier = "NH_RALPH_MVIC_METHANE", + Parent = transforms.NewHorizonsPosition.Identifier, + Renderable = { + Type = "RenderableFov", + Body = "NEW HORIZONS", + Frame = "NH_SPACECRAFT", + RGB = { 0.8, 0.7, 0.7 }, + Instrument = { + Name = "NH_RALPH_MVIC_METHANE", + Aberration = "NONE" }, - Transform = { - Translation = { - Type = "StaticTranslation", - Position = RalphOffset - } - }, - GUI = { - Name = "RALPH MVIC METHANE", - Path = "/Solar System/Missions/New Horizons/Instruments" + PotentialTargets = { + "Pluto", + "Charon", + -- "Jupiter", "Io", "Europa", "Ganymede", "Callisto" } + }, + Transform = { + Translation = { + Type = "StaticTranslation", + Position = RalphOffset + } + }, + GUI = { + Name = "RALPH MVIC METHANE", + Path = "/Solar System/Missions/New Horizons/Instruments" + } } local RalphMvicNir = { - Identifier = "NH_RALPH_MVIC_NIR", - Parent = transforms.NewHorizonsPosition.Identifier, - Renderable = { - Type = "RenderableFov", - Body = "NEW HORIZONS", - Frame = "NH_SPACECRAFT", - RGB = { 0.8, 0.7, 0.7 }, - Instrument = { - Name = "NH_RALPH_MVIC_NIR", - Aberration = "NONE" - }, - PotentialTargets = { - "Pluto", - "Charon", - -- "Jupiter", "Io", "Europa", "Ganymede", "Callisto" - } + Identifier = "NH_RALPH_MVIC_NIR", + Parent = transforms.NewHorizonsPosition.Identifier, + Renderable = { + Type = "RenderableFov", + Body = "NEW HORIZONS", + Frame = "NH_SPACECRAFT", + RGB = { 0.8, 0.7, 0.7 }, + Instrument = { + Name = "NH_RALPH_MVIC_NIR", + Aberration = "NONE" }, - Transform = { - Translation = { - Type = "StaticTranslation", - Position = RalphOffset - } - }, - GUI = { - Name = "RALPH MVIC NIR", - Path = "/Solar System/Missions/New Horizons/Instruments" + PotentialTargets = { + "Pluto", + "Charon", + -- "Jupiter", "Io", "Europa", "Ganymede", "Callisto" } + }, + Transform = { + Translation = { + Type = "StaticTranslation", + Position = RalphOffset + } + }, + GUI = { + Name = "RALPH MVIC NIR", + Path = "/Solar System/Missions/New Horizons/Instruments" + } } local AliceAirglow = { - Identifier = "NH_ALICE_AIRGLOW", - Parent = transforms.NewHorizonsPosition.Identifier, - Renderable = { - Type = "RenderableFov", - Body = "NEW HORIZONS", - Frame = "NH_SPACECRAFT", - RGB = { 0.8, 0.7, 0.7 }, - Instrument = { - Name = "NH_ALICE_AIRGLOW", - Aberration = "NONE" - }, - PotentialTargets = { - "Pluto", - "Charon", - -- "Jupiter", "Io", "Europa", "Ganymede", "Callisto" - }, - SimplifyBounds = true + Identifier = "NH_ALICE_AIRGLOW", + Parent = transforms.NewHorizonsPosition.Identifier, + Renderable = { + Type = "RenderableFov", + Body = "NEW HORIZONS", + Frame = "NH_SPACECRAFT", + RGB = { 0.8, 0.7, 0.7 }, + Instrument = { + Name = "NH_ALICE_AIRGLOW", + Aberration = "NONE" }, - Transform = { - Translation = { - Type = "StaticTranslation", - Position = AliceOffset - } + PotentialTargets = { + "Pluto", + "Charon", + -- "Jupiter", "Io", "Europa", "Ganymede", "Callisto" }, - GUI = { - Name = "ALICE AIRGLOW", - Path = "/Solar System/Missions/New Horizons/Instruments" + SimplifyBounds = true + }, + Transform = { + Translation = { + Type = "StaticTranslation", + Position = AliceOffset } + }, + GUI = { + Name = "ALICE AIRGLOW", + Path = "/Solar System/Missions/New Horizons/Instruments" + } } local AliceSoc = { - Identifier = "NH_ALICE_SOC", - Parent = transforms.NewHorizonsPosition.Identifier, - Renderable = { - Type = "RenderableFov", - Body = "NEW HORIZONS", - Frame = "NH_SPACECRAFT", - RGB = { 0.8, 0.7, 0.7 }, - Instrument = { - Name = "NH_ALICE_SOC", - Aberration = "NONE" - }, - PotentialTargets = { - "Pluto", - "Charon", - -- "Jupiter", "Io", "Europa", "Ganymede", "Callisto" - } + Identifier = "NH_ALICE_SOC", + Parent = transforms.NewHorizonsPosition.Identifier, + Renderable = { + Type = "RenderableFov", + Body = "NEW HORIZONS", + Frame = "NH_SPACECRAFT", + RGB = { 0.8, 0.7, 0.7 }, + Instrument = { + Name = "NH_ALICE_SOC", + Aberration = "NONE" }, - Transform = { - Translation = { - Type = "StaticTranslation", - Position = AliceOffset - } - }, - GUI = { - Name = "ALICE SOC", - Path = "/Solar System/Missions/New Horizons/Instruments" + PotentialTargets = { + "Pluto", + "Charon", + -- "Jupiter", "Io", "Europa", "Ganymede", "Callisto" } + }, + Transform = { + Translation = { + Type = "StaticTranslation", + Position = AliceOffset + } + }, + GUI = { + Name = "ALICE SOC", + Path = "/Solar System/Missions/New Horizons/Instruments" + } } local Rex = { - Identifier = "NH_REX", - Parent = transforms.NewHorizonsPosition.Identifier, - Renderable = { - Type = "RenderableCrawlingLine", - Source = "NH_REX", - Target = "EARTH", - Instrument = "NH_REX", - Color = { - Start = { 1.0, 0.7, 0.0, 1.0 }, - End = { 0.0, 0.0, 0.0, 0.0 } - } - }, - Transform = { - Rotation = { - Type = "StaticRotation", - Rotation = {-3.141502/2, 0, -3.141502/2} - }, - Translation = { - Type = "StaticTranslation", - Position = RexOffset - } - }, - GUI = { - Name = "REX", - Path = "/Solar System/Missions/New Horizons/Instruments" + Identifier = "NH_REX", + Parent = transforms.NewHorizonsPosition.Identifier, + Renderable = { + Type = "RenderableCrawlingLine", + Source = "NH_REX", + Target = "EARTH", + Instrument = "NH_REX", + Color = { + Start = { 1.0, 0.7, 0.0, 1.0 }, + End = { 0.0, 0.0, 0.0, 0.0 } } + }, + Transform = { + Rotation = { + Type = "StaticRotation", + Rotation = {-3.141502/2, 0, -3.141502/2} + }, + Translation = { + Type = "StaticTranslation", + Position = RexOffset + } + }, + GUI = { + Name = "REX", + Path = "/Solar System/Missions/New Horizons/Instruments" + } } assetHelper.registerSceneGraphNodesAndExport(asset, { - Lorri, - RalphLeisa, - RalphMvicPan1, - RalphMvicPan2, - RalphMvicRed, - RalphMvicBlue, - RalphMvicFt, - RalphMvicMethane, - RalphMvicNir, - AliceAirglow, - AliceSoc, - Rex + Lorri, + RalphLeisa, + RalphMvicPan1, + RalphMvicPan2, + RalphMvicRed, + RalphMvicBlue, + RalphMvicFt, + RalphMvicMethane, + RalphMvicNir, + AliceAirglow, + AliceSoc, + Rex }) diff --git a/data/assets/scene/solarsystem/missions/newhorizons/kernels.asset b/data/assets/scene/solarsystem/missions/newhorizons/kernels.asset index e008d59119..081af3b699 100644 --- a/data/assets/scene/solarsystem/missions/newhorizons/kernels.asset +++ b/data/assets/scene/solarsystem/missions/newhorizons/kernels.asset @@ -1,44 +1,44 @@ local Kernels = asset.syncedResource({ - Name = "New Horizons Kernels", - Type = "HttpSynchronization", - Identifier = "newhorizons_kernels", - Version = 1 + Name = "New Horizons Kernels", + Type = "HttpSynchronization", + Identifier = "newhorizons_kernels", + Version = 1 }) local NewHorizonsKernels = { - Kernels .. "/nh_pred_20141201_20190301_od122.bsp", - Kernels .. "/NavSE_plu047_od122.bsp", - Kernels .. "/NavPE_de433_od122.bsp", + Kernels .. "/nh_pred_20141201_20190301_od122.bsp", + Kernels .. "/NavSE_plu047_od122.bsp", + Kernels .. "/NavPE_de433_od122.bsp", - Kernels .. "/new-horizons_1121.tsc", + Kernels .. "/new-horizons_1121.tsc", - Kernels .. "/nh_scispi_2015_pred.bc", - Kernels .. "/nh_scispi_2015_recon.bc", - Kernels .. "/nh_lorri_wcs.bc", - - Kernels .. "/PLU_LORRI_ALL_161216.bc", + Kernels .. "/nh_scispi_2015_pred.bc", + Kernels .. "/nh_scispi_2015_recon.bc", + Kernels .. "/nh_lorri_wcs.bc", + + Kernels .. "/PLU_LORRI_ALL_161216.bc", - Kernels .. "/nh_targets_v001.tpc", - Kernels .. "/nh_pcnh_005.tpc", + Kernels .. "/nh_targets_v001.tpc", + Kernels .. "/nh_pcnh_005.tpc", - Kernels .. "/nh_v220.tf", - Kernels .. "/nh_allinstruments_v002.ti", - Kernels .. "/nh_alice_v200.ti", - Kernels .. "/nh_lorri_v201.ti", - Kernels .. "/nh_pepssi_v110.ti", - Kernels .. "/nh_ralph_v100.ti", - Kernels .. "/nh_rex_v100.ti", - Kernels .. "/nh_sdc_v101.ti", - Kernels .. "/nh_swap_v100.ti", - Kernels .. "/nh_astr_v000.ti", - Kernels .. "/nh_fss_v000.ti", - Kernels .. "/nh_soc_misc_v001.tf", - Kernels .. "/nh_stars.bsp", + Kernels .. "/nh_v220.tf", + Kernels .. "/nh_allinstruments_v002.ti", + Kernels .. "/nh_alice_v200.ti", + Kernels .. "/nh_lorri_v201.ti", + Kernels .. "/nh_pepssi_v110.ti", + Kernels .. "/nh_ralph_v100.ti", + Kernels .. "/nh_rex_v100.ti", + Kernels .. "/nh_sdc_v101.ti", + Kernels .. "/nh_swap_v100.ti", + Kernels .. "/nh_astr_v000.ti", + Kernels .. "/nh_fss_v000.ti", + Kernels .. "/nh_soc_misc_v001.tf", + Kernels .. "/nh_stars.bsp", } local PlutoKernels = { - Kernels .. "/NavPE_de433_od122.bsp", - Kernels .. "/NavSE_plu047_od122.bsp" + Kernels .. "/NavPE_de433_od122.bsp", + Kernels .. "/NavSE_plu047_od122.bsp" } asset.export("Kernels", Kernels) diff --git a/data/assets/scene/solarsystem/missions/newhorizons/label.asset b/data/assets/scene/solarsystem/missions/newhorizons/label.asset index 41eed6c729..21a9cb8c83 100644 --- a/data/assets/scene/solarsystem/missions/newhorizons/label.asset +++ b/data/assets/scene/solarsystem/missions/newhorizons/label.asset @@ -9,17 +9,17 @@ local textures = NewHorizonsModel.NewHorizonsTextures local models = NewHorizonsModel.NewHorizonsModels local Labels = { - Identifier = "Labels", - Parent = NewHorizonsModel.NewHorizons.Identifier, - Renderable = { - Type = "RenderableModel", - Body = "NEW HORIZONS", - GeometryFile = models .. "/Labels.obj", - AmbientIntensity = 0.8 - }, - GUI = { - Path = "/Solar System/Missions/New Horizons" - } + Identifier = "Labels", + Parent = NewHorizonsModel.NewHorizons.Identifier, + Renderable = { + Type = "RenderableModel", + Body = "NEW HORIZONS", + GeometryFile = models .. "/Labels.obj", + AmbientIntensity = 0.8 + }, + GUI = { + Path = "/Solar System/Missions/New Horizons" + } } assetHelper.registerSceneGraphNodesAndExport(asset, { Labels }) diff --git a/data/assets/scene/solarsystem/missions/newhorizons/model.asset b/data/assets/scene/solarsystem/missions/newhorizons/model.asset index 939764e2a6..fcd476e2d8 100644 --- a/data/assets/scene/solarsystem/missions/newhorizons/model.asset +++ b/data/assets/scene/solarsystem/missions/newhorizons/model.asset @@ -3,40 +3,40 @@ local transforms = asset.require('./transforms') local sunTransforms = asset.require('scene/solarsystem/sun/transforms') local models = asset.syncedResource({ - Name = "New Horizons Model", - Type = "HttpSynchronization", - Identifier = "newhorizons_model", - Version = 2 + Name = "New Horizons Model", + Type = "HttpSynchronization", + Identifier = "newhorizons_model", + Version = 2 }) local NewHorizons = { - Identifier = "NewHorizons", - Parent = transforms.NewHorizonsPosition.Identifier, - Renderable = { - Type = "RenderableModel", - Body = "NEW HORIZONS", - GeometryFile = models .. "/NewHorizonsCleanModel.obj", - AmbientIntensity = 0.0, - DiffuseIntensity = 1.0, - SpecularIntensity = 1.0, - LightSources = { - { - Type = "SceneGraphLightSource", - Identifier = "Sun", - Node = sunTransforms.SolarSystemBarycenter.Identifier, - Intensity = 1.0 - }, - { - Identifier = "Camera", - Type = "CameraLightSource", - Intensity = 0.5 - } - } - }, - GUI = { - Name = "New Horizons", - Path = "/Solar System/Missions/New Horizons" + Identifier = "NewHorizons", + Parent = transforms.NewHorizonsPosition.Identifier, + Renderable = { + Type = "RenderableModel", + Body = "NEW HORIZONS", + GeometryFile = models .. "/NewHorizonsCleanModel.obj", + AmbientIntensity = 0.0, + DiffuseIntensity = 1.0, + SpecularIntensity = 1.0, + LightSources = { + { + Type = "SceneGraphLightSource", + Identifier = "Sun", + Node = sunTransforms.SolarSystemBarycenter.Identifier, + Intensity = 1.0 + }, + { + Identifier = "Camera", + Type = "CameraLightSource", + Intensity = 0.5 + } } + }, + GUI = { + Name = "New Horizons", + Path = "/Solar System/Missions/New Horizons" + } } assetHelper.registerSceneGraphNodesAndExport(asset, { NewHorizons }) diff --git a/data/assets/scene/solarsystem/missions/newhorizons/newhorizons.asset b/data/assets/scene/solarsystem/missions/newhorizons/newhorizons.asset index cf35bc01c1..ac7159463c 100644 --- a/data/assets/scene/solarsystem/missions/newhorizons/newhorizons.asset +++ b/data/assets/scene/solarsystem/missions/newhorizons/newhorizons.asset @@ -12,9 +12,9 @@ local mission = asset.localResource("newhorizons.mission") local missionName asset.onInitialize(function() - missionName = openspace.loadMission(mission) + missionName = openspace.loadMission(mission) end) asset.onDeinitialize(function() - openspace.unloadMission(missionName) + openspace.unloadMission(missionName) end) diff --git a/data/assets/scene/solarsystem/missions/newhorizons/newhorizons.mission b/data/assets/scene/solarsystem/missions/newhorizons/newhorizons.mission index 66923f4cc0..ea2080d9ea 100644 --- a/data/assets/scene/solarsystem/missions/newhorizons/newhorizons.mission +++ b/data/assets/scene/solarsystem/missions/newhorizons/newhorizons.mission @@ -3,120 +3,120 @@ -- are approximate and need fixing return { - Name = "New Horizons", - Phases = { + Name = "New Horizons", + Phases = { + { + Name = "Cruise Phase", + TimeRange = { Start = "2006 JAN 19 00:00:00", End = "2015 JAN 15 00:00:00" }, + Phases = { { - Name = "Cruise Phase", - TimeRange = { Start = "2006 JAN 19 00:00:00", End = "2015 JAN 15 00:00:00" }, - Phases = { - { - Name = "Jupiter fly-by", - TimeRange = { Start = "2007 FEB 28 00:00:00", End = "2007 FEB 28 23:59:59" } - }, - { - Name = "Annual checkout 1", - TimeRange = { Start = "2007 SEP 01 00:00:00", End = "2007 NOV 30 00:00:00" } - }, - { - Name = "Annual checkout 2", - TimeRange = { Start = "2008 JUL 01 00:00:00", End = "2008 AUG 31 00:00:00" } - }, - { - Name = "Annual checkout 3", - TimeRange = { Start = "2009 JUL 01 00:00:00", End = "2009 AUG 31 00:00:00" } - }, - { - Name = "Annual checkout 4", - TimeRange = { Start = "2010 MAY 01 00:00:00", End = "2010 JUL 31 00:00:00" } - }, - { - Name = "Annual checkout 5", - TimeRange = { Start = "2011 MAY 01 00:00:00", End = "2011 JUL 31 00:00:00" } - }, - { - Name = "Annual checkout 6", - TimeRange = { Start = "2012 MAY 01 00:00:00", End = "2012 JUL 31 00:00:00" } - }, - { - Name = "Annual checkout 7", - TimeRange = { Start = "2013 MAY 01 00:00:00", End = "2013 AUG 31 00:00:00" } - }, - { - Name = "Annual checkout 8 and Optical Navigation campaign 1", - TimeRange = { Start = "2014 JUN 01 00:00:00", End = "2014 AUG 31 00:00:00" } - }, - { - Name = "Final Wakeup from Hibernation", - TimeRange = { Start = "2014 DEC 06 00:00:00", End = "2014 DEC 06 23:59:59" } - } - } + Name = "Jupiter fly-by", + TimeRange = { Start = "2007 FEB 28 00:00:00", End = "2007 FEB 28 23:59:59" } }, { - Name = "Pluto Encounter/Approach Phase 1", - TimeRange = { Start = "2015 JAN 15 00:00:00", End = "2015 APR 01 00:00:00" }, - Phases = { - { - Name = "Optical nagivation campaign 2", - TimeRange = { Start = "2015 JAN 25 00:00:00", End = "2015 APR 01 00:00:00" } - } - } + Name = "Annual checkout 1", + TimeRange = { Start = "2007 SEP 01 00:00:00", End = "2007 NOV 30 00:00:00" } }, { - Name = "Pluto Encounter/Approach Phase 2", - TimeRange = { Start = "2015 APR 01 00:00:00", End = "2015 JUN 01 00:00:00" }, - Phases = { - { - Name = "Best-ever images of Pluto", - TimeRange = { Start = "2015 MAY 01 00:00:00", End = "2015 JUN 01 00:00:00" } - } - } + Name = "Annual checkout 2", + TimeRange = { Start = "2008 JUL 01 00:00:00", End = "2008 AUG 31 00:00:00" } }, { - Name = "Pluto Encounter/Approach Phase 3", - TimeRange = { Start = "2015 JUN 01 00:00:00", End = "2015 JUL 15 00:00:00" }, - Phases = { - { - Name = "Closest approach to Pluto", - TimeRange = { Start = "2015 JUL 14 11:49:57", End = "2015 JUL 14 11:49:58" } - }, - { - Name = "Closest approach to Charon", - TimeRange = { Start = "2015 JUL 14 12:03:50", End = "2015 JUL 14 12:03:51" } - }, - { - Name = "Pluto-Sun Occultation", - TimeRange = { Start = "2015 JUL 14 12:51:25", End = "2015 JUL 14 12:52:00" } - }, - { - Name = "Pluto-Earth Occultation", - TimeRange = { Start = "2015 JUL 14 12:52:27", End = "2015 JUL 14 12:53:00" } - }, - { - Name = "Charon-Sun Occultation", - TimeRange = { Start = "2015 JUL 14 14:17:40", End = "2015 JUL 14 14:18:00" } - }, - { - Name = "Charon-Earth Occultation", - TimeRange = { Start = "2015 JUL 14 14:20:00", End = "2015 JUL 14 14:21:00" } - } - } + Name = "Annual checkout 3", + TimeRange = { Start = "2009 JUL 01 00:00:00", End = "2009 AUG 31 00:00:00" } }, { - Name = "Departure Phase 1", - TimeRange = { Start = "2015 JUL 15 00:00:00", End = "2015 AUG 01 00:00:00" } + Name = "Annual checkout 4", + TimeRange = { Start = "2010 MAY 01 00:00:00", End = "2010 JUL 31 00:00:00" } }, { - Name = "Departure Phase 2", - TimeRange = { Start = "2015 AUG 01 00:00:00", End = "2015 OCT 01 00:00:00" } + Name = "Annual checkout 5", + TimeRange = { Start = "2011 MAY 01 00:00:00", End = "2011 JUL 31 00:00:00" } }, { - Name = "Departure Phase 3", - TimeRange = { Start = "2015 OCT 01 00:00:00", End = "2016 JAN 01 00:00:00" } + Name = "Annual checkout 6", + TimeRange = { Start = "2012 MAY 01 00:00:00", End = "2012 JUL 31 00:00:00" } }, { - Name = "Data Playback Ends", - TimeRange = { Start = "2016 OCT 01 00:00:00", End = "2016 DEC 01 00:00:00" } + Name = "Annual checkout 7", + TimeRange = { Start = "2013 MAY 01 00:00:00", End = "2013 AUG 31 00:00:00" } + }, + { + Name = "Annual checkout 8 and Optical Navigation campaign 1", + TimeRange = { Start = "2014 JUN 01 00:00:00", End = "2014 AUG 31 00:00:00" } + }, + { + Name = "Final Wakeup from Hibernation", + TimeRange = { Start = "2014 DEC 06 00:00:00", End = "2014 DEC 06 23:59:59" } } + } + }, + { + Name = "Pluto Encounter/Approach Phase 1", + TimeRange = { Start = "2015 JAN 15 00:00:00", End = "2015 APR 01 00:00:00" }, + Phases = { + { + Name = "Optical nagivation campaign 2", + TimeRange = { Start = "2015 JAN 25 00:00:00", End = "2015 APR 01 00:00:00" } + } + } + }, + { + Name = "Pluto Encounter/Approach Phase 2", + TimeRange = { Start = "2015 APR 01 00:00:00", End = "2015 JUN 01 00:00:00" }, + Phases = { + { + Name = "Best-ever images of Pluto", + TimeRange = { Start = "2015 MAY 01 00:00:00", End = "2015 JUN 01 00:00:00" } + } + } + }, + { + Name = "Pluto Encounter/Approach Phase 3", + TimeRange = { Start = "2015 JUN 01 00:00:00", End = "2015 JUL 15 00:00:00" }, + Phases = { + { + Name = "Closest approach to Pluto", + TimeRange = { Start = "2015 JUL 14 11:49:57", End = "2015 JUL 14 11:49:58" } + }, + { + Name = "Closest approach to Charon", + TimeRange = { Start = "2015 JUL 14 12:03:50", End = "2015 JUL 14 12:03:51" } + }, + { + Name = "Pluto-Sun Occultation", + TimeRange = { Start = "2015 JUL 14 12:51:25", End = "2015 JUL 14 12:52:00" } + }, + { + Name = "Pluto-Earth Occultation", + TimeRange = { Start = "2015 JUL 14 12:52:27", End = "2015 JUL 14 12:53:00" } + }, + { + Name = "Charon-Sun Occultation", + TimeRange = { Start = "2015 JUL 14 14:17:40", End = "2015 JUL 14 14:18:00" } + }, + { + Name = "Charon-Earth Occultation", + TimeRange = { Start = "2015 JUL 14 14:20:00", End = "2015 JUL 14 14:21:00" } + } + } + }, + { + Name = "Departure Phase 1", + TimeRange = { Start = "2015 JUL 15 00:00:00", End = "2015 AUG 01 00:00:00" } + }, + { + Name = "Departure Phase 2", + TimeRange = { Start = "2015 AUG 01 00:00:00", End = "2015 OCT 01 00:00:00" } + }, + { + Name = "Departure Phase 3", + TimeRange = { Start = "2015 OCT 01 00:00:00", End = "2016 JAN 01 00:00:00" } + }, + { + Name = "Data Playback Ends", + TimeRange = { Start = "2016 OCT 01 00:00:00", End = "2016 DEC 01 00:00:00" } } + } } diff --git a/data/assets/scene/solarsystem/missions/newhorizons/othermoons.asset b/data/assets/scene/solarsystem/missions/newhorizons/othermoons.asset index e1b61d50f7..8448163a5e 100644 --- a/data/assets/scene/solarsystem/missions/newhorizons/othermoons.asset +++ b/data/assets/scene/solarsystem/missions/newhorizons/othermoons.asset @@ -5,87 +5,87 @@ local Styx = asset.require('scene/solarsystem/dwarf_planets/pluto/minor/styx') local assetHelper = asset.require('util/asset_helper') local hydraTextures = asset.syncedResource({ - Name = "Hydra Textures", - Type = "HttpSynchronization", - Identifier = "hydra_textures", - Version = 1 + Name = "Hydra Textures", + Type = "HttpSynchronization", + Identifier = "hydra_textures", + Version = 1 }) local HydraText = { - Identifier = "HydraText", - Parent = Hydra.Hydra.Identifier, - Transform = { - Translation = { - Type = "StaticTranslation", - Position = { 1000000, 0, 1000000 }, - }, - }, - Renderable = { - Type = "RenderablePlaneImageLocal", - Size = 10.0^6.3, - Origin = "Center", - Billboard = true, - Texture = hydraTextures .. "/Hydra-Text.png", - BlendMode = "Additive" - }, - GUI = { - Name = "Hydra Text", - Path = "/Solar System/Dwarf Planets/Pluto" + Identifier = "HydraText", + Parent = Hydra.Hydra.Identifier, + Transform = { + Translation = { + Type = "StaticTranslation", + Position = { 1000000, 0, 1000000 } } + }, + Renderable = { + Type = "RenderablePlaneImageLocal", + Size = 10.0^6.3, + Origin = "Center", + Billboard = true, + Texture = hydraTextures .. "/Hydra-Text.png", + BlendMode = "Additive" + }, + GUI = { + Name = "Hydra Text", + Path = "/Solar System/Dwarf Planets/Pluto" + } } local kerberosTextures = asset.syncedResource({ - Name = "Kerberos Textures", - Type = "HttpSynchronization", - Identifier = "kerberos_textures", - Version = 1 + Name = "Kerberos Textures", + Type = "HttpSynchronization", + Identifier = "kerberos_textures", + Version = 1 }) local KerberosText = { - Identifier = "KerberosText", - Parent = Kerberos.Kerberos.Identifier, - Transform = { - Translation = { - Type = "StaticTranslation", - Position = { 1000000.0, 0, 1000000.0 } - }, - }, - Renderable = { - Type = "RenderablePlaneImageLocal", - Size = 10^6.3, - Origin = "Center", - Billboard = true, - Texture = kerberosTextures .. "/Kerberos-Text.png", - BlendMode = "Additive" - }, - GUI = { - Name = "Kerberos Text", - Path = "/Solar System/Dwarf Planets/Pluto" + Identifier = "KerberosText", + Parent = Kerberos.Kerberos.Identifier, + Transform = { + Translation = { + Type = "StaticTranslation", + Position = { 1000000.0, 0, 1000000.0 } } + }, + Renderable = { + Type = "RenderablePlaneImageLocal", + Size = 10^6.3, + Origin = "Center", + Billboard = true, + Texture = kerberosTextures .. "/Kerberos-Text.png", + BlendMode = "Additive" + }, + GUI = { + Name = "Kerberos Text", + Path = "/Solar System/Dwarf Planets/Pluto" + } } local nixTextures = asset.syncedResource({ - Name = "Nix Textures", - Type = "HttpSynchronization", - Identifier = "nix_textures", - Version = 1 + Name = "Nix Textures", + Type = "HttpSynchronization", + Identifier = "nix_textures", + Version = 1 }) local NixText = { - Identifier = "NixText", - Parent = Nix.Nix.Identifier, - Renderable = { - Type = "RenderablePlaneImageLocal", - Size = 10^6.3, - Origin = "Center", - Billboard = true, - Texture = nixTextures .. "/Nix-Text.png", - BlendMode = "Additive" - }, - GUI = { - Name = "Nix Text", - Path = "/Solar System/Dwarf Planets/Pluto" - } + Identifier = "NixText", + Parent = Nix.Nix.Identifier, + Renderable = { + Type = "RenderablePlaneImageLocal", + Size = 10^6.3, + Origin = "Center", + Billboard = true, + Texture = nixTextures .. "/Nix-Text.png", + BlendMode = "Additive" + }, + GUI = { + Name = "Nix Text", + Path = "/Solar System/Dwarf Planets/Pluto" + } } local styxTextures = asset.syncedResource({ @@ -96,31 +96,31 @@ local styxTextures = asset.syncedResource({ }) local StyxText = { - Identifier = "StyxText", - Parent = Styx.Styx.Identifier, - Transform = { - Translation = { - Type = "StaticTranslation", - Position = { 1000000.0, 0, 1000000.0 } - }, - }, - Renderable = { - Type = "RenderablePlaneImageLocal", - Size = 10^6.3, - Origin = "Center", - Billboard = true, - Texture = styxTextures .. "/Styx-Text.png", - BlendMode = "Additive" - }, - GUI = { - Name = "Styx Text", - Path = "/Solar System/Dwarf Planets/Pluto" + Identifier = "StyxText", + Parent = Styx.Styx.Identifier, + Transform = { + Translation = { + Type = "StaticTranslation", + Position = { 1000000.0, 0, 1000000.0 } } + }, + Renderable = { + Type = "RenderablePlaneImageLocal", + Size = 10^6.3, + Origin = "Center", + Billboard = true, + Texture = styxTextures .. "/Styx-Text.png", + BlendMode = "Additive" + }, + GUI = { + Name = "Styx Text", + Path = "/Solar System/Dwarf Planets/Pluto" + } } assetHelper.registerSceneGraphNodesAndExport(asset, { - HydraText, - KerberosText, - NixText, - StyxText + HydraText, + KerberosText, + NixText, + StyxText }) diff --git a/data/assets/scene/solarsystem/missions/newhorizons/pluto.asset b/data/assets/scene/solarsystem/missions/newhorizons/pluto.asset index 35210c0e09..45f4b97830 100644 --- a/data/assets/scene/solarsystem/missions/newhorizons/pluto.asset +++ b/data/assets/scene/solarsystem/missions/newhorizons/pluto.asset @@ -4,246 +4,248 @@ local sunTransforms = asset.require('scene/solarsystem/sun/transforms') local NewHorizonsKernels = asset.require('./kernels').NewHorizonsKernels local assets = asset.syncedResource({ - Name = "Pluto Assets", - Type = "HttpSynchronization", - Identifier = "newhorizons_plutoencounter_pluto_assets", - Version = 1 + Name = "Pluto Assets", + Type = "HttpSynchronization", + Identifier = "newhorizons_plutoencounter_pluto_assets", + Version = 1 }) local encounterTextures = asset.syncedResource({ - Name = "Pluto Encounter Textures", - Type = "HttpSynchronization", - Identifier = "newhorizons_plutoencounter_pluto_textures", - Version = 4 + Name = "Pluto Encounter Textures", + Type = "HttpSynchronization", + Identifier = "newhorizons_plutoencounter_pluto_textures", + Version = 4 }) local textures = asset.syncedResource({ - Name = "Pluto Textures", - Type = "HttpSynchronization", - Identifier = "pluto_textures", - Version = 5 + Name = "Pluto Textures", + Type = "HttpSynchronization", + Identifier = "pluto_textures", + Version = 5 }) local images = asset.syncedResource({ - Name = "Pluto Images", - Type = "HttpSynchronization", - Identifier = "newhorizons_plutoencounter_pluto_images", - Version = 1 + Name = "Pluto Images", + Type = "HttpSynchronization", + Identifier = "newhorizons_plutoencounter_pluto_images", + Version = 1 }) local plutoRadius = 1.173E6 local PlutoProjection = { - Identifier = "PlutoProjection", - Parent = transforms.PlutoBarycenterAccurate.Identifier, - Transform = { - Translation = { - Type = "SpiceTranslation", - Target = "PLUTO", - Observer = "PLUTO BARYCENTER", - Kernels = NewHorizonsKernels - }, - Rotation = { - Type = "SpiceRotation", - SourceFrame = "IAU_PLUTO", - DestinationFrame = "GALACTIC" - } + Identifier = "PlutoProjection", + Parent = transforms.PlutoBarycenterAccurate.Identifier, + Transform = { + Translation = { + Type = "SpiceTranslation", + Target = "PLUTO", + Observer = "PLUTO BARYCENTER", + Kernels = NewHorizonsKernels }, - Renderable = { - Type = "RenderablePlanetProjection", - Radius = plutoRadius, - Geometry = { - Type = "SimpleSphere", - Radius = plutoRadius, - Segments = 400 - }, - ColorTexturePaths = { - textures .. "/pluto.png", - textures .. "/NH_Pluto_mosaic_16384.png", - textures .. "/NH_Pluto_mosaic_8192.png", - textures .. "/pmap_cyl_k201.jpg", - textures .. "/pmap_cyl_k201_4096.jpg" - }, - HeightTexturePaths = { - textures .. "/NH_Pluto_DTM_16384.png", - textures .. "/NH_Pluto_DTM_8192.png" - }, - MeridianShift = false, - Projection = { - Sequence = images, - EventFile = assets .. "/core_v9h_obs_getmets_v8_time_fix_nofrcd_mld.txt", - -- SequenceType = "hybrid", - SequenceType = "image-sequence", - Observer = "NEW HORIZONS", - Target = "PLUTO", - Aberration = "NONE", - AspectRatio = 2, - - DataInputTranslation = { - Instrument = { - LORRI = { - DetectorType = "Camera", - Spice = { "NH_LORRI" } - }, - RALPH_MVIC_PAN_FRAME = { - DetectorType = "Scanner", - StopCommand = "RALPH_ABORT", - Spice = { "NH_RALPH_MVIC_FT" } - }, - RALPH_MVIC_COLOR = { - DetectorType = "Scanner", - StopCommand = "END_NOM", - Spice = { "NH_RALPH_MVIC_NIR", - "NH_RALPH_MVIC_METHANE", - "NH_RALPH_MVIC_RED", - "NH_RALPH_MVIC_BLUE" } - }, - RALPH_LEISA = { - DetectorType = "Scanner", - StopCommand = "END_NOM", - Spice = { "NH_RALPH_LEISA" } - }, - RALPH_MVIC_PAN1 = { - DetectorType = "Scanner", - StopCommand = "END_NOM", - Spice = { "NH_RALPH_MVIC_PAN1" } - }, - RALPH_MVIC_PAN2 = { - DetectorType = "Scanner", - StopCommand = "END_NOM", - Spice = { "NH_RALPH_MVIC_PAN2" } - }, - ALICE_Use_AIRGLOW = { - DetectorType = "Scanner", - StopCommand = "ALICE_END_PIXELLIST", - Spice = { "NH_ALICE_AIRGLOW" } - }, - ALICE_Use_AIRGLOW = { - DetectorType = "Scanner", - StopCommand = "ALICE_END_HISTOGRAM", - Spice = { "NH_ALICE_AIRGLOW" } - }, - ALICE_Use_SOCC = { - DetectorType = "Scanner", - StopCommand = "ALICE_END_PIXELLIST", - Spice = { "NH_ALICE_SOC" } - }, - ALICE_Use_SOCC = { - DetectorType = "Scanner", - StopCommand = "ALICE_END_HISTOGRAM", - Spice = { "NH_ALICE_SOC" } - }, - REX_START = { - DetectorType = "Scanner", - StopCommand = "REX_MODE_OFF", - Spice = { "NH_REX" } - } - }, - Target ={ - Read = { - "TARGET_NAME", - "INSTRUMENT_HOST_NAME", - "INSTRUMENT_ID", - "START_TIME", - "STOP_TIME", - "DETECTOR_TYPE" - }, - Convert = { - PLUTO = { "PLUTO" }, - NEWHORIZONS = { "NEW HORIZONS" }, - CCD = { "CAMERA" }, - FRAMECCD = { "SCANNER" } - } - } - }, - - Instrument = { - Name = "NH_LORRI", - Method = "ELLIPSOID", - Aberration = "NONE", - Fovy = 0.2907, - Aspect = 1, - Near = 0.2, - Far = 10000 - }, - - PotentialTargets = { - "PLUTO", - "CHARON", - "NIX", - "HYDRA", - "P5", - "P4" - } - } - }, - GUI = { - Name = "Pluto Projection", - Path = "/Solar System/Dwarf Planets/Pluto" + Rotation = { + Type = "SpiceRotation", + SourceFrame = "IAU_PLUTO", + DestinationFrame = "GALACTIC" } + }, + Renderable = { + Type = "RenderablePlanetProjection", + Radius = plutoRadius, + Geometry = { + Type = "SimpleSphere", + Radius = plutoRadius, + Segments = 400 + }, + ColorTexturePaths = { + textures .. "/pluto.png", + textures .. "/NH_Pluto_mosaic_16384.png", + textures .. "/NH_Pluto_mosaic_8192.png", + textures .. "/pmap_cyl_k201.jpg", + textures .. "/pmap_cyl_k201_4096.jpg" + }, + HeightTexturePaths = { + textures .. "/NH_Pluto_DTM_16384.png", + textures .. "/NH_Pluto_DTM_8192.png" + }, + MeridianShift = false, + Projection = { + Sequence = images, + EventFile = assets .. "/core_v9h_obs_getmets_v8_time_fix_nofrcd_mld.txt", + -- SequenceType = "hybrid", + SequenceType = "image-sequence", + Observer = "NEW HORIZONS", + Target = "PLUTO", + Aberration = "NONE", + AspectRatio = 2, + + DataInputTranslation = { + Instrument = { + LORRI = { + DetectorType = "Camera", + Spice = { "NH_LORRI" } + }, + RALPH_MVIC_PAN_FRAME = { + DetectorType = "Scanner", + StopCommand = "RALPH_ABORT", + Spice = { "NH_RALPH_MVIC_FT" } + }, + RALPH_MVIC_COLOR = { + DetectorType = "Scanner", + StopCommand = "END_NOM", + Spice = { + "NH_RALPH_MVIC_NIR", + "NH_RALPH_MVIC_METHANE", + "NH_RALPH_MVIC_RED", + "NH_RALPH_MVIC_BLUE" + } + }, + RALPH_LEISA = { + DetectorType = "Scanner", + StopCommand = "END_NOM", + Spice = { "NH_RALPH_LEISA" } + }, + RALPH_MVIC_PAN1 = { + DetectorType = "Scanner", + StopCommand = "END_NOM", + Spice = { "NH_RALPH_MVIC_PAN1" } + }, + RALPH_MVIC_PAN2 = { + DetectorType = "Scanner", + StopCommand = "END_NOM", + Spice = { "NH_RALPH_MVIC_PAN2" } + }, + ALICE_Use_AIRGLOW = { + DetectorType = "Scanner", + StopCommand = "ALICE_END_PIXELLIST", + Spice = { "NH_ALICE_AIRGLOW" } + }, + ALICE_Use_AIRGLOW = { + DetectorType = "Scanner", + StopCommand = "ALICE_END_HISTOGRAM", + Spice = { "NH_ALICE_AIRGLOW" } + }, + ALICE_Use_SOCC = { + DetectorType = "Scanner", + StopCommand = "ALICE_END_PIXELLIST", + Spice = { "NH_ALICE_SOC" } + }, + ALICE_Use_SOCC = { + DetectorType = "Scanner", + StopCommand = "ALICE_END_HISTOGRAM", + Spice = { "NH_ALICE_SOC" } + }, + REX_START = { + DetectorType = "Scanner", + StopCommand = "REX_MODE_OFF", + Spice = { "NH_REX" } + } + }, + Target ={ + Read = { + "TARGET_NAME", + "INSTRUMENT_HOST_NAME", + "INSTRUMENT_ID", + "START_TIME", + "STOP_TIME", + "DETECTOR_TYPE" + }, + Convert = { + PLUTO = { "PLUTO" }, + NEWHORIZONS = { "NEW HORIZONS" }, + CCD = { "CAMERA" }, + FRAMECCD = { "SCANNER" } + } + } + }, + + Instrument = { + Name = "NH_LORRI", + Method = "ELLIPSOID", + Aberration = "NONE", + Fovy = 0.2907, + Aspect = 1, + Near = 0.2, + Far = 10000 + }, + + PotentialTargets = { + "PLUTO", + "CHARON", + "NIX", + "HYDRA", + "P5", + "P4" + } + } + }, + GUI = { + Name = "Pluto Projection", + Path = "/Solar System/Dwarf Planets/Pluto" + } } local PlutoBarycenterLabel = { - Identifier = "PlutoBarycenterLabel", - Parent = transforms.PlutoBarycenterAccurate.Identifier, - Renderable = { - Type = "RenderablePlaneImageLocal", - Billboard = true, - Size = 5E4, - Texture = encounterTextures .. "/barycenter.png", - BlendMode = "Additive" - }, - GUI = { - Name = "Pluto Barycenter Label", - Path = "/Solar System/Dwarf Planets/Pluto" - } + Identifier = "PlutoBarycenterLabel", + Parent = transforms.PlutoBarycenterAccurate.Identifier, + Renderable = { + Type = "RenderablePlaneImageLocal", + Billboard = true, + Size = 5E4, + Texture = encounterTextures .. "/barycenter.png", + BlendMode = "Additive" + }, + GUI = { + Name = "Pluto Barycenter Label", + Path = "/Solar System/Dwarf Planets/Pluto" + } } local PlutoText = { - Identifier = "PlutoText", - Parent = PlutoProjection.Identifier, - Transform = { - Translation = { - Type = "StaticTranslation", - Position = {0, -2000000.0, 0} - }, - }, - Renderable = { - Type = "RenderablePlaneImageLocal", - Size = 10^6.3, - Origin = "Center", - Billboard = true, - Texture = encounterTextures .. "/Pluto-Text.png", - BlendMode = "Additive" - }, - GUI = { - Name = "Pluto Text", - Path = "/Solar System/Dwarf Planets/Pluto" + Identifier = "PlutoText", + Parent = PlutoProjection.Identifier, + Transform = { + Translation = { + Type = "StaticTranslation", + Position = {0, -2000000.0, 0} } + }, + Renderable = { + Type = "RenderablePlaneImageLocal", + Size = 10^6.3, + Origin = "Center", + Billboard = true, + Texture = encounterTextures .. "/Pluto-Text.png", + BlendMode = "Additive" + }, + GUI = { + Name = "Pluto Text", + Path = "/Solar System/Dwarf Planets/Pluto" + } } local PlutoShadow = { - Identifier = "PlutoShadow", - Parent = PlutoProjection.Identifier, - Renderable = { - Type = "RenderableShadowCylinder", - Opacity = 0.25, - TerminatorType = "PENUMBRAL", - LightSource = "SUN", - Observer = "NEW HORIZONS", - Body = "PLUTO", - BodyFrame = "IAU_PLUTO", - Aberration = "NONE", - }, - GUI = { - Name = "Pluto Shadow", - Path = "/Solar System/Dwarf Planets/Pluto" - } + Identifier = "PlutoShadow", + Parent = PlutoProjection.Identifier, + Renderable = { + Type = "RenderableShadowCylinder", + Opacity = 0.25, + TerminatorType = "PENUMBRAL", + LightSource = "SUN", + Observer = "NEW HORIZONS", + Body = "PLUTO", + BodyFrame = "IAU_PLUTO", + Aberration = "NONE" + }, + GUI = { + Name = "Pluto Shadow", + Path = "/Solar System/Dwarf Planets/Pluto" + } } assetHelper.registerSceneGraphNodesAndExport(asset, { - PlutoProjection, - PlutoBarycenterLabel, - PlutoText, - PlutoShadow + PlutoProjection, + PlutoBarycenterLabel, + PlutoText, + PlutoShadow }) diff --git a/data/assets/scene/solarsystem/missions/newhorizons/trail.asset b/data/assets/scene/solarsystem/missions/newhorizons/trail.asset index dbb2a6d987..2f6dbb45b8 100644 --- a/data/assets/scene/solarsystem/missions/newhorizons/trail.asset +++ b/data/assets/scene/solarsystem/missions/newhorizons/trail.asset @@ -4,31 +4,31 @@ local transforms = asset.require('./transforms') local TrailAtPluto = { - Identifier = "NewHorizonsTrailPluto", - Parent = transforms.PlutoBarycenterAccurate.Identifier, - Renderable = { - Type = "RenderableTrailTrajectory", - Translation = { - Type = "SpiceTranslation", - Target = "NEW HORIZONS", - Observer = "PLUTO BARYCENTER" - }, - Color = { 1.0, 0.8, 0.4 }, - ShowFullTrail = true, - StartTime = "2015 JUL 07 12:00:00", - EndTime = "2015 JUL 17 12:00:00", - PointSize = 5, - SampleInterval = 3600, - TimeStampSubsampleFactor = 4, - EnableFade = false, - Rendering = "Lines+Points" + Identifier = "NewHorizonsTrailPluto", + Parent = transforms.PlutoBarycenterAccurate.Identifier, + Renderable = { + Type = "RenderableTrailTrajectory", + Translation = { + Type = "SpiceTranslation", + Target = "NEW HORIZONS", + Observer = "PLUTO BARYCENTER" }, - GUI = { - Name = "New Horizons Trail Pluto", - Path = "/Solar System/Missions/New Horizons" - } + Color = { 1.0, 0.8, 0.4 }, + ShowFullTrail = true, + StartTime = "2015 JUL 07 12:00:00", + EndTime = "2015 JUL 17 12:00:00", + PointSize = 5, + SampleInterval = 3600, + TimeStampSubsampleFactor = 4, + EnableFade = false, + Rendering = "Lines+Points" + }, + GUI = { + Name = "New Horizons Trail Pluto", + Path = "/Solar System/Missions/New Horizons" + } } assetHelper.registerSceneGraphNodesAndExport(asset, { - TrailAtPluto + TrailAtPluto }) diff --git a/data/assets/scene/solarsystem/missions/newhorizons/transforms.asset b/data/assets/scene/solarsystem/missions/newhorizons/transforms.asset index cbcbab62da..5238428c17 100644 --- a/data/assets/scene/solarsystem/missions/newhorizons/transforms.asset +++ b/data/assets/scene/solarsystem/missions/newhorizons/transforms.asset @@ -3,50 +3,50 @@ local sunTransforms = asset.require('scene/solarsystem/sun/transforms') local kernels = asset.require('./kernels') local PlutoBarycenterAccurate = { - Identifier = "PlutoBarycenterAccurate", - Parent = sunTransforms.SolarSystemBarycenter.Identifier, - TimeFrame = { - Type = "TimeFrameInterval", - Start = "2015-JAN-01", - End = "2015-AUG-01" - }, - Transform = { - Translation = { - Type = "SpiceTranslation", - Target = "PLUTO BARYCENTER", - Observer = "SUN", - Kernels = kernels.PlutoKernels - }, - }, - GUI = { - Name = "Pluto Barycenter Accurate", - Path = "/Solar System/Dwarf Planets/Pluto" + Identifier = "PlutoBarycenterAccurate", + Parent = sunTransforms.SolarSystemBarycenter.Identifier, + TimeFrame = { + Type = "TimeFrameInterval", + Start = "2015-JAN-01", + End = "2015-AUG-01" + }, + Transform = { + Translation = { + Type = "SpiceTranslation", + Target = "PLUTO BARYCENTER", + Observer = "SUN", + Kernels = kernels.PlutoKernels } + }, + GUI = { + Name = "Pluto Barycenter Accurate", + Path = "/Solar System/Dwarf Planets/Pluto" + } } local NewHorizonsPosition = { - Identifier = "NewHorizonsPosition", - Parent = PlutoBarycenterAccurate.Identifier, - Transform = { - Translation = { - Type = "SpiceTranslation", - Target = "NEW HORIZONS", - Observer = "PLUTO BARYCENTER", - Kernels = kernels.NewHorizonsKernels - }, - Rotation = { - Type = "SpiceRotation", - SourceFrame = "NH_SPACECRAFT", - DestinationFrame = "GALACTIC" - } + Identifier = "NewHorizonsPosition", + Parent = PlutoBarycenterAccurate.Identifier, + Transform = { + Translation = { + Type = "SpiceTranslation", + Target = "NEW HORIZONS", + Observer = "PLUTO BARYCENTER", + Kernels = kernels.NewHorizonsKernels }, - GUI = { - Name = "New Horizons Position", - Path = "/Solar System/Missions/New Horizons" + Rotation = { + Type = "SpiceRotation", + SourceFrame = "NH_SPACECRAFT", + DestinationFrame = "GALACTIC" } + }, + GUI = { + Name = "New Horizons Position", + Path = "/Solar System/Missions/New Horizons" + } } assetHelper.registerSceneGraphNodesAndExport(asset, { - PlutoBarycenterAccurate, - NewHorizonsPosition + PlutoBarycenterAccurate, + NewHorizonsPosition }) diff --git a/data/assets/scene/solarsystem/missions/osirisrex/bennu.asset b/data/assets/scene/solarsystem/missions/osirisrex/bennu.asset index bdd3e41c98..ea0377a3a9 100644 --- a/data/assets/scene/solarsystem/missions/osirisrex/bennu.asset +++ b/data/assets/scene/solarsystem/missions/osirisrex/bennu.asset @@ -3,99 +3,98 @@ local transforms = asset.require('./transforms') local sunTransforms = asset.require('scene/solarsystem/sun/transforms') local models = asset.syncedResource({ - Name = "Bennu Models", - Type = "HttpSynchronization", - Identifier = "bennu_models", - Version = 1 + Name = "Bennu Models", + Type = "HttpSynchronization", + Identifier = "bennu_models", + Version = 1 }) local BENNU_BODY = "2101955" local Bennu = { - Identifier = "Bennu", - Parent = transforms.BennuBarycenter.Identifier, - Transform = { - Rotation = { - Type = "SpiceRotation", - SourceFrame = "IAU_BENNU", - DestinationFrame = "GALACTIC" - }, - }, - Renderable = { - Type = "RenderableModelProjection", - Body = BENNU_BODY, - GeometryFile = models .. "/BennuUntextured.obj", - Projection = { - Sequence = asset.localResource('InstrumentTimes'), - SequenceType = "instrument-times", - Observer = "OSIRIS-REX", - Target = BENNU_BODY, - Aberration = "NONE", - AspectRatio = 2, - - DataInputTranslation = { - Instruments = { - ORX_OCAMS_POLYCAM = { - DetectorType = "Camera", - Spice = { "ORX_OCAMS_POLYCAM" }, - Files = { - "BaseballDiamond_PolyCam.txt", - --"OrbitalB_Site08_PolyCamImages.txt", - "Recon_225m_Equatorial_PolyCam.txt", - }, - }, - ORX_REXIS = { - DetectorType = "Camera", - Spice = { "ORX_REXIS" }, - Files = { - "DetailedSurvey_EquatorialStations_Spectrometers.txt", - "Recon_225m_Equatorial_spectrometers.txt", - "Recon_525m_Equatorial_spectrometers.txt", - } - } - }, - Target = { - Body = BENNU_BODY - }, - }, - - Instrument = { -- INVALID DATA - JUST FOR TESTING - Name = "ORX_OCAMS_POLYCAM", - Method = "ELLIPSOID", - Aberration = "NONE", - Fovy = 0.792, - Aspect = 1, - Near = 0.01, - Far = 1000000 - } - } - }, - GUI = { - Path = "/Solar System/Asteroid" + Identifier = "Bennu", + Parent = transforms.BennuBarycenter.Identifier, + Transform = { + Rotation = { + Type = "SpiceRotation", + SourceFrame = "IAU_BENNU", + DestinationFrame = "GALACTIC" } + }, + Renderable = { + Type = "RenderableModelProjection", + Body = BENNU_BODY, + GeometryFile = models .. "/BennuUntextured.obj", + Projection = { + Sequence = asset.localResource('InstrumentTimes'), + SequenceType = "instrument-times", + Observer = "OSIRIS-REX", + Target = BENNU_BODY, + Aberration = "NONE", + AspectRatio = 2, + + DataInputTranslation = { + Instruments = { + ORX_OCAMS_POLYCAM = { + DetectorType = "Camera", + Spice = { "ORX_OCAMS_POLYCAM" }, + Files = { + "BaseballDiamond_PolyCam.txt", + --"OrbitalB_Site08_PolyCamImages.txt", + "Recon_225m_Equatorial_PolyCam.txt" + } + }, + ORX_REXIS = { + DetectorType = "Camera", + Spice = { "ORX_REXIS" }, + Files = { + "DetailedSurvey_EquatorialStations_Spectrometers.txt", + "Recon_225m_Equatorial_spectrometers.txt", + "Recon_525m_Equatorial_spectrometers.txt" + } + } + }, + Target = { + Body = BENNU_BODY + }, + }, + + Instrument = { -- INVALID DATA - JUST FOR TESTING + Name = "ORX_OCAMS_POLYCAM", + Method = "ELLIPSOID", + Aberration = "NONE", + Fovy = 0.792, + Aspect = 1, + Near = 0.01, + Far = 1000000 + } + } + }, + GUI = { + Path = "/Solar System/Asteroid" + } } local BennuTrail = { - Identifier = "BennuTrail", - Parent = sunTransforms.SolarSystemBarycenter.Identifier, - Renderable = { - Type = "RenderableTrailTrajectory", - Translation = { - Type = "SpiceTranslation", - Target = BENNU_BODY, - Observer = "SUN" - }, - Color = { 0.4, 0.0, 0.7 }, - StartTime = "2015 JAN 01 00:00:00.000", - EndTime = "2023 MAY 31 00:00:00.000", - SampleInterval = 3600 + Identifier = "BennuTrail", + Parent = sunTransforms.SolarSystemBarycenter.Identifier, + Renderable = { + Type = "RenderableTrailTrajectory", + Translation = { + Type = "SpiceTranslation", + Target = BENNU_BODY, + Observer = "SUN" }, - GUI = { - Name = "Bennu Trail", - Path = "/Solar System/Asteroid" - } - + Color = { 0.4, 0.0, 0.7 }, + StartTime = "2015 JAN 01 00:00:00.000", + EndTime = "2023 MAY 31 00:00:00.000", + SampleInterval = 3600 + }, + GUI = { + Name = "Bennu Trail", + Path = "/Solar System/Asteroid" + } } assetHelper.registerSceneGraphNodesAndExport(asset, { Bennu, BennuTrail }) diff --git a/data/assets/scene/solarsystem/missions/osirisrex/dashboard.asset b/data/assets/scene/solarsystem/missions/osirisrex/dashboard.asset index 9fc97a6439..44c0b86cb5 100644 --- a/data/assets/scene/solarsystem/missions/osirisrex/dashboard.asset +++ b/data/assets/scene/solarsystem/missions/osirisrex/dashboard.asset @@ -1,24 +1,24 @@ local assetHelper = asset.require('util/asset_helper') assetHelper.registerDashboardItems(asset, { - { - Type = "DashboardItemSpacing", - Identifier = "OsirisRexSpacing", - GuiName = "OSIRIS-REx Spacing", - Spacing = 25 - }, - { - Type = "DashboardItemDistance", - Identifier = "OsirisRexBennuDistance", - GuiName = "OSIRIS-REx Bennu Distance", - SourceType = "Node", - SourceNodeName = "OsirisRex", - DestinationType = "Node", - DestinationNodeName = "BennuBarycenter" - }, - { - Type = "DashboardItemInstruments", - Identifier = "OsirisRexInstruments", - GuiName = "OSIRIS-REx Instruments", - } + { + Type = "DashboardItemSpacing", + Identifier = "OsirisRexSpacing", + GuiName = "OSIRIS-REx Spacing", + Spacing = 25 + }, + { + Type = "DashboardItemDistance", + Identifier = "OsirisRexBennuDistance", + GuiName = "OSIRIS-REx Bennu Distance", + SourceType = "Node", + SourceNodeName = "OsirisRex", + DestinationType = "Node", + DestinationNodeName = "BennuBarycenter" + }, + { + Type = "DashboardItemInstruments", + Identifier = "OsirisRexInstruments", + GuiName = "OSIRIS-REx Instruments", + } }) diff --git a/data/assets/scene/solarsystem/missions/osirisrex/model.asset b/data/assets/scene/solarsystem/missions/osirisrex/model.asset index 0fee58aaf9..454d4462e3 100644 --- a/data/assets/scene/solarsystem/missions/osirisrex/model.asset +++ b/data/assets/scene/solarsystem/missions/osirisrex/model.asset @@ -6,17 +6,17 @@ local earthTransforms = asset.require('scene/solarsystem/planets/earth/transform local kernels = asset.syncedResource({ - Name = "Osiris Rex Kernels", - Type = "HttpSynchronization", - Identifier = "osirisrex_kernels", - Version = 1 + Name = "Osiris Rex Kernels", + Type = "HttpSynchronization", + Identifier = "osirisrex_kernels", + Version = 1 }) local models = asset.syncedResource({ - Name = "Osiris Rex Models", - Type = "HttpSynchronization", - Identifier = "osirisrex_models", - Version = 2 + Name = "Osiris Rex Models", + Type = "HttpSynchronization", + Identifier = "osirisrex_models", + Version = 2 }) local BENNU_BODY = "2101955" @@ -25,300 +25,296 @@ KernelCase = 2 -- Right now we only have the image times for case 2 local CaseDependentKernels if KernelCase == 2 then - CaseDependentKernels = { - kernels .. "/ORX_Recon_525mSortie_Case02.bsp", - kernels .. "/Recon_525mSortie_Case02_0Latitude.bc", - kernels .. "/Recon_525mSortie_Case02_atl_19145_04.atf", + CaseDependentKernels = { + kernels .. "/ORX_Recon_525mSortie_Case02.bsp", + kernels .. "/Recon_525mSortie_Case02_0Latitude.bc", + kernels .. "/Recon_525mSortie_Case02_atl_19145_04.atf", - kernels .. "/ORX_Recon_225mSortie_Case02.bsp", - kernels .. "/Recon_225mSortie_Case02_0Latitude.bc" - } + kernels .. "/ORX_Recon_225mSortie_Case02.bsp", + kernels .. "/Recon_225mSortie_Case02_0Latitude.bc" + } elseif KernelCase == 5 then - CaseDependentKernels = { - kernels .. "/ORX_Recon_525mSortie_Case05.bsp", - kernels .. "/Recon_525mSortie_Case05_20negLatitude.bc", - kernels .. "/Recon_525mSortie_Case05_atl_19145_04.atf", - kernels .. "/Recon_525mSortie_Case05_NominalProfile.bc", + CaseDependentKernels = { + kernels .. "/ORX_Recon_525mSortie_Case05.bsp", + kernels .. "/Recon_525mSortie_Case05_20negLatitude.bc", + kernels .. "/Recon_525mSortie_Case05_atl_19145_04.atf", + kernels .. "/Recon_525mSortie_Case05_NominalProfile.bc", - kernels .. "/ORX_Recon_225mSortie_Case05.bsp", - kernels .. "/Recon_225mSortie_Case05_20negLatitude.bc" - } + kernels .. "/ORX_Recon_225mSortie_Case05.bsp", + kernels .. "/Recon_225mSortie_Case05_20negLatitude.bc" + } elseif KernelCase == 8 then - CaseDependentKernels = { - kernels .. "/Recon_525mSortie_Case08_NominalProfile.bc", - kernels .. "/ORX_Recon_225mSortie_Case08.bsp", - kernels .. "/Recon_225mSortie_Case08_40negLatitude.bc" - } + CaseDependentKernels = { + kernels .. "/Recon_525mSortie_Case08_NominalProfile.bc", + kernels .. "/ORX_Recon_225mSortie_Case08.bsp", + kernels .. "/Recon_225mSortie_Case08_40negLatitude.bc" + } elseif KernelCase == 11 then - CaseDependentKernels = { - kernels .. "/ORX_Recon_225mSortie_Case11.bsp", - kernels .. "/Recon_225mSortie_Case11_60negLatitude.bc" - } + CaseDependentKernels = { + kernels .. "/ORX_Recon_225mSortie_Case11.bsp", + kernels .. "/Recon_225mSortie_Case11_60negLatitude.bc" + } end local OsirisRexKernels = { -- background - -- SCLK kernels needs to be loaded before CK kernels (and generally first) - kernels .. "/ORX_SCLKSCET.00000.tsc", + -- SCLK kernels needs to be loaded before CK kernels (and generally first) + kernels .. "/ORX_SCLKSCET.00000.tsc", - -- This cannot be loaded correctly for some reason! - --openspace.spice.loadKernel(kernels .. "/OsirisRexKernels/background/dsk/RQ36mod.oct12_CCv0001.bds") - - kernels .. "/orx_v04.tf", - kernels .. "/orx_lidar_v00.ti", - kernels .. "/orx_ocams_v03.ti", - kernels .. "/orx_otes_v00.ti", - kernels .. "/orx_rexis_v00.ti", - kernels .. "/orx_struct_v00.ti", - kernels .. "/orx_navcam_v00.ti", - kernels .. "/orx_ola_v00.ti", - kernels .. "/orx_ovirs_v00.ti", - kernels .. "/orx_stowcam_v00.ti", - -- kernels .. "/naif0011.tls", - kernels .. "/bennu_SPH250m.tpc", - kernels .. "/bennu_v10.tpc", + -- This cannot be loaded correctly for some reason! + --openspace.spice.loadKernel(kernels .. "/OsirisRexKernels/background/dsk/RQ36mod.oct12_CCv0001.bds") + + kernels .. "/orx_v04.tf", + kernels .. "/orx_lidar_v00.ti", + kernels .. "/orx_ocams_v03.ti", + kernels .. "/orx_otes_v00.ti", + kernels .. "/orx_rexis_v00.ti", + kernels .. "/orx_struct_v00.ti", + kernels .. "/orx_navcam_v00.ti", + kernels .. "/orx_ola_v00.ti", + kernels .. "/orx_ovirs_v00.ti", + kernels .. "/orx_stowcam_v00.ti", + -- kernels .. "/naif0011.tls", + kernels .. "/bennu_SPH250m.tpc", + kernels .. "/bennu_v10.tpc", - -- Low res SPK - kernels .. "/orx_160917_231024_pgaa3_day15m60_v1.bsp", - kernels .. "/orx_160914_231024_pgaa3_day12m60_v1.bsp", - - kernels .. "/orx_160908_231024_pgaa3_day06m60_v1.bsp", - kernels .. "/spk_orx_160908_231024_pgaa2_day06m60_v3.bsp", - kernels .. "/orx_160908_231024_pgaa2_day06m60.bsp", + -- Low res SPK + kernels .. "/orx_160917_231024_pgaa3_day15m60_v1.bsp", + kernels .. "/orx_160914_231024_pgaa3_day12m60_v1.bsp", + + kernels .. "/orx_160908_231024_pgaa3_day06m60_v1.bsp", + kernels .. "/spk_orx_160908_231024_pgaa2_day06m60_v3.bsp", + kernels .. "/orx_160908_231024_pgaa2_day06m60.bsp", - kernels .. "/OREX_20160908_M60_complete.bsp", - kernels .. "/OREX_20160904_M45_complete.bsp", + kernels .. "/OREX_20160908_M60_complete.bsp", + kernels .. "/OREX_20160904_M45_complete.bsp", - -- SPK - kernels .. "/de421.bsp", - kernels .. "/sb-101955-76.bsp", + -- SPK + kernels .. "/de421.bsp", + kernels .. "/sb-101955-76.bsp", - -- Nominal_Profile_LowRes - kernels .. "/Approach_600s_20180816T230000_20181119T010000.bsp", - kernels .. "/Approach_NominalProfile_600s_20180816T230000_20181119T010000.bc", - kernels .. "/DetailedSurvey_600s_20190108T000000_20190317T000000.bsp", - kernels .. "/OrbitalA_600s_20181203T230000_20190109T000000.bsp", - kernels .. "/OrbitalA_NominalProfile_600s_20181203T230000_20190109T000000.bc", - kernels .. "/OrbitalB_600s_20190316T000000_20190521T000000.bsp", - kernels .. "/DetailedSurvey_NominalProfile_600s_20190108T000000_20190317T000000.bc", - kernels .. "/OrbitalB_NominalProfile600s_20190316T000000_20190521T000000.bc", - kernels .. "/PrelimSurvey_600s_20181119T230000_20181204T010000.bsp", - kernels .. "/PrelimSurvey_NominalProfile_600s_20181119T230000_20181204T010000.bc", - kernels .. "/Recon_600s_20190519T000000_20190830T000000.bsp", - kernels .. "/Recon_NominalProfile_600s_20190519T000000_20190830T000000.bc", - - -- Nominal_Observations_Science - kernels .. "/Phase03_AP_DustSearch_1.bc", - kernels .. "/Phase03_AP_LightCurve_1.bc", - kernels .. "/Phase03_AP_LightCurve_2.bc", - kernels .. "/Phase03_AP_SatSearch_1.bc", - kernels .. "/Phase03_AP_SatSearch_2.bc", - kernels .. "/Phase03_AP_PhaseFunction_1.bc", - kernels .. "/Phase03_AP_ShapeModel_1.bc", - kernels .. "/Phase03_AP_ShapeModel_2.bc", - kernels .. "/Phase03_AP_ShapeModel_3.bc", - kernels .. "/Phase03_AP_ShapeModel_4.bc", - kernels .. "/Phase03_AP_ShapeModel_5.bc", - kernels .. "/Phase03_AP_ShapeModel_6.bc", - kernels .. "/Phase03_AP_ShapeModel_7.bc", - kernels .. "/Phase03_AP_ShapeModel_8.bc", - kernels .. "/Phase03_AP_ShapeModel_9_Forced4x4.bc", - kernels .. "/Phase03_AP_SpectraMap_1.bc", - kernels .. "/Phase04_PS_MC_1_v1_1a.bc", - kernels .. "/Phase04_PS_MC_2_v1_1a.bc", - kernels .. "/Phase04_PS_OLA_Nominal_1.bc", - kernels .. "/Phase04_PS_OLA_Nominal_2.bc", - kernels .. "/Phase04_PS_OLA_Nominal_3.bc", - kernels .. "/Phase04_PS_OLA_Nominal_4.bc", - kernels .. "/Phase04_PS_PolyCam_1.bc", - kernels .. "/Phase04_PS_PolyCam_2.bc", - kernels .. "/Phase04_PS_PolyCam_3.bc", - kernels .. "/Phase04_PS_PolyCam_4.bc", - kernels .. "/Phase04_PS_PolyCam_5.bc", - kernels .. "/Phase04_PS_PolyCam_6.bc", + -- Nominal_Profile_LowRes + kernels .. "/Approach_600s_20180816T230000_20181119T010000.bsp", + kernels .. "/Approach_NominalProfile_600s_20180816T230000_20181119T010000.bc", + kernels .. "/DetailedSurvey_600s_20190108T000000_20190317T000000.bsp", + kernels .. "/OrbitalA_600s_20181203T230000_20190109T000000.bsp", + kernels .. "/OrbitalA_NominalProfile_600s_20181203T230000_20190109T000000.bc", + kernels .. "/OrbitalB_600s_20190316T000000_20190521T000000.bsp", + kernels .. "/DetailedSurvey_NominalProfile_600s_20190108T000000_20190317T000000.bc", + kernels .. "/OrbitalB_NominalProfile600s_20190316T000000_20190521T000000.bc", + kernels .. "/PrelimSurvey_600s_20181119T230000_20181204T010000.bsp", + kernels .. "/PrelimSurvey_NominalProfile_600s_20181119T230000_20181204T010000.bc", + kernels .. "/Recon_600s_20190519T000000_20190830T000000.bsp", + kernels .. "/Recon_NominalProfile_600s_20190519T000000_20190830T000000.bc", + + -- Nominal_Observations_Science + kernels .. "/Phase03_AP_DustSearch_1.bc", + kernels .. "/Phase03_AP_LightCurve_1.bc", + kernels .. "/Phase03_AP_LightCurve_2.bc", + kernels .. "/Phase03_AP_SatSearch_1.bc", + kernels .. "/Phase03_AP_SatSearch_2.bc", + kernels .. "/Phase03_AP_PhaseFunction_1.bc", + kernels .. "/Phase03_AP_ShapeModel_1.bc", + kernels .. "/Phase03_AP_ShapeModel_2.bc", + kernels .. "/Phase03_AP_ShapeModel_3.bc", + kernels .. "/Phase03_AP_ShapeModel_4.bc", + kernels .. "/Phase03_AP_ShapeModel_5.bc", + kernels .. "/Phase03_AP_ShapeModel_6.bc", + kernels .. "/Phase03_AP_ShapeModel_7.bc", + kernels .. "/Phase03_AP_ShapeModel_8.bc", + kernels .. "/Phase03_AP_ShapeModel_9_Forced4x4.bc", + kernels .. "/Phase03_AP_SpectraMap_1.bc", + kernels .. "/Phase04_PS_MC_1_v1_1a.bc", + kernels .. "/Phase04_PS_MC_2_v1_1a.bc", + kernels .. "/Phase04_PS_OLA_Nominal_1.bc", + kernels .. "/Phase04_PS_OLA_Nominal_2.bc", + kernels .. "/Phase04_PS_OLA_Nominal_3.bc", + kernels .. "/Phase04_PS_OLA_Nominal_4.bc", + kernels .. "/Phase04_PS_PolyCam_1.bc", + kernels .. "/Phase04_PS_PolyCam_2.bc", + kernels .. "/Phase04_PS_PolyCam_3.bc", + kernels .. "/Phase04_PS_PolyCam_4.bc", + kernels .. "/Phase04_PS_PolyCam_5.bc", + kernels .. "/Phase04_PS_PolyCam_6.bc", - --openspace.spice.loadKernel(kernels .. "/OsirisRexKernels/Nominal_Observations_Science/06_DetailedSurvey/BaseballDiamond_v2/atl_19013_18_BBD1_info.TXT") - --openspace.spice.loadKernel(kernels .. "/OsirisRexKernels/Nominal_Observations_Science/06_DetailedSurvey/BaseballDiamond_v2/atl_19014_16_BBD2_info.TXT") - --openspace.spice.loadKernel(kernels .. "/OsirisRexKernels/Nominal_Observations_Science/06_DetailedSurvey/BaseballDiamond_v2/atl_19020_18_BBD3_info.TXT") - --openspace.spice.loadKernel(kernels .. "/OsirisRexKernels/Nominal_Observations_Science/06_DetailedSurvey/BaseballDiamond_v2/atl_19021_19_BBD4_info.TXT") - --openspace.spice.loadKernel(kernels .. "/OsirisRexKernels/Nominal_Observations_Science/06_DetailedSurvey/BaseballDiamond_v2/README.txt") - - kernels .. "/atl_19013_18_BBD1_v2.bc", - kernels .. "/atl_19014_16_BBD2_v2.bc", - kernels .. "/atl_19020_18_BBD3_v2.bc", - kernels .. "/atl_19021_19_BBD4_v2.bc", - + --openspace.spice.loadKernel(kernels .. "/OsirisRexKernels/Nominal_Observations_Science/06_DetailedSurvey/BaseballDiamond_v2/atl_19013_18_BBD1_info.TXT") + --openspace.spice.loadKernel(kernels .. "/OsirisRexKernels/Nominal_Observations_Science/06_DetailedSurvey/BaseballDiamond_v2/atl_19014_16_BBD2_info.TXT") + --openspace.spice.loadKernel(kernels .. "/OsirisRexKernels/Nominal_Observations_Science/06_DetailedSurvey/BaseballDiamond_v2/atl_19020_18_BBD3_info.TXT") + --openspace.spice.loadKernel(kernels .. "/OsirisRexKernels/Nominal_Observations_Science/06_DetailedSurvey/BaseballDiamond_v2/atl_19021_19_BBD4_info.TXT") + --openspace.spice.loadKernel(kernels .. "/OsirisRexKernels/Nominal_Observations_Science/06_DetailedSurvey/BaseballDiamond_v2/README.txt") + + kernels .. "/atl_19013_18_BBD1_v2.bc", + kernels .. "/atl_19014_16_BBD2_v2.bc", + kernels .. "/atl_19020_18_BBD3_v2.bc", + kernels .. "/atl_19021_19_BBD4_v2.bc", + - kernels .. "/Phase06_DS_Equatorial_Stations_1.bc", - kernels .. "/Phase06_DS_Equatorial_Stations_2.bc", - kernels .. "/Phase06_DS_Equatorial_Stations_3.bc", - kernels .. "/Phase06_DS_Equatorial_Stations_4.bc", - kernels .. "/Phase06_DS_Equatorial_Stations_5.bc", - kernels .. "/Phase06_DS_Equatorial_Stations_6.bc", - kernels .. "/Phase06_DS_Equatorial_Stations_7.bc", - kernels .. "/Phase06_DS_Plume_Search_1.bc", - kernels .. "/Phase06_DS_Plume_Search_2.bc", - kernels .. "/Phase07_OB_CSS_Mapping_1.bc", - kernels .. "/Phase07_OB_CSS_Mapping_2.bc", - kernels .. "/Phase07_OB_CSS_Mapping_3.bc", - kernels .. "/CSS_Mapping_1.a", - kernels .. "/CSS_Mapping_2.a", - kernels .. "/CSS_Mapping_3.a", + kernels .. "/Phase06_DS_Equatorial_Stations_1.bc", + kernels .. "/Phase06_DS_Equatorial_Stations_2.bc", + kernels .. "/Phase06_DS_Equatorial_Stations_3.bc", + kernels .. "/Phase06_DS_Equatorial_Stations_4.bc", + kernels .. "/Phase06_DS_Equatorial_Stations_5.bc", + kernels .. "/Phase06_DS_Equatorial_Stations_6.bc", + kernels .. "/Phase06_DS_Equatorial_Stations_7.bc", + kernels .. "/Phase06_DS_Plume_Search_1.bc", + kernels .. "/Phase06_DS_Plume_Search_2.bc", + kernels .. "/Phase07_OB_CSS_Mapping_1.bc", + kernels .. "/Phase07_OB_CSS_Mapping_2.bc", + kernels .. "/Phase07_OB_CSS_Mapping_3.bc", + kernels .. "/CSS_Mapping_1.a", + kernels .. "/CSS_Mapping_2.a", + kernels .. "/CSS_Mapping_3.a", - --openspace.spice.loadKernel(kernels .. "/Case02_0Latitude.wmv") - --openspace.spice.loadKernel(kernels .. "/Case05_20negLatitude.wmv") - --openspace.spice.loadKernel(kernels .. "/Case08_40negLatitude.wmv") - --openspace.spice.loadKernel(kernels .. "/Case11_60negLatitude.wmv") + --openspace.spice.loadKernel(kernels .. "/Case02_0Latitude.wmv") + --openspace.spice.loadKernel(kernels .. "/Case05_20negLatitude.wmv") + --openspace.spice.loadKernel(kernels .. "/Case08_40negLatitude.wmv") + --openspace.spice.loadKernel(kernels .. "/Case11_60negLatitude.wmv") } local LightSources = { - { - Type = "SceneGraphLightSource", - Identifier = "Sun", - Node = sunTransforms.SolarSystemBarycenter.Identifier, - Intensity = 1.0 - }, - { - Identifier = "Camera", - Type = "CameraLightSource", - Intensity = 0.5 - } + { + Type = "SceneGraphLightSource", + Identifier = "Sun", + Node = sunTransforms.SolarSystemBarycenter.Identifier, + Intensity = 1.0 + }, + { + Identifier = "Camera", + Type = "CameraLightSource", + Intensity = 0.5 + } } -- Append the CaseDependentKernels at the end of the OsirisRexKernels set for i = 0, #CaseDependentKernels do - OsirisRexKernels[#OsirisRexKernels + 1] = CaseDependentKernels[i] + OsirisRexKernels[#OsirisRexKernels + 1] = CaseDependentKernels[i] end local OsirisRex = { - Identifier = "OsirisRex", - Parent = sunTransforms.SolarSystemBarycenter.Identifier, - Transform = { - Translation = { - Type = "SpiceTranslation", - Target = "OSIRIS-REX", - Observer = "SUN", - Kernels = OsirisRexKernels - }, - Rotation = { - Type = "SpiceRotation", - SourceFrame = "ORX_SPACECRAFT", - DestinationFrame = "GALACTIC" - }, + Identifier = "OsirisRex", + Parent = sunTransforms.SolarSystemBarycenter.Identifier, + Transform = { + Translation = { + Type = "SpiceTranslation", + Target = "OSIRIS-REX", + Observer = "SUN", + Kernels = OsirisRexKernels }, - Renderable = { - Type = "RenderableModel", - Body = "OSIRIS-REX", - GeometryFile = models .. "/orx_base_resized_12_sep_2016.obj", - LightSources = LightSources - }, - GUI = { - Name = "OSIRIS REx", - Path = "/Solar System/Missions/OSIRIS REx" + Rotation = { + Type = "SpiceRotation", + SourceFrame = "ORX_SPACECRAFT", + DestinationFrame = "GALACTIC" } + }, + Renderable = { + Type = "RenderableModel", + Body = "OSIRIS-REX", + GeometryFile = models .. "/orx_base_resized_12_sep_2016.obj", + LightSources = LightSources + }, + GUI = { + Name = "OSIRIS REx", + Path = "/Solar System/Missions/OSIRIS REx" + } } local PolyCam = { - Identifier = "ORX_OCAMS_POLYCAM", - Parent = OsirisRex.Identifier, - Transform = { - Translation = { - Type = "StaticTranslation", - Position = { -0.2476, 0.2710, 0.3364 } - }, - Rotation = { - Type = "SpiceRotation", - SourceFrame = "ORX_OCAMS_POLYCAM", - DestinationFrame = "ORX_SPACECRAFT" - } + Identifier = "ORX_OCAMS_POLYCAM", + Parent = OsirisRex.Identifier, + Transform = { + Translation = { + Type = "StaticTranslation", + Position = { -0.2476, 0.2710, 0.3364 } }, - Renderable = { - Type = "RenderableModel", - Body = "OSIRIS-REX", - GeometryFile = models .. "/orx_polycam_resized_12_sep_2016.obj", - LightSources = LightSources - }, - GUI = { - Name = "OCAMS POLYCAM", - Path = "/Solar System/Missions/OSIRIS REx/Instruments" + Rotation = { + Type = "SpiceRotation", + SourceFrame = "ORX_OCAMS_POLYCAM", + DestinationFrame = "ORX_SPACECRAFT" } + }, + Renderable = { + Type = "RenderableModel", + Body = "OSIRIS-REX", + GeometryFile = models .. "/orx_polycam_resized_12_sep_2016.obj", + LightSources = LightSources + }, + GUI = { + Name = "OCAMS POLYCAM", + Path = "/Solar System/Missions/OSIRIS REx/Instruments" + } } local Rexis = { - Identifier = "ORX_REXIS", - Parent = OsirisRex.Identifier, - Renderable = { - Type = "RenderableModel", - Body = "OSIRIS-REX", - GeometryFile = models .. "/orx_rexis_resized_12_sep_2016.obj", - LightSources = LightSources + Identifier = "ORX_REXIS", + Parent = OsirisRex.Identifier, + Renderable = { + Type = "RenderableModel", + Body = "OSIRIS-REX", + GeometryFile = models .. "/orx_rexis_resized_12_sep_2016.obj", + LightSources = LightSources + }, + Transform = { + Translation = { + Type = "StaticTranslation", + Position = { 0, 0.3371, 0.2712 } }, - Transform = { - Translation = { - Type = "StaticTranslation", - Position = { 0, 0.3371, 0.2712 } - }, - Rotation = { - Type = "SpiceRotation", - SourceFrame = "ORX_REXIS", - DestinationFrame = "ORX_SPACECRAFT" - }, - }, - GUI = { - Name = "REXIS", - Path = "/Solar System/Missions/OSIRIS REx/Instruments" + Rotation = { + Type = "SpiceRotation", + SourceFrame = "ORX_REXIS", + DestinationFrame = "ORX_SPACECRAFT" } + }, + GUI = { + Name = "REXIS", + Path = "/Solar System/Missions/OSIRIS REx/Instruments" + } } local PolyCamFov = { - Identifier = "POLYCAM FOV", - Parent = PolyCam.Identifier, - Renderable = { - Type = "RenderableFov", - Body = "OSIRIS-REX", - Frame = "ORX_OCAMS_POLYCAM", - RGB = { 0.8, 0.7, 0.7 }, - Instrument = { - Name = "ORX_OCAMS_POLYCAM", - Method = "ELLIPSOID", - Aberration = "NONE" - }, - PotentialTargets = { BENNU_BODY } + Identifier = "POLYCAM FOV", + Parent = PolyCam.Identifier, + Renderable = { + Type = "RenderableFov", + Body = "OSIRIS-REX", + Frame = "ORX_OCAMS_POLYCAM", + RGB = { 0.8, 0.7, 0.7 }, + Instrument = { + Name = "ORX_OCAMS_POLYCAM", + Method = "ELLIPSOID", + Aberration = "NONE" }, - GUI = { - Name = "POLYCAM FOV", - Path = "/Solar System/Missions/OSIRIS REx/Instruments" - } + PotentialTargets = { BENNU_BODY } + }, + GUI = { + Name = "POLYCAM FOV", + Path = "/Solar System/Missions/OSIRIS REx/Instruments" + } } local RexisFov = { - Identifier = "REXIS FOV", - Parent = Rexis.Identifier, - Renderable = { - Type = "RenderableFov", - Body = "OSIRIS-REX", - Frame = "ORX_REXIS", - RGB = { 0.8, 0.7, 0.7 }, - Instrument = { - Name = "ORX_REXIS", - Method = "ELLIPSOID", - Aberration = "NONE" - }, - PotentialTargets = { BENNU_BODY }, - FrameConversions = { - [BENNU_BODY] = "IAU_BENNU" - } + Identifier = "REXIS FOV", + Parent = Rexis.Identifier, + Renderable = { + Type = "RenderableFov", + Body = "OSIRIS-REX", + Frame = "ORX_REXIS", + RGB = { 0.8, 0.7, 0.7 }, + Instrument = { + Name = "ORX_REXIS", + Method = "ELLIPSOID", + Aberration = "NONE" }, - GUI = { - Name = "REXIS FOV", - Path = "/Solar System/Missions/OSIRIS REx/Instruments" + PotentialTargets = { BENNU_BODY }, + FrameConversions = { + [BENNU_BODY] = "IAU_BENNU" } + }, + GUI = { + Name = "REXIS FOV", + Path = "/Solar System/Missions/OSIRIS REx/Instruments" + } } assetHelper.registerSceneGraphNodesAndExport(asset, { - OsirisRex, - PolyCam, - Rexis, - PolyCamFov, - RexisFov + OsirisRex, PolyCam, Rexis, PolyCamFov, RexisFov }) diff --git a/data/assets/scene/solarsystem/missions/osirisrex/osirisrex.asset b/data/assets/scene/solarsystem/missions/osirisrex/osirisrex.asset index 9877ef9694..ff5d7658b6 100644 --- a/data/assets/scene/solarsystem/missions/osirisrex/osirisrex.asset +++ b/data/assets/scene/solarsystem/missions/osirisrex/osirisrex.asset @@ -9,9 +9,9 @@ local mission = asset.localResource('osirisrex.mission') local missionName asset.onInitialize(function() - missionName = openspace.loadMission(mission) + missionName = openspace.loadMission(mission) end) asset.onDeinitialize(function() - openspace.unloadMission(missionName) + openspace.unloadMission(missionName) end) diff --git a/data/assets/scene/solarsystem/missions/osirisrex/osirisrex.mission b/data/assets/scene/solarsystem/missions/osirisrex/osirisrex.mission index 3e35cffd28..2693825cdf 100644 --- a/data/assets/scene/solarsystem/missions/osirisrex/osirisrex.mission +++ b/data/assets/scene/solarsystem/missions/osirisrex/osirisrex.mission @@ -25,362 +25,362 @@ References: --]] return { - Name = "OSIRIS-REx", - Phases = { - -- All 1-level phases based on [1] + Name = "OSIRIS-REx", + Phases = { + -- All 1-level phases based on [1] + { + Name = "Planning and Fabrication", + TimeRange = { Start = "2012 JAN 01 00:00:00", End = "2016 SEP 08 23:05:00" } + }, + { + Name = "Outbound Cruise", + TimeRange = { Start = "2016 SEP 03 00:00:00", End = "2018 SEP 01 01:00:00" }, + Phases = { + -- Phases from [4] { - Name = "Planning and Fabrication", - TimeRange = { Start = "2012 JAN 01 00:00:00", End = "2016 SEP 08 23:05:00" } + Name = "Pre Launch", + TimeRange = { Start = "2016 SEP 03 01:00:00", End = "2016 SEP 08 23:05:05" } }, { - Name = "Outbound Cruise", - TimeRange = { Start = "2016 SEP 03 00:00:00", End = "2018 SEP 01 01:00:00" }, - Phases = { - -- Phases from [4] - { - Name = "Pre Launch", - TimeRange = { Start = "2016 SEP 03 01:00:00", End = "2016 SEP 08 23:05:05" } - }, + Name = "Launch", TimeRange = { Start = "2016 SEP 08 23:05:05", End = "2016 SEP 08 23:09:00" } + }, + { + Name = "Earth Orbit", TimeRange = { Start = "2016 SEP 08 23:09:00", End = "2016 SEP 08 23:45:00" } + }, + { + Name = "Solar Orbit", TimeRange = { Start = "2016 SEP 08 23:45:00", End = "2018 SEP 01 00:00:00" } + }, + { + Name = "Upcoming Gravity Assist", TimeRange = { Start = "2017 JAN 22 15:00:00", End = "2017 SEP 22 15:00:00" } + }, + { + Name = "Gravity Assist", TimeRange = { Start = "2017 SEP 22 15:00:00", End = "2017 SEP 22 21:00:00" } + } + } + }, + { + Name = "Asteroid Operations", + Phases = { + -- Nested Levels from [3] + { + Name = "03_Approach", Phases = { + { + Name = "DustSearch_v1", + Phases = { { - Name = "Launch", TimeRange = { Start = "2016 SEP 08 23:05:05", End = "2016 SEP 08 23:09:00" } - }, - { - Name = "Earth Orbit", TimeRange = { Start = "2016 SEP 08 23:09:00", End = "2016 SEP 08 23:45:00" } - }, - { - Name = "Solar Orbit", TimeRange = { Start = "2016 SEP 08 23:45:00", End = "2018 SEP 01 00:00:00" } - }, - { - Name = "Upcoming Gravity Assist", TimeRange = { Start = "2017 JAN 22 15:00:00", End = "2017 SEP 22 15:00:00" } - }, - { - Name = "Gravity Assist", TimeRange = { Start = "2017 SEP 22 15:00:00", End = "2017 SEP 22 21:00:00" } + Name = "Phase03_AP_DustSearch_1.bc", + TimeRange = { Start = "2018-SEP-11 21:31:01.183", End = "2018-SEP-12 02:18:41.183" } } - } - }, - { - Name = "Asteroid Operations", - Phases = { - -- Nested Levels from [3] + } + }, + { + Name = "LightCurve_v1", + Phases = { { - Name = "03_Approach", Phases = { - { - Name = "DustSearch_v1", - Phases = { - { - Name = "Phase03_AP_DustSearch_1.bc", - TimeRange = { Start = "2018-SEP-11 21:31:01.183", End = "2018-SEP-12 02:18:41.183" } - } - } - }, - { - Name = "LightCurve_v1", - Phases = { - { - Name = "Phase03_AP_LightCurve_1.bc", - TimeRange = { Start = "2018-OCT-09 21:50:48.182", End = "2018-OCT-10 02:33:16.183" } - }, - { - Name = "Phase03_AP_LightCurve_2.bc", - TimeRange = { Start = "2018-OCT-10 21:50:48.182", End = "2018-OCT-11 02:33:16.183" } - } - } - }, - { - Name = "NatSatSearch_v1", - Phases = { - { - Name = "Phase03_AP_SatSearch_1.bc", - TimeRange = { Start = "2018-OCT-26 19:38:30.183", End = "2018-OCT-27 00:22:34.183" } - }, - { - Name = "Phase03_AP_SatSearch_2.bc", - TimeRange = { Start = "2018-NOV-05 17:10:20.183", End = "2018-NOV-05 21:59:48.183" } - } - } - }, - { - Name = "PhaseFunction_v1", - Phases = { - { - Name = "Phase03_AP_PhaseFunction_1.bc", - TimeRange = { Start = "2018-OCT-12 21:42:26.183", End = "2018-OCT-13 02:24:54.183" } - } - } - }, - { - Name = "ShapeModel_v1", Phases = { - { - Name = "Phase03_AP_ShapeModel_1.bc", - TimeRange = { Start = "2018-NOV-09 11:02:59.183", End = "2018-NOV-09 15:52:27.183" } - }, - { - Name = "Phase03_AP_ShapeModel_2.bc", - TimeRange = { Start = "2018-NOV-10 11:02:59.183", End = "2018-NOV-10 15:52:27.183" } - }, - { - Name = "Phase03_AP_ShapeModel_3.bc", - TimeRange = { Start = "2018-NOV-11 11:02:59.183", End = "2018-NOV-11 15:52:27.183" } - }, - { - Name = "Phase03_AP_ShapeModel_4.bc", - TimeRange = { Start = "2018-NOV-12 11:02:59.183", End = "2018-NOV-12 15:52:27.183" } - }, - { - Name = "Phase03_AP_ShapeModel_5.bc", - TimeRange = { Start = "2018-NOV-13 11:02:59.183", End = "2018-NOV-13 15:52:27.183" } - }, - { - Name = "Phase03_AP_ShapeModel_6.bc", - TimeRange = { Start = "2018-NOV-14 11:03:53.183", End = "2018-NOV-14 15:51:33.183" } - }, - { - Name = "Phase03_AP_ShapeModel_7.bc", - TimeRange = { Start = "2018-NOV-15 11:03:53.183", End = "2018-NOV-15 15:51:33.183" } - }, - { - Name = "Phase03_AP_ShapeModel_8.bc", - TimeRange = { Start = "2018-NOV-16 11:03:53.183", End = "2018-NOV-16 15:51:33.183" } - }, - { - Name = "Phase03_AP_ShapeModel_9_Forced4x4.bc", - TimeRange = { Start = "2018-NOV-17 11:03:54.183", End = "2018-NOV-17 15:51:34.183" } - } - } - }, - { - Name = "SpectraMap_v1", - Phases = { - { - Name = "Phase03_AP_SpectraMap_1.bc", - TimeRange = { Start = "2018-OCT-30 20:44:53.183", End = "2018-OCT-31 01:34:21.183" } - } - } - } - } + Name = "Phase03_AP_LightCurve_1.bc", + TimeRange = { Start = "2018-OCT-09 21:50:48.182", End = "2018-OCT-10 02:33:16.183" } }, { - Name = "04_PrelimSurvey", - Phases = { - { - Name = "MapCamOLA_v1", - Phases = { - { - Name = "Phase04_PS_MC_1_v1_1a.bc", - TimeRange = { Start = "2018-NOV-20 01:13:12.183", End = "2018-NOV-20 06:13:04.183" } - }, - { - Name = "Phase04_PS_MC_2_v1_1a.bc", - TimeRange = { Start = "2018-NOV-28 01:13:12.183", End = "2018-NOV-28 06:13:04.183" } - } - } - }, - { - Name = "OLA_v1", - Phases = { - { - Name = "Phase04_PS_OLA_Nominal_1.bc", - TimeRange = { Start = "2018-NOV-19 22:30:00.184", End = "2018-NOV-19 23:19:28.183" } - }, - { - Name = "Phase04_PS_OLA_Nominal_2.bc", - TimeRange = { Start = "2018-NOV-23 22:19:34.184", End = "2018-NOV-23 23:19:26.183" } - }, - { - Name = "Phase04_PS_OLA_Nominal_3.bc", - TimeRange = { Start = "2018-NOV-24 00:48:38.184", End = "2018-NOV-24 01:38:06.184" } - }, - { - Name = "Phase04_PS_OLA_Nominal_4.bc", - TimeRange = { Start = "2018-NOV-27 22:29:58.184", End = "2018-NOV-27 23:19:26.183" } - } - } - }, - { - Name = "PolyCam_v1", - Phases = { - { - Name = "Phase04_PS_PolyCam_1.bc", - TimeRange = { Start = "2018-NOV-19 12:00:33.183", End = "2018-NOV-19 16:46:25.183" } - }, - { - Name = "Phase04_PS_PolyCam_2.bc", - TimeRange = { Start = "2018-NOV-20 07:10:26.183", End = "2018-NOV-20 12:10:18.183" } - }, - { - Name = "Phase04_PS_PolyCam_3.bc", - TimeRange = { Start = "2018-NOV-23 11:51:29.184", End = "2018-NOV-23 16:51:21.184" } - }, - { - Name = "Phase04_PS_PolyCam_4.bc", - TimeRange = { Start = "2018-NOV-24 07:17:39.184", End = "2018-NOV-24 12:03:31.184" } - }, - { - Name = "Phase04_PS_PolyCam_5.bc", - TimeRange = { Start = "2018-NOV-27 12:00:20.184", End = "2018-NOV-27 16:46:12.184" } - }, - { - Name = "Phase04_PS_PolyCam_6.bc", - TimeRange = { Start = "2018-NOV-28 07:10:35.183", End = "2018-NOV-28 12:10:27.183" } - } - } - }, - } - }, - { - Name = "06_DetailedSurvey", - Phases = { - { - Name = "BaseballDiamond_v2", - Phases = { - { - Name = "atl_19013_18_BBD1_v2.bc", - TimeRange = { Start = "2019-JAN-13 18:59:31.195", End = "2019-JAN-13 23:59:29.179" } - }, - { - Name = "atl_19014_16_BBD2_v2.bc", - TimeRange = { Start = "2019-JAN-14 16:56:01.185", End = "2019-JAN-14 21:55:58.219" } - }, - { - Name = "atl_19020_18_BBD3_v2.bc", - TimeRange = { Start = "2019-JAN-20 18:59:15.211", End = "2019-JAN-20 23:59:13.195" } - }, - { - Name = "atl_19021_19_BBD4_v2.bc", - TimeRange = { Start = "2019-JAN-21 19:26:47.179", End = "2019-JAN-22 00:26:44.213" } - } - } - }, - { - Name = "EquatorialStations_v1", - Phases = { - { - Name = "Phase06_DS_Equatorial_Stations_1.bc", - TimeRange = { Start = "2019-JAN-27 10:36:24.185", End = "2019-JAN-27 15:20:28.185" } - }, - { - Name = "Phase06_DS_Equatorial_Stations_2.bc", - TimeRange = { Start = "2019-FEB-03 10:35:30.185", End = "2019-FEB-03 15:21:22.185" } - }, - { - Name = "Phase06_DS_Equatorial_Stations_3.bc", - TimeRange = { Start = "2019-FEB-10 10:51:50.185", End = "2019-FEB-10 15:51:42.185" } - }, - { - Name = "Phase06_DS_Equatorial_Stations_4.bc", - TimeRange = { Start = "2019-FEB-17 10:29:11.186", End = "2019-FEB-17 15:29:03.186" } - }, - { - Name = "Phase06_DS_Equatorial_Stations_5.bc", - TimeRange = { Start = "2019-FEB-24 10:08:28.186", End = "2019-FEB-24 15:08:20.185" } - }, - { - Name = "Phase06_DS_Equatorial_Stations_6.bc", - TimeRange = { Start = "2019-MAR-03 09:52:58.186", End = "2019-MAR-03 14:42:26.186" } - }, - { - Name = "Phase06_DS_Equatorial_Stations_7.bc", - TimeRange = { Start = "2019-MAR-10 09:57:47.186", End = "2019-MAR-10 14:36:33.186" } - } - } - }, - { - Name = "PlumeSearch_v1", - Phases = { - { - Name = "Phase06_DS_Plume_Search_1.bc", - TimeRange = { Start = "2019-JAN-28 10:34:36.185", End = "2019-JAN-28 15:22:16.185" } - }, - { - Name = "Phase06_DS_Plume_Search_2.bc", - TimeRange = { Start = "2019-FEB-18 10:29:11.186", End = "2019-FEB-18 15:29:03.186" } - } - } - } - } - }, - { - Name = "07_OrbitalB", - Phases = { - { - Name = "CandidateSampleSite_v1", - Phases = { - { - Name = "Phase07_OB_CSS_Mapping_1.bc", - TimeRange = { Start = "2019-APR-08 10:35:27.186", End = "2019-APR-08 15:22:06.186" } - }, - { - Name = "Phase07_OB_CSS_Mapping_2.bc", - TimeRange = { Start = "2019-APR-08 16:16:06.186", End = "2019-APR-11 10:38:58.186" } - }, - { - Name = "Phase07_OB_CSS_Mapping_3.bc", - TimeRange = { Start = "2019-APR-22 17:51:23.186", End = "2019-APR-29 19:41:03.186" } - } - } - } - } - }, - { - Name = "08_Recon", - Phases = { - { - Name = "225m_Sortie_v2", - Phases = { - { - Name = "Recon_225mSortie_Case02_0Latitude.bc", - TimeRange = { Start = "2019-MAY-25 03:50:31.195", End = "2019-MAY-25 04:32:17.227" } - }, - { - Name = "Recon_225mSortie_Case05_20negLatitude.bc", - TimeRange = { Start = "2019-MAY-25 03:50:48.216", End = "2019-MAY-25 04:37:10.209" } - }, - { - Name = "Recon_225mSortie_Case08_40negLatitude.bc", - TimeRange = { Start = "2019-MAY-25 04:02:43.176", End = "2019-MAY-25 04:54:41.179" } - }, - { - Name = "Recon_225mSortie_Case11_60negLatitude.bc", - TimeRange = { Start = "2019-MAY-25 04:21:46.161", End = "2019-MAY-25 05:18:44.232" } - } - } - }, - { - Name = "525m_Sortie_v2", - Phases = { - { - Name = "Recon_525mSortie_Case02_0Latitude.bc", - TimeRange = { Start = "2019-MAY-25 04:06:39.220", End = "2019-MAY-25 04:44:17.198" } - }, - { - Name = "Recon_525mSortie_Case05_20negLatitude.bc", - TimeRange = { Start = "2019-MAY-25 04:11:39.201", End = "2019-MAY-25 04:49:37.224" } - }, - { - Name = "Recon_525mSortie_Case05_NominalProfile.bc", - TimeRange = { Start = "2019-MAY-25 03:01:50.184", End = "2019-MAY-25 06:38:50.232" } - }, - { - Name = "Recon_525mSortie_Case08_NominalProfile.bc", - TimeRange = { Start = "2019-MAY-25 03:01:50.184", End = "2019-MAY-25 06:38:50.232" } - } - } - } - } + Name = "Phase03_AP_LightCurve_2.bc", + TimeRange = { Start = "2018-OCT-10 21:50:48.182", End = "2018-OCT-11 02:33:16.183" } } - -- End of [3] + } + }, + { + Name = "NatSatSearch_v1", + Phases = { + { + Name = "Phase03_AP_SatSearch_1.bc", + TimeRange = { Start = "2018-OCT-26 19:38:30.183", End = "2018-OCT-27 00:22:34.183" } + }, + { + Name = "Phase03_AP_SatSearch_2.bc", + TimeRange = { Start = "2018-NOV-05 17:10:20.183", End = "2018-NOV-05 21:59:48.183" } + } + } + }, + { + Name = "PhaseFunction_v1", + Phases = { + { + Name = "Phase03_AP_PhaseFunction_1.bc", + TimeRange = { Start = "2018-OCT-12 21:42:26.183", End = "2018-OCT-13 02:24:54.183" } + } + } + }, + { + Name = "ShapeModel_v1", Phases = { + { + Name = "Phase03_AP_ShapeModel_1.bc", + TimeRange = { Start = "2018-NOV-09 11:02:59.183", End = "2018-NOV-09 15:52:27.183" } + }, + { + Name = "Phase03_AP_ShapeModel_2.bc", + TimeRange = { Start = "2018-NOV-10 11:02:59.183", End = "2018-NOV-10 15:52:27.183" } + }, + { + Name = "Phase03_AP_ShapeModel_3.bc", + TimeRange = { Start = "2018-NOV-11 11:02:59.183", End = "2018-NOV-11 15:52:27.183" } + }, + { + Name = "Phase03_AP_ShapeModel_4.bc", + TimeRange = { Start = "2018-NOV-12 11:02:59.183", End = "2018-NOV-12 15:52:27.183" } + }, + { + Name = "Phase03_AP_ShapeModel_5.bc", + TimeRange = { Start = "2018-NOV-13 11:02:59.183", End = "2018-NOV-13 15:52:27.183" } + }, + { + Name = "Phase03_AP_ShapeModel_6.bc", + TimeRange = { Start = "2018-NOV-14 11:03:53.183", End = "2018-NOV-14 15:51:33.183" } + }, + { + Name = "Phase03_AP_ShapeModel_7.bc", + TimeRange = { Start = "2018-NOV-15 11:03:53.183", End = "2018-NOV-15 15:51:33.183" } + }, + { + Name = "Phase03_AP_ShapeModel_8.bc", + TimeRange = { Start = "2018-NOV-16 11:03:53.183", End = "2018-NOV-16 15:51:33.183" } + }, + { + Name = "Phase03_AP_ShapeModel_9_Forced4x4.bc", + TimeRange = { Start = "2018-NOV-17 11:03:54.183", End = "2018-NOV-17 15:51:34.183" } + } + } + }, + { + Name = "SpectraMap_v1", + Phases = { + { + Name = "Phase03_AP_SpectraMap_1.bc", + TimeRange = { Start = "2018-OCT-30 20:44:53.183", End = "2018-OCT-31 01:34:21.183" } + } + } } + } }, { - Name = "Backup Time", - TimeRange = { Start = "2020 JAN 01 00:00:00", End = "2021 JAN 01 00:00:00" } + Name = "04_PrelimSurvey", + Phases = { + { + Name = "MapCamOLA_v1", + Phases = { + { + Name = "Phase04_PS_MC_1_v1_1a.bc", + TimeRange = { Start = "2018-NOV-20 01:13:12.183", End = "2018-NOV-20 06:13:04.183" } + }, + { + Name = "Phase04_PS_MC_2_v1_1a.bc", + TimeRange = { Start = "2018-NOV-28 01:13:12.183", End = "2018-NOV-28 06:13:04.183" } + } + } + }, + { + Name = "OLA_v1", + Phases = { + { + Name = "Phase04_PS_OLA_Nominal_1.bc", + TimeRange = { Start = "2018-NOV-19 22:30:00.184", End = "2018-NOV-19 23:19:28.183" } + }, + { + Name = "Phase04_PS_OLA_Nominal_2.bc", + TimeRange = { Start = "2018-NOV-23 22:19:34.184", End = "2018-NOV-23 23:19:26.183" } + }, + { + Name = "Phase04_PS_OLA_Nominal_3.bc", + TimeRange = { Start = "2018-NOV-24 00:48:38.184", End = "2018-NOV-24 01:38:06.184" } + }, + { + Name = "Phase04_PS_OLA_Nominal_4.bc", + TimeRange = { Start = "2018-NOV-27 22:29:58.184", End = "2018-NOV-27 23:19:26.183" } + } + } + }, + { + Name = "PolyCam_v1", + Phases = { + { + Name = "Phase04_PS_PolyCam_1.bc", + TimeRange = { Start = "2018-NOV-19 12:00:33.183", End = "2018-NOV-19 16:46:25.183" } + }, + { + Name = "Phase04_PS_PolyCam_2.bc", + TimeRange = { Start = "2018-NOV-20 07:10:26.183", End = "2018-NOV-20 12:10:18.183" } + }, + { + Name = "Phase04_PS_PolyCam_3.bc", + TimeRange = { Start = "2018-NOV-23 11:51:29.184", End = "2018-NOV-23 16:51:21.184" } + }, + { + Name = "Phase04_PS_PolyCam_4.bc", + TimeRange = { Start = "2018-NOV-24 07:17:39.184", End = "2018-NOV-24 12:03:31.184" } + }, + { + Name = "Phase04_PS_PolyCam_5.bc", + TimeRange = { Start = "2018-NOV-27 12:00:20.184", End = "2018-NOV-27 16:46:12.184" } + }, + { + Name = "Phase04_PS_PolyCam_6.bc", + TimeRange = { Start = "2018-NOV-28 07:10:35.183", End = "2018-NOV-28 12:10:27.183" } + } + } + }, + } }, { - Name = "Return Cruise", - TimeRange = { Start = "2021 JAN 01 00:00:00", End = "2023 SEP 20 00:00:00"} + Name = "06_DetailedSurvey", + Phases = { + { + Name = "BaseballDiamond_v2", + Phases = { + { + Name = "atl_19013_18_BBD1_v2.bc", + TimeRange = { Start = "2019-JAN-13 18:59:31.195", End = "2019-JAN-13 23:59:29.179" } + }, + { + Name = "atl_19014_16_BBD2_v2.bc", + TimeRange = { Start = "2019-JAN-14 16:56:01.185", End = "2019-JAN-14 21:55:58.219" } + }, + { + Name = "atl_19020_18_BBD3_v2.bc", + TimeRange = { Start = "2019-JAN-20 18:59:15.211", End = "2019-JAN-20 23:59:13.195" } + }, + { + Name = "atl_19021_19_BBD4_v2.bc", + TimeRange = { Start = "2019-JAN-21 19:26:47.179", End = "2019-JAN-22 00:26:44.213" } + } + } + }, + { + Name = "EquatorialStations_v1", + Phases = { + { + Name = "Phase06_DS_Equatorial_Stations_1.bc", + TimeRange = { Start = "2019-JAN-27 10:36:24.185", End = "2019-JAN-27 15:20:28.185" } + }, + { + Name = "Phase06_DS_Equatorial_Stations_2.bc", + TimeRange = { Start = "2019-FEB-03 10:35:30.185", End = "2019-FEB-03 15:21:22.185" } + }, + { + Name = "Phase06_DS_Equatorial_Stations_3.bc", + TimeRange = { Start = "2019-FEB-10 10:51:50.185", End = "2019-FEB-10 15:51:42.185" } + }, + { + Name = "Phase06_DS_Equatorial_Stations_4.bc", + TimeRange = { Start = "2019-FEB-17 10:29:11.186", End = "2019-FEB-17 15:29:03.186" } + }, + { + Name = "Phase06_DS_Equatorial_Stations_5.bc", + TimeRange = { Start = "2019-FEB-24 10:08:28.186", End = "2019-FEB-24 15:08:20.185" } + }, + { + Name = "Phase06_DS_Equatorial_Stations_6.bc", + TimeRange = { Start = "2019-MAR-03 09:52:58.186", End = "2019-MAR-03 14:42:26.186" } + }, + { + Name = "Phase06_DS_Equatorial_Stations_7.bc", + TimeRange = { Start = "2019-MAR-10 09:57:47.186", End = "2019-MAR-10 14:36:33.186" } + } + } + }, + { + Name = "PlumeSearch_v1", + Phases = { + { + Name = "Phase06_DS_Plume_Search_1.bc", + TimeRange = { Start = "2019-JAN-28 10:34:36.185", End = "2019-JAN-28 15:22:16.185" } + }, + { + Name = "Phase06_DS_Plume_Search_2.bc", + TimeRange = { Start = "2019-FEB-18 10:29:11.186", End = "2019-FEB-18 15:29:03.186" } + } + } + } + } }, - -- Not too interesting in terms of space visualization --> out commented - -- { Name = "Sample Analysis", TimeRange = { Start = "2023 JAN 01 00:00:00", End = "2025 JUN 01 00:00:00" } }, - -- End of [1] + { + Name = "07_OrbitalB", + Phases = { + { + Name = "CandidateSampleSite_v1", + Phases = { + { + Name = "Phase07_OB_CSS_Mapping_1.bc", + TimeRange = { Start = "2019-APR-08 10:35:27.186", End = "2019-APR-08 15:22:06.186" } + }, + { + Name = "Phase07_OB_CSS_Mapping_2.bc", + TimeRange = { Start = "2019-APR-08 16:16:06.186", End = "2019-APR-11 10:38:58.186" } + }, + { + Name = "Phase07_OB_CSS_Mapping_3.bc", + TimeRange = { Start = "2019-APR-22 17:51:23.186", End = "2019-APR-29 19:41:03.186" } + } + } + } + } + }, + { + Name = "08_Recon", + Phases = { + { + Name = "225m_Sortie_v2", + Phases = { + { + Name = "Recon_225mSortie_Case02_0Latitude.bc", + TimeRange = { Start = "2019-MAY-25 03:50:31.195", End = "2019-MAY-25 04:32:17.227" } + }, + { + Name = "Recon_225mSortie_Case05_20negLatitude.bc", + TimeRange = { Start = "2019-MAY-25 03:50:48.216", End = "2019-MAY-25 04:37:10.209" } + }, + { + Name = "Recon_225mSortie_Case08_40negLatitude.bc", + TimeRange = { Start = "2019-MAY-25 04:02:43.176", End = "2019-MAY-25 04:54:41.179" } + }, + { + Name = "Recon_225mSortie_Case11_60negLatitude.bc", + TimeRange = { Start = "2019-MAY-25 04:21:46.161", End = "2019-MAY-25 05:18:44.232" } + } + } + }, + { + Name = "525m_Sortie_v2", + Phases = { + { + Name = "Recon_525mSortie_Case02_0Latitude.bc", + TimeRange = { Start = "2019-MAY-25 04:06:39.220", End = "2019-MAY-25 04:44:17.198" } + }, + { + Name = "Recon_525mSortie_Case05_20negLatitude.bc", + TimeRange = { Start = "2019-MAY-25 04:11:39.201", End = "2019-MAY-25 04:49:37.224" } + }, + { + Name = "Recon_525mSortie_Case05_NominalProfile.bc", + TimeRange = { Start = "2019-MAY-25 03:01:50.184", End = "2019-MAY-25 06:38:50.232" } + }, + { + Name = "Recon_525mSortie_Case08_NominalProfile.bc", + TimeRange = { Start = "2019-MAY-25 03:01:50.184", End = "2019-MAY-25 06:38:50.232" } + } + } + } + } + } + -- End of [3] + } + }, + { + Name = "Backup Time", + TimeRange = { Start = "2020 JAN 01 00:00:00", End = "2021 JAN 01 00:00:00" } + }, + { + Name = "Return Cruise", + TimeRange = { Start = "2021 JAN 01 00:00:00", End = "2023 SEP 20 00:00:00"} } + -- Not too interesting in terms of space visualization --> out commented + -- { Name = "Sample Analysis", TimeRange = { Start = "2023 JAN 01 00:00:00", End = "2025 JUN 01 00:00:00" } }, + -- End of [1] + } } diff --git a/data/assets/scene/solarsystem/missions/osirisrex/script_schedule.asset b/data/assets/scene/solarsystem/missions/osirisrex/script_schedule.asset index c30315862d..b187e8968e 100644 --- a/data/assets/scene/solarsystem/missions/osirisrex/script_schedule.asset +++ b/data/assets/scene/solarsystem/missions/osirisrex/script_schedule.asset @@ -1,18 +1,18 @@ local scriptSchedulerHelper = asset.require('util/script_scheduler_helper') asset.onInitialize(function () - scriptSchedulerHelper.scheduleRenderableEnabled("2016 SEP 08 23:05:00", "Scene.OsirisRexTrailSolarSystem", false) - scriptSchedulerHelper.scheduleRenderableEnabled("2016 SEP 08 23:05:00", "Scene.OsirisRexTrailBennu", false) - scriptSchedulerHelper.scheduleRenderableEnabledReversable("2016 SEP 08 23:05:01", "Scene.OsirisRexTrailEarth", true) - scriptSchedulerHelper.scheduleRenderableEnabledReversable("2016 SEP 09 00:00:00", "Scene.OsirisRexTrailSolarSystem", true) - scriptSchedulerHelper.scheduleRenderableEnabledReversable("2016 SEP 09 02:00:00", "Scene.OsirisRexTrailEarth", false) - scriptSchedulerHelper.scheduleRenderableEnabledReversable("2018 OCT 11 00:00:00", "Scene.OsirisRexTrailBennu", true) - scriptSchedulerHelper.scheduleRenderableEnabledReversable("2018 OCT 15 00:00:00", "Scene.OsirisRexTrailSolarSystem", false) - scriptSchedulerHelper.scheduleRenderableEnabledReversable("2019 AUG 01 00:00:00", "Scene.OsirisRexTrailSolarSystem", true) - scriptSchedulerHelper.scheduleRenderableEnabledReversable("2019 AUG 01 00:00:00", "Scene.OsirisRexTrailBennu", false) + scriptSchedulerHelper.scheduleRenderableEnabled("2016 SEP 08 23:05:00", "Scene.OsirisRexTrailSolarSystem", false) + scriptSchedulerHelper.scheduleRenderableEnabled("2016 SEP 08 23:05:00", "Scene.OsirisRexTrailBennu", false) + scriptSchedulerHelper.scheduleRenderableEnabledReversable("2016 SEP 08 23:05:01", "Scene.OsirisRexTrailEarth", true) + scriptSchedulerHelper.scheduleRenderableEnabledReversable("2016 SEP 09 00:00:00", "Scene.OsirisRexTrailSolarSystem", true) + scriptSchedulerHelper.scheduleRenderableEnabledReversable("2016 SEP 09 02:00:00", "Scene.OsirisRexTrailEarth", false) + scriptSchedulerHelper.scheduleRenderableEnabledReversable("2018 OCT 11 00:00:00", "Scene.OsirisRexTrailBennu", true) + scriptSchedulerHelper.scheduleRenderableEnabledReversable("2018 OCT 15 00:00:00", "Scene.OsirisRexTrailSolarSystem", false) + scriptSchedulerHelper.scheduleRenderableEnabledReversable("2019 AUG 01 00:00:00", "Scene.OsirisRexTrailSolarSystem", true) + scriptSchedulerHelper.scheduleRenderableEnabledReversable("2019 AUG 01 00:00:00", "Scene.OsirisRexTrailBennu", false) end) asset.onDeinitialize(function () - openspace.scriptScheduler.clear() + openspace.scriptScheduler.clear() end) diff --git a/data/assets/scene/solarsystem/missions/osirisrex/spice_kernel_times.mission b/data/assets/scene/solarsystem/missions/osirisrex/spice_kernel_times.mission index 4032141bd6..26293ec878 100644 --- a/data/assets/scene/solarsystem/missions/osirisrex/spice_kernel_times.mission +++ b/data/assets/scene/solarsystem/missions/osirisrex/spice_kernel_times.mission @@ -92,4 +92,4 @@ return { Name = "Recon_525mSortie_Case08_NominalProfile.bc", TimeRange = { Start = "2019-MAY-25 03:01:50.184", End = "2019-MAY-25 06:38:50.232" }}, }}, }}, -}} \ No newline at end of file +}} diff --git a/data/assets/scene/solarsystem/missions/osirisrex/trail.asset b/data/assets/scene/solarsystem/missions/osirisrex/trail.asset index 92fbaf68ac..4d152a2bf7 100644 --- a/data/assets/scene/solarsystem/missions/osirisrex/trail.asset +++ b/data/assets/scene/solarsystem/missions/osirisrex/trail.asset @@ -8,71 +8,71 @@ local earthTransforms = asset.require('scene/solarsystem/planets/earth/transform local BENNU_BODY = "2101955" local OsirisRexTrailEarth = { - Identifier = "OsirisRexTrailEarth", - Parent = earthTransforms.EarthIAU.Identifier, - Renderable = { - Type = "RenderableTrailTrajectory", - Translation = { - Type = "SpiceTranslation", - Target = "OSIRIS-REX", - Frame = "IAU_EARTH", - Observer = "EARTH" - }, - Color = { 0.9, 0.9, 0.0 }, - StartTime = "2016 SEP 8 23:05:00.50", - EndTime = "2016 SEP 9 00:05:00", - SampleInterval = 60 + Identifier = "OsirisRexTrailEarth", + Parent = earthTransforms.EarthIAU.Identifier, + Renderable = { + Type = "RenderableTrailTrajectory", + Translation = { + Type = "SpiceTranslation", + Target = "OSIRIS-REX", + Frame = "IAU_EARTH", + Observer = "EARTH" }, - GUI = { - Name = "OSIRIS REx Trail Earth", - Path = "/Solar System/Missions/OSIRIS REx" - } + Color = { 0.9, 0.9, 0.0 }, + StartTime = "2016 SEP 8 23:05:00.50", + EndTime = "2016 SEP 9 00:05:00", + SampleInterval = 60 + }, + GUI = { + Name = "OSIRIS REx Trail Earth", + Path = "/Solar System/Missions/OSIRIS REx" + } } local OsirisRexTrailSolarSystem = { - Identifier = "OsirisRexTrailSolarSystem", - Parent = sunTransforms.SolarSystemBarycenter.Identifier, - Renderable = { - Type = "RenderableTrailTrajectory", - Translation = { - Type = "SpiceTranslation", - Target = "OSIRIS-REX", - Observer = "SUN" - }, - Color = { 0.2, 0.9, 0.2 }, - StartTime = "2016 SEP 8 23:05:00.50", - EndTime = "2023 SEP 24 12:00:00", - SampleInterval = 3600 + Identifier = "OsirisRexTrailSolarSystem", + Parent = sunTransforms.SolarSystemBarycenter.Identifier, + Renderable = { + Type = "RenderableTrailTrajectory", + Translation = { + Type = "SpiceTranslation", + Target = "OSIRIS-REX", + Observer = "SUN" }, - GUI = { - Name = "OSIRIS REx Trail Solar System", - Path = "/Solar System/Missions/OSIRIS REx" - } + Color = { 0.2, 0.9, 0.2 }, + StartTime = "2016 SEP 8 23:05:00.50", + EndTime = "2023 SEP 24 12:00:00", + SampleInterval = 3600 + }, + GUI = { + Name = "OSIRIS REx Trail Solar System", + Path = "/Solar System/Missions/OSIRIS REx" + } } local OsirisRexTrailBennu = { - Identifier = "OsirisRexTrailBennu", - Parent = transforms.BennuBarycenter.Identifier, - Renderable = { - Type = "RenderableTrailTrajectory", - Translation = { - Type = "SpiceTranslation", - Target = "OSIRIS-REX", - Observer = BENNU_BODY - }, - Color = { 0.9, 0.2, 0.9 }, - StartTime = "2018 SEP 4 00:00:00", - EndTime = "2023 SEP 24 12:00:00", - SampleInterval = 3600 + Identifier = "OsirisRexTrailBennu", + Parent = transforms.BennuBarycenter.Identifier, + Renderable = { + Type = "RenderableTrailTrajectory", + Translation = { + Type = "SpiceTranslation", + Target = "OSIRIS-REX", + Observer = BENNU_BODY }, - GUI = { - Name = "OSIRIS REx Trail Bennu", - Path = "/Solar System/Missions/OSIRIS REx" - } + Color = { 0.9, 0.2, 0.9 }, + StartTime = "2018 SEP 4 00:00:00", + EndTime = "2023 SEP 24 12:00:00", + SampleInterval = 3600 + }, + GUI = { + Name = "OSIRIS REx Trail Bennu", + Path = "/Solar System/Missions/OSIRIS REx" + } } assetHelper.registerSceneGraphNodesAndExport(asset, { - OsirisRexTrailEarth, - OsirisRexTrailSolarSystem, - OsirisRexTrailBennu + OsirisRexTrailEarth, + OsirisRexTrailSolarSystem, + OsirisRexTrailBennu }) diff --git a/data/assets/scene/solarsystem/missions/osirisrex/transforms.asset b/data/assets/scene/solarsystem/missions/osirisrex/transforms.asset index 62a2e42faa..e8266beadf 100644 --- a/data/assets/scene/solarsystem/missions/osirisrex/transforms.asset +++ b/data/assets/scene/solarsystem/missions/osirisrex/transforms.asset @@ -6,19 +6,19 @@ local transforms = asset.require('scene/solarsystem/sun/transforms') local BENNU_BODY = "2101955" local BennuBarycenter = { - Identifier = "BennuBarycenter", - Parent = transforms.SolarSystemBarycenter.Identifier, - Transform = { - Translation = { - Type = "SpiceTranslation", - Target = BENNU_BODY, - Observer = "SUN" - } - }, - GUI = { - Name = "Bennu Barycenter", - Path = "/Solar System/Missions/OSIRIS REx" + Identifier = "BennuBarycenter", + Parent = transforms.SolarSystemBarycenter.Identifier, + Transform = { + Translation = { + Type = "SpiceTranslation", + Target = BENNU_BODY, + Observer = "SUN" } + }, + GUI = { + Name = "Bennu Barycenter", + Path = "/Solar System/Missions/OSIRIS REx" + } } assetHelper.registerSceneGraphNodesAndExport(asset, { BennuBarycenter }) diff --git a/data/assets/scene/solarsystem/missions/perseverance/model.asset b/data/assets/scene/solarsystem/missions/perseverance/model.asset index cf656285c7..f11c247d21 100644 --- a/data/assets/scene/solarsystem/missions/perseverance/model.asset +++ b/data/assets/scene/solarsystem/missions/perseverance/model.asset @@ -6,69 +6,68 @@ local sunTransforms = asset.require('scene/solarsystem/sun/transforms') -- asset.require('./fov') local LightSources = { - { - Type = "SceneGraphLightSource", - Identifier = "Sun", - Node = sunTransforms.SolarSystemBarycenter.Identifier, - Intensity = 1.0 - }, - { - Identifier = "Camera", - Type = "CameraLightSource", - Intensity = 0.5 - } + { + Type = "SceneGraphLightSource", + Identifier = "Sun", + Node = sunTransforms.SolarSystemBarycenter.Identifier, + Intensity = 1.0 + }, + { + Identifier = "Camera", + Type = "CameraLightSource", + Intensity = 0.5 + } } local models = asset.syncedResource({ - Name = "Mars 2020 Kernels", - Type = "HttpSynchronization", - Identifier = "perseverance_models", - Version = 2 + Name = "Mars 2020 Kernels", + Type = "HttpSynchronization", + Identifier = "perseverance_models", + Version = 2 }) -- Perseverance Model -- local Perseverance = { - Identifier = "Perseverance", - Parent = transforms.MSL_Body.Identifier, - GUI = { - Name = "Perseverance", - Path = "/Solar System/Missions/Perseverance" - } + Identifier = "Perseverance", + Parent = transforms.MSL_Body.Identifier, + GUI = { + Name = "Perseverance", + Path = "/Solar System/Missions/Perseverance" + } } -- Perseverance Model -- local PerseveranceModel = { - Identifier = "PerseveranceModel", - Parent = Perseverance.Identifier, - GUI = { - Name = "Perseverance Model", - Path = "/Solar System/Missions/Perseverance", - Hidden = true, - } + Identifier = "PerseveranceModel", + Parent = Perseverance.Identifier, + GUI = { + Name = "Perseverance Model", + Path = "/Solar System/Missions/Perseverance", + Hidden = true + } } -- Perseverance Model Instruments -- local Body = { - Identifier = "Perseverance_body", - Parent = PerseveranceModel.Identifier, - Renderable = { - Type = "RenderableModel", - Body = "MARS SCIENCE LABORATORY", - GeometryFile = models .. "/Perseverance.obj", - LightSources = LightSources, - PerformShading = false, - }, - GUI = { - Name = "Perseverance Model Body", - Path = "/Solar System/Missions/Perseverance/Model", - Hidden = true, - } - + Identifier = "Perseverance_body", + Parent = PerseveranceModel.Identifier, + Renderable = { + Type = "RenderableModel", + Body = "MARS SCIENCE LABORATORY", + GeometryFile = models .. "/Perseverance.obj", + LightSources = LightSources, + PerformShading = false + }, + GUI = { + Name = "Perseverance Model Body", + Path = "/Solar System/Missions/Perseverance/Model", + Hidden = true + } } assetHelper.registerSceneGraphNodesAndExport(asset, { - Perseverance, - PerseveranceModel, - Body + Perseverance, + PerseveranceModel, + Body }) diff --git a/data/assets/scene/solarsystem/missions/perseverance/shortcuts.asset b/data/assets/scene/solarsystem/missions/perseverance/shortcuts.asset index 287cb76164..b2c162fd09 100644 --- a/data/assets/scene/solarsystem/missions/perseverance/shortcuts.asset +++ b/data/assets/scene/solarsystem/missions/perseverance/shortcuts.asset @@ -4,67 +4,67 @@ local PerseveranceLaunchTime = "2020 JUL 17 13:56:42" local PerseveranceLandingTime = "2021 FEB 18 20:32:16" local PerseveranceNavigationState = "{" .. - "Anchor = 'Perseverance'," .. - "Pitch = 0.567457E-4," .. - "Position = { 1.240506E1,-1.369270E1,-2.423553E0 }," .. - "ReferenceFrame = 'Root',".. - "Up = { 0.441211E0,0.247019E0,0.862737E0 }," .. - "Yaw = -0.446853E-4}" + "Anchor = 'Perseverance'," .. + "Pitch = 0.567457E-4," .. + "Position = { 1.240506E1,-1.369270E1,-2.423553E0 }," .. + "ReferenceFrame = 'Root',".. + "Up = { 0.441211E0,0.247019E0,0.862737E0 }," .. + "Yaw = -0.446853E-4}" local Shortcuts = { - { - Command = "openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.HeightLayers.Mola_Utah.Settings.Offset', -1677.088867);" .. - "openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.HeightLayers.OnMarsHiRISELS.Settings.Offset', -1677.088867);", - Documentation = "Enable height layer offset for Perseverance landing trail", - Name = "Perseverance Height Offset", - GuiPath = "/Missions/Insight", - Local = false - }, - { - Command = "openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.HeightLayers.Mola_Utah.Settings.Offset', 0);" .. - "openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.HeightLayers.OnMarsHiRISELS.Settings.Offset', 0);", - Documentation = "Disable Perseverance landing height layer offset", - Name = "Default Height Offset", - GuiPath = "/Missions/Insight", - Local = false - }, - { - Command = "openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.HeightLayers.OnMarsHiRISELS.Enabled', true);" .. - "openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.ColorLayers.OnMarsHiRISELS.Enabled', true);", - Documentation = "Enables HiRISE layer for Perseverance", - Name = "Enable HiRISE", - GuiPath = "/Missions/Insight", - Local = false - }, - { - Command = "openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.HeightLayers.OnMarsHiRISELS.Enabled', false);" .. - "openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.ColorLayers.OnMarsHiRISELS.Enabled', false);", - Documentation = "Disables HiRISE layer used for Perseverance", - Name = "Disable HiRISE", - GuiPath = "/Missions/Insight", - Local = false - }, - { - Command = "openspace.navigation.setNavigationState(" .. PerseveranceNavigationState .. ");", - Documentation = "Change the camera state for the start of Insight EDL", - Name = "Insight EDL NavigationState", - GuiPath = "/Missions/Insight", - Local = false - }, - { - Command = "openspace.time.setPause(true);openspace.time.setTime('" .. PerseveranceLaunchTime .. "');", - Documentation = "Change the time for Perseverance launch", - Name = "Perseverance launch time", - GuiPath = "/Missions/Perseverance", - Local = false - }, - { - Command = "openspace.time.setPause(true);openspace.time.setTime('" .. PerseveranceLandingTime .. "');", - Documentation = "Change the time for when Perseverance has landed", - Name = "Perseverance landed time", - GuiPath = "/Missions/Perseverance", - Local = false - }, + { + Command = "openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.HeightLayers.Mola_Utah.Settings.Offset', -1677.088867);" .. + "openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.HeightLayers.OnMarsHiRISELS.Settings.Offset', -1677.088867);", + Documentation = "Enable height layer offset for Perseverance landing trail", + Name = "Perseverance Height Offset", + GuiPath = "/Missions/Insight", + Local = false + }, + { + Command = "openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.HeightLayers.Mola_Utah.Settings.Offset', 0);" .. + "openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.HeightLayers.OnMarsHiRISELS.Settings.Offset', 0);", + Documentation = "Disable Perseverance landing height layer offset", + Name = "Default Height Offset", + GuiPath = "/Missions/Insight", + Local = false + }, + { + Command = "openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.HeightLayers.OnMarsHiRISELS.Enabled', true);" .. + "openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.ColorLayers.OnMarsHiRISELS.Enabled', true);", + Documentation = "Enables HiRISE layer for Perseverance", + Name = "Enable HiRISE", + GuiPath = "/Missions/Insight", + Local = false + }, + { + Command = "openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.HeightLayers.OnMarsHiRISELS.Enabled', false);" .. + "openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.ColorLayers.OnMarsHiRISELS.Enabled', false);", + Documentation = "Disables HiRISE layer used for Perseverance", + Name = "Disable HiRISE", + GuiPath = "/Missions/Insight", + Local = false + }, + { + Command = "openspace.navigation.setNavigationState(" .. PerseveranceNavigationState .. ");", + Documentation = "Change the camera state for the start of Insight EDL", + Name = "Insight EDL NavigationState", + GuiPath = "/Missions/Insight", + Local = false + }, + { + Command = "openspace.time.setPause(true);openspace.time.setTime('" .. PerseveranceLaunchTime .. "');", + Documentation = "Change the time for Perseverance launch", + Name = "Perseverance launch time", + GuiPath = "/Missions/Perseverance", + Local = false + }, + { + Command = "openspace.time.setPause(true);openspace.time.setTime('" .. PerseveranceLandingTime .. "');", + Documentation = "Change the time for when Perseverance has landed", + Name = "Perseverance landed time", + GuiPath = "/Missions/Perseverance", + Local = false + } } asset.export("Shortcuts", Shortcuts) diff --git a/data/assets/scene/solarsystem/missions/perseverance/trail.asset b/data/assets/scene/solarsystem/missions/perseverance/trail.asset index a6074d4f3b..79ccffb602 100644 --- a/data/assets/scene/solarsystem/missions/perseverance/trail.asset +++ b/data/assets/scene/solarsystem/missions/perseverance/trail.asset @@ -4,24 +4,24 @@ local sunTransforms = asset.require('scene/solarsystem/sun/transforms') local marsTransforms = asset.require('scene/solarsystem/planets/mars/transforms') local kernels = asset.syncedResource({ - Name = "Mars 2020 Kernels", - Type = "HttpSynchronization", - Identifier = "perseverance_kernels", - Version = 1 + Name = "Mars 2020 Kernels", + Type = "HttpSynchronization", + Identifier = "perseverance_kernels", + Version = 1 }) local perseverance_id = "-168" local m2020_kernels = { - kernels .. "/m2020.tf", + kernels .. "/m2020.tf", - kernels .. "/m2020.tls", - kernels .. "/naif0012.tls", - - kernels .. "/m2020.tsc", - - kernels .. "/m2020_FMAresponse_JEZ_20200717_P000.cruise.bsp", - kernels .. "/m2020_FMAresponse_JEZ_20200717_P000.edl.bsp", + kernels .. "/m2020.tls", + kernels .. "/naif0012.tls", + + kernels .. "/m2020.tsc", + + kernels .. "/m2020_FMAresponse_JEZ_20200717_P000.cruise.bsp", + kernels .. "/m2020_FMAresponse_JEZ_20200717_P000.edl.bsp" } local startTime = "2020 JUL 17 13:56:42" @@ -29,69 +29,69 @@ local approachMars = "2021 FEB 11 20:32:16" local endTime = "2021 FEB 18 20:32:16" local PerseveranceNode = { - Identifier = "PerseveranceNode", - Parent = sunTransforms.SolarSystemBarycenter.Identifier, - Transform = { - Translation = { - Type = "SpiceTranslation", - Target = perseverance_id, - Observer = "SUN", - Kernels = m2020_kernels - }, - }, - GUI = { - Name = "Perseverance Node", - Path = "/Solar System/Missions/Perseverance", - Hidden = true + Identifier = "PerseveranceNode", + Parent = sunTransforms.SolarSystemBarycenter.Identifier, + Transform = { + Translation = { + Type = "SpiceTranslation", + Target = perseverance_id, + Observer = "SUN", + Kernels = m2020_kernels } + }, + GUI = { + Name = "Perseverance Node", + Path = "/Solar System/Missions/Perseverance", + Hidden = true + } } local PerseveranceTrailSun = { - Identifier = "PerseveranceTrailSun", - Parent = sunTransforms.SolarSystemBarycenter.Identifier, - Renderable = { - Type = "RenderableTrailTrajectory", - Translation = { - Type = "SpiceTranslation", - Target = perseverance_id, - Observer = "SUN", - Kernels = m2020_kernels - }, - Color = { 0.2, 0.7, 0.1 }, - StartTime = startTime, - EndTime = endTime, - SampleInterval = 100 + Identifier = "PerseveranceTrailSun", + Parent = sunTransforms.SolarSystemBarycenter.Identifier, + Renderable = { + Type = "RenderableTrailTrajectory", + Translation = { + Type = "SpiceTranslation", + Target = perseverance_id, + Observer = "SUN", + Kernels = m2020_kernels }, - GUI = { - Name = "Perseverance Trail", - Path = "/Solar System/Missions/Perseverance", - } + Color = { 0.2, 0.7, 0.1 }, + StartTime = startTime, + EndTime = endTime, + SampleInterval = 100 + }, + GUI = { + Name = "Perseverance Trail", + Path = "/Solar System/Missions/Perseverance" + } } local PerseveranceTrailMars = { - Identifier = "PerseveranceTrailMars", - Parent = marsTransforms.MarsBarycenter.Identifier, - Renderable = { - Type = "RenderableTrailTrajectory", - Translation = { - Type = "SpiceTranslation", - Target = perseverance_id, - Observer = "MARS", - Kernels = m2020_kernels - }, - Color = { 0.7, 0.9, 0.6 }, - StartTime = approachMars, - EndTime = endTime, - SampleInterval = 100 + Identifier = "PerseveranceTrailMars", + Parent = marsTransforms.MarsBarycenter.Identifier, + Renderable = { + Type = "RenderableTrailTrajectory", + Translation = { + Type = "SpiceTranslation", + Target = perseverance_id, + Observer = "MARS", + Kernels = m2020_kernels }, - GUI = { - Name = "Perseverance Trail (Mars)", - Path = "/Solar System/Missions/Perseverance", - } + Color = { 0.7, 0.9, 0.6 }, + StartTime = approachMars, + EndTime = endTime, + SampleInterval = 100 + }, + GUI = { + Name = "Perseverance Trail (Mars)", + Path = "/Solar System/Missions/Perseverance" + } } assetHelper.registerSceneGraphNodesAndExport(asset, { - PerseveranceNode, - PerseveranceTrailSun, - PerseveranceTrailMars -}) \ No newline at end of file + PerseveranceNode, + PerseveranceTrailSun, + PerseveranceTrailMars +}) diff --git a/data/assets/scene/solarsystem/missions/perseverance/transforms.asset b/data/assets/scene/solarsystem/missions/perseverance/transforms.asset index 7197b0e59f..c4caed35ac 100644 --- a/data/assets/scene/solarsystem/missions/perseverance/transforms.asset +++ b/data/assets/scene/solarsystem/missions/perseverance/transforms.asset @@ -5,501 +5,499 @@ local trailAsset = asset.require('./trail') local MSL_Body = { - Identifier = "MSL_Body", - Parent = trailAsset.PerseveranceNode.Identifier, - Transform = { - Translation = { - Type = "StaticTranslation", - Position = { 0, 0.0, 2.8 } - }, - Rotation = { - Type = "StaticRotation", - Rotation = { -0.521593,0.648407,2.888407 } - } + Identifier = "MSL_Body", + Parent = trailAsset.PerseveranceNode.Identifier, + Transform = { + Translation = { + Type = "StaticTranslation", + Position = { 0, 0.0, 2.8 } }, - GUI = { - Path = "/Solar System/Missions/Perseverance/Transforms", - Hidden = true + Rotation = { + Type = "StaticRotation", + Rotation = { -0.521593,0.648407,2.888407 } } + }, + GUI = { + Path = "/Solar System/Missions/Perseverance/Transforms", + Hidden = true + } } ---- ROBOTIC ARM RA ---- local RA_Base_Location = { - Identifier = "RA_Base_Location", - Parent = MSL_Body.Identifier, - Transform = { - Translation = { - Type = "StaticTranslation", - Position = { 1.111, -0.4525, -0.106 } - }, - }, - GUI = { - Path = "/Solar System/Missions/Perseverance/Transforms", - Hidden = true + Identifier = "RA_Base_Location", + Parent = MSL_Body.Identifier, + Transform = { + Translation = { + Type = "StaticTranslation", + Position = { 1.111, -0.4525, -0.106 } } + }, + GUI = { + Path = "/Solar System/Missions/Perseverance/Transforms", + Hidden = true + } } --AZ local RA_Shoulder_AZ_Location = { - Identifier = "RA_Shoulder_AZ_Location", - Parent = RA_Base_Location.Identifier, - Transform = { - Translation = { - Type = "StaticTranslation", - Position = { 0.0, 0.0, -0.08 } - } - }, - GUI = { - Path = "/Solar System/Missions/Perseverance/Transforms", - Hidden = true + Identifier = "RA_Shoulder_AZ_Location", + Parent = RA_Base_Location.Identifier, + Transform = { + Translation = { + Type = "StaticTranslation", + Position = { 0.0, 0.0, -0.08 } } + }, + GUI = { + Path = "/Solar System/Missions/Perseverance/Transforms", + Hidden = true + } } ----EL local RA_Shoulder_EL_Location = { - Identifier = "RA_Shoulder_EL_Location", - Parent = RA_Shoulder_AZ_Location.Identifier, - Transform = { - Translation = { - Type = "StaticTranslation", - Position = { 0.17, 0.2, -0.005 } - } - }, - GUI = { - Path = "/Solar System/Missions/Perseverance/Transforms", - Hidden = true + Identifier = "RA_Shoulder_EL_Location", + Parent = RA_Shoulder_AZ_Location.Identifier, + Transform = { + Translation = { + Type = "StaticTranslation", + Position = { 0.17, 0.2, -0.005 } } + }, + GUI = { + Path = "/Solar System/Missions/Perseverance/Transforms", + Hidden = true + } } --ELBOW local RA_Elbow_Location = { - Identifier = "RA_Elbow_Location", - Parent = RA_Shoulder_EL_Location.Identifier, - Transform = { - Translation = { - Type = "StaticTranslation", - Position = { 0.83, -0.2, 0.0 } - } - }, - GUI = { - Path = "/Solar System/Missions/Perseverance/Transforms", - Hidden = true + Identifier = "RA_Elbow_Location", + Parent = RA_Shoulder_EL_Location.Identifier, + Transform = { + Translation = { + Type = "StaticTranslation", + Position = { 0.83, -0.2, 0.0 } } + }, + GUI = { + Path = "/Solar System/Missions/Perseverance/Transforms", + Hidden = true + } } --WRIST local RA_Wrist_Location = { - Identifier = "RA_Wrist_Location", - Parent = RA_Elbow_Location.Identifier, - Transform = { - Translation = { - Type = "StaticTranslation", - Position = { 0.77, 0.13, 0.035 } - } - }, - GUI = { - Path = "/Solar System/Missions/Perseverance/Transforms", - Hidden = true + Identifier = "RA_Wrist_Location", + Parent = RA_Elbow_Location.Identifier, + Transform = { + Translation = { + Type = "StaticTranslation", + Position = { 0.77, 0.13, 0.035 } } + }, + GUI = { + Path = "/Solar System/Missions/Perseverance/Transforms", + Hidden = true + } } --TURRET local RA_Turret_Location = { - Identifier = "RA_Turret_Location", - Parent = RA_Wrist_Location.Identifier, - Transform = { - Translation = { - Type = "StaticTranslation", - Position = { 0.0, 0.04, -0.15 } - } - }, - GUI = { - Path = "/Solar System/Missions/Perseverance/Transforms", - Hidden = true + Identifier = "RA_Turret_Location", + Parent = RA_Wrist_Location.Identifier, + Transform = { + Translation = { + Type = "StaticTranslation", + Position = { 0.0, 0.04, -0.15 } } + }, + GUI = { + Path = "/Solar System/Missions/Perseverance/Transforms", + Hidden = true + } } --MAHLI local RA_Mahli_Location = { - Identifier = "RA_Mahli_Location", - Parent = RA_Turret_Location.Identifier + Identifier = "RA_Mahli_Location", + Parent = RA_Turret_Location.Identifier } ---- MASTCAM RSM ---- local RSM_ROOT_Location = { - Identifier = "RSM_ROOT_Location", - Parent = MSL_Body.Identifier, - Transform = { - Translation = { - Type = "StaticTranslation", - Position = { 0.7039, 0.5769, -0.563 } - } - }, - GUI = { - Path = "/Solar System/Missions/Perseverance/Transforms", - Hidden = true + Identifier = "RSM_ROOT_Location", + Parent = MSL_Body.Identifier, + Transform = { + Translation = { + Type = "StaticTranslation", + Position = { 0.7039, 0.5769, -0.563 } } + }, + GUI = { + Path = "/Solar System/Missions/Perseverance/Transforms", + Hidden = true + } } local RSM_AZ_Location = { - Identifier = "RSM_AZ_Location", - Parent = RSM_ROOT_Location.Identifier, - Transform = { - Translation = { - Type = "StaticTranslation", - Position = { 0.0, 0.008, 0.0 } - } - }, - GUI = { - Path = "/Solar System/Missions/Perseverance/Transforms", - Hidden = true + Identifier = "RSM_AZ_Location", + Parent = RSM_ROOT_Location.Identifier, + Transform = { + Translation = { + Type = "StaticTranslation", + Position = { 0.0, 0.008, 0.0 } } + }, + GUI = { + Path = "/Solar System/Missions/Perseverance/Transforms", + Hidden = true + } } local RSM_ZERO_EL_Location = { - Identifier = "RSM_ZERO_EL_Location", - Parent = RSM_AZ_Location.Identifier, - GUI = { - Path = "/Solar System/Missions/Perseverance/Transforms", - Hidden = true - } + Identifier = "RSM_ZERO_EL_Location", + Parent = RSM_AZ_Location.Identifier, + GUI = { + Path = "/Solar System/Missions/Perseverance/Transforms", + Hidden = true + } } local RSM_EL_Location = { - Identifier = "RSM_EL_Location", - Parent = RSM_AZ_Location.Identifier, - Transform = { - Translation = { - Type = "StaticTranslation", - --Position = {0.0, 0.0, -0.664} - Position = { 0.002, 0.007, -0.688 } - } - }, - GUI = { - Path = "/Solar System/Missions/Perseverance/Transforms", - Hidden = true + Identifier = "RSM_EL_Location", + Parent = RSM_AZ_Location.Identifier, + Transform = { + Translation = { + Type = "StaticTranslation", + --Position = {0.0, 0.0, -0.664} + Position = { 0.002, 0.007, -0.688 } } + }, + GUI = { + Path = "/Solar System/Missions/Perseverance/Transforms", + Hidden = true + } } ---- HIGH GAIN ANTENNA HGA ---- local HGA_AZ_Location = { - Identifier = "HGA_AZ_Location", - Parent = MSL_Body.Identifier, - Transform = { - Translation = { - Type = "StaticTranslation", - Position = { -0.46, -0.47, -0.55 } - } - }, - GUI = { - Path = "/Solar System/Missions/Perseverance/Transforms", - Hidden = true + Identifier = "HGA_AZ_Location", + Parent = MSL_Body.Identifier, + Transform = { + Translation = { + Type = "StaticTranslation", + Position = { -0.46, -0.47, -0.55 } } + }, + GUI = { + Path = "/Solar System/Missions/Perseverance/Transforms", + Hidden = true + } } local HGA_EL_Location = { - Identifier = "HGA_EL_Location", - Parent = HGA_AZ_Location.Identifier, - Transform = { - Translation = { - Type = "StaticTranslation", - Position = { 0.0, 0.0, -0.17 } - } - }, - GUI = { - Path = "/Solar System/Missions/Perseverance/Transforms", - Hidden = true + Identifier = "HGA_EL_Location", + Parent = HGA_AZ_Location.Identifier, + Transform = { + Translation = { + Type = "StaticTranslation", + Position = { 0.0, 0.0, -0.17 } } + }, + GUI = { + Path = "/Solar System/Missions/Perseverance/Transforms", + Hidden = true + } } ---- SAM & HEMIN ---- local SAM_Cover_1_Location = { - Identifier = "SAM_Cover_1_Location", - Parent = MSL_Body.Identifier, - GUI = { - Path = "/Solar System/Missions/Perseverance/Transforms", - Hidden = true - } + Identifier = "SAM_Cover_1_Location", + Parent = MSL_Body.Identifier, + GUI = { + Path = "/Solar System/Missions/Perseverance/Transforms", + Hidden = true + } } local SAM_Cover_2_Location = { - Identifier = "SAM_Cover_2_Location", - Parent = MSL_Body.Identifier, - GUI = { - Path = "/Solar System/Missions/Perseverance/Transforms", - Hidden = true - } + Identifier = "SAM_Cover_2_Location", + Parent = MSL_Body.Identifier, + GUI = { + Path = "/Solar System/Missions/Perseverance/Transforms", + Hidden = true + } } local CHEMIN_Location = { - Identifier = "CHEMIN_Location", - Parent = MSL_Body.Identifier, - GUI = { - Path = "/Solar System/Missions/Perseverance/Transforms", - Hidden = true - } + Identifier = "CHEMIN_Location", + Parent = MSL_Body.Identifier, + GUI = { + Path = "/Solar System/Missions/Perseverance/Transforms", + Hidden = true + } } ---- Wheels ---- local Wheel_base_Location = { - Identifier = "Wheel_base_Location", - Parent = MSL_Body.Identifier, - GUI = { - Path = "/Solar System/Missions/Perseverance/Transforms", - Hidden = true - } + Identifier = "Wheel_base_Location", + Parent = MSL_Body.Identifier, + GUI = { + Path = "/Solar System/Missions/Perseverance/Transforms", + Hidden = true + } } -- Left side -- local Leg_1_L_Location = { - Identifier = "Leg_1_L_Location", - Parent = Wheel_base_Location.Identifier, - Transform = { - Translation = { - Type = "StaticTranslation", - Position = { 0.217, -0.812, -0.215 } --for the right side - } - }, - GUI = { - Path = "/Solar System/Missions/Perseverance/Transforms", - Hidden = true + Identifier = "Leg_1_L_Location", + Parent = Wheel_base_Location.Identifier, + Transform = { + Translation = { + Type = "StaticTranslation", + Position = { 0.217, -0.812, -0.215 } --for the right side } + }, + GUI = { + Path = "/Solar System/Missions/Perseverance/Transforms", + Hidden = true + } } local Leg_2_L_Location = { - Identifier = "Leg_2_L_Location", - Parent = Leg_1_L_Location.Identifier, - Transform = { - Translation = { - Type = "StaticTranslation", - Position = { -0.74, -0.00380, 0.223 } --CORRECT, DONT CHANGE - } - }, - GUI = { - Path = "/Solar System/Missions/Perseverance/Transforms", - Hidden = true + Identifier = "Leg_2_L_Location", + Parent = Leg_1_L_Location.Identifier, + Transform = { + Translation = { + Type = "StaticTranslation", + Position = { -0.74, -0.00380, 0.223 } --CORRECT, DONT CHANGE } + }, + GUI = { + Path = "/Solar System/Missions/Perseverance/Transforms", + Hidden = true + } } local Wrist_F_L_Location = { - Identifier = "Wrist_F_L_Location", - Parent = Leg_1_L_Location.Identifier, - Transform = { - Translation = { - Type = "StaticTranslation", - Position = { 0.8839, -0.2659, 0.2 } --CORRECT, DONT TOUCH - } - }, - GUI = { - Path = "/Solar System/Missions/Perseverance/Transforms", - Hidden = true + Identifier = "Wrist_F_L_Location", + Parent = Leg_1_L_Location.Identifier, + Transform = { + Translation = { + Type = "StaticTranslation", + Position = { 0.8839, -0.2659, 0.2 } --CORRECT, DONT TOUCH } + }, + GUI = { + Path = "/Solar System/Missions/Perseverance/Transforms", + Hidden = true + } } local Wheel_F_L_Location = { - Identifier = "Wheel_F_L_Location", - Parent = Wrist_F_L_Location.Identifier, - Transform = { - Translation = { - Type = "StaticTranslation", - Position = { 0.0, 0.0, 0.426 } - } - }, - GUI = { - Path = "/Solar System/Missions/Perseverance/Transforms", - Hidden = true + Identifier = "Wheel_F_L_Location", + Parent = Wrist_F_L_Location.Identifier, + Transform = { + Translation = { + Type = "StaticTranslation", + Position = { 0.0, 0.0, 0.426 } } + }, + GUI = { + Path = "/Solar System/Missions/Perseverance/Transforms", + Hidden = true + } } local Wheel_C_L_Location = { - Identifier = "Wheel_C_L_Location", - Parent = Leg_2_L_Location.Identifier, - Transform = { - Translation = { - Type = "StaticTranslation", - Position = { 0.45, -0.4, 0.403 } - } - }, - GUI = { - Path = "/Solar System/Missions/Perseverance/Transforms", - Hidden = true + Identifier = "Wheel_C_L_Location", + Parent = Leg_2_L_Location.Identifier, + Transform = { + Translation = { + Type = "StaticTranslation", + Position = { 0.45, -0.4, 0.403 } } + }, + GUI = { + Path = "/Solar System/Missions/Perseverance/Transforms", + Hidden = true + } } local Wrist_B_L_Location = { - Identifier = "Wrist_B_L_Location", - Parent = Leg_2_L_Location.Identifier, - Transform = { - Translation = { - Type = "StaticTranslation", - Position = { -0.627, -0.2635, -0.022 } --CORRECT, DONT CHANGE - } - }, - GUI = { - Path = "/Solar System/Missions/Perseverance/Transforms", - Hidden = true + Identifier = "Wrist_B_L_Location", + Parent = Leg_2_L_Location.Identifier, + Transform = { + Translation = { + Type = "StaticTranslation", + Position = { -0.627, -0.2635, -0.022 } --CORRECT, DONT CHANGE } + }, + GUI = { + Path = "/Solar System/Missions/Perseverance/Transforms", + Hidden = true + } } local Wheel_B_L_Location = { - Identifier = "Wheel_B_L_Location", - Parent = Wrist_B_L_Location.Identifier, - Transform = { - Translation = { - Type = "StaticTranslation", - Position = { 0.0, -0.0, 0.426 } - } - }, - GUI = { - Path = "/Solar System/Missions/Perseverance/Transforms", - Hidden = true + Identifier = "Wheel_B_L_Location", + Parent = Wrist_B_L_Location.Identifier, + Transform = { + Translation = { + Type = "StaticTranslation", + Position = { 0.0, -0.0, 0.426 } } + }, + GUI = { + Path = "/Solar System/Missions/Perseverance/Transforms", + Hidden = true + } } -- wheels, Right Side -- local Leg_1_R_Location = { - Identifier = "Leg_1_R_Location", - Parent = Wheel_base_Location.Identifier, - Transform = { - Translation = { - Type = "StaticTranslation", - Position = { 0.217, 0.812, -0.215 } --Check with caroline!!! - } - }, - GUI = { - Path = "/Solar System/Missions/Perseverance/Transforms", - Hidden = true + Identifier = "Leg_1_R_Location", + Parent = Wheel_base_Location.Identifier, + Transform = { + Translation = { + Type = "StaticTranslation", + Position = { 0.217, 0.812, -0.215 } --Check with caroline!!! } + }, + GUI = { + Path = "/Solar System/Missions/Perseverance/Transforms", + Hidden = true + } } local Leg_2_R_Location = { - Identifier = "Leg_2_R_Location", - Parent = Leg_1_R_Location.Identifier, - Transform = { - Translation = { - Type = "StaticTranslation", - --Position = {-0.74, 0.0, 0.24} - Position = { -0.74, 0.00380, 0.223 } --want to use this one, once the center point is changed in maya - - } - }, - GUI = { - Path = "/Solar System/Missions/Perseverance/Transforms", - Hidden = true + Identifier = "Leg_2_R_Location", + Parent = Leg_1_R_Location.Identifier, + Transform = { + Translation = { + Type = "StaticTranslation", + --Position = {-0.74, 0.0, 0.24} + Position = { -0.74, 0.00380, 0.223 } --want to use this one, once the center point is changed in maya } + }, + GUI = { + Path = "/Solar System/Missions/Perseverance/Transforms", + Hidden = true + } } local Wrist_F_R_Location = { - Identifier = "Wrist_F_R_Location", - Parent = Leg_1_R_Location.Identifier, - Transform = { - Translation = { - Type = "StaticTranslation", - Position = { 0.882, 0.259, 0.215 } - --Position = {0.8839, 0.2659, 0.2} --position for the Wrist_F_L - } - }, - GUI = { - Path = "/Solar System/Missions/Perseverance/Transforms", - Hidden = true + Identifier = "Wrist_F_R_Location", + Parent = Leg_1_R_Location.Identifier, + Transform = { + Translation = { + Type = "StaticTranslation", + Position = { 0.882, 0.259, 0.215 } + --Position = {0.8839, 0.2659, 0.2} --position for the Wrist_F_L } + }, + GUI = { + Path = "/Solar System/Missions/Perseverance/Transforms", + Hidden = true + } } local Wheel_F_R_Location = { - Identifier = "Wheel_F_R_Location", - Parent = Wrist_F_R_Location.Identifier, - Transform = { - Translation = { - Type = "StaticTranslation", - Position = { 0.0, 0.0, 0.426 } - } - }, - GUI = { - Path = "/Solar System/Missions/Perseverance/Transforms", - Hidden = true + Identifier = "Wheel_F_R_Location", + Parent = Wrist_F_R_Location.Identifier, + Transform = { + Translation = { + Type = "StaticTranslation", + Position = { 0.0, 0.0, 0.426 } } + }, + GUI = { + Path = "/Solar System/Missions/Perseverance/Transforms", + Hidden = true + } } local Wheel_C_R_Location = { - Identifier = "Wheel_C_R_Location", - Parent = Leg_2_R_Location.Identifier, - Transform = { - Translation = { - Type = "StaticTranslation", - Position = { 0.45, 0.4, 0.403 } - } - }, - GUI = { - Path = "/Solar System/Missions/Perseverance/Transforms", - Hidden = true + Identifier = "Wheel_C_R_Location", + Parent = Leg_2_R_Location.Identifier, + Transform = { + Translation = { + Type = "StaticTranslation", + Position = { 0.45, 0.4, 0.403 } } + }, + GUI = { + Path = "/Solar System/Missions/Perseverance/Transforms", + Hidden = true + } } local Wrist_B_R_Location = { - Identifier = "Wrist_B_R_Location", - Parent = Leg_2_R_Location.Identifier, - Transform = { - Translation = { - Type = "StaticTranslation", - Position = { -0.6208, 0.2759, -0.025 } - } - }, - GUI = { - Path = "/Solar System/Missions/Perseverance/Transforms", - Hidden = true + Identifier = "Wrist_B_R_Location", + Parent = Leg_2_R_Location.Identifier, + Transform = { + Translation = { + Type = "StaticTranslation", + Position = { -0.6208, 0.2759, -0.025 } } + }, + GUI = { + Path = "/Solar System/Missions/Perseverance/Transforms", + Hidden = true + } } local Wheel_B_R_Location = { - Identifier = "Wheel_B_R_Location", - Parent = Wrist_B_R_Location.Identifier, - Transform = { - Translation = { - Type = "StaticTranslation", - Position = { 0.0, -0.0005, 0.426 } - } - }, - GUI = { - Path = "/Solar System/Missions/Perseverance/Transforms", - Hidden = true + Identifier = "Wheel_B_R_Location", + Parent = Wrist_B_R_Location.Identifier, + Transform = { + Translation = { + Type = "StaticTranslation", + Position = { 0.0, -0.0005, 0.426 } } + }, + GUI = { + Path = "/Solar System/Missions/Perseverance/Transforms", + Hidden = true + } } assetHelper.registerSceneGraphNodesAndExport(asset, { - MSL_Body, - RA_Base_Location, - RA_Shoulder_AZ_Location, - RA_Shoulder_EL_Location, - RA_Elbow_Location, - RA_Wrist_Location, - RA_Turret_Location, - RA_Mahli_Location, - RSM_ROOT_Location, - RSM_AZ_Location, - RSM_ZERO_EL_Location, - RSM_EL_Location, + MSL_Body, + RA_Base_Location, + RA_Shoulder_AZ_Location, + RA_Shoulder_EL_Location, + RA_Elbow_Location, + RA_Wrist_Location, + RA_Turret_Location, + RA_Mahli_Location, + RSM_ROOT_Location, + RSM_AZ_Location, + RSM_ZERO_EL_Location, + RSM_EL_Location, - HGA_AZ_Location, - HGA_EL_Location, - SAM_Cover_1_Location, - SAM_Cover_2_Location, - CHEMIN_Location, + HGA_AZ_Location, + HGA_EL_Location, + SAM_Cover_1_Location, + SAM_Cover_2_Location, + CHEMIN_Location, - Wheel_base_Location, - Leg_1_L_Location, - Leg_2_L_Location, - Wrist_F_L_Location, - Wheel_F_L_Location, - Wheel_C_L_Location, - Wrist_B_L_Location, - Wheel_B_L_Location, + Wheel_base_Location, + Leg_1_L_Location, + Leg_2_L_Location, + Wrist_F_L_Location, + Wheel_F_L_Location, + Wheel_C_L_Location, + Wrist_B_L_Location, + Wheel_B_L_Location, - Leg_1_R_Location, - Leg_2_R_Location, - Wrist_F_R_Location, - Wheel_F_R_Location, - Wheel_C_R_Location, - Wrist_B_R_Location, - Wheel_B_R_Location + Leg_1_R_Location, + Leg_2_R_Location, + Wrist_F_R_Location, + Wheel_F_R_Location, + Wheel_C_R_Location, + Wrist_B_R_Location, + Wheel_B_R_Location }) - diff --git a/data/assets/scene/solarsystem/missions/pioneer/pioneer10.asset b/data/assets/scene/solarsystem/missions/pioneer/pioneer10.asset index 8f7ad17c31..5ff94818de 100644 --- a/data/assets/scene/solarsystem/missions/pioneer/pioneer10.asset +++ b/data/assets/scene/solarsystem/missions/pioneer/pioneer10.asset @@ -4,10 +4,10 @@ local model = asset.require("scene/solarsystem/missions/pioneer/pioneermodel") local kernelsFolder = asset.syncedResource({ - Name = "Pioneer Kernels", - Type = "HttpSynchronization", - Identifier = "pioneer_10_spice", - Version = 1 + Name = "Pioneer Kernels", + Type = "HttpSynchronization", + Identifier = "pioneer_10_spice", + Version = 1 }) local kernelsList = {kernelsFolder .. '/p10-a.bsp'} @@ -15,64 +15,60 @@ local kernelsList = {kernelsFolder .. '/p10-a.bsp'} local Pioneer10NAIF = "-23" local Pioneer10 = { - Identifier = "Pioneer_10", - Parent = sunTransforms.SolarSystemBarycenter.Identifier, - Transform = { - Translation = { - Type = "SpiceTranslation", - Target = Pioneer10NAIF, - Observer = "SUN", - Kernels = kernelsList - }, - }, - Renderable = model.PioneerModel, - GUI = { - Name = "Pioneer 10 Spacecraft", - Path = "/Solar System/Missions/Pioneer", - Description = [[Pioneer 10 Spacecraft. Positioned by SPICE data.]] - + Identifier = "Pioneer_10", + Parent = sunTransforms.SolarSystemBarycenter.Identifier, + Transform = { + Translation = { + Type = "SpiceTranslation", + Target = Pioneer10NAIF, + Observer = "SUN", + Kernels = kernelsList } + }, + Renderable = model.PioneerModel, + GUI = { + Name = "Pioneer 10 Spacecraft", + Path = "/Solar System/Missions/Pioneer", + Description = [[Pioneer 10 Spacecraft. Positioned by SPICE data.]] + } } local Pioneer10Trail = { - Identifier = "Pioneer_10Trail", - Parent = sunTransforms.SolarSystemBarycenter.Identifier, - Renderable = { - Type = "RenderableTrailTrajectory", - Translation = { - Type = "SpiceTranslation", - Target = Pioneer10NAIF, - Observer = "SUN", - Kernels = kernelsList - }, - Color = { 0.70, 0.50, 0.20 }, - StartTime = "1972 MAR 03 02:04:00", - EndTime = "1990 JAN 02 00:00:00", - EnableFade = false, - SampleInterval = 6545 * 2 - -- 6545 is the number of days between the Start and End time (aka sample every 2d) + Identifier = "Pioneer_10Trail", + Parent = sunTransforms.SolarSystemBarycenter.Identifier, + Renderable = { + Type = "RenderableTrailTrajectory", + Translation = { + Type = "SpiceTranslation", + Target = Pioneer10NAIF, + Observer = "SUN", + Kernels = kernelsList }, - GUI = { - Name = "Pioneer 10 Trail (SPICE)", - Path = "/Solar System/Missions/Pioneer", - Description = [[Pioneer 10 Trail, spanning March 3rd, 1972 to January 2nd, 1990. - Data from SPICE]] - } + Color = { 0.70, 0.50, 0.20 }, + StartTime = "1972 MAR 03 02:04:00", + EndTime = "1990 JAN 02 00:00:00", + EnableFade = false, + SampleInterval = 6545 * 2 + -- 6545 is the number of days between the Start and End time (aka sample every 2d) + }, + GUI = { + Name = "Pioneer 10 Trail (SPICE)", + Path = "/Solar System/Missions/Pioneer", + Description = [[Pioneer 10 Trail, spanning March 3rd, 1972 to January 2nd, 1990. + Data from SPICE]] + } } -assetHelper.registerSceneGraphNodesAndExport(asset, { - Pioneer10, - Pioneer10Trail, -}) +assetHelper.registerSceneGraphNodesAndExport(asset, { Pioneer10, Pioneer10Trail }) asset.meta = { - Name = "Pioneer 10", - Version = "1.0", - Description = [[ Pioneer 10 Model and Trail. Driven by SPICE data for high accuracy - from March 3rd, 1972 to January 2nd, 1990.]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"Pioneer_10", "Pioneer_10Trail"} + Name = "Pioneer 10", + Version = "1.0", + Description = [[ Pioneer 10 Model and Trail. Driven by SPICE data for high accuracy + from March 3rd, 1972 to January 2nd, 1990.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license", + Identifiers = {"Pioneer_10", "Pioneer_10Trail"} } diff --git a/data/assets/scene/solarsystem/missions/pioneer/pioneer11.asset b/data/assets/scene/solarsystem/missions/pioneer/pioneer11.asset index ae51e753a8..c9f5a6355c 100644 --- a/data/assets/scene/solarsystem/missions/pioneer/pioneer11.asset +++ b/data/assets/scene/solarsystem/missions/pioneer/pioneer11.asset @@ -4,77 +4,74 @@ local model = asset.require("scene/solarsystem/missions/pioneer/pioneermodel") local kernelsFolder = asset.syncedResource({ - Name = "Pioneer Kernels", - Type = "HttpSynchronization", - Identifier = "pioneer_11_spice", - Version = 1 + Name = "Pioneer Kernels", + Type = "HttpSynchronization", + Identifier = "pioneer_11_spice", + Version = 1 }) local kernelsList = { - kernelsFolder .. '/p11-a.bsp', - kernelsFolder .. '/p11_sat336.bsp' + kernelsFolder .. '/p11-a.bsp', + kernelsFolder .. '/p11_sat336.bsp' } local Pioneer11NAIF = "-24" local Pioneer11 = { - Identifier = "Pioneer_11", - Parent = sunTransforms.SolarSystemBarycenter.Identifier, - Transform = { - Translation = { - Type = "SpiceTranslation", - Target = Pioneer11NAIF, - Observer = "SUN", - Kernels = kernelsList - }, - }, - Renderable = model.PioneerModel, - GUI = { - Name = "Pioneer 11 Spacecraft", - Path = "/Solar System/Missions/Pioneer", - Description = [[Pioneer 11 Spacecraft. Positioned by SPICE data.]] + Identifier = "Pioneer_11", + Parent = sunTransforms.SolarSystemBarycenter.Identifier, + Transform = { + Translation = { + Type = "SpiceTranslation", + Target = Pioneer11NAIF, + Observer = "SUN", + Kernels = kernelsList } + }, + Renderable = model.PioneerModel, + GUI = { + Name = "Pioneer 11 Spacecraft", + Path = "/Solar System/Missions/Pioneer", + Description = [[Pioneer 11 Spacecraft. Positioned by SPICE data.]] + } } local Pioneer11Trail = { - Identifier = "Pioneer_11Trail", - Parent = sunTransforms.SolarSystemBarycenter.Identifier, - Renderable = { - Type = "RenderableTrailTrajectory", - Translation = { - Type = "SpiceTranslation", - Target = Pioneer11NAIF, - Observer = "SUN", - Kernels = kernelsList - }, - Color = { 0.70, 0.50, 0.20 }, - StartTime = "1973 APR 06 02:25:00.000", - EndTime = "1990 JAN 02 00:00:00.000", - EnableFade = false, - SampleInterval = 6087 * 2 - --6087 is the number of days between the Start and End time (so sample every 2d) + Identifier = "Pioneer_11Trail", + Parent = sunTransforms.SolarSystemBarycenter.Identifier, + Renderable = { + Type = "RenderableTrailTrajectory", + Translation = { + Type = "SpiceTranslation", + Target = Pioneer11NAIF, + Observer = "SUN", + Kernels = kernelsList }, - GUI = { - Name = "Pioneer 11 Trail (SPICE)", - Path = "/Solar System/Missions/Pioneer", - Description = [[Pioneer 11 Trail, spanning April 6th, 1973 to January 2nd, 1990. - Data from SPICE.]] - } + Color = { 0.70, 0.50, 0.20 }, + StartTime = "1973 APR 06 02:25:00.000", + EndTime = "1990 JAN 02 00:00:00.000", + EnableFade = false, + SampleInterval = 6087 * 2 + --6087 is the number of days between the Start and End time (so sample every 2d) + }, + GUI = { + Name = "Pioneer 11 Trail (SPICE)", + Path = "/Solar System/Missions/Pioneer", + Description = [[Pioneer 11 Trail, spanning April 6th, 1973 to January 2nd, 1990. + Data from SPICE.]] + } } -assetHelper.registerSceneGraphNodesAndExport(asset, { - Pioneer11, - Pioneer11Trail, -}) +assetHelper.registerSceneGraphNodesAndExport(asset, { Pioneer11, Pioneer11Trail, }) asset.meta = { - Name = "Pioneer 11", - Version = "1.0", - Description = [[ Pioneer 11 Model and Trail. Driven by SPICE data for high accuracy - from April 6th, 1973 to January 2nd, 1990.]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"Pioneer_11", "Pioneer_11Trail"} + Name = "Pioneer 11", + Version = "1.0", + Description = [[ Pioneer 11 Model and Trail. Driven by SPICE data for high accuracy + from April 6th, 1973 to January 2nd, 1990.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license", + Identifiers = {"Pioneer_11", "Pioneer_11Trail"} } diff --git a/data/assets/scene/solarsystem/missions/pioneer/pioneermodel.asset b/data/assets/scene/solarsystem/missions/pioneer/pioneermodel.asset index a0b1b632ff..2663f7fb32 100644 --- a/data/assets/scene/solarsystem/missions/pioneer/pioneermodel.asset +++ b/data/assets/scene/solarsystem/missions/pioneer/pioneermodel.asset @@ -2,32 +2,32 @@ local assetHelper = asset.require('util/asset_helper') local sunTransforms = asset.require('scene/solarsystem/sun/transforms') local modelFolder = asset.syncedResource({ - Name = "Pioneer 10/11 Models", - Type = "HttpSynchronization", - Identifier = "pioneer_10_11_model", - Version = 2 + Name = "Pioneer 10/11 Models", + Type = "HttpSynchronization", + Identifier = "pioneer_10_11_model", + Version = 2 }) local ModelRenderable = { - Type = "RenderableModel", - Geometry = {{ - Type = "MultiModelGeometry", - GeometryFile = modelFolder .. "/Pioneer.obj", - ColorTexture = modelFolder .. "/gray.png" - }}, - LightSources = assetHelper.getDefaultLightSources( - sunTransforms.SolarSystemBarycenter.Identifier - ) + Type = "RenderableModel", + Geometry = {{ + Type = "MultiModelGeometry", + GeometryFile = modelFolder .. "/Pioneer.obj", + ColorTexture = modelFolder .. "/gray.png" + }}, + LightSources = assetHelper.getDefaultLightSources( + sunTransforms.SolarSystemBarycenter.Identifier + ) } asset.export("PioneerModel", ModelRenderable) asset.meta = { - Name = "Pioneer Model", - Version = "1.0", - Description = [[ Pioneer model asset. Used by both pioneer 10 and pioneer 11 asset. - Untextured version of model from NASA 3D resources.]], - Author = "NASA", - URL = "https://nasa3d.arc.nasa.gov/detail/eoss-pioneer", - License = "NASA" + Name = "Pioneer Model", + Version = "1.0", + Description = [[ Pioneer model asset. Used by both pioneer 10 and pioneer 11 asset. + Untextured version of model from NASA 3D resources.]], + Author = "NASA", + URL = "https://nasa3d.arc.nasa.gov/detail/eoss-pioneer", + License = "NASA" } \ No newline at end of file diff --git a/data/assets/scene/solarsystem/missions/rosetta/67p.asset b/data/assets/scene/solarsystem/missions/rosetta/67p.asset index d6a3e740b4..cf41bc2a91 100644 --- a/data/assets/scene/solarsystem/missions/rosetta/67p.asset +++ b/data/assets/scene/solarsystem/missions/rosetta/67p.asset @@ -4,146 +4,146 @@ local transforms = asset.require('scene/solarsystem/sun/transforms') local textures = asset.syncedResource({ - Name = "67P Textures", - Type = "HttpSynchronization", - Identifier = "67p_textures", - Version = 2 + Name = "67P Textures", + Type = "HttpSynchronization", + Identifier = "67p_textures", + Version = 2 }) local models = asset.syncedResource({ - Name = "67P Models", - Type = "HttpSynchronization", - Identifier = "67p_models", - Version = 1 + Name = "67P Models", + Type = "HttpSynchronization", + Identifier = "67p_models", + Version = 1 }) local images = asset.syncedResource({ - Name = "Rosetta Images", - Type = "HttpSynchronization", - Identifier = "rosettaimages", - Version = 2 + Name = "Rosetta Images", + Type = "HttpSynchronization", + Identifier = "rosettaimages", + Version = 2 }) local imagesDestination = images .. "/images" local Barycenter = { - Identifier = "67PBarycenter", - Parent = transforms.SolarSystemBarycenter.Identifier, - Transform = { - Translation = { - Type = "SpiceTranslation", - Target = "CHURYUMOV-GERASIMENKO", - Observer = "SUN" - } - }, - GUI = { - Name = "67P Barycenter", - Path = "/Solar System/Comets/67P Churymov-Gerasimenko" + Identifier = "67PBarycenter", + Parent = transforms.SolarSystemBarycenter.Identifier, + Transform = { + Translation = { + Type = "SpiceTranslation", + Target = "CHURYUMOV-GERASIMENKO", + Observer = "SUN" } + }, + GUI = { + Name = "67P Barycenter", + Path = "/Solar System/Comets/67P Churymov-Gerasimenko" + } } local Comet67P = { - Identifier = "67P", - Parent = Barycenter.Identifier, - Transform = { - Rotation = { - Type = "SpiceRotation", - SourceFrame = "67P/C-G_CK", - DestinationFrame = "GALACTIC" - } - }, - Renderable = { - Type = "RenderableModelProjection", - GeometryFile = models .. "/67P_rotated_5_130.obj", - Projection = { - Sequence = { imagesDestination }, - SequenceType = "image-sequence", - Observer = "ROSETTA", - Target = "CHURYUMOV-GERASIMENKO", - Aberration = "NONE", - TextureMap = true, - ShadowMap = true, + Identifier = "67P", + Parent = Barycenter.Identifier, + Transform = { + Rotation = { + Type = "SpiceRotation", + SourceFrame = "67P/C-G_CK", + DestinationFrame = "GALACTIC" + } + }, + Renderable = { + Type = "RenderableModelProjection", + GeometryFile = models .. "/67P_rotated_5_130.obj", + Projection = { + Sequence = { imagesDestination }, + SequenceType = "image-sequence", + Observer = "ROSETTA", + Target = "CHURYUMOV-GERASIMENKO", + Aberration = "NONE", + TextureMap = true, + ShadowMap = true, - DataInputTranslation = { - Instrument = { - NAVCAM = { - DetectorType = "Camera", - Spice = { "ROS_NAVCAM-A" } - }, - }, - Target = { - Read = { - "TARGET_NAME", - "INSTRUMENT_HOST_NAME", - "INSTRUMENT_ID", - "START_TIME", - "STOP_TIME" - }, - Convert = { - CHURYUMOV = { "CHURYUMOV-GERASIMENKO" }, - ROSETTA = { "ROSETTA" }, - ["ROSETTA-ORBITER"] = { "ROSETTA" }, - CHURYUMOVGERASIMENKO11969R1 = { "CHURYUMOV-GERASIMENKO" }, - CHURYUMOVGERASIMENKO = { "CHURYUMOV-GERASIMENKO" }, - ["CHURYUMOV-GERASIMENKO1(1969R1)"] = { "CHURYUMOV-GERASIMENKO" }, - CALIBRATION = { "CALIBRATION" }, - ALPHALYR = { "ALPHALYR" }, - ZETACAS = { "ZETACAS" } - } - } - }, - - Instrument = { - Name = "ROS_NAVCAM-A", - Method = "ELLIPSOID", - Aberration = "NONE", - Fovy = 5.00, - Aspect = 1 + DataInputTranslation = { + Instrument = { + NAVCAM = { + DetectorType = "Camera", + Spice = { "ROS_NAVCAM-A" } } + }, + Target = { + Read = { + "TARGET_NAME", + "INSTRUMENT_HOST_NAME", + "INSTRUMENT_ID", + "START_TIME", + "STOP_TIME" + }, + Convert = { + CHURYUMOV = { "CHURYUMOV-GERASIMENKO" }, + ROSETTA = { "ROSETTA" }, + ["ROSETTA-ORBITER"] = { "ROSETTA" }, + CHURYUMOVGERASIMENKO11969R1 = { "CHURYUMOV-GERASIMENKO" }, + CHURYUMOVGERASIMENKO = { "CHURYUMOV-GERASIMENKO" }, + ["CHURYUMOV-GERASIMENKO1(1969R1)"] = { "CHURYUMOV-GERASIMENKO" }, + CALIBRATION = { "CALIBRATION" }, + ALPHALYR = { "ALPHALYR" }, + ZETACAS = { "ZETACAS" } + } + } }, - BoundingSphereRadius = 5000.0 + Instrument = { + Name = "ROS_NAVCAM-A", + Method = "ELLIPSOID", + Aberration = "NONE", + Fovy = 5.00, + Aspect = 1 + } }, - GUI = { - Name = "67P Churymov-Gerasimenko", - Path = "/Solar System/Comets/67P Churymov-Gerasimenko" - } + + BoundingSphereRadius = 5000.0 + }, + GUI = { + Name = "67P Churymov-Gerasimenko", + Path = "/Solar System/Comets/67P Churymov-Gerasimenko" + } } local Trail67P = { - Identifier = "67PTrail", - Parent = transforms.SolarSystemBarycenter.Identifier, - Renderable = { - Type = "RenderableTrailTrajectory", - Translation = { - Type = "SpiceTranslation", - Target = "CHURYUMOV-GERASIMENKO", - Observer = "SUN" - }, - Color = { 0.1, 0.9, 0.2 }, - StartTime = "2014 JAN 01 00:00:00.000", - EndTime = "2017 JAN 01 00:00:00.000", - SampleInterval = 3600 + Identifier = "67PTrail", + Parent = transforms.SolarSystemBarycenter.Identifier, + Renderable = { + Type = "RenderableTrailTrajectory", + Translation = { + Type = "SpiceTranslation", + Target = "CHURYUMOV-GERASIMENKO", + Observer = "SUN" }, - GUI = { - Name = "67P Trail", - Path = "/Solar System/Comets/67P Churymov-Gerasimenko" - } + Color = { 0.1, 0.9, 0.2 }, + StartTime = "2014 JAN 01 00:00:00.000", + EndTime = "2017 JAN 01 00:00:00.000", + SampleInterval = 3600 + }, + GUI = { + Name = "67P Trail", + Path = "/Solar System/Comets/67P Churymov-Gerasimenko" + } } asset.onInitialize(function() - if not openspace.directoryExists(imagesDestination) then - openspace.printInfo("Extracting Rosetta images") - openspace.unzipFile(images .. "/images_v1_v2.zip", imagesDestination, true) - end + if not openspace.directoryExists(imagesDestination) then + openspace.printInfo("Extracting Rosetta images") + openspace.unzipFile(images .. "/images_v1_v2.zip", imagesDestination, true) + end end) assetHelper.registerSceneGraphNodesAndExport(asset, { - Barycenter, - Comet67P, - Trail67P + Barycenter, + Comet67P, + Trail67P }) asset.export("Barycenter", Barycenter) diff --git a/data/assets/scene/solarsystem/missions/rosetta/dashboard.asset b/data/assets/scene/solarsystem/missions/rosetta/dashboard.asset index c84614fe7c..93b85fcef2 100644 --- a/data/assets/scene/solarsystem/missions/rosetta/dashboard.asset +++ b/data/assets/scene/solarsystem/missions/rosetta/dashboard.asset @@ -1,24 +1,24 @@ local assetHelper = asset.require('util/asset_helper') assetHelper.registerDashboardItems(asset, { - { - Type = "DashboardItemSpacing", - Identifier = "RosettaSpacing", - GuiName = "Rosetta Spacing", - Spacing = 25 - }, - { - Type = "DashboardItemDistance", - Identifier = "Rosetta67PDistance", - GuiName = "Rosetta 67P Distance", - SourceType = "Node", - SourceNodeName = "Rosetta", - DestinationType = "Node", - DestinationNodeName = "67P" - }, - { - Type = "DashboardItemInstruments", - Identifier = "RosettaInstruments", - GuiName = "Rosetta Instruments", - } + { + Type = "DashboardItemSpacing", + Identifier = "RosettaSpacing", + GuiName = "Rosetta Spacing", + Spacing = 25 + }, + { + Type = "DashboardItemDistance", + Identifier = "Rosetta67PDistance", + GuiName = "Rosetta 67P Distance", + SourceType = "Node", + SourceNodeName = "Rosetta", + DestinationType = "Node", + DestinationNodeName = "67P" + }, + { + Type = "DashboardItemInstruments", + Identifier = "RosettaInstruments", + GuiName = "Rosetta Instruments", + } }) diff --git a/data/assets/scene/solarsystem/missions/rosetta/rosetta.asset b/data/assets/scene/solarsystem/missions/rosetta/rosetta.asset index 7c8fa351ab..189d22ca49 100644 --- a/data/assets/scene/solarsystem/missions/rosetta/rosetta.asset +++ b/data/assets/scene/solarsystem/missions/rosetta/rosetta.asset @@ -4,478 +4,478 @@ local transforms = asset.require('./67p') local models = asset.syncedResource({ - Name = "Rosetta Models", - Type = "HttpSynchronization", - Identifier = "rosetta_model", - Version = 4 + Name = "Rosetta Models", + Type = "HttpSynchronization", + Identifier = "rosetta_model", + Version = 4 }) local kernels = asset.syncedResource({ - Name = "Rosetta Kernels", - Type = "HttpSynchronization", - Identifier = "rosetta_kernels", - Version = 1 + Name = "Rosetta Kernels", + Type = "HttpSynchronization", + Identifier = "rosetta_kernels", + Version = 1 }) local RosettaKernels = { - kernels .. "/ROS_160718_STEP.TSC", - kernels .. "/ros_triv.tsc", + kernels .. "/ROS_160718_STEP.TSC", + kernels .. "/ros_triv.tsc", - kernels .. "/CORB_DV_243_01___T19_00325.BSP", - kernels .. "/CORB_DV_223_01___T19_00302.BSP", - kernels .. "/CORB_DV_145_01___T19_00216.BSP", + kernels .. "/CORB_DV_243_01___T19_00325.BSP", + kernels .. "/CORB_DV_223_01___T19_00302.BSP", + kernels .. "/CORB_DV_145_01___T19_00216.BSP", - kernels .. "/LORB_DV_236_01___T19_00318.BSP", - kernels .. "/LORB_DV_223_01___T19_00302.BSP", - kernels .. "/LORB_DV_145_01___T19_00216.BSP", - - kernels .. "/RORB_DV_243_01___T19_00325.BSP", - kernels .. "/RORB_DV_223_01___T19_00302.BSP", - kernels .. "/RORB_DV_145_01___T19_00216.BSP", + kernels .. "/LORB_DV_236_01___T19_00318.BSP", + kernels .. "/LORB_DV_223_01___T19_00302.BSP", + kernels .. "/LORB_DV_145_01___T19_00216.BSP", + + kernels .. "/RORB_DV_243_01___T19_00325.BSP", + kernels .. "/RORB_DV_223_01___T19_00302.BSP", + kernels .. "/RORB_DV_145_01___T19_00216.BSP", - kernels .. "/ATNR_P040302093352_00127.BC", + kernels .. "/ATNR_P040302093352_00127.BC", - kernels .. "/ROS_STRUCT_V5.BSP", + kernels .. "/ROS_STRUCT_V5.BSP", - kernels .. "/ROS_NAVCAM_V01.TI", - - kernels .. "/ROS_CHURYUMOV_V01.TF", - kernels .. "/ROS_V26.TF", + kernels .. "/ROS_NAVCAM_V01.TI", + + kernels .. "/ROS_CHURYUMOV_V01.TF", + kernels .. "/ROS_V26.TF", - -- CK - -- Rosetta attitude - kernels .. "/RATT_DV_243_01_01____00325.BC", - kernels .. "/RATT_DV_223_01_01____00302.BC", - kernels .. "/RATT_DV_145_01_01____00216.BC", + -- CK + -- Rosetta attitude + kernels .. "/RATT_DV_243_01_01____00325.BC", + kernels .. "/RATT_DV_223_01_01____00302.BC", + kernels .. "/RATT_DV_145_01_01____00216.BC", - -- Comet attitude - kernels .. "/CATT_DV_243_01_______00325.BC", - kernels .. "/CATT_DV_223_01_______00302.BC", - kernels .. "/CATT_DV_145_01_______00216.BC", + -- Comet attitude + kernels .. "/CATT_DV_243_01_______00325.BC", + kernels .. "/CATT_DV_223_01_______00302.BC", + kernels .. "/CATT_DV_145_01_______00216.BC", - -- High gain antenna - kernels .. "/ROS_HGA_2016_V0035.BC", - kernels .. "/ROS_HGA_2015_V0053.BC", - kernels .. "/ROS_HGA_2014_V0044.BC", + -- High gain antenna + kernels .. "/ROS_HGA_2016_V0035.BC", + kernels .. "/ROS_HGA_2015_V0053.BC", + kernels .. "/ROS_HGA_2014_V0044.BC", - -- Solar arrays - kernels .. "/ROS_SA_2016_V0034.BC", - kernels .. "/ROS_SA_2015_V0042.BC", - kernels .. "/ROS_SA_2014_V0047.BC", + -- Solar arrays + kernels .. "/ROS_SA_2016_V0034.BC", + kernels .. "/ROS_SA_2015_V0042.BC", + kernels .. "/ROS_SA_2014_V0047.BC", - kernels .. "/ROS_CGS_RSOC_V03.TPC" + kernels .. "/ROS_CGS_RSOC_V03.TPC" } local LightSources = { - { - Type = "SceneGraphLightSource", - Identifier = "Sun", - Node = sunTransforms.SolarSystemBarycenter.Identifier, - Intensity = 1.0 - }, - { - Identifier = "Camera", - Type = "CameraLightSource", - Intensity = 0.5 - } + { + Type = "SceneGraphLightSource", + Identifier = "Sun", + Node = sunTransforms.SolarSystemBarycenter.Identifier, + Intensity = 1.0 + }, + { + Identifier = "Camera", + Type = "CameraLightSource", + Intensity = 0.5 + } } local RotationMatrix = { - 0, 1, 0, - 0, 0, 1, - 1, 0, 0 + 0, 1, 0, + 0, 0, 1, + 1, 0, 0 } local Rosetta = { - Identifier = "Rosetta", - Parent = sunTransforms.SolarSystemBarycenter.Identifier, - Transform = { - Translation = { - Type = "SpiceTranslation", - Target = "ROSETTA", - Observer = "SUN", - Kernels = RosettaKernels - }, - Rotation = { - Type = "SpiceRotation", - SourceFrame = "ROS_SPACECRAFT", - DestinationFrame = "GALACTIC" - } - }, - GUI = { - Path = "/Solar System/Missions/Rosetta" + Identifier = "Rosetta", + Parent = sunTransforms.SolarSystemBarycenter.Identifier, + Transform = { + Translation = { + Type = "SpiceTranslation", + Target = "ROSETTA", + Observer = "SUN", + Kernels = RosettaKernels + }, + Rotation = { + Type = "SpiceRotation", + SourceFrame = "ROS_SPACECRAFT", + DestinationFrame = "GALACTIC" } + }, + GUI = { + Path = "/Solar System/Missions/Rosetta" + } } local RosettaModel = { - Identifier = "RosettaModel", - Parent = Rosetta.Identifier, - Transform = { - Scale = { - Type = "StaticScale", - -- The scale of the model is in cm; OpenSpace is in m - Scale = 0.01 - } - }, - GUI = { - Name = "Rosetta Model", - Path = "/Solar System/Missions/Rosetta" + Identifier = "RosettaModel", + Parent = Rosetta.Identifier, + Transform = { + Scale = { + Type = "StaticScale", + -- The scale of the model is in cm; OpenSpace is in m + Scale = 0.01 } + }, + GUI = { + Name = "Rosetta Model", + Path = "/Solar System/Missions/Rosetta" + } } local RosettaBlackFoil = { - Identifier = "Rosetta_black_foil", - Parent = RosettaModel.Identifier, - Renderable = { - Type = "RenderableModel", - Body = "ROSETTA", - GeometryFile = models .. "/black_foil.obj", - ModelTransform = RotationMatrix, - LightSources = LightSources - }, - GUI = { - Name = "Rosetta Model Part Black Foil", - Path = "/Solar System/Missions/Rosetta" - } + Identifier = "Rosetta_black_foil", + Parent = RosettaModel.Identifier, + Renderable = { + Type = "RenderableModel", + Body = "ROSETTA", + GeometryFile = models .. "/black_foil.obj", + ModelTransform = RotationMatrix, + LightSources = LightSources + }, + GUI = { + Name = "Rosetta Model Part Black Foil", + Path = "/Solar System/Missions/Rosetta" + } } local RosettaBlackParts = { - Identifier = "Rosetta_black_parts", - Parent = RosettaModel.Identifier, - Renderable = { - Type = "RenderableModel", - Body = "ROSETTA", - GeometryFile = models .. "/black_parts.obj", - ModelTransform = RotationMatrix, - LightSources = LightSources - }, - GUI = { - Name = "Rosetta Model Part Black Parts", - Path = "/Solar System/Missions/Rosetta" - } + Identifier = "Rosetta_black_parts", + Parent = RosettaModel.Identifier, + Renderable = { + Type = "RenderableModel", + Body = "ROSETTA", + GeometryFile = models .. "/black_parts.obj", + ModelTransform = RotationMatrix, + LightSources = LightSources + }, + GUI = { + Name = "Rosetta Model Part Black Parts", + Path = "/Solar System/Missions/Rosetta" + } } local RosettaDish = { - Identifier = "Rosetta_dish", - Parent = RosettaModel.Identifier, - Renderable = { - Type = "RenderableModel", - Body = "ROSETTA", - GeometryFile = models .. "/dish.obj", - ModelTransform = RotationMatrix, - LightSources = LightSources - }, - GUI = { - Name = "Rosetta Model Part Dish", - Path = "/Solar System/Missions/Rosetta" - } + Identifier = "Rosetta_dish", + Parent = RosettaModel.Identifier, + Renderable = { + Type = "RenderableModel", + Body = "ROSETTA", + GeometryFile = models .. "/dish.obj", + ModelTransform = RotationMatrix, + LightSources = LightSources + }, + GUI = { + Name = "Rosetta Model Part Dish", + Path = "/Solar System/Missions/Rosetta" + } } local RosettaParts = { - Identifier = "Rosetta_parts", - Parent = RosettaModel.Identifier, - Renderable = { - Type = "RenderableModel", - Body = "ROSETTA", - GeometryFile = models .. "/parts.obj", - ModelTransform = RotationMatrix, - LightSources = LightSources - }, - GUI = { - Name = "Rosetta Model Part Parts", - Path = "/Solar System/Missions/Rosetta" - } + Identifier = "Rosetta_parts", + Parent = RosettaModel.Identifier, + Renderable = { + Type = "RenderableModel", + Body = "ROSETTA", + GeometryFile = models .. "/parts.obj", + ModelTransform = RotationMatrix, + LightSources = LightSources + }, + GUI = { + Name = "Rosetta Model Part Parts", + Path = "/Solar System/Missions/Rosetta" + } } local RosettaSilverFoil = { - Identifier = "Rosetta_silver_foil", - Parent = RosettaModel.Identifier, - Renderable = { - Type = "RenderableModel", - Body = "ROSETTA", - GeometryFile = models .. "/silver_foil.obj", - ModelTransform = RotationMatrix, - LightSources = LightSources - }, - GUI = { - Name = "Rosetta Model Part Silver Foil", - Path = "/Solar System/Missions/Rosetta" - } + Identifier = "Rosetta_silver_foil", + Parent = RosettaModel.Identifier, + Renderable = { + Type = "RenderableModel", + Body = "ROSETTA", + GeometryFile = models .. "/silver_foil.obj", + ModelTransform = RotationMatrix, + LightSources = LightSources + }, + GUI = { + Name = "Rosetta Model Part Silver Foil", + Path = "/Solar System/Missions/Rosetta" + } } local RosettaVents = { - Identifier = "Rosetta_vents", - Parent = RosettaModel.Identifier, - Renderable = { - Type = "RenderableModel", - Body = "ROSETTA", - GeometryFile = models .. "/vents.obj", - ModelTransform = RotationMatrix, - LightSources = LightSources - }, - GUI = { - Name = "Rosetta Model Part Vents", - Path = "/Solar System/Missions/Rosetta" - } + Identifier = "Rosetta_vents", + Parent = RosettaModel.Identifier, + Renderable = { + Type = "RenderableModel", + Body = "ROSETTA", + GeometryFile = models .. "/vents.obj", + ModelTransform = RotationMatrix, + LightSources = LightSources + }, + GUI = { + Name = "Rosetta Model Part Vents", + Path = "/Solar System/Missions/Rosetta" + } } local RosettaWingA = { - Identifier = "Rosetta_wing_a", - Parent = RosettaModel.Identifier, - Renderable = { - Type = "RenderableModel", - Body = "ROSETTA", - GeometryFile = models .."/wingA.obj", - ModelTransform = RotationMatrix, - LightSources = LightSources - }, - GUI = { - Name = "Rosetta Model Part Wing A", - Path = "/Solar System/Missions/Rosetta" - } + Identifier = "Rosetta_wing_a", + Parent = RosettaModel.Identifier, + Renderable = { + Type = "RenderableModel", + Body = "ROSETTA", + GeometryFile = models .."/wingA.obj", + ModelTransform = RotationMatrix, + LightSources = LightSources + }, + GUI = { + Name = "Rosetta Model Part Wing A", + Path = "/Solar System/Missions/Rosetta" + } } local RosettaWingB = { - Identifier = "Rosetta_wing_b", - Parent = RosettaModel.Identifier, - Renderable = { - Type = "RenderableModel", - Body = "ROSETTA", - GeometryFile = models .. "/wingB.obj", - ModelTransform = RotationMatrix, - LightSources = LightSources - }, - GUI = { - Name = "Rosetta Model Part Wing B", - Path = "/Solar System/Missions/Rosetta" - } + Identifier = "Rosetta_wing_b", + Parent = RosettaModel.Identifier, + Renderable = { + Type = "RenderableModel", + Body = "ROSETTA", + GeometryFile = models .. "/wingB.obj", + ModelTransform = RotationMatrix, + LightSources = LightSources + }, + GUI = { + Name = "Rosetta Model Part Wing B", + Path = "/Solar System/Missions/Rosetta" + } } local RosettaYellowFoil = { - Identifier = "Rosetta_yellow_foil", - Parent = RosettaModel.Identifier, - Renderable = { - Type = "RenderableModel", - Body = "ROSETTA", - GeometryFile = models .. "/yellow_foil.obj", - ModelTransform = RotationMatrix, - LightSources = LightSources - }, - GUI = { - Name = "Rosetta Model Part Yellow Foil", - Path = "/Solar System/Missions/Rosetta" - } + Identifier = "Rosetta_yellow_foil", + Parent = RosettaModel.Identifier, + Renderable = { + Type = "RenderableModel", + Body = "ROSETTA", + GeometryFile = models .. "/yellow_foil.obj", + ModelTransform = RotationMatrix, + LightSources = LightSources + }, + GUI = { + Name = "Rosetta Model Part Yellow Foil", + Path = "/Solar System/Missions/Rosetta" + } } local Philae = { - Identifier = "Philae", - Parent = transforms.Barycenter.Identifier, - -- This should need a transform, but currently the model is intrinsically - -- translated - Transform = { - Translation = { - Type = "SpiceTranslation", - Target = "PHILAE", - Observer = "CHURYUMOV-GERASIMENKO", - Kernels = RosettaKernels - }, - Rotation = { - Type = "SpiceRotation", - SourceFrame = "ROS_SPACECRAFT", - DestinationFrame = "GALACTIC", - }, - Scale = { - Type = "StaticScale", - -- The scale of the model is in cm; OpenSpace is in m - Scale = 0.01 - } + Identifier = "Philae", + Parent = transforms.Barycenter.Identifier, + -- This should need a transform, but currently the model is intrinsically + -- translated + Transform = { + Translation = { + Type = "SpiceTranslation", + Target = "PHILAE", + Observer = "CHURYUMOV-GERASIMENKO", + Kernels = RosettaKernels }, - GUI = { - Name = "Philae Model", - Path = "/Solar System/Missions/Rosetta" + Rotation = { + Type = "SpiceRotation", + SourceFrame = "ROS_SPACECRAFT", + DestinationFrame = "GALACTIC", + }, + Scale = { + Type = "StaticScale", + -- The scale of the model is in cm; OpenSpace is in m + Scale = 0.01 } + }, + GUI = { + Name = "Philae Model", + Path = "/Solar System/Missions/Rosetta" + } } local PhilaeFoil = { - Identifier = "Philae_foil", - Parent = Philae.Identifier, - Renderable = { - Type = "RenderableModel", - Body = "ROSETTA", - GeometryFile = models .. "/lander_foil.obj", - ModelTransform = RotationMatrix, - LightSources = LightSources - }, - GUI = { - Name = "Philae Model Part Foil", - Path = "/Solar System/Missions/Rosetta" - } + Identifier = "Philae_foil", + Parent = Philae.Identifier, + Renderable = { + Type = "RenderableModel", + Body = "ROSETTA", + GeometryFile = models .. "/lander_foil.obj", + ModelTransform = RotationMatrix, + LightSources = LightSources + }, + GUI = { + Name = "Philae Model Part Foil", + Path = "/Solar System/Missions/Rosetta" + } } local PhilaeLids = { - Identifier = "Philae_lids", - Parent = Philae.Identifier, - Renderable = { - Type = "RenderableModel", - Body = "ROSETTA", - GeometryFile = models .. "/lander_lids.obj", - ModelTransform = RotationMatrix, - LightSources = LightSources - }, - GUI = { - Name = "Philae Model Part Lids", - Path = "/Solar System/Missions/Rosetta" - } + Identifier = "Philae_lids", + Parent = Philae.Identifier, + Renderable = { + Type = "RenderableModel", + Body = "ROSETTA", + GeometryFile = models .. "/lander_lids.obj", + ModelTransform = RotationMatrix, + LightSources = LightSources + }, + GUI = { + Name = "Philae Model Part Lids", + Path = "/Solar System/Missions/Rosetta" + } } local PhilaeParts = { - Identifier = "Philae_parts", - Parent = Philae.Identifier, - Renderable = { - Type = "RenderableModel", - Body = "ROSETTA", - GeometryFile = models .. "/lander_parts.obj", - ModelTransform = RotationMatrix, - LightSources = LightSources - }, - GUI = { - Name = "Philae Model Part Parts", - Path = "/Solar System/Missions/Rosetta" - } + Identifier = "Philae_parts", + Parent = Philae.Identifier, + Renderable = { + Type = "RenderableModel", + Body = "ROSETTA", + GeometryFile = models .. "/lander_parts.obj", + ModelTransform = RotationMatrix, + LightSources = LightSources + }, + GUI = { + Name = "Philae Model Part Parts", + Path = "/Solar System/Missions/Rosetta" + } } local PhilaeSolarPanels = { - Identifier = "Philae_solarp", - Parent = Philae.Identifier, - Renderable = { - Type = "RenderableModel", - Body = "ROSETTA", - GeometryFile = models .. "/lander_solarp.obj", - ModelTransform = RotationMatrix, - LightSources = LightSources - }, - GUI = { - Name = "Philae Model Parts Solar Panels", - Path = "/Solar System/Missions/Rosetta" - } + Identifier = "Philae_solarp", + Parent = Philae.Identifier, + Renderable = { + Type = "RenderableModel", + Body = "ROSETTA", + GeometryFile = models .. "/lander_solarp.obj", + ModelTransform = RotationMatrix, + LightSources = LightSources + }, + GUI = { + Name = "Philae Model Parts Solar Panels", + Path = "/Solar System/Missions/Rosetta" + } } local NavCam = { - Identifier = "NAVCAM", - Parent = Rosetta.Identifier, - GUI = { - Path = "/Solar System/Missions/Rosetta/Instruments" - } + Identifier = "NAVCAM", + Parent = Rosetta.Identifier, + GUI = { + Path = "/Solar System/Missions/Rosetta/Instruments" + } } local NavCamFov = { - Identifier = "NAVCAM_FOV", - Parent = NavCam.Identifier, - Renderable = { - Type = "RenderableFov", - Body = "ROSETTA", - Frame = "ROS_NAVCAM-A", - RGB = { 0.8, 0.7, 0.7 }, - Instrument = { - Name = "ROS_NAVCAM-A", - Method = "ELLIPSOID", - Aberration = "NONE" - }, - PotentialTargets = { "CHURYUMOV-GERASIMENKO" }, - FrameConversions = { - ["CHURYUMOV-GERASIMENKO"] = "67P/C-G_CK" - } + Identifier = "NAVCAM_FOV", + Parent = NavCam.Identifier, + Renderable = { + Type = "RenderableFov", + Body = "ROSETTA", + Frame = "ROS_NAVCAM-A", + RGB = { 0.8, 0.7, 0.7 }, + Instrument = { + Name = "ROS_NAVCAM-A", + Method = "ELLIPSOID", + Aberration = "NONE" }, - GUI = { - Name = "NAVCAM FOV", - Path = "/Solar System/Missions/Rosetta/Instruments" + PotentialTargets = { "CHURYUMOV-GERASIMENKO" }, + FrameConversions = { + ["CHURYUMOV-GERASIMENKO"] = "67P/C-G_CK" } + }, + GUI = { + Name = "NAVCAM FOV", + Path = "/Solar System/Missions/Rosetta/Instruments" + } } local ImagePlane = { - Identifier = "ImagePlaneRosetta", - Parent = transforms.Comet67P.Identifier, - Renderable = { - Type = "RenderablePlaneProjection", - Frame = "67P/C-G_CK", - DefaultTarget = "CHURYUMOV-GERASIMENKO", - Spacecraft = "ROSETTA", - Instrument = "ROS_NAVCAM-A", - Moving = false, - Texture = models .. "/defaultProj.png" - }, - GUI = { - Name = "Rosetta Image Plane", - Path = "/Solar System/Missions/Rosetta" - } + Identifier = "ImagePlaneRosetta", + Parent = transforms.Comet67P.Identifier, + Renderable = { + Type = "RenderablePlaneProjection", + Frame = "67P/C-G_CK", + DefaultTarget = "CHURYUMOV-GERASIMENKO", + Spacecraft = "ROSETTA", + Instrument = "ROS_NAVCAM-A", + Moving = false, + Texture = models .. "/defaultProj.png" + }, + GUI = { + Name = "Rosetta Image Plane", + Path = "/Solar System/Missions/Rosetta" + } } local RosettaCometTrail = { - Identifier = "RosettaCometTrail", - Parent = transforms.Barycenter.Identifier, - Renderable = { - Type = "RenderableTrailTrajectory", - Translation = { - Type = "SpiceTranslation", - Target = "ROSETTA", - Observer = "CHURYUMOV-GERASIMENKO" - }, - Color = { 0.288, 0.375, 0.934 }, - StartTime = "2014 AUG 01 12:00:00", - EndTime = "2016 SEP 30 12:00:00", - SampleInterval = 3600 + Identifier = "RosettaCometTrail", + Parent = transforms.Barycenter.Identifier, + Renderable = { + Type = "RenderableTrailTrajectory", + Translation = { + Type = "SpiceTranslation", + Target = "ROSETTA", + Observer = "CHURYUMOV-GERASIMENKO" }, - GUI = { - Name = "Rosetta Comet Trail", - Path = "/Solar System/Missions/Rosetta" - } + Color = { 0.288, 0.375, 0.934 }, + StartTime = "2014 AUG 01 12:00:00", + EndTime = "2016 SEP 30 12:00:00", + SampleInterval = 3600 + }, + GUI = { + Name = "Rosetta Comet Trail", + Path = "/Solar System/Missions/Rosetta" + } } local PhilaeTrail = { - Identifier = "PhilaeTrail", - Parent = transforms.Barycenter.Identifier, - Renderable = { - Type = "RenderableTrailTrajectory", - Translation = { - Type = "SpiceTranslation", - Target = "PHILAE", - Observer = "CHURYUMOV-GERASIMENKO" - }, - Color = { 0.8, 0.5, 1.0 }, - StartTime = "2014 NOV 12 08:35:00", - EndTime = "2014 NOV 12 17:00:00", - SampleInterval = 2 + Identifier = "PhilaeTrail", + Parent = transforms.Barycenter.Identifier, + Renderable = { + Type = "RenderableTrailTrajectory", + Translation = { + Type = "SpiceTranslation", + Target = "PHILAE", + Observer = "CHURYUMOV-GERASIMENKO" }, - GUI = { - Name = "Philae Trail", - Path = "/Solar System/Missions/Rosetta" - } + Color = { 0.8, 0.5, 1.0 }, + StartTime = "2014 NOV 12 08:35:00", + EndTime = "2014 NOV 12 17:00:00", + SampleInterval = 2 + }, + GUI = { + Name = "Philae Trail", + Path = "/Solar System/Missions/Rosetta" + } } assetHelper.registerSceneGraphNodesAndExport(asset, { - Rosetta, - RosettaModel, - RosettaBlackFoil, - RosettaBlackParts, - RosettaDish, - RosettaParts, - RosettaSilverFoil, - RosettaVents, - RosettaWingA, - RosettaWingB, - RosettaYellowFoil, + Rosetta, + RosettaModel, + RosettaBlackFoil, + RosettaBlackParts, + RosettaDish, + RosettaParts, + RosettaSilverFoil, + RosettaVents, + RosettaWingA, + RosettaWingB, + RosettaYellowFoil, - NavCam, - NavCamFov, - ImagePlane, + NavCam, + NavCamFov, + ImagePlane, - Philae, - PhilaeFoil, - PhilaeLids, - PhilaeParts, - PhilaeSolarPanels, + Philae, + PhilaeFoil, + PhilaeLids, + PhilaeParts, + PhilaeSolarPanels, - RosettaCometTrail, - PhilaeTrail + RosettaCometTrail, + PhilaeTrail }) diff --git a/data/assets/scene/solarsystem/missions/voyager/dashboard.asset b/data/assets/scene/solarsystem/missions/voyager/dashboard.asset index 777aae93c5..8a0967ea71 100644 --- a/data/assets/scene/solarsystem/missions/voyager/dashboard.asset +++ b/data/assets/scene/solarsystem/missions/voyager/dashboard.asset @@ -1,22 +1,22 @@ local assetHelper = asset.require('util/asset_helper') assetHelper.registerDashboardItems(asset, { - { - Type = "DashboardItemDistance", - Identifier = "Voyager1Distance", - GuiName = "Voyager 1 - Earth Distance", - SourceType = "Node", - SourceNodeName = "Voyager_1", - DestinationType = "Node", - DestinationNodeName = "Earth" - }, - { - Type = "DashboardItemDistance", - Identifier = "Voyager2Distance", - GuiName = "Voyager 2 - Earth Distance", - SourceType = "Node", - SourceNodeName = "Voyager_2", - DestinationType = "Node", - DestinationNodeName = "Earth" - } + { + Type = "DashboardItemDistance", + Identifier = "Voyager1Distance", + GuiName = "Voyager 1 - Earth Distance", + SourceType = "Node", + SourceNodeName = "Voyager_1", + DestinationType = "Node", + DestinationNodeName = "Earth" + }, + { + Type = "DashboardItemDistance", + Identifier = "Voyager2Distance", + GuiName = "Voyager 2 - Earth Distance", + SourceType = "Node", + SourceNodeName = "Voyager_2", + DestinationType = "Node", + DestinationNodeName = "Earth" + } }) diff --git a/data/assets/scene/solarsystem/missions/voyager/model.asset b/data/assets/scene/solarsystem/missions/voyager/model.asset index e1d17adda6..c72367fd35 100644 --- a/data/assets/scene/solarsystem/missions/voyager/model.asset +++ b/data/assets/scene/solarsystem/missions/voyager/model.asset @@ -1,8 +1,8 @@ local models = asset.syncedResource({ - Name = "Voyager Model", - Type = "HttpSynchronization", - Identifier = "voyager_model", - Version = 1 + Name = "Voyager Model", + Type = "HttpSynchronization", + Identifier = "voyager_model", + Version = 1 }) asset.export('modelFolder', models) diff --git a/data/assets/scene/solarsystem/missions/voyager/voyager1.asset b/data/assets/scene/solarsystem/missions/voyager/voyager1.asset index a39d0e9779..922dfa6c03 100644 --- a/data/assets/scene/solarsystem/missions/voyager/voyager1.asset +++ b/data/assets/scene/solarsystem/missions/voyager/voyager1.asset @@ -3,224 +3,224 @@ local sunTransforms = asset.require('scene/solarsystem/sun/transforms') local models = asset.require("./model" ).modelFolder; local kernels = asset.syncedResource({ - Name = "Voyager 1 Kernels", - Type = "HttpSynchronization", - Identifier = "voyager1_spice", - Version = 1 + Name = "Voyager 1 Kernels", + Type = "HttpSynchronization", + Identifier = "voyager1_spice", + Version = 1 }) local Kernels = { - kernels .. '/vg1_v02.tf', - kernels .. '/vg100019.tsc', - kernels .. '/Voyager_1.a54206u_V0.2_merged.bsp', - kernels .. '/voyager_1.ST+1991_a54418u.merged.bsp', - kernels .. '/vgr1_jup230.bsp', - kernels .. '/vgr1_sat337.bsp', - kernels .. '/vgr1_super.bc', - kernels .. '/vgr1_super_v2.bc' + kernels .. '/vg1_v02.tf', + kernels .. '/vg100019.tsc', + kernels .. '/Voyager_1.a54206u_V0.2_merged.bsp', + kernels .. '/voyager_1.ST+1991_a54418u.merged.bsp', + kernels .. '/vgr1_jup230.bsp', + kernels .. '/vgr1_sat337.bsp', + kernels .. '/vgr1_super.bc', + kernels .. '/vgr1_super_v2.bc' } local RotationMatrix = { - -1, 0, 0, - 0, 0, -1, - 0, -1, 0 + -1, 0, 0, + 0, 0, -1, + 0, -1, 0 } local LightSources = { - { - Type = "SceneGraphLightSource", - Identifier = "Sun", - Node = sunTransforms.SolarSystemBarycenter.Identifier, - Intensity = 1.0 - }, - { - Identifier = "Camera", - Type = "CameraLightSource", - Intensity = 0.5 - } + { + Type = "SceneGraphLightSource", + Identifier = "Sun", + Node = sunTransforms.SolarSystemBarycenter.Identifier, + Intensity = 1.0 + }, + { + Identifier = "Camera", + Type = "CameraLightSource", + Intensity = 0.5 + } } local Voyager1 = { - Identifier = "Voyager_1", - Parent = sunTransforms.SolarSystemBarycenter.Identifier, - Transform = { - Translation = { - Type = "SpiceTranslation", - Target = "VOYAGER 1", - Observer = "SUN", - Kernels = Kernels - }, - Rotation = { - Type = "SpiceRotation", - SourceFrame = "VG1_SC_BUS", - DestinationFrame = "GALACTIC", - TimeFrame = { - Type = "TimeFrameInterval", - Start = "1977-SEP-05 14:10:11.786", - End = "2027-DEC-27" - } - } + Identifier = "Voyager_1", + Parent = sunTransforms.SolarSystemBarycenter.Identifier, + Transform = { + Translation = { + Type = "SpiceTranslation", + Target = "VOYAGER 1", + Observer = "SUN", + Kernels = Kernels }, - GUI = { - Name = "Voyager 1", - Path = "/Solar System/Missions/Voyager 1" + Rotation = { + Type = "SpiceRotation", + SourceFrame = "VG1_SC_BUS", + DestinationFrame = "GALACTIC", + TimeFrame = { + Type = "TimeFrameInterval", + Start = "1977-SEP-05 14:10:11.786", + End = "2027-DEC-27" + } } + }, + GUI = { + Name = "Voyager 1", + Path = "/Solar System/Missions/Voyager 1" + } } local Voyager1Main = { - Identifier = "Voyager_1_Main", - Parent = Voyager1.Identifier, - Renderable = { - Type = "RenderableModel", - GeometryFile = models .. "/voyager-main.obj", - ModelTransform = RotationMatrix, - LightSources = LightSources - }, - GUI = { - Name = "Voyager 1 Main", - Path = "/Solar System/Missions/Voyager 1" - } + Identifier = "Voyager_1_Main", + Parent = Voyager1.Identifier, + Renderable = { + Type = "RenderableModel", + GeometryFile = models .. "/voyager-main.obj", + ModelTransform = RotationMatrix, + LightSources = LightSources + }, + GUI = { + Name = "Voyager 1 Main", + Path = "/Solar System/Missions/Voyager 1" + } } local Voyager1Antenna = { - Identifier = "Voyager_1_Antanna", - Parent = Voyager1.Identifier, - Renderable = { - Type = "RenderableModel", - GeometryFile = models .. "/voyager-antenna.obj", - ModelTransform = RotationMatrix, - LightSources = LightSources - }, - GUI = { - Name = "Voyager 1 Antanna", - Path = "/Solar System/Missions/Voyager 1" - } + Identifier = "Voyager_1_Antanna", + Parent = Voyager1.Identifier, + Renderable = { + Type = "RenderableModel", + GeometryFile = models .. "/voyager-antenna.obj", + ModelTransform = RotationMatrix, + LightSources = LightSources + }, + GUI = { + Name = "Voyager 1 Antanna", + Path = "/Solar System/Missions/Voyager 1" + } } -- The trails are organized as follows. The cruise phases can be resolved in relatively -- low resolution since they are just straight lines -- The encounter phases should be much higher resolution or otherwise artifacts would appear local VoyagerTrailCruiseEarthJupiter = { - Identifier = "Voyager_1_Trail_Cruise_Earth_Jupiter", - Parent = sunTransforms.SolarSystemBarycenter.Identifier, - Renderable = { - Type = "RenderableTrailTrajectory", - Translation = { - Type = "SpiceTranslation", - Target = "VOYAGER 1", - Observer = "SUN", - Kernels = Kernels - }, - Color = { 0.70, 0.50, 0.20 }, - StartTime = "1977 SEP 05", - EndTime = "1979 MAR 04", - SampleInterval = 545 * 2 -- 545 is the number of days between the Start and End time + Identifier = "Voyager_1_Trail_Cruise_Earth_Jupiter", + Parent = sunTransforms.SolarSystemBarycenter.Identifier, + Renderable = { + Type = "RenderableTrailTrajectory", + Translation = { + Type = "SpiceTranslation", + Target = "VOYAGER 1", + Observer = "SUN", + Kernels = Kernels }, - GUI = { - Name = "Voyager 1 Trail Cruise Earth-Jupiter", - Path = "/Solar System/Missions/Voyager 1" - } + Color = { 0.70, 0.50, 0.20 }, + StartTime = "1977 SEP 05", + EndTime = "1979 MAR 04", + SampleInterval = 545 * 2 -- 545 is the number of days between the Start and End time + }, + GUI = { + Name = "Voyager 1 Trail Cruise Earth-Jupiter", + Path = "/Solar System/Missions/Voyager 1" + } } local VoyagerTrailEncounterJupiter = { - Identifier = "Voyager_1_Trail_Encounter_Jupiter", - Parent = sunTransforms.SolarSystemBarycenter.Identifier, - Renderable = { - Type = "RenderableTrailTrajectory", - Translation = { - Type = "SpiceTranslation", - Target = "VOYAGER 1", - Observer = "SUN", - Kernels = Kernels - }, - Color = { 0.70, 0.50, 0.20 }, - EnableFade = false, - StartTime = "1979 MAR 03 23:24:00", -- @TODO: Probably an off-by-one bug in RenderableTrailTrajectory? - EndTime = "1979 MAR 09", - SampleInterval = 100 + Identifier = "Voyager_1_Trail_Encounter_Jupiter", + Parent = sunTransforms.SolarSystemBarycenter.Identifier, + Renderable = { + Type = "RenderableTrailTrajectory", + Translation = { + Type = "SpiceTranslation", + Target = "VOYAGER 1", + Observer = "SUN", + Kernels = Kernels }, - GUI = { - Name = "Voyager 1 Trail Encounter Jupiter", - Path = "/Solar System/Missions/Voyager 1" - } + Color = { 0.70, 0.50, 0.20 }, + EnableFade = false, + StartTime = "1979 MAR 03 23:24:00", -- @TODO: Probably an off-by-one bug in RenderableTrailTrajectory? + EndTime = "1979 MAR 09", + SampleInterval = 100 + }, + GUI = { + Name = "Voyager 1 Trail Encounter Jupiter", + Path = "/Solar System/Missions/Voyager 1" + } } local VoyagerTrailCruiseJupiterSaturn = { - Identifier = "Voyager_1_Trail_Cruise_Jupiter_Saturn", - Parent = sunTransforms.SolarSystemBarycenter.Identifier, - Renderable = { - Type = "RenderableTrailTrajectory", - Translation = { - Type = "SpiceTranslation", - Target = "VOYAGER 1", - Observer = "SUN", - Kernels = Kernels - }, - EnableFade = false, - Color = { 0.70, 0.50, 0.20 }, - StartTime = "1979 MAR 09", - EndTime = "1980 NOV 11", - SampleInterval = 618 * 2 -- 618 is the number of days between the Start and End time + Identifier = "Voyager_1_Trail_Cruise_Jupiter_Saturn", + Parent = sunTransforms.SolarSystemBarycenter.Identifier, + Renderable = { + Type = "RenderableTrailTrajectory", + Translation = { + Type = "SpiceTranslation", + Target = "VOYAGER 1", + Observer = "SUN", + Kernels = Kernels }, - GUI = { - Name = "Voyager 1 Trail Cruise Jupiter-Saturn", - Path = "/Solar System/Missions/Voyager 1" - } + EnableFade = false, + Color = { 0.70, 0.50, 0.20 }, + StartTime = "1979 MAR 09", + EndTime = "1980 NOV 11", + SampleInterval = 618 * 2 -- 618 is the number of days between the Start and End time + }, + GUI = { + Name = "Voyager 1 Trail Cruise Jupiter-Saturn", + Path = "/Solar System/Missions/Voyager 1" + } } local VoyagerTrailEncounterSaturn = { - Identifier = "Voyager_1_Trail_Encounter_Saturn", - Parent = sunTransforms.SolarSystemBarycenter.Identifier, - Renderable = { - Type = "RenderableTrailTrajectory", - Translation = { - Type = "SpiceTranslation", - Target = "VOYAGER 1", - Observer = "SUN", - Kernels = Kernels - }, - EnableFade = false, - Color = { 0.70, 0.50, 0.20 }, - StartTime = "1980 NOV 10 23:08:30", -- @TODO: Probably an off-by-one bug in RenderableTrailTrajectory? - EndTime = "1980 NOV 16", - SampleInterval = 100 + Identifier = "Voyager_1_Trail_Encounter_Saturn", + Parent = sunTransforms.SolarSystemBarycenter.Identifier, + Renderable = { + Type = "RenderableTrailTrajectory", + Translation = { + Type = "SpiceTranslation", + Target = "VOYAGER 1", + Observer = "SUN", + Kernels = Kernels }, - GUI = { - Name = "Voyager 1 Trail Encounter Saturn", - Path = "/Solar System/Missions/Voyager 1" - } + EnableFade = false, + Color = { 0.70, 0.50, 0.20 }, + StartTime = "1980 NOV 10 23:08:30", -- @TODO: Probably an off-by-one bug in RenderableTrailTrajectory? + EndTime = "1980 NOV 16", + SampleInterval = 100 + }, + GUI = { + Name = "Voyager 1 Trail Encounter Saturn", + Path = "/Solar System/Missions/Voyager 1" + } } local VoyagerTrailCruiseSaturnInf = { - Identifier = "Voyager_1_Trail_Cruise_Saturn_Inf", - Parent = sunTransforms.SolarSystemBarycenter.Identifier, - Renderable = { - Type = "RenderableTrailTrajectory", - Translation = { - Type = "SpiceTranslation", - Target = "VOYAGER 1", - Observer = "SUN", - Kernels = Kernels - }, - EnableFade = false, - Color = { 0.70, 0.50, 0.20 }, - StartTime = "1980 NOV 16", - EndTime = "2021 JAN 01", - SampleInterval = 14656 * 2 -- 14656 is the number of days between the Start and End time + Identifier = "Voyager_1_Trail_Cruise_Saturn_Inf", + Parent = sunTransforms.SolarSystemBarycenter.Identifier, + Renderable = { + Type = "RenderableTrailTrajectory", + Translation = { + Type = "SpiceTranslation", + Target = "VOYAGER 1", + Observer = "SUN", + Kernels = Kernels }, - GUI = { - Name = "Voyager 1 Trail Cruise Saturn-Inf", - Path = "/Solar System/Missions/Voyager 1" - } + EnableFade = false, + Color = { 0.70, 0.50, 0.20 }, + StartTime = "1980 NOV 16", + EndTime = "2021 JAN 01", + SampleInterval = 14656 * 2 -- 14656 is the number of days between the Start and End time + }, + GUI = { + Name = "Voyager 1 Trail Cruise Saturn-Inf", + Path = "/Solar System/Missions/Voyager 1" + } } assetHelper.registerSceneGraphNodesAndExport(asset, { - Voyager1, - Voyager1Main, - Voyager1Antenna, - VoyagerTrailCruiseEarthJupiter, - VoyagerTrailEncounterJupiter, - VoyagerTrailCruiseJupiterSaturn, - VoyagerTrailEncounterSaturn, - VoyagerTrailCruiseSaturnInf + Voyager1, + Voyager1Main, + Voyager1Antenna, + VoyagerTrailCruiseEarthJupiter, + VoyagerTrailEncounterJupiter, + VoyagerTrailCruiseJupiterSaturn, + VoyagerTrailEncounterSaturn, + VoyagerTrailCruiseSaturnInf }) diff --git a/data/assets/scene/solarsystem/missions/voyager/voyager2.asset b/data/assets/scene/solarsystem/missions/voyager/voyager2.asset index 765b4a28d3..8cbe9dcbac 100644 --- a/data/assets/scene/solarsystem/missions/voyager/voyager2.asset +++ b/data/assets/scene/solarsystem/missions/voyager/voyager2.asset @@ -4,323 +4,323 @@ local models = asset.require("./model" ).modelFolder; local kernels = asset.syncedResource({ - Name = "Voyager 2 Kernels", - Type = "HttpSynchronization", - Identifier = "voyager2_spice", - Version = 1 + Name = "Voyager 2 Kernels", + Type = "HttpSynchronization", + Identifier = "voyager2_spice", + Version = 1 }) local Kernels = { - kernels .. '/vg2_v02.tf', - kernels .. '/vg200022.tsc', - kernels .. '/Voyager_2.m05016u.merged.bsp', - kernels .. '/voyager_2.ST+1992_m05208u.merged.bsp', - kernels .. '/vgr2_jup230.bsp', - kernels .. '/vgr2_sat337.bsp', - kernels .. '/vgr2_ura083.bsp', - kernels .. '/vgr2_nep081.bsp', - kernels .. '/vgr2_super.bc', - kernels .. '/vgr2_super_v2.bc' + kernels .. '/vg2_v02.tf', + kernels .. '/vg200022.tsc', + kernels .. '/Voyager_2.m05016u.merged.bsp', + kernels .. '/voyager_2.ST+1992_m05208u.merged.bsp', + kernels .. '/vgr2_jup230.bsp', + kernels .. '/vgr2_sat337.bsp', + kernels .. '/vgr2_ura083.bsp', + kernels .. '/vgr2_nep081.bsp', + kernels .. '/vgr2_super.bc', + kernels .. '/vgr2_super_v2.bc' } local RotationMatrix = { - -1, 0, 0, - 0, 0, -1, - 0, -1, 0 + -1, 0, 0, + 0, 0, -1, + 0, -1, 0 } local LightSources = { - { - Type = "SceneGraphLightSource", - Identifier = "Sun", - Node = sunTransforms.SolarSystemBarycenter.Identifier, - Intensity = 1.0 - }, - { - Identifier = "Camera", - Type = "CameraLightSource", - Intensity = 0.5 - } + { + Type = "SceneGraphLightSource", + Identifier = "Sun", + Node = sunTransforms.SolarSystemBarycenter.Identifier, + Intensity = 1.0 + }, +{ + Identifier = "Camera", + Type = "CameraLightSource", + Intensity = 0.5 + } } local Voyager2 = { - Identifier = "Voyager_2", - Parent = sunTransforms.SolarSystemBarycenter.Identifier, - Transform = { - Translation = { - Type = "SpiceTranslation", - Target = "VOYAGER 2", - Observer = "SUN", - Kernels = Kernels - }, - Rotation = { - Type = "SpiceRotation", - SourceFrame = "VG2_SC_BUS", - DestinationFrame = "GALACTIC", - TimeFrame = { - Type = "TimeFrameInterval", - Start = "1977-AUG-20 16:07:06.535", - End = "2027-DEC-27" - } - } + Identifier = "Voyager_2", + Parent = sunTransforms.SolarSystemBarycenter.Identifier, + Transform = { + Translation = { + Type = "SpiceTranslation", + Target = "VOYAGER 2", + Observer = "SUN", + Kernels = Kernels }, - GUI = { - Name = "Voyager 2", - Path = "/Solar System/Missions/Voyager 2" + Rotation = { + Type = "SpiceRotation", + SourceFrame = "VG2_SC_BUS", + DestinationFrame = "GALACTIC", + TimeFrame = { + Type = "TimeFrameInterval", + Start = "1977-AUG-20 16:07:06.535", + End = "2027-DEC-27" + } } + }, + GUI = { + Name = "Voyager 2", + Path = "/Solar System/Missions/Voyager 2" + } } local Voyager2Main = { - Identifier = "Voyager_2_Main", - Parent = Voyager2.Identifier, - Renderable = { - Type = "RenderableModel", - GeometryFile = models .. "/voyager-main.obj", - ModelTransform = RotationMatrix, - LightSources = LightSources - }, - GUI = { - Name = "Voyager 2 Main", - Path = "/Solar System/Missions/Voyager 2" - } + Identifier = "Voyager_2_Main", + Parent = Voyager2.Identifier, + Renderable = { + Type = "RenderableModel", + GeometryFile = models .. "/voyager-main.obj", + ModelTransform = RotationMatrix, + LightSources = LightSources + }, + GUI = { + Name = "Voyager 2 Main", + Path = "/Solar System/Missions/Voyager 2" + } } local Voyager2Antenna = { - Identifier = "Voyager_2_Antanna", - Parent = Voyager2.Identifier, - Renderable = { - Type = "RenderableModel", - GeometryFile = models .. "/voyager-antenna.obj", - ModelTransform = RotationMatrix, - LightSources = LightSources - }, - GUI = { - Name = "Voyager 2 Antanna", - Path = "/Solar System/Missions/Voyager 2" - } + Identifier = "Voyager_2_Antanna", + Parent = Voyager2.Identifier, + Renderable = { + Type = "RenderableModel", + GeometryFile = models .. "/voyager-antenna.obj", + ModelTransform = RotationMatrix, + LightSources = LightSources + }, + GUI = { + Name = "Voyager 2 Antanna", + Path = "/Solar System/Missions/Voyager 2" + } } -- The trails are organized as follows. The cruise phases can be resolved in relatively -- low resolution since they are just straight lines -- The encounter phases should be much higher resolution or otherwise artifacts would appear local VoyagerTrailCruiseEarthJupiter = { - Identifier = "Voyager_2_Trail_Cruise_Earth_Jupiter", - Parent = sunTransforms.SolarSystemBarycenter.Identifier, - Renderable = { - Type = "RenderableTrailTrajectory", - Translation = { - Type = "SpiceTranslation", - Target = "VOYAGER 2", - Observer = "SUN", - Kernels = Kernels - }, - Color = { 0.70, 0.50, 0.20 }, - StartTime = "1977 SEP 05", - EndTime = "1979 JUL 06", - SampleInterval = 669 * 2 -- 669 is the number of days between the Start and End time + Identifier = "Voyager_2_Trail_Cruise_Earth_Jupiter", + Parent = sunTransforms.SolarSystemBarycenter.Identifier, + Renderable = { + Type = "RenderableTrailTrajectory", + Translation = { + Type = "SpiceTranslation", + Target = "VOYAGER 2", + Observer = "SUN", + Kernels = Kernels }, - GUI = { - Name = "Voyager 2 Trail Cruise Earth-Jupiter", - Path = "/Solar System/Missions/Voyager 2" - } + Color = { 0.70, 0.50, 0.20 }, + StartTime = "1977 SEP 05", + EndTime = "1979 JUL 06", + SampleInterval = 669 * 2 -- 669 is the number of days between the Start and End time + }, + GUI = { + Name = "Voyager 2 Trail Cruise Earth-Jupiter", + Path = "/Solar System/Missions/Voyager 2" + } } local VoyagerTrailEncounterJupiter = { - Identifier = "Voyager_2_Trail_Encounter_Jupiter", - Parent = sunTransforms.SolarSystemBarycenter.Identifier, - Renderable = { - Type = "RenderableTrailTrajectory", - Translation = { - Type = "SpiceTranslation", - Target = "VOYAGER 2", - Observer = "SUN", - Kernels = Kernels - }, - Color = { 0.70, 0.50, 0.20 }, - EnableFade = false, - StartTime = "1979 JUL 05 23:24:00", -- @TODO: Probably an off-by-one bug in RenderableTrailTrajectory? - EndTime = "1979 JUL 15", - SampleInterval = 100 + Identifier = "Voyager_2_Trail_Encounter_Jupiter", + Parent = sunTransforms.SolarSystemBarycenter.Identifier, + Renderable = { + Type = "RenderableTrailTrajectory", + Translation = { + Type = "SpiceTranslation", + Target = "VOYAGER 2", + Observer = "SUN", + Kernels = Kernels }, - GUI = { - Name = "Voyager 2 Trail Encounter Jupiter", - Path = "/Solar System/Missions/Voyager 2" - } + Color = { 0.70, 0.50, 0.20 }, + EnableFade = false, + StartTime = "1979 JUL 05 23:24:00", -- @TODO: Probably an off-by-one bug in RenderableTrailTrajectory? + EndTime = "1979 JUL 15", + SampleInterval = 100 + }, + GUI = { + Name = "Voyager 2 Trail Encounter Jupiter", + Path = "/Solar System/Missions/Voyager 2" + } } local VoyagerTrailCruiseJupiterSaturn = { - Identifier = "Voyager_2_Trail_Cruise_Jupiter_Saturn", - Parent = sunTransforms.SolarSystemBarycenter.Identifier, - Renderable = { - Type = "RenderableTrailTrajectory", - Translation = { - Type = "SpiceTranslation", - Target = "VOYAGER 2", - Observer = "SUN", - Kernels = Kernels - }, - EnableFade = false, - Color = { 0.70, 0.50, 0.20 }, - StartTime = "1979 JUL 15", - EndTime = "1981 AUG 23", - SampleInterval = 770 * 2 -- 770 is the number of days between the Start and End time + Identifier = "Voyager_2_Trail_Cruise_Jupiter_Saturn", + Parent = sunTransforms.SolarSystemBarycenter.Identifier, + Renderable = { + Type = "RenderableTrailTrajectory", + Translation = { + Type = "SpiceTranslation", + Target = "VOYAGER 2", + Observer = "SUN", + Kernels = Kernels }, - GUI = { - Name = "Voyager 2 Trail Cruise Jupiter-Saturn", - Path = "/Solar System/Missions/Voyager 2" - } + EnableFade = false, + Color = { 0.70, 0.50, 0.20 }, + StartTime = "1979 JUL 15", + EndTime = "1981 AUG 23", + SampleInterval = 770 * 2 -- 770 is the number of days between the Start and End time + }, + GUI = { + Name = "Voyager 2 Trail Cruise Jupiter-Saturn", + Path = "/Solar System/Missions/Voyager 2" + } } local VoyagerTrailEncounterSaturn = { - Identifier = "Voyager_2_Trail_Encounter_Saturn", - Parent = sunTransforms.SolarSystemBarycenter.Identifier, - Renderable = { - Type = "RenderableTrailTrajectory", - Translation = { - Type = "SpiceTranslation", - Target = "VOYAGER 2", - Observer = "SUN", - Kernels = Kernels - }, - EnableFade = false, - Color = { 0.70, 0.50, 0.20 }, - StartTime = "1981 AUG 22 23:08:30", -- @TODO: Probably an off-by-one bug in RenderableTrailTrajectory? - EndTime = "1981 AUG 30", - SampleInterval = 100 + Identifier = "Voyager_2_Trail_Encounter_Saturn", + Parent = sunTransforms.SolarSystemBarycenter.Identifier, + Renderable = { + Type = "RenderableTrailTrajectory", + Translation = { + Type = "SpiceTranslation", + Target = "VOYAGER 2", + Observer = "SUN", + Kernels = Kernels }, - GUI = { - Name = "Voyager 2 Trail Encounter Saturn", - Path = "/Solar System/Missions/Voyager 2" - } + EnableFade = false, + Color = { 0.70, 0.50, 0.20 }, + StartTime = "1981 AUG 22 23:08:30", -- @TODO: Probably an off-by-one bug in RenderableTrailTrajectory? + EndTime = "1981 AUG 30", + SampleInterval = 100 + }, + GUI = { + Name = "Voyager 2 Trail Encounter Saturn", + Path = "/Solar System/Missions/Voyager 2" + } } local VoyagerTrailCruiseSaturnUranus = { - Identifier = "Voyager_2_Trail_Cruise_Saturn_Uranus", - Parent = sunTransforms.SolarSystemBarycenter.Identifier, - Renderable = { - Type = "RenderableTrailTrajectory", - Translation = { - Type = "SpiceTranslation", - Target = "VOYAGER 2", - Observer = "SUN", - Kernels = Kernels - }, - EnableFade = false, - Color = { 0.70, 0.50, 0.20 }, - StartTime = "1981 AUG 30", - EndTime = "1986 JAN 22", - SampleInterval = 1971 * 2 -- 1971 is the number of days between the Start and End time + Identifier = "Voyager_2_Trail_Cruise_Saturn_Uranus", + Parent = sunTransforms.SolarSystemBarycenter.Identifier, + Renderable = { + Type = "RenderableTrailTrajectory", + Translation = { + Type = "SpiceTranslation", + Target = "VOYAGER 2", + Observer = "SUN", + Kernels = Kernels }, - GUI = { - Name = "Voyager 2 Trail Cruise Saturn-Uranus", - Path = "/Solar System/Missions/Voyager 2" - } + EnableFade = false, + Color = { 0.70, 0.50, 0.20 }, + StartTime = "1981 AUG 30", + EndTime = "1986 JAN 22", + SampleInterval = 1971 * 2 -- 1971 is the number of days between the Start and End time + }, + GUI = { + Name = "Voyager 2 Trail Cruise Saturn-Uranus", + Path = "/Solar System/Missions/Voyager 2" + } } local VoyagerTrailEncounterUranus = { - Identifier = "Voyager_2_Trail_Encounter_Uranus", - Parent = sunTransforms.SolarSystemBarycenter.Identifier, - Renderable = { - Type = "RenderableTrailTrajectory", - Translation = { - Type = "SpiceTranslation", - Target = "VOYAGER 2", - Observer = "SUN", - Kernels = Kernels - }, - EnableFade = false, - Color = { 0.70, 0.50, 0.20 }, - StartTime = "1986 JAN 21 23:30:00", -- @TODO: Probably an off-by-one bug in RenderableTrailTrajectory? - EndTime = "1986 JAN 27", - SampleInterval = 100 + Identifier = "Voyager_2_Trail_Encounter_Uranus", + Parent = sunTransforms.SolarSystemBarycenter.Identifier, + Renderable = { + Type = "RenderableTrailTrajectory", + Translation = { + Type = "SpiceTranslation", + Target = "VOYAGER 2", + Observer = "SUN", + Kernels = Kernels }, - GUI = { - Name = "Voyager 2 Trail Encounter Uranus", - Path = "/Solar System/Missions/Voyager 2" - } + EnableFade = false, + Color = { 0.70, 0.50, 0.20 }, + StartTime = "1986 JAN 21 23:30:00", -- @TODO: Probably an off-by-one bug in RenderableTrailTrajectory? + EndTime = "1986 JAN 27", + SampleInterval = 100 + }, + GUI = { + Name = "Voyager 2 Trail Encounter Uranus", + Path = "/Solar System/Missions/Voyager 2" + } } local VoyagerTrailCruiseUranusNeptune = { - Identifier = "Voyager_2_Trail_Cruise_Uranus_Neptune", - Parent = sunTransforms.SolarSystemBarycenter.Identifier, - Renderable = { - Type = "RenderableTrailTrajectory", - Translation = { - Type = "SpiceTranslation", - Target = "VOYAGER 2", - Observer = "SUN", - Kernels = Kernels - }, - EnableFade = false, - Color = { 0.70, 0.50, 0.20 }, - StartTime = "1986 JAN 27", - EndTime = "1989 AUG 24", - SampleInterval = 1305 * 2 -- 1305 is the number of days between the Start and End time + Identifier = "Voyager_2_Trail_Cruise_Uranus_Neptune", + Parent = sunTransforms.SolarSystemBarycenter.Identifier, + Renderable = { + Type = "RenderableTrailTrajectory", + Translation = { + Type = "SpiceTranslation", + Target = "VOYAGER 2", + Observer = "SUN", + Kernels = Kernels }, - GUI = { - Name = "Voyager 2 Trail Cruise Uranus-Neptune", - Path = "/Solar System/Missions/Voyager 2" - } + EnableFade = false, + Color = { 0.70, 0.50, 0.20 }, + StartTime = "1986 JAN 27", + EndTime = "1989 AUG 24", + SampleInterval = 1305 * 2 -- 1305 is the number of days between the Start and End time + }, + GUI = { + Name = "Voyager 2 Trail Cruise Uranus-Neptune", + Path = "/Solar System/Missions/Voyager 2" + } } local VoyagerTrailEncounterNeptune = { - Identifier = "Voyager_2_Trail_Encounter_Neptune", - Parent = sunTransforms.SolarSystemBarycenter.Identifier, - Renderable = { - Type = "RenderableTrailTrajectory", - Translation = { - Type = "SpiceTranslation", - Target = "VOYAGER 2", - Observer = "SUN", - Kernels = Kernels - }, - EnableFade = false, - Color = { 0.70, 0.50, 0.20 }, - StartTime = "1989 AUG 23 23:30:00", -- @TODO: Probably an off-by-one bug in RenderableTrailTrajectory? - EndTime = "1989 AUG 26", - SampleInterval = 100 + Identifier = "Voyager_2_Trail_Encounter_Neptune", + Parent = sunTransforms.SolarSystemBarycenter.Identifier, + Renderable = { + Type = "RenderableTrailTrajectory", + Translation = { + Type = "SpiceTranslation", + Target = "VOYAGER 2", + Observer = "SUN", + Kernels = Kernels }, - GUI = { - Name = "Voyager 2 Trail Encounter Neptune", - Path = "/Solar System/Missions/Voyager 2" - } + EnableFade = false, + Color = { 0.70, 0.50, 0.20 }, + StartTime = "1989 AUG 23 23:30:00", -- @TODO: Probably an off-by-one bug in RenderableTrailTrajectory? + EndTime = "1989 AUG 26", + SampleInterval = 100 + }, + GUI = { + Name = "Voyager 2 Trail Encounter Neptune", + Path = "/Solar System/Missions/Voyager 2" + } } local VoyagerTrailCruiseNeptuneInf = { - Identifier = "Voyager_2_Trail_Cruise_Neptune_Inf", - Parent = sunTransforms.SolarSystemBarycenter.Identifier, - Renderable = { - Type = "RenderableTrailTrajectory", - Translation = { - Type = "SpiceTranslation", - Target = "VOYAGER 2", - Observer = "SUN", - Kernels = Kernels - }, - EnableFade = false, - Color = { 0.70, 0.50, 0.20 }, - StartTime = "1989 AUG 26", - EndTime = "2021 JAN 01", - SampleInterval = 11451 * 2 -- 11451 is the number of days between the Start and End time + Identifier = "Voyager_2_Trail_Cruise_Neptune_Inf", + Parent = sunTransforms.SolarSystemBarycenter.Identifier, + Renderable = { + Type = "RenderableTrailTrajectory", + Translation = { + Type = "SpiceTranslation", + Target = "VOYAGER 2", + Observer = "SUN", + Kernels = Kernels }, - GUI = { - Name = "Voyager 2 Trail Cruise Neptune-Inf", - Path = "/Solar System/Missions/Voyager 2" - } + EnableFade = false, + Color = { 0.70, 0.50, 0.20 }, + StartTime = "1989 AUG 26", + EndTime = "2021 JAN 01", + SampleInterval = 11451 * 2 -- 11451 is the number of days between the Start and End time + }, + GUI = { + Name = "Voyager 2 Trail Cruise Neptune-Inf", + Path = "/Solar System/Missions/Voyager 2" + } } assetHelper.registerSceneGraphNodesAndExport(asset, { - Voyager2, - Voyager2Main, - Voyager2Antenna, - VoyagerTrailCruiseEarthJupiter, - VoyagerTrailEncounterJupiter, - VoyagerTrailCruiseJupiterSaturn, - VoyagerTrailEncounterSaturn, - VoyagerTrailCruiseSaturnUranus, - VoyagerTrailEncounterUranus, - VoyagerTrailCruiseUranusNeptune, - VoyagerTrailEncounterNeptune, - VoyagerTrailCruiseNeptuneInf + Voyager2, + Voyager2Main, + Voyager2Antenna, + VoyagerTrailCruiseEarthJupiter, + VoyagerTrailEncounterJupiter, + VoyagerTrailCruiseJupiterSaturn, + VoyagerTrailEncounterSaturn, + VoyagerTrailCruiseSaturnUranus, + VoyagerTrailEncounterUranus, + VoyagerTrailCruiseUranusNeptune, + VoyagerTrailEncounterNeptune, + VoyagerTrailCruiseNeptuneInf }) diff --git a/data/assets/scene/solarsystem/missions/voyagerpioneer/voyager1_2__pioneer10_11.asset b/data/assets/scene/solarsystem/missions/voyagerpioneer/voyager1_2__pioneer10_11.asset index 02be5ab03e..a464240511 100644 --- a/data/assets/scene/solarsystem/missions/voyagerpioneer/voyager1_2__pioneer10_11.asset +++ b/data/assets/scene/solarsystem/missions/voyagerpioneer/voyager1_2__pioneer10_11.asset @@ -3,116 +3,116 @@ local assetHelper = asset.require('util/asset_helper') local sampleInterval = 24*60*60 local voyager1 = { - Identifier = "Voyager1", - Parent = "SolarSystemBarycenter", - Renderable = { - Type = "RenderableTrailTrajectory", - Enabled = false, - Translation = { - Type = "HorizonsTranslation", - HorizonsTextFile = asset.localResource("voyager_1.txt") - }, - Color = { 0.9, 0.9, 0.0 }, - Fade = 5.0, - StartTime = "1977 SEP 06 00:00:00", - EndTime = "2030 DEC 31 00:00:00", - SampleInterval = sampleInterval, - TimeStampSubsampleFactor = 1 - }, - GUI = { - Name = "Voyager 1 Trail", - Path = "/Solar System/Missions/Voyager", - Description = [[Voyager 1 Trail, spanning September 6th, 1977 to December 31st, - 2030. Data from JPL Horizons.]] - } + Identifier = "Voyager1", + Parent = "SolarSystemBarycenter", + Renderable = { + Type = "RenderableTrailTrajectory", + Enabled = false, + Translation = { + Type = "HorizonsTranslation", + HorizonsTextFile = asset.localResource("voyager_1.txt") + }, + Color = { 0.9, 0.9, 0.0 }, + Fade = 5.0, + StartTime = "1977 SEP 06 00:00:00", + EndTime = "2030 DEC 31 00:00:00", + SampleInterval = sampleInterval, + TimeStampSubsampleFactor = 1 + }, + GUI = { + Name = "Voyager 1 Trail", + Path = "/Solar System/Missions/Voyager", + Description = [[Voyager 1 Trail, spanning September 6th, 1977 to December 31st, + 2030. Data from JPL Horizons.]] + } } local voyager2 = { - Identifier = "Voyager2", - Parent = "SolarSystemBarycenter", - Renderable = { - Type = "RenderableTrailTrajectory", - Enabled = false, - Translation = { - Type = "HorizonsTranslation", - HorizonsTextFile = asset.localResource("voyager_2.txt") - }, - Color = { 0.9, 0.9, 0.0 }, - Fade = 5.0, - StartTime = "1977 AUG 21 00:00:00", - EndTime = "2030 DEC 31 00:00:00", - SampleInterval = sampleInterval, - TimeStampSubsampleFactor = 1 - }, - GUI = { - Name = "Voyager 2 Trail", - Path = "/Solar System/Missions/Voyager", - Description = [[Voyager 2 Trail, spanning August 21st, 1977 to December 31st, 2030. - Data from JPL Horizons.]] - } + Identifier = "Voyager2", + Parent = "SolarSystemBarycenter", + Renderable = { + Type = "RenderableTrailTrajectory", + Enabled = false, + Translation = { + Type = "HorizonsTranslation", + HorizonsTextFile = asset.localResource("voyager_2.txt") + }, + Color = { 0.9, 0.9, 0.0 }, + Fade = 5.0, + StartTime = "1977 AUG 21 00:00:00", + EndTime = "2030 DEC 31 00:00:00", + SampleInterval = sampleInterval, + TimeStampSubsampleFactor = 1 + }, + GUI = { + Name = "Voyager 2 Trail", + Path = "/Solar System/Missions/Voyager", + Description = [[Voyager 2 Trail, spanning August 21st, 1977 to December 31st, 2030. + Data from JPL Horizons.]] + } } local pioneer10 = { - Identifier = "Pioneer10", - Parent = "SolarSystemBarycenter", - Renderable = { - Type = "RenderableTrailTrajectory", - Enabled = false, - Translation = { - Type = "HorizonsTranslation", - HorizonsTextFile = asset.localResource("pioneer_10.txt") - }, - Color = { 0.9, 0.3, 0.0 }, - Fade = 5.0, - StartTime = "1972 MAR 04 00:00:00", - EndTime = "2030 DEC 31 00:00:00", - SampleInterval = sampleInterval, - TimeStampSubsampleFactor = 1 - }, - GUI = { - Name = "Pioneer 10 Trail", - Path = "/Solar System/Missions/Pioneer", - Description = [[Pioneer 10 Trail, spanning March 4th, 1972 to December 31st, 2030. - Data from JPL Horizons.]] - } + Identifier = "Pioneer10", + Parent = "SolarSystemBarycenter", + Renderable = { + Type = "RenderableTrailTrajectory", + Enabled = false, + Translation = { + Type = "HorizonsTranslation", + HorizonsTextFile = asset.localResource("pioneer_10.txt") + }, + Color = { 0.9, 0.3, 0.0 }, + Fade = 5.0, + StartTime = "1972 MAR 04 00:00:00", + EndTime = "2030 DEC 31 00:00:00", + SampleInterval = sampleInterval, + TimeStampSubsampleFactor = 1 + }, + GUI = { + Name = "Pioneer 10 Trail", + Path = "/Solar System/Missions/Pioneer", + Description = [[Pioneer 10 Trail, spanning March 4th, 1972 to December 31st, 2030. + Data from JPL Horizons.]] + } } local pioneer11 ={ - Identifier = "Pioneer11", - Parent = "SolarSystemBarycenter", - Renderable = { - Type = "RenderableTrailTrajectory", - Enabled = false, - Translation = { - Type = "HorizonsTranslation", - HorizonsTextFile = asset.localResource("pioneer_11.txt") - }, - Color = { 0.9, 0.3, 0.0 }, - Fade = 5.0, - StartTime = "1973 APR 07 00:00:00", - EndTime = "2030 DEC 31 00:00:00", - SampleInterval = sampleInterval, - TimeStampSubsampleFactor = 1 - }, - GUI = { - Name = "Pioneer 11 Trail", - Path = "/Solar System/Missions/Pioneer", - Description = [[Pioneer 11 Trail, spanning April 7th, 1973 to December 31st, 2030. - Data from JPL Horizons.]] - } + Identifier = "Pioneer11", + Parent = "SolarSystemBarycenter", + Renderable = { + Type = "RenderableTrailTrajectory", + Enabled = false, + Translation = { + Type = "HorizonsTranslation", + HorizonsTextFile = asset.localResource("pioneer_11.txt") + }, + Color = { 0.9, 0.3, 0.0 }, + Fade = 5.0, + StartTime = "1973 APR 07 00:00:00", + EndTime = "2030 DEC 31 00:00:00", + SampleInterval = sampleInterval, + TimeStampSubsampleFactor = 1 + }, + GUI = { + Name = "Pioneer 11 Trail", + Path = "/Solar System/Missions/Pioneer", + Description = [[Pioneer 11 Trail, spanning April 7th, 1973 to December 31st, 2030. + Data from JPL Horizons.]] + } } assetHelper.registerSceneGraphNodesAndExport(asset, { voyager1, voyager2, pioneer10, pioneer11 }) asset.meta = { - Name = "Pioneer and Voyager Trails", - Version = "1.0", - Description = [[ Pioneer 10, Pioneer 11, Voyager 1 and Voyager 2 trails. Driven by JPL - Horizons data for better performance then spice but lower resolution. Data is from - shortly after mission launches until December 31st, 2030.]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"Pioneer10", "Pioneer11", "Voyager1", "Voyager2"} -} \ No newline at end of file + Name = "Pioneer and Voyager Trails", + Version = "1.0", + Description = [[ Pioneer 10, Pioneer 11, Voyager 1 and Voyager 2 trails. Driven by JPL + Horizons data for better performance then spice but lower resolution. Data is from + shortly after mission launches until December 31st, 2030.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license", + Identifiers = {"Pioneer10", "Pioneer11", "Voyager1", "Voyager2"} +} diff --git a/data/assets/scene/solarsystem/planets/default_layers.asset b/data/assets/scene/solarsystem/planets/default_layers.asset index 37649a9ed0..acfe25579b 100644 --- a/data/assets/scene/solarsystem/planets/default_layers.asset +++ b/data/assets/scene/solarsystem/planets/default_layers.asset @@ -31,11 +31,11 @@ asset.require('./venus/default_layers') asset.meta = { - Name = "Default Solar System Layers", - Version = "1.0", - Description = [[ Adds default layers for all planets. Remove this asset and include - individual layers for planets to customize planet layers]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license" + Name = "Default Solar System Layers", + Version = "1.0", + Description = [[ Adds default layers for all planets. Remove this asset and include + individual layers for planets to customize planet layers]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/earth/atmosphere.asset b/data/assets/scene/solarsystem/planets/earth/atmosphere.asset index e52677d158..497d9e91c7 100644 --- a/data/assets/scene/solarsystem/planets/earth/atmosphere.asset +++ b/data/assets/scene/solarsystem/planets/earth/atmosphere.asset @@ -10,66 +10,66 @@ local Atmosphere = { Parent = transforms.Earth.Identifier, Renderable = { Type = "RenderableAtmosphere", - -- Atmosphere radius in Km - AtmosphereHeight = 6447.0 - 6377.0, - PlanetRadius = 6377.0, - PlanetAverageGroundReflectance = 0.1, - GroundRadianceEmission = 0.6, - SunIntensity = 6.9, - Rayleigh = { - Coefficients = { - -- Wavelengths are given in 10^-9m - Wavelengths = { 680, 550, 440 }, - -- Reflection coefficients are given in km^-1 - Scattering = { 5.8E-3, 13.5E-3, 33.1E-3 }, - -- In Rayleigh scattering, the coefficients of absorption and scattering are the same. - }, - -- Thichkness of atmosphere if its density were uniform, in Km - H_R = 8.0 + -- Atmosphere radius in Km + AtmosphereHeight = 6447.0 - 6377.0, + PlanetRadius = 6377.0, + PlanetAverageGroundReflectance = 0.1, + GroundRadianceEmission = 0.6, + SunIntensity = 6.9, + Rayleigh = { + Coefficients = { + -- Wavelengths are given in 10^-9m + Wavelengths = { 680, 550, 440 }, + -- Reflection coefficients are given in km^-1 + Scattering = { 5.8E-3, 13.5E-3, 33.1E-3 }, + -- In Rayleigh scattering, the coefficients of absorption and scattering are the same. }, - --[[ - Ozone = { - Coefficients = { - -- Extinction coefficients - Extinction = {3.426, 8.298, 0.356} - }, - H_O = 8.0, + -- Thichkness of atmosphere if its density were uniform, in Km + H_R = 8.0 + }, + --[[ + Ozone = { + Coefficients = { + -- Extinction coefficients + Extinction = {3.426, 8.298, 0.356} }, - ]] - -- Default - Mie = { - Coefficients = { - -- Reflection coefficients are given in km^-1 - Scattering = { 4.0e-3, 4.0e-3, 4.0e-3 }, - -- Extinction coefficients are a fraction of the Mie coefficients - Extinction = { 4.0e-3/0.9, 4.0e-3/0.9, 4.0e-3/0.9 } - }, - -- Height scale (atmosphere thickness for constant density) in Km - H_M = 1.2, - -- Mie Phase Function Value (G e [-1.0, 1.0]. If G = 1.0, Mie phase function = Rayleigh Phase Function) - G = 0.85 + H_O = 8.0, + }, + ]] + -- Default + Mie = { + Coefficients = { + -- Reflection coefficients are given in km^-1 + Scattering = { 4.0e-3, 4.0e-3, 4.0e-3 }, + -- Extinction coefficients are a fraction of the Mie coefficients + Extinction = { 4.0e-3/0.9, 4.0e-3/0.9, 4.0e-3/0.9 } }, - -- Clear Sky - -- Mie = { - -- Coefficients = { - -- Scattering = {20e-3, 20e-3, 20e-3}, - -- Extinction = 1.0/0.9, - -- } - -- H_M = 1.2, - -- G = 0.76, - -- }, - -- Cloudy - -- Mie = { - -- Coefficients = { - -- Scattering = {3e-3, 3e-3, 3e-3}, - -- Extinction = 1.0/0.9, - -- } - -- H_M = 3.0, - -- G = 0.65, - -- }, - Debug = { - PreCalculatedTextureScale = 1.0, - SaveCalculatedTextures = false + -- Height scale (atmosphere thickness for constant density) in Km + H_M = 1.2, + -- Mie Phase Function Value (G e [-1.0, 1.0]. If G = 1.0, Mie phase function = Rayleigh Phase Function) + G = 0.85 + }, + -- Clear Sky + -- Mie = { + -- Coefficients = { + -- Scattering = {20e-3, 20e-3, 20e-3}, + -- Extinction = 1.0/0.9, + -- } + -- H_M = 1.2, + -- G = 0.76, + -- }, + -- Cloudy + -- Mie = { + -- Coefficients = { + -- Scattering = {3e-3, 3e-3, 3e-3}, + -- Extinction = 1.0/0.9, + -- } + -- H_M = 3.0, + -- G = 0.65, + -- }, + Debug = { + PreCalculatedTextureScale = 1.0, + SaveCalculatedTextures = false }, ShadowGroup = { Sources = { @@ -83,9 +83,9 @@ local Atmosphere = { } }, GUI = { - Name = "Earth Atmosphere", - Path = "/Solar System/Planets/Earth", - Description = [[ Atmosphere of Earth.]] + Name = "Earth Atmosphere", + Path = "/Solar System/Planets/Earth", + Description = [[ Atmosphere of Earth.]] } } diff --git a/data/assets/scene/solarsystem/planets/earth/default_layers.asset b/data/assets/scene/solarsystem/planets/earth/default_layers.asset index 459913ca3e..15834a073f 100644 --- a/data/assets/scene/solarsystem/planets/earth/default_layers.asset +++ b/data/assets/scene/solarsystem/planets/earth/default_layers.asset @@ -40,28 +40,28 @@ local watermask = asset.require(waterMasksPath .. "/modis_water_mask") -- Set enabled layers (temporary solution) -- @TODO: do this using a boolean that's passed to the 'asset.require' instead asset.onInitialize(function () - openspace.setPropertyValueSingle("Scene.Earth.Renderable.Layers.ColorLayers." .. - colorLayer.layer.Identifier .. ".Enabled", true) - openspace.setPropertyValueSingle("Scene.Earth.Renderable.Layers.HeightLayers." .. - heightLayer.layer.Identifier .. ".Enabled", true) - openspace.setPropertyValueSingle("Scene.Earth.Renderable.Layers.NightLayers." .. - nightLayer.layer.Identifier .. ".Enabled", true) - openspace.setPropertyValueSingle("Scene.Earth.Renderable.Layers.WaterMasks." .. - watermask.layer.Identifier .. ".Enabled", true) + openspace.setPropertyValueSingle("Scene.Earth.Renderable.Layers.ColorLayers." .. + colorLayer.layer.Identifier .. ".Enabled", true) + openspace.setPropertyValueSingle("Scene.Earth.Renderable.Layers.HeightLayers." .. + heightLayer.layer.Identifier .. ".Enabled", true) + openspace.setPropertyValueSingle("Scene.Earth.Renderable.Layers.NightLayers." .. + nightLayer.layer.Identifier .. ".Enabled", true) + openspace.setPropertyValueSingle("Scene.Earth.Renderable.Layers.WaterMasks." .. + watermask.layer.Identifier .. ".Enabled", true) end) asset.meta = { - Name = "Default Earth Layers", - Version = "1.0", - Description = [[ Default Earth layers are: ESRI VIIRS Combo, ESRI World Imagery, VIIRS - SNPP (Temporal), Aqua Modis (Temporal), Terra Modis (Temporal), BMNG, AMSR2 GCOM - W1 Sea Ice Concentration (Temporal), MODIS Terra Chlorophyll A (Temporal), GHRSST, - L4 G1SST Sea Surface Temperature (Temporal), GHRSST L4 MUR Sea Surface Temperature - (Temporal), World Elevation (3D), Earth at Night 2012, Coastlines, Reference - Features, Reference Labels, Tile Indicies, Size Reference, Gebco, and Modis Water - Mask.]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license" + Name = "Default Earth Layers", + Version = "1.0", + Description = [[ Default Earth layers are: ESRI VIIRS Combo, ESRI World Imagery, VIIRS + SNPP (Temporal), Aqua Modis (Temporal), Terra Modis (Temporal), BMNG, AMSR2 GCOM + W1 Sea Ice Concentration (Temporal), MODIS Terra Chlorophyll A (Temporal), GHRSST, + L4 G1SST Sea Surface Temperature (Temporal), GHRSST L4 MUR Sea Surface Temperature + (Temporal), World Elevation (3D), Earth at Night 2012, Coastlines, Reference + Features, Reference Labels, Tile Indicies, Size Reference, Gebco, and Modis Water + Mask.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/earth/earth.asset b/data/assets/scene/solarsystem/planets/earth/earth.asset index e66cb53329..fb34cd82d1 100644 --- a/data/assets/scene/solarsystem/planets/earth/earth.asset +++ b/data/assets/scene/solarsystem/planets/earth/earth.asset @@ -6,86 +6,86 @@ local labelsPath = asset.require('./earth_globelabels').LabelsPath local earthEllipsoid = { 6378137.0, 6378137.0, 6378137.0 } local Earth = { - Identifier = "Earth", - Parent = transforms.EarthIAU.Identifier, - Renderable = { - Type = "RenderableGlobe", - Radii = earthEllipsoid, - SegmentsPerPatch = 64, - PerformShading = false, - Layers = {}, - ShadowGroup = { - Sources = { - { Name = "Sun", Radius = 696.3E6 }, - }, - Casters = { - { Name = "Moon", Radius = 1.737E6 }, - } - }, - Labels = { - Enable = false, - FileName = labelsPath .. "/Earth.labels", - LabelAlignmentOption = "Horizontally", -- or Circularly - LabelsFontSize = 40.0, - LabelsSize = 4.0, - LabelsMinSize = 1.0, - LabelsMaxSize = 1500.0, - ProximityEnabled = false, - LabelsFadeInEnabled = true, - LabelsFadeOutEnabled = true, - FadeInStartingDistance = 300000.0, - FadeOutStartingDistance = 10000.0, - LabelsForceDomeRendering = true, - LabelsDistanceEPS = 1500000.0, - LabelsColor = { 1.0, 0.0, 0.0 } - } + Identifier = "Earth", + Parent = transforms.EarthIAU.Identifier, + Renderable = { + Type = "RenderableGlobe", + Radii = earthEllipsoid, + SegmentsPerPatch = 64, + PerformShading = false, + Layers = {}, + ShadowGroup = { + Sources = { + { Name = "Sun", Radius = 696.3E6 }, + }, + Casters = { + { Name = "Moon", Radius = 1.737E6 }, + } }, - Tag = { "planet_solarSystem", "planet_terrestrial" }, - GUI = { - Name = "Earth", - Path = "/Solar System/Planets/Earth", - Description = "Third rock from the Sun" + Labels = { + Enable = false, + FileName = labelsPath .. "/Earth.labels", + LabelAlignmentOption = "Horizontally", -- or Circularly + LabelsFontSize = 40.0, + LabelsSize = 4.0, + LabelsMinSize = 1.0, + LabelsMaxSize = 1500.0, + ProximityEnabled = false, + LabelsFadeInEnabled = true, + LabelsFadeOutEnabled = true, + FadeInStartingDistance = 300000.0, + FadeOutStartingDistance = 10000.0, + LabelsForceDomeRendering = true, + LabelsDistanceEPS = 1500000.0, + LabelsColor = { 1.0, 0.0, 0.0 } } + }, + Tag = { "planet_solarSystem", "planet_terrestrial" }, + GUI = { + Name = "Earth", + Path = "/Solar System/Planets/Earth", + Description = "Third rock from the Sun" + } } local EarthLabel = { - Identifier = "EarthLabel", - Parent = Earth.Identifier, - Renderable = { - Enabled = false, - Type = "RenderableLabels", - LabelText = "Earth", - FontSize = 100.0, - LabelSize = 8.6, - LabelMaxSize = 100.0, - LabelMinSize = 1.0, - LabelOrientationOption = "Camera View Direction", - BlendMode = "Additive", - EnableFading = true, - FadeStartUnit = "au", - FadeStartDistance = 1.5, - FadeStartSpeed = 1.0, - FadeEndUnit = "au", - FadeEndDistance = 15.0, - FadeEndSpeed = 25.0 - }, - Tag = { "solarsystem_labels" }, - GUI = { - Name = "Earth Label", - Path = "/Solar System/Planets/Earth", - Description = "Main label for Earth" - } + Identifier = "EarthLabel", + Parent = Earth.Identifier, + Renderable = { + Enabled = false, + Type = "RenderableLabels", + LabelText = "Earth", + FontSize = 100.0, + LabelSize = 8.6, + LabelMaxSize = 100.0, + LabelMinSize = 1.0, + LabelOrientationOption = "Camera View Direction", + BlendMode = "Additive", + EnableFading = true, + FadeStartUnit = "au", + FadeStartDistance = 1.5, + FadeStartSpeed = 1.0, + FadeEndUnit = "au", + FadeEndDistance = 15.0, + FadeEndSpeed = 25.0 + }, + Tag = { "solarsystem_labels" }, + GUI = { + Name = "Earth Label", + Path = "/Solar System/Planets/Earth", + Description = "Main label for Earth" + } } assetHelper.registerSceneGraphNodesAndExport(asset, { Earth, EarthLabel }) asset.meta = { - Name = "Earth", - Version = "1.0", - Description = [[ Earth is a special planet with special needs ]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"Earth", "EarthLabel"} + Name = "Earth", + Version = "1.0", + Description = [[ Earth is a special planet with special needs ]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license", + Identifiers = {"Earth", "EarthLabel"} } diff --git a/data/assets/scene/solarsystem/planets/earth/earth_globelabels.asset b/data/assets/scene/solarsystem/planets/earth/earth_globelabels.asset index 61bc481f9d..f454309a56 100644 --- a/data/assets/scene/solarsystem/planets/earth/earth_globelabels.asset +++ b/data/assets/scene/solarsystem/planets/earth/earth_globelabels.asset @@ -1,7 +1,7 @@ local LabelsPath = asset.syncedResource({ - Name = "Earth Labels", - Type = "HttpSynchronization", - Identifier = "earth_labels", - Version = 1 + Name = "Earth Labels", + Type = "HttpSynchronization", + Identifier = "earth_labels", + Version = 1 }) asset.export("LabelsPath", LabelsPath) diff --git a/data/assets/scene/solarsystem/planets/earth/earth_textures.asset b/data/assets/scene/solarsystem/planets/earth/earth_textures.asset index 27fd8014ae..73448a46b7 100644 --- a/data/assets/scene/solarsystem/planets/earth/earth_textures.asset +++ b/data/assets/scene/solarsystem/planets/earth/earth_textures.asset @@ -1,7 +1,7 @@ local TexturesPath = asset.syncedResource({ - Name = "Earth Textures", - Type = "HttpSynchronization", - Identifier = "earth_textures", - Version = 2 + Name = "Earth Textures", + Type = "HttpSynchronization", + Identifier = "earth_textures", + Version = 2 }) asset.export("TexturesPath", TexturesPath) diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/amsr2_gcom_w1_sea_ice_concentration_temporal.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/amsr2_gcom_w1_sea_ice_concentration_temporal.asset index d4c110e9fc..ef294487f1 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/amsr2_gcom_w1_sea_ice_concentration_temporal.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/amsr2_gcom_w1_sea_ice_concentration_temporal.asset @@ -1,39 +1,39 @@ local globeIdentifier = asset.require("./../../earth").Earth.Identifier local layer = { - Identifier = "AMSR2_GCOM_W1_Sea_Ice_Concentration_Temporal", - Name = "AMSR2 GCOM W1 Sea Ice Concentration (Temporal)", - Type = "TemporalTileLayer", - FilePath = openspace.globebrowsing.createTemporalGibsGdalXml( - "AMSRU2_Sea_Ice_Concentration_12km", - "2012-05-08", - "Yesterday", - "1d", - "2km", - "png" - ), - Description = [[ Temporal coverage: 02 July 2012 - Present. The Advanced Microwave - Scanning Radiometer-E/Advanced Microwave Scanning Radiometer-2 (AMSR-E/AMSR2) - unified "Sea Ice Concentration (12 km)" layer displays the percent of sea ice - concentration in the polar regions as a daily composite of the AMSR2 1:30 a.m. - ascending and 1:30 p.m. descending half-orbit passes, at a spatial resolution - of 12 km. (Description from NASA Worldview)]] + Identifier = "AMSR2_GCOM_W1_Sea_Ice_Concentration_Temporal", + Name = "AMSR2 GCOM W1 Sea Ice Concentration (Temporal)", + Type = "TemporalTileLayer", + FilePath = openspace.globebrowsing.createTemporalGibsGdalXml( + "AMSRU2_Sea_Ice_Concentration_12km", + "2012-05-08", + "Yesterday", + "1d", + "2km", + "png" + ), + Description = [[ Temporal coverage: 02 July 2012 - Present. The Advanced Microwave + Scanning Radiometer-E/Advanced Microwave Scanning Radiometer-2 (AMSR-E/AMSR2) + unified "Sea Ice Concentration (12 km)" layer displays the percent of sea ice + concentration in the polar regions as a daily composite of the AMSR2 1:30 a.m. + ascending and 1:30 p.m. descending half-orbit passes, at a spatial resolution + of 12 km. (Description from NASA Worldview)]] } asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) asset.export("layer", layer) asset.meta = { - Name = "AMSR2 GCOM W1 Sea Ice Concentration (Temporal)", - Version = "1.0", - Description = [[ GIBS hosted layer created with - openspace.globebrowsing.createTemporalGibsGdalXml ]], - Author = "NASA EOSDIS Global Imagery Browse Services", - URL = "https://earthdata.nasa.gov/eosdis/science-system-description/eosdis-components/gibs", - License = "NASA", - Identifiers = {"AMSR2_GCOM_W1_Sea_Ice_Concentration_Temporal"} + Name = "AMSR2 GCOM W1 Sea Ice Concentration (Temporal)", + Version = "1.0", + Description = [[ GIBS hosted layer created with + openspace.globebrowsing.createTemporalGibsGdalXml ]], + Author = "NASA EOSDIS Global Imagery Browse Services", + URL = "https://earthdata.nasa.gov/eosdis/science-system-description/eosdis-components/gibs", + License = "NASA", + Identifiers = {"AMSR2_GCOM_W1_Sea_Ice_Concentration_Temporal"} } diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/aqua_modis_temporal.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/aqua_modis_temporal.asset index fa0b103440..7e6e085717 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/aqua_modis_temporal.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/aqua_modis_temporal.asset @@ -1,18 +1,18 @@ local globeIdentifier = asset.require("./../../earth").Earth.Identifier local layer = { - Identifier = "Aqua_Modis_Temporal", - Name = "Aqua Modis (Temporal)", - Type = "TemporalTileLayer", - FilePath = openspace.globebrowsing.createTemporalGibsGdalXml( - "MODIS_Aqua_CorrectedReflectance_TrueColor", - "2002-07-04", - "Yesterday", - "1d", - "250m", - "jpg" - ), - Description = [[ Temporal coverage: 03 July 2002 - Present. True Color: Red = Band 1, + Identifier = "Aqua_Modis_Temporal", + Name = "Aqua Modis (Temporal)", + Type = "TemporalTileLayer", + FilePath = openspace.globebrowsing.createTemporalGibsGdalXml( + "MODIS_Aqua_CorrectedReflectance_TrueColor", + "2002-07-04", + "Yesterday", + "1d", + "250m", + "jpg" + ), + Description = [[ Temporal coverage: 03 July 2002 - Present. True Color: Red = Band 1, Green = Band 4, Blue = Band 3. These images are called true-color or natural color because this combination of wavelengths is similar to what the human eye would see. The images are natural-looking images of land surface, oceanic and atmospheric @@ -22,23 +22,23 @@ local layer = { (GIBS). The sensor resolution is 500 m and 250 m (Bands 1 and 2 have a sensor resolution of 250 m, Bands 3 - 7 have a sensor resolution of 500m, and Bands 8 - 36 are 1 km. Band 1 is used to sharpen Band 3, 4, 6, and 7), imagery resolution is 250 m, - and the temporal resolution is daily. (Description from NASA Worldview)]] + and the temporal resolution is daily. (Description from NASA Worldview)]] } asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) asset.export("layer", layer) asset.meta = { - Name = "Aqua Modis (Temporal)", - Version = "1.0", - Description = [[ GIBS hosted layer created with - openspace.globebrowsing.createTemporalGibsGdalXml ]], - Author = "NASA EOSDIS Global Imagery Browse Services", - URL = "https://earthdata.nasa.gov/eosdis/science-system-description/eosdis-components/gibs", - License = "NASA", - Identifiers = {"Aqua_Modis_Temporal"} + Name = "Aqua Modis (Temporal)", + Version = "1.0", + Description = [[ GIBS hosted layer created with + openspace.globebrowsing.createTemporalGibsGdalXml ]], + Author = "NASA EOSDIS Global Imagery Browse Services", + URL = "https://earthdata.nasa.gov/eosdis/science-system-description/eosdis-components/gibs", + License = "NASA", + Identifiers = {"Aqua_Modis_Temporal"} } diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/bmng_sweden.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/bmng_sweden.asset index ad786b1301..92ebc494fd 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/bmng_sweden.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/bmng_sweden.asset @@ -2,27 +2,27 @@ local mapServiceConfigsPath = asset.localResource("./../../map_service_configs") local globeIdentifier = asset.require("./../../earth").Earth.Identifier local layer = { - Identifier = "BMNG_Sweden", - Name = "BMNG [Sweden]", - FilePath = mapServiceConfigsPath .. "/LiU/Bmng.wms", - Description = [[ Web loaded full resolution map of Blue Marble Next Generation. - This map is hosted on the OpenSpace servers in Sweden]], + Identifier = "BMNG_Sweden", + Name = "BMNG [Sweden]", + FilePath = mapServiceConfigsPath .. "/LiU/Bmng.wms", + Description = [[ Web loaded full resolution map of Blue Marble Next Generation. + This map is hosted on the OpenSpace servers in Sweden]], } asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) asset.export("layer", layer) asset.meta = { - Name = "Blue Marble Next Generation (Sweden)", - Version = "1.0", - Description = [[ Web loaded full resolution map of Blue Marble Next Generation. - This map is hosted on the OpenSpace servers in Sweden]], - Author = "OpenSpace Team", - URL = "https://visibleearth.nasa.gov/collection/1484/blue-marble", - License = "NASA", - Identifiers = {"BMNG_Sweden"} + Name = "Blue Marble Next Generation (Sweden)", + Version = "1.0", + Description = [[ Web loaded full resolution map of Blue Marble Next Generation. + This map is hosted on the OpenSpace servers in Sweden]], + Author = "OpenSpace Team", + URL = "https://visibleearth.nasa.gov/collection/1484/blue-marble", + License = "NASA", + Identifiers = {"BMNG_Sweden"} } diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/bmng_utah.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/bmng_utah.asset index fca8d5e4c5..a49d173df5 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/bmng_utah.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/bmng_utah.asset @@ -2,27 +2,27 @@ local mapServiceConfigsPath = asset.localResource("./../../map_service_configs") local globeIdentifier = asset.require("./../../earth").Earth.Identifier local layer = { - Identifier = "BMNG_Utah", - Name = "BMNG [Utah]", - FilePath = mapServiceConfigsPath .. "/Utah/Bmng.wms", - Description = [[ Web loaded full resolution map of Blue Marble Next Generation. - This map is hosted on the OpenSpace servers in Utah]], + Identifier = "BMNG_Utah", + Name = "BMNG [Utah]", + FilePath = mapServiceConfigsPath .. "/Utah/Bmng.wms", + Description = [[ Web loaded full resolution map of Blue Marble Next Generation. + This map is hosted on the OpenSpace servers in Utah]], } asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) asset.export("layer", layer) asset.meta = { - Name = "Blue Marble Next Generation (Utah)", - Version = "1.0", - Description = [[ Web loaded full resolution map of Blue Marble Next Generation. - This map is hosted on the OpenSpace servers in Utah]], - Author = "OpenSpace Team", - URL = "https://visibleearth.nasa.gov/collection/1484/blue-marble", - License = "NASA", - Identifiers = {"BMNG_Utah"} + Name = "Blue Marble Next Generation (Utah)", + Version = "1.0", + Description = [[ Web loaded full resolution map of Blue Marble Next Generation. + This map is hosted on the OpenSpace servers in Utah]], + Author = "OpenSpace Team", + URL = "https://visibleearth.nasa.gov/collection/1484/blue-marble", + License = "NASA", + Identifiers = {"BMNG_Utah"} } diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_imagery_world_2D.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_imagery_world_2D.asset index 284eebb05c..50434a2e16 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_imagery_world_2D.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_imagery_world_2D.asset @@ -2,33 +2,33 @@ local mapServiceConfigsPath = asset.localResource("./../../map_service_configs") local globeIdentifier = asset.require("./../../earth").Earth.Identifier local layer = { - Identifier = "ESRI_Imagery_World_2D", - Name = "ESRI Imagery World 2D", - FilePath = mapServiceConfigsPath .. "/ESRI/ESRI_Imagery_World_2D.wms", - Description = [[This map presents low-resolution imagery for the world and - high-resolution imagery for the United States and other metropolitan areas around - the world. The map includes NASA Blue Marble: Next Generation 500m resolution - imagery at small scales (above 1:1,000,000), i-cubed 15m eSAT imagery at - medium-to-large scales (down to 1:70,000) for the world, and USGS 15m Landsat - imagery for Antarctica. It also includes 1m i-cubed Nationwide Select imagery for - the continental United States, and GeoEye IKONOS 1m resolution imagery for Hawaii, - parts of Alaska, and several hundred metropolitan areas around the world. - (Description from URL)]], + Identifier = "ESRI_Imagery_World_2D", + Name = "ESRI Imagery World 2D", + FilePath = mapServiceConfigsPath .. "/ESRI/ESRI_Imagery_World_2D.wms", + Description = [[This map presents low-resolution imagery for the world and + high-resolution imagery for the United States and other metropolitan areas around + the world. The map includes NASA Blue Marble: Next Generation 500m resolution + imagery at small scales (above 1:1,000,000), i-cubed 15m eSAT imagery at + medium-to-large scales (down to 1:70,000) for the world, and USGS 15m Landsat + imagery for Antarctica. It also includes 1m i-cubed Nationwide Select imagery for + the continental United States, and GeoEye IKONOS 1m resolution imagery for Hawaii, + parts of Alaska, and several hundred metropolitan areas around the world. + (Description from URL)]], } asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) asset.export("layer", layer) asset.meta = { - Name = "ESRI Imagery World 2D", - Version = "1.0", - Description = [[Older 2D imager map layer for Earth. This layer is hosted by ESRI.]], - Author = "ESRI", - URL = "https://www.arcgis.com/home/item.html?id=21b4ba14d9e5472d97afcbb819f7368e", - License = "Esri Master License Agreement", - Identifiers = {"ESRI_Imagery_World_2D"} + Name = "ESRI Imagery World 2D", + Version = "1.0", + Description = [[Older 2D imager map layer for Earth. This layer is hosted by ESRI.]], + Author = "ESRI", + URL = "https://www.arcgis.com/home/item.html?id=21b4ba14d9e5472d97afcbb819f7368e", + License = "Esri Master License Agreement", + Identifiers = {"ESRI_Imagery_World_2D"} } diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_viirs_combo.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_viirs_combo.asset index 5ced647f2f..ace6f96a5d 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_viirs_combo.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_viirs_combo.asset @@ -4,57 +4,57 @@ local globeIdentifier = asset.require("./../../earth").Earth.Identifier local fallBackLayer = asset.require("./fallbacks/blue_marble").layer local layer = { - Identifier = "ESRI_VIIRS_Combo", - Name = "ESRI VIIRS Combo", - Type = "ByLevelTileLayer", - LevelTileProviders = { - { - MaxLevel = 4, - TileProvider = { - Identifier = "Temporal_VIIRS_SNPP", - Name = "Temporal VIIRS SNPP", - Type = "TemporalTileLayer", - FilePath = openspace.globebrowsing.createTemporalGibsGdalXml( - "VIIRS_SNPP_CorrectedReflectance_TrueColor", - "2015-11-24", - "Today", - "1d", - "250m", - "jpg" - ), - PadTiles = false - } - }, - { - MaxLevel = 22, - TileProvider = { - Identifier = "ESRI_World_Imagery", - Name = "ESRI World Imagery", - FilePath = mapServiceConfigsPath .. "/ESRI/World_Imagery.wms", - PadTiles = false - } - }, + Identifier = "ESRI_VIIRS_Combo", + Name = "ESRI VIIRS Combo", + Type = "ByLevelTileLayer", + LevelTileProviders = { + { + MaxLevel = 4, + TileProvider = { + Identifier = "Temporal_VIIRS_SNPP", + Name = "Temporal VIIRS SNPP", + Type = "TemporalTileLayer", + FilePath = openspace.globebrowsing.createTemporalGibsGdalXml( + "VIIRS_SNPP_CorrectedReflectance_TrueColor", + "2015-11-24", + "Today", + "1d", + "250m", + "jpg" + ), + PadTiles = false + } }, - PadTiles = false, - Fallback = fallBackLayer, - Description = [[Level based layer combining "VIIRS SNPP (Temporal)" and ESRI World - Imagery. "VIIRS SNPP (Temporal)" is faded out at tile level 4]] + { + MaxLevel = 22, + TileProvider = { + Identifier = "ESRI_World_Imagery", + Name = "ESRI World Imagery", + FilePath = mapServiceConfigsPath .. "/ESRI/World_Imagery.wms", + PadTiles = false + } + }, + }, + PadTiles = false, + Fallback = fallBackLayer, + Description = [[Level based layer combining "VIIRS SNPP (Temporal)" and ESRI World + Imagery. "VIIRS SNPP (Temporal)" is faded out at tile level 4]] } asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) asset.export("layer", layer) asset.meta = { - Name = "ESRI VIIRS Combo", - Version = "1.0", - Description = [[Level based layer combining "VIIRS SNPP (Temporal)" and ESRI World - Imagery. "VIIRS SNPP (Temporal)" is faded out at tile level 4]], - Author = "OpenSpace Tem", - URL = "http://www.openspaceproject.com", - License = "MIT License", - Identifiers = {"ESRI_VIIRS_Combo"} + Name = "ESRI VIIRS Combo", + Version = "1.0", + Description = [[Level based layer combining "VIIRS SNPP (Temporal)" and ESRI World + Imagery. "VIIRS SNPP (Temporal)" is faded out at tile level 4]], + Author = "OpenSpace Tem", + URL = "http://www.openspaceproject.com", + License = "MIT License", + Identifiers = {"ESRI_VIIRS_Combo"} } diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_world_imagery.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_world_imagery.asset index f583a8e8bb..6a2f064e8c 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_world_imagery.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_world_imagery.asset @@ -2,34 +2,34 @@ local mapServiceConfigsPath = asset.localResource("./../../map_service_configs") local globeIdentifier = asset.require("./../../earth").Earth.Identifier local layer = { - Identifier = "ESRI_World_Imagery", - Name = "ESRI World Imagery", - FilePath = mapServiceConfigsPath .. "/ESRI/World_Imagery.wms", - Description = [[World Imagery provides one meter or better satellite and aerial - imagery in many parts of the world and lower resolution satellite imagery - worldwide. The map includes 15m TerraColor imagery at small and mid-scales - (~1:591M down to ~1:72k) and 2.5m SPOT Imagery (~1:288k to ~1:72k) for the world. - The map features 0.5m resolution imagery in the continental United States and - parts of Western Europe from Maxar. Additional Maxar sub-meter imagery is - featured in many parts of the world. In other parts of the world, imagery at - different resolutions has been contributed by the GIS User Community. In select - communities, very high resolution imagery (down to 0.03m) is available down to - ~1:280 scale. (Description from URL)]] + Identifier = "ESRI_World_Imagery", + Name = "ESRI World Imagery", + FilePath = mapServiceConfigsPath .. "/ESRI/World_Imagery.wms", + Description = [[World Imagery provides one meter or better satellite and aerial + imagery in many parts of the world and lower resolution satellite imagery + worldwide. The map includes 15m TerraColor imagery at small and mid-scales + (~1:591M down to ~1:72k) and 2.5m SPOT Imagery (~1:288k to ~1:72k) for the world. + The map features 0.5m resolution imagery in the continental United States and + parts of Western Europe from Maxar. Additional Maxar sub-meter imagery is + featured in many parts of the world. In other parts of the world, imagery at + different resolutions has been contributed by the GIS User Community. In select + communities, very high resolution imagery (down to 0.03m) is available down to + ~1:280 scale. (Description from URL)]] } asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) asset.export("layer", layer) asset.meta = { - Name = "ESRI World Imagery", - Version = "1.0", - Description = [[Main web loaded map layer for Earth. This layer is hosted by ESRI.]], - Author = "ESRI", - URL = "https://www.arcgis.com/home/item.html?id=10df2279f9684e4a9f6a7f08febac2a9", - License = "Esri Master License Agreement", - Identifiers = {"ESRI_World_Imagery"} + Name = "ESRI World Imagery", + Version = "1.0", + Description = [[Main web loaded map layer for Earth. This layer is hosted by ESRI.]], + Author = "ESRI", + URL = "https://www.arcgis.com/home/item.html?id=10df2279f9684e4a9f6a7f08febac2a9", + License = "Esri Master License Agreement", + Identifiers = {"ESRI_World_Imagery"} } diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/fallbacks/blue_marble.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/fallbacks/blue_marble.asset index 548f57c33c..ef07346d05 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/fallbacks/blue_marble.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/fallbacks/blue_marble.asset @@ -2,22 +2,22 @@ local texturesPath = asset.require("./../../../earth_textures").TexturesPath local globeIdentifier = asset.require("./../../../earth").Earth.Identifier local layer = { - Identifier = "Blue_Marble", - Name = "Blue Marble", - FilePath = texturesPath .. "/earth_bluemarble.jpg", - Description = [[ Earth image from Blue Marble Next Generation ]], + Identifier = "Blue_Marble", + Name = "Blue Marble", + FilePath = texturesPath .. "/earth_bluemarble.jpg", + Description = [[ Earth image from Blue Marble Next Generation ]], } asset.export("layer", layer) asset.meta = { - Name = "Blue Marble", - Version = "1.0", - Description = [[ Fallback layer for earth image if no internet is available. Contains - Blue Marble Next Generation ]], - Author = "OpenSpace Team", - URL = "https://visibleearth.nasa.gov/collection/1484/blue-marble", - License = "NASA", - Identifiers = {"Blue_Marble"} + Name = "Blue Marble", + Version = "1.0", + Description = [[ Fallback layer for earth image if no internet is available. Contains + Blue Marble Next Generation ]], + Author = "OpenSpace Team", + URL = "https://visibleearth.nasa.gov/collection/1484/blue-marble", + License = "NASA", + Identifiers = {"Blue_Marble"} } diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/ghrsst_l4_g1sst_sea_surface_temperature_temporal.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/ghrsst_l4_g1sst_sea_surface_temperature_temporal.asset index eaf1a5b5ea..bb8330360e 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/ghrsst_l4_g1sst_sea_surface_temperature_temporal.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/ghrsst_l4_g1sst_sea_surface_temperature_temporal.asset @@ -1,38 +1,37 @@ local globeIdentifier = asset.require("./../../earth").Earth.Identifier local layer = { - Identifier = "GHRSST_L4_G1SST_Sea_Surface_Temperature_Temporal", - Name = "GHRSST L4 G1SST Sea Surface Temperature (Temporal)", - Type = "TemporalTileLayer", - FilePath = openspace.globebrowsing.createTemporalGibsGdalXml( - "GHRSST_L4_G1SST_Sea_Surface_Temperature", - "2010-06-21", - "2019-12-08", - "1d", - "1km", - "png" - ), - Description = [[ Temporal coverage: 21 June 2010 - 08 December 2019. The imagery - resolution is 1 km, and the temporal resolution is daily.]], - Author = "NASA EOSDIS Global Imagery Browse Services" - + Identifier = "GHRSST_L4_G1SST_Sea_Surface_Temperature_Temporal", + Name = "GHRSST L4 G1SST Sea Surface Temperature (Temporal)", + Type = "TemporalTileLayer", + FilePath = openspace.globebrowsing.createTemporalGibsGdalXml( + "GHRSST_L4_G1SST_Sea_Surface_Temperature", + "2010-06-21", + "2019-12-08", + "1d", + "1km", + "png" + ), + Description = [[ Temporal coverage: 21 June 2010 - 08 December 2019. The imagery + resolution is 1 km, and the temporal resolution is daily.]], + Author = "NASA EOSDIS Global Imagery Browse Services" } asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) asset.export("layer", layer) asset.meta = { - Name = "GHRSST L4 MUR Sea Surface Temperature (Temporal)", - Version = "1.0", - Description = [[ GIBS hosted layer created with - openspace.globebrowsing.createTemporalGibsGdalXml ]], - Author = "NASA EOSDIS Global Imagery Browse Services", - URL = "https://earthdata.nasa.gov/eosdis/science-system-description/" .. - "eosdis-components/gibs", - License = "NASA", - Identifiers = {"GHRSST_L4_G1SST_Sea_Surface_Temperature_Temporal"} + Name = "GHRSST L4 MUR Sea Surface Temperature (Temporal)", + Version = "1.0", + Description = [[ GIBS hosted layer created with + openspace.globebrowsing.createTemporalGibsGdalXml ]], + Author = "NASA EOSDIS Global Imagery Browse Services", + URL = "https://earthdata.nasa.gov/eosdis/science-system-description/" .. + "eosdis-components/gibs", + License = "NASA", + Identifiers = {"GHRSST_L4_G1SST_Sea_Surface_Temperature_Temporal"} } diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/ghrsst_l4_mur_sea_surface_temperature_temporal.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/ghrsst_l4_mur_sea_surface_temperature_temporal.asset index 0371007fd9..cb8055135c 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/ghrsst_l4_mur_sea_surface_temperature_temporal.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/ghrsst_l4_mur_sea_surface_temperature_temporal.asset @@ -1,36 +1,36 @@ local globeIdentifier = asset.require("./../../earth").Earth.Identifier local layer = { - Identifier = "GHRSST_L4_MUR_Sea_Surface_Temperature_Temporal", - Name = "GHRSST L4 MUR Sea Surface Temperature (Temporal)", - Type = "TemporalTileLayer", - FilePath = openspace.globebrowsing.createTemporalGibsGdalXml( - "GHRSST_L4_MUR_Sea_Surface_Temperature", - "2002-06-01", - "Yesterday", - "1d", - "1km", - "jpg" - ), - Description = [[ Temporal coverage: 01 June 2002 - Present. The imagery resolution + Identifier = "GHRSST_L4_MUR_Sea_Surface_Temperature_Temporal", + Name = "GHRSST L4 MUR Sea Surface Temperature (Temporal)", + Type = "TemporalTileLayer", + FilePath = openspace.globebrowsing.createTemporalGibsGdalXml( + "GHRSST_L4_MUR_Sea_Surface_Temperature", + "2002-06-01", + "Yesterday", + "1d", + "1km", + "jpg" + ), + Description = [[ Temporal coverage: 01 June 2002 - Present. The imagery resolution is 1 km, and the temporal resolution is daily.]] } asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) asset.export("layer", layer) asset.meta = { - Name = "GHRSST L4 MUR Sea Surface Temperature (Temporal)", - Version = "1.0", - Description = [[ GIBS hosted layer created with - openspace.globebrowsing.createTemporalGibsGdalXml ]], - Author = "NASA EOSDIS Global Imagery Browse Services", - URL = "https://earthdata.nasa.gov/eosdis/science-system-description/".. - "eosdis-components/gibs", - License = "NASA", - Identifiers = {"GHRSST_L4_MUR_Sea_Surface_Temperature_Temporal"} + Name = "GHRSST L4 MUR Sea Surface Temperature (Temporal)", + Version = "1.0", + Description = [[ GIBS hosted layer created with + openspace.globebrowsing.createTemporalGibsGdalXml ]], + Author = "NASA EOSDIS Global Imagery Browse Services", + URL = "https://earthdata.nasa.gov/eosdis/science-system-description/".. + "eosdis-components/gibs", + License = "NASA", + Identifiers = {"GHRSST_L4_MUR_Sea_Surface_Temperature_Temporal"} } diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/modis_terra_chlorophyll_a_temporal.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/modis_terra_chlorophyll_a_temporal.asset index 64d5ddfabe..750e4910bf 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/modis_terra_chlorophyll_a_temporal.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/modis_terra_chlorophyll_a_temporal.asset @@ -1,36 +1,36 @@ local globeIdentifier = asset.require("./../../earth").Earth.Identifier local layer = { - Identifier = "MODIS_Terra_Chlorophyll_A_Temporal", - Name = "MODIS Terra Chlorophyll A (Temporal)", - Type = "TemporalTileLayer", - FilePath = openspace.globebrowsing.createTemporalGibsGdalXml( - "MODIS_Terra_Chlorophyll_A", - "2013-07-02", - "Yesterday", - "1d", - "1km", - "png" - ), - Description = [[ Temporal coverage: 02 July 2013 - Present. The imagery resolution - is 1 km, and the temporal resolution is daily.]] + Identifier = "MODIS_Terra_Chlorophyll_A_Temporal", + Name = "MODIS Terra Chlorophyll A (Temporal)", + Type = "TemporalTileLayer", + FilePath = openspace.globebrowsing.createTemporalGibsGdalXml( + "MODIS_Terra_Chlorophyll_A", + "2013-07-02", + "Yesterday", + "1d", + "1km", + "png" + ), + Description = [[ Temporal coverage: 02 July 2013 - Present. The imagery resolution + is 1 km, and the temporal resolution is daily.]] } asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) asset.export("layer", layer) asset.meta = { - Name = "MODIS Terra Chlorophyll A (Temporal)", - Version = "1.0", - Description = [[ GIBS hosted layer created with - openspace.globebrowsing.createTemporalGibsGdalXml ]], - Author = "NASA EOSDIS Global Imagery Browse Services", - URL = "https://earthdata.nasa.gov/eosdis/science-system-description/" .. - "eosdis-components/gibs", - License = "NASA", - Identifiers = {"MODIS_Terra_Chlorophyll_A_Temporal"} + Name = "MODIS Terra Chlorophyll A (Temporal)", + Version = "1.0", + Description = [[ GIBS hosted layer created with + openspace.globebrowsing.createTemporalGibsGdalXml ]], + Author = "NASA EOSDIS Global Imagery Browse Services", + URL = "https://earthdata.nasa.gov/eosdis/science-system-description/" .. + "eosdis-components/gibs", + License = "NASA", + Identifiers = {"MODIS_Terra_Chlorophyll_A_Temporal"} } diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/terra_modis_temporal.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/terra_modis_temporal.asset index de489171d6..0eddfc5711 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/terra_modis_temporal.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/terra_modis_temporal.asset @@ -1,36 +1,36 @@ local globeIdentifier = asset.require("./../../earth").Earth.Identifier local layer = { - Identifier = "Terra_Modis_Temporal", - Name = "Terra Modis (Temporal)", - Type = "TemporalTileLayer", - FilePath = openspace.globebrowsing.createTemporalGibsGdalXml( - "MODIS_Terra_CorrectedReflectance_TrueColor", - "2000-02-24", - "Yesterday", - "1d", - "250m", - "jpg" - ), - Description = [[ Temporal coverage: 02 July 2013 - Present. The imagery resolution - is 1 km, and the temporal resolution is daily.]] + Identifier = "Terra_Modis_Temporal", + Name = "Terra Modis (Temporal)", + Type = "TemporalTileLayer", + FilePath = openspace.globebrowsing.createTemporalGibsGdalXml( + "MODIS_Terra_CorrectedReflectance_TrueColor", + "2000-02-24", + "Yesterday", + "1d", + "250m", + "jpg" + ), + Description = [[ Temporal coverage: 02 July 2013 - Present. The imagery resolution + is 1 km, and the temporal resolution is daily.]] } asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) asset.export("layer", layer) asset.meta = { - Name = "Terra Modis (Temporal)", - Version = "1.0", - Description = [[ GIBS hosted layer created with - openspace.globebrowsing.createTemporalGibsGdalXml ]], - Author = "NASA EOSDIS Global Imagery Browse Services", - URL = "https://earthdata.nasa.gov/eosdis/science-system-description/".. - "eosdis-components/gibs", - License = "NASA", - Identifiers = {"Terra_Modis_Temporal"} + Name = "Terra Modis (Temporal)", + Version = "1.0", + Description = [[ GIBS hosted layer created with + openspace.globebrowsing.createTemporalGibsGdalXml ]], + Author = "NASA EOSDIS Global Imagery Browse Services", + URL = "https://earthdata.nasa.gov/eosdis/science-system-description/".. + "eosdis-components/gibs", + License = "NASA", + Identifiers = {"Terra_Modis_Temporal"} } diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/viirs_snpp_temporal.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/viirs_snpp_temporal.asset index 4730e990a7..311347f2de 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/viirs_snpp_temporal.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/viirs_snpp_temporal.asset @@ -1,36 +1,36 @@ local globeIdentifier = asset.require("./../../earth").Earth.Identifier local layer = { - Identifier = "VIIRS_SNPP_Temporal", - Name = "VIIRS SNPP (Temporal)", - Type = "TemporalTileLayer", - FilePath = openspace.globebrowsing.createTemporalGibsGdalXml( - "VIIRS_SNPP_CorrectedReflectance_TrueColor", - "2015-11-24", - "Yesterday", - "1d", - "250m", - "jpg" - ), - Description = [[ Temporal coverage: 11 November 2015 - Present. The imagery resolution - is 0.25 km, and the temporal resolution is daily.]] + Identifier = "VIIRS_SNPP_Temporal", + Name = "VIIRS SNPP (Temporal)", + Type = "TemporalTileLayer", + FilePath = openspace.globebrowsing.createTemporalGibsGdalXml( + "VIIRS_SNPP_CorrectedReflectance_TrueColor", + "2015-11-24", + "Yesterday", + "1d", + "250m", + "jpg" + ), + Description = [[ Temporal coverage: 11 November 2015 - Present. The imagery resolution + is 0.25 km, and the temporal resolution is daily.]] } asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) asset.export("layer", layer) asset.meta = { - Name = "VIIRS SNPP (Temporal)", - Version = "1.0", - Description = [[ This layer has the best daily Earth Image. GIBS hosted layer created - with openspace.globebrowsing.createTemporalGibsGdalXml ]], - Author = "NASA EOSDIS Global Imagery Browse Services", - URL = "https://earthdata.nasa.gov/eosdis/science-system-description/" .. - "eosdis-components/gibs", - License = "NASA", - Identifiers = {"VIIRS_SNPP_Temporal"} + Name = "VIIRS SNPP (Temporal)", + Version = "1.0", + Description = [[ This layer has the best daily Earth Image. GIBS hosted layer created + with openspace.globebrowsing.createTemporalGibsGdalXml ]], + Author = "NASA EOSDIS Global Imagery Browse Services", + URL = "https://earthdata.nasa.gov/eosdis/science-system-description/" .. + "eosdis-components/gibs", + License = "NASA", + Identifiers = {"VIIRS_SNPP_Temporal"} } diff --git a/data/assets/scene/solarsystem/planets/earth/layers/heightlayers/fallbacks/blue_marble_height.asset b/data/assets/scene/solarsystem/planets/earth/layers/heightlayers/fallbacks/blue_marble_height.asset index 6cfd7a680e..116faf265f 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/heightlayers/fallbacks/blue_marble_height.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/heightlayers/fallbacks/blue_marble_height.asset @@ -1,22 +1,22 @@ local texturesPath = asset.require("./../../../earth_textures").TexturesPath local layer = { - Name = "Earth Bluemarble Height", - Identifier = "Earth_Bluemarble_Height", - FilePath = texturesPath .. "/earth_bluemarble_height.jpg", - Description = [[ Topographic layer from Blue Marble Next Generation]] + Name = "Earth Bluemarble Height", + Identifier = "Earth_Bluemarble_Height", + FilePath = texturesPath .. "/earth_bluemarble_height.jpg", + Description = [[ Topographic layer from Blue Marble Next Generation]] } asset.export("layer", layer) asset.meta = { - Name = "Earth Bluemarble Height", - Version = "1.0", - Description = [[ Fallback layer for earth height if no internet is available. Contains - Blue Marble Next Generation Topographic]], - Author = "NASA", - URL = "https://visibleearth.nasa.gov/collection/1484/blue-marble", - License = "NASA", - Identifiers = {"Earth_Bluemarble_Height"} + Name = "Earth Bluemarble Height", + Version = "1.0", + Description = [[ Fallback layer for earth height if no internet is available. Contains + Blue Marble Next Generation Topographic]], + Author = "NASA", + URL = "https://visibleearth.nasa.gov/collection/1484/blue-marble", + License = "NASA", + Identifiers = {"Earth_Bluemarble_Height"} } diff --git a/data/assets/scene/solarsystem/planets/earth/layers/heightlayers/terrain_tileset.asset b/data/assets/scene/solarsystem/planets/earth/layers/heightlayers/terrain_tileset.asset index ad574bb9b2..6cdfc6367b 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/heightlayers/terrain_tileset.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/heightlayers/terrain_tileset.asset @@ -4,32 +4,31 @@ local globeIdentifier = asset.require("./../../earth").Earth.Identifier local fallBackLayer = asset.require("./fallbacks/blue_marble_height").layer local layer = { - Identifier = "Terrain_tileset", - Name = "Terrain tileset", - FilePath = mapServiceConfigsPath .. "/ESRI/Terrain.wms", - TilePixelSize = 64, - Fallback = fallBackLayer, - Description = [[This globe layer presents elevation data at approximately 90m or 1km - per pixel resolution for the world. The elevation data includes 90m Shuttle Radar - Topography Mission (SRTM) elevation data from NASA and National - Geospatial-Intelligence Agency (NGA) where it is available and 1km GTOPO30 - data from the USGS elsewhere. Vertical units are measured in meters.]], + Identifier = "Terrain_tileset", + Name = "Terrain tileset", + FilePath = mapServiceConfigsPath .. "/ESRI/Terrain.wms", + TilePixelSize = 64, + Fallback = fallBackLayer, + Description = [[This globe layer presents elevation data at approximately 90m or 1km + per pixel resolution for the world. The elevation data includes 90m Shuttle Radar + Topography Mission (SRTM) elevation data from NASA and National + Geospatial-Intelligence Agency (NGA) where it is available and 1km GTOPO30 + data from the USGS elsewhere. Vertical units are measured in meters.]], } asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "HeightLayers", layer) + openspace.globebrowsing.addLayer(globeIdentifier, "HeightLayers", layer) end) asset.export("layer", layer) asset.meta = { - Name = "World Elevation (3D)", - Version = "1.0", - Description = [[Main web loaded height layer for Earth. This layer is hosted by - ESRI.]], - Author = "ESRI", - URL = "https://www.arcgis.com/home/item.html?id=1b48cd3b6276416784fe90a68c580a89", - License = "Esri Master License Agreement", - Identifiers = {"Terrain_tileset"} + Name = "World Elevation (3D)", + Version = "1.0", + Description = [[Main web loaded height layer for Earth. This layer is hosted by ESRI.]], + Author = "ESRI", + URL = "https://www.arcgis.com/home/item.html?id=1b48cd3b6276416784fe90a68c580a89", + License = "Esri Master License Agreement", + Identifiers = {"Terrain_tileset"} } diff --git a/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_at_night_2012.asset b/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_at_night_2012.asset index 103ae90770..77a5ec4fd4 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_at_night_2012.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_at_night_2012.asset @@ -4,27 +4,27 @@ local globeIdentifier = asset.require("./../../earth").Earth.Identifier local fallBackLayer = asset.require("./fallbacks/earth_night_texture").layer local layer = { - Identifier = "Earth_at_Night_2012", - Name = "Earth at Night 2012", - FilePath = mapServiceConfigsPath .. "/GIBS/night/VIIRS_CityLights_2012.wms", - Fallback = fallBackLayer, - Description = [[ The lights of cities and villages trace the outlines of civilization - in this global view. ]], + Identifier = "Earth_at_Night_2012", + Name = "Earth at Night 2012", + FilePath = mapServiceConfigsPath .. "/GIBS/night/VIIRS_CityLights_2012.wms", + Fallback = fallBackLayer, + Description = [[ The lights of cities and villages trace the outlines of civilization + in this global view. ]], } asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "NightLayers", layer) + openspace.globebrowsing.addLayer(globeIdentifier, "NightLayers", layer) end) asset.export("layer", layer) asset.meta = { - Name = "Earth at Night 2012", - Version = "1.0", - Description = [[Main web loaded night layer for Earth. This layer is hosted by GIBS.]], - Author = "OpenSpace Team", - URL = "https://visibleearth.nasa.gov/images/79765/night-lights-2012-map", - License = "NASA", - Identifiers = {"Earth_at_Night_2012"} + Name = "Earth at Night 2012", + Version = "1.0", + Description = [[Main web loaded night layer for Earth. This layer is hosted by GIBS.]], + Author = "OpenSpace Team", + URL = "https://visibleearth.nasa.gov/images/79765/night-lights-2012-map", + License = "NASA", + Identifiers = {"Earth_at_Night_2012"} } diff --git a/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_at_night_temporal.asset b/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_at_night_temporal.asset index 6b126d25b7..f74bf463f4 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_at_night_temporal.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_at_night_temporal.asset @@ -1,35 +1,35 @@ local globeIdentifier = asset.require("./../../earth").Earth.Identifier local layer = { - Identifier = "Earth_at_Night_Temporal", - Name = "Earth at Night (Temporal)", - Type = "TemporalTileLayer", - FilePath = openspace.globebrowsing.createTemporalGibsGdalXml( - "VIIRS_SNPP_DayNightBand_ENCC", - "2012-05-08", - "Yesterday", - "1d", - "500m", - "png" - ), - Description = [[ The VIIRS Nighttime Imagery (Day/Night Band, Enhanced Near Constant - Contrast) layer shows the Earth's surface and atmosphere using a sensor designed - to capture low-light emission sources, under varying illumination conditions. It - is displayed as a grey-scale image. Sources of illumination include both natural - and anthropogenic sources of light emissions. Lunar reflection can be used to - highlight the location and features of clouds and other terrestrial features such - as sea ice and snow cover when there is partial to full moon conditions. When - there is no moonlight, natural and anthropogenic night time light emissions are - highlighted such as city lights, lightning, auroras, fires, gas flares, and - fishing fleets. This layer is useful for showing patterns of human activity and - energy behaviors such as cities and highways, the holiday periods, the tracking - of shipping and fishing fleets at night and, the burning of waste natural gas - (gas flares) from on and offshore oil/gas production sites.

The VIIRS - Nighttime Imagery (Day/Night Band, Enhanced Near Constant Contrast) layer is - available from the Visible Infrared Imaging Radiometer Suite (VIIRS) on the joint - NASA/NOAA Suomi National Polar orbiting Partnership (Suomi NPP) satellite. - The sensor resolution is 750 m at nadir, imagery resolution is 500 m, and the - temporal resolution is daily. (Description from NASA Worldview)]], + Identifier = "Earth_at_Night_Temporal", + Name = "Earth at Night (Temporal)", + Type = "TemporalTileLayer", + FilePath = openspace.globebrowsing.createTemporalGibsGdalXml( + "VIIRS_SNPP_DayNightBand_ENCC", + "2012-05-08", + "Yesterday", + "1d", + "500m", + "png" + ), + Description = [[ The VIIRS Nighttime Imagery (Day/Night Band, Enhanced Near Constant + Contrast) layer shows the Earth's surface and atmosphere using a sensor designed + to capture low-light emission sources, under varying illumination conditions. It + is displayed as a grey-scale image. Sources of illumination include both natural + and anthropogenic sources of light emissions. Lunar reflection can be used to + highlight the location and features of clouds and other terrestrial features such + as sea ice and snow cover when there is partial to full moon conditions. When + there is no moonlight, natural and anthropogenic night time light emissions are + highlighted such as city lights, lightning, auroras, fires, gas flares, and + fishing fleets. This layer is useful for showing patterns of human activity and + energy behaviors such as cities and highways, the holiday periods, the tracking + of shipping and fishing fleets at night and, the burning of waste natural gas + (gas flares) from on and offshore oil/gas production sites.

The VIIRS + Nighttime Imagery (Day/Night Band, Enhanced Near Constant Contrast) layer is + available from the Visible Infrared Imaging Radiometer Suite (VIIRS) on the joint + NASA/NOAA Suomi National Polar orbiting Partnership (Suomi NPP) satellite. + The sensor resolution is 750 m at nadir, imagery resolution is 500 m, and the + temporal resolution is daily. (Description from NASA Worldview)]], } asset.onInitialize(function () @@ -40,12 +40,12 @@ asset.export("layer", layer) asset.meta = { - Name = "Earth at Night (Temporal)", - Version = "1.0", - Description = [[Temporal layer for earth with daily night image. This layer is a GIBS - hosted layer created with openspace.globebrowsing.createTemporalGibsGdalXml ]], - Author = "OpenSpace Team", - URL = "https://worldview.earthdata.nasa.gov/?l=VIIRS_SNPP_DayNightBand_ENCC", - License = "NASA", - Identifiers = {"Earth_at_Night_Temporal"} + Name = "Earth at Night (Temporal)", + Version = "1.0", + Description = [[Temporal layer for earth with daily night image. This layer is a GIBS + hosted layer created with openspace.globebrowsing.createTemporalGibsGdalXml ]], + Author = "OpenSpace Team", + URL = "https://worldview.earthdata.nasa.gov/?l=VIIRS_SNPP_DayNightBand_ENCC", + License = "NASA", + Identifiers = {"Earth_at_Night_Temporal"} } diff --git a/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/fallbacks/earth_night_texture.asset b/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/fallbacks/earth_night_texture.asset index 25d092b60d..8ceae0261f 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/fallbacks/earth_night_texture.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/fallbacks/earth_night_texture.asset @@ -1,21 +1,21 @@ local texturesPath = asset.require("./../../../earth_textures").TexturesPath local layer = { - Identifier = "Earth_Night_Texture", - Name = "Earth Night Texture", - FilePath = texturesPath .. "/earth_night.jpg", - Description = [[ Earth's city lights are clearly visible from space ]] + Identifier = "Earth_Night_Texture", + Name = "Earth Night Texture", + FilePath = texturesPath .. "/earth_night.jpg", + Description = [[ Earth's city lights are clearly visible from space ]] } asset.export("layer", layer) asset.meta = { - Name = "Blue Marble Night", - Version = "1.0", - Description = [[ Fallback layer for earth night image if no internet is available. ]], - Author = "OpenSpace Team", - URL = "https://visibleearth.nasa.gov/collection/1484/blue-marble", - License = "NASA", - Identifiers = {"Earth_Night_Texture"} + Name = "Blue Marble Night", + Version = "1.0", + Description = [[ Fallback layer for earth night image if no internet is available. ]], + Author = "OpenSpace Team", + URL = "https://visibleearth.nasa.gov/collection/1484/blue-marble", + License = "NASA", + Identifiers = {"Earth_Night_Texture"} } diff --git a/data/assets/scene/solarsystem/planets/earth/layers/overlays/coastlines.asset b/data/assets/scene/solarsystem/planets/earth/layers/overlays/coastlines.asset index 069cf168d7..8ae8338119 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/overlays/coastlines.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/overlays/coastlines.asset @@ -2,12 +2,12 @@ local mapServiceConfigsPath = asset.localResource("./../../map_service_configs") local globeIdentifier = asset.require("./../../earth").Earth.Identifier local layer = { - Identifier = "Coastlines", - FilePath = mapServiceConfigsPath .. "/GIBS/overlays/Coastlines.wms" + Identifier = "Coastlines", + FilePath = mapServiceConfigsPath .. "/GIBS/overlays/Coastlines.wms" } asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "Overlays", layer) + openspace.globebrowsing.addLayer(globeIdentifier, "Overlays", layer) end) asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/earth/layers/overlays/coastlines_enabled.asset b/data/assets/scene/solarsystem/planets/earth/layers/overlays/coastlines_enabled.asset index accb16ac44..0260ed6ae3 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/overlays/coastlines_enabled.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/overlays/coastlines_enabled.asset @@ -4,7 +4,7 @@ local layer = asset.require("./coastlines").layer layer.Enabled = true asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "Overlays", layer) + openspace.globebrowsing.addLayer(globeIdentifier, "Overlays", layer) end) asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/earth/layers/overlays/reference_features.asset b/data/assets/scene/solarsystem/planets/earth/layers/overlays/reference_features.asset index e1c4d7eae1..6862852dfd 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/overlays/reference_features.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/overlays/reference_features.asset @@ -2,13 +2,13 @@ local mapServiceConfigsPath = asset.localResource("./../../map_service_configs") local globeIdentifier = asset.require("./../../earth").Earth.Identifier local layer = { - Identifier = "Reference_Features", - Name = "Reference Features", - FilePath = mapServiceConfigsPath .. "/GIBS/overlays/Reference_Features.wms" + Identifier = "Reference_Features", + Name = "Reference Features", + FilePath = mapServiceConfigsPath .. "/GIBS/overlays/Reference_Features.wms" } asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "Overlays", layer) + openspace.globebrowsing.addLayer(globeIdentifier, "Overlays", layer) end) asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/earth/layers/overlays/reference_labels.asset b/data/assets/scene/solarsystem/planets/earth/layers/overlays/reference_labels.asset index 8d14244d4c..d998889fe7 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/overlays/reference_labels.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/overlays/reference_labels.asset @@ -2,13 +2,13 @@ local mapServiceConfigsPath = asset.localResource("./../../map_service_configs") local globeIdentifier = asset.require("./../../earth").Earth.Identifier local layer = { - Identifier = "Reference_Labels", - Name = "Reference Labels", - FilePath = mapServiceConfigsPath .. "/GIBS/overlays/Reference_Labels.wms" + Identifier = "Reference_Labels", + Name = "Reference Labels", + FilePath = mapServiceConfigsPath .. "/GIBS/overlays/Reference_Labels.wms" } asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "Overlays", layer) + openspace.globebrowsing.addLayer(globeIdentifier, "Overlays", layer) end) asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/earth/layers/overlays/size_reference.asset b/data/assets/scene/solarsystem/planets/earth/layers/overlays/size_reference.asset index 5173e8bae0..0be0291ada 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/overlays/size_reference.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/overlays/size_reference.asset @@ -2,14 +2,14 @@ local earthAsset = asset.require("./../../earth").Earth local globeIdentifier = earthAsset.Identifier local layer ={ - Identifier = "Size_Reference", - Name = "Size Reference", - Type = "SizeReferenceTileLayer", - Radii = earthAsset.Renderable.Radii + Identifier = "Size_Reference", + Name = "Size Reference", + Type = "SizeReferenceTileLayer", + Radii = earthAsset.Renderable.Radii } asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "Overlays", layer) + openspace.globebrowsing.addLayer(globeIdentifier, "Overlays", layer) end) asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/earth/layers/overlays/tile_indices.asset b/data/assets/scene/solarsystem/planets/earth/layers/overlays/tile_indices.asset index 95496a8134..96b2fde089 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/overlays/tile_indices.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/overlays/tile_indices.asset @@ -2,13 +2,13 @@ local mapServiceConfigsPath = asset.localResource("./../../map_service_configs") local globeIdentifier = asset.require("./../../earth").Earth.Identifier local layer = { - Identifier = "Tile_Indices", - Name = "Tile Indices", - Type = "TileIndexTileLayer" + Identifier = "Tile_Indices", + Name = "Tile Indices", + Type = "TileIndexTileLayer" } asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "Overlays", layer) + openspace.globebrowsing.addLayer(globeIdentifier, "Overlays", layer) end) asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/earth/layers/watermasks/gebco_sweden.asset b/data/assets/scene/solarsystem/planets/earth/layers/watermasks/gebco_sweden.asset index 1c13cb9555..12d24ab479 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/watermasks/gebco_sweden.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/watermasks/gebco_sweden.asset @@ -2,13 +2,13 @@ local mapServiceConfigsPath = asset.localResource("./../../map_service_configs") local globeIdentifier = asset.require("./../../earth").Earth.Identifier local layer = { - Name = "Gebco [Sweden]", - Identifier = "Gebco_Sweden", - FilePath = mapServiceConfigsPath .. "/LiU/Gebco.wms" + Name = "Gebco [Sweden]", + Identifier = "Gebco_Sweden", + FilePath = mapServiceConfigsPath .. "/LiU/Gebco.wms" } asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "WaterMasks", layer) + openspace.globebrowsing.addLayer(globeIdentifier, "WaterMasks", layer) end) asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/earth/layers/watermasks/gebco_utah.asset b/data/assets/scene/solarsystem/planets/earth/layers/watermasks/gebco_utah.asset index e7e4c4af35..c7743814a5 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/watermasks/gebco_utah.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/watermasks/gebco_utah.asset @@ -2,13 +2,13 @@ local mapServiceConfigsPath = asset.localResource("./../../map_service_configs") local globeIdentifier = asset.require("./../../earth").Earth.Identifier local layer = { - Name = "Gebco [Utah]", - Identifier = "Gebco_Utah", - FilePath = mapServiceConfigsPath .. "/Utah/Gebco.wms" + Name = "Gebco [Utah]", + Identifier = "Gebco_Utah", + FilePath = mapServiceConfigsPath .. "/Utah/Gebco.wms" } asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "WaterMasks", layer) + openspace.globebrowsing.addLayer(globeIdentifier, "WaterMasks", layer) end) asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/earth/layers/watermasks/modis_water_mask.asset b/data/assets/scene/solarsystem/planets/earth/layers/watermasks/modis_water_mask.asset index 399ab658f5..c46c102b7c 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/watermasks/modis_water_mask.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/watermasks/modis_water_mask.asset @@ -2,13 +2,13 @@ local mapServiceConfigsPath = asset.localResource("./../../map_service_configs") local globeIdentifier = asset.require("./../../earth").Earth.Identifier local layer = { - Identifier = "MODIS_Water_Mask", - Name = "MODIS Water Mask", - FilePath = mapServiceConfigsPath .. "/GIBS/water/MODIS_Water_Mask.wms", + Identifier = "MODIS_Water_Mask", + Name = "MODIS Water Mask", + FilePath = mapServiceConfigsPath .. "/GIBS/water/MODIS_Water_Mask.wms", } asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "WaterMasks", layer) + openspace.globebrowsing.addLayer(globeIdentifier, "WaterMasks", layer) end) asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/earth/markers.asset b/data/assets/scene/solarsystem/planets/earth/markers.asset index d6acac5b23..79971e6339 100644 --- a/data/assets/scene/solarsystem/planets/earth/markers.asset +++ b/data/assets/scene/solarsystem/planets/earth/markers.asset @@ -5,32 +5,32 @@ local texturesPath = asset.require('./earth_textures').TexturesPath local EarthMarker = { - Identifier = "EarthMarker", - Parent = transforms.EarthIAU.Identifier, - Renderable = { - Type = "RenderablePlaneImageLocal", - Enabled = false, - Size = 3.0E11, - Origin = "Center", - Billboard = true, - Texture = texturesPath .. "/marker.png", - BlendMode = "Additive" - }, - GUI = { - Name = "Earth Marker", - Path = "/Solar System/Planets/Earth" - } + Identifier = "EarthMarker", + Parent = transforms.EarthIAU.Identifier, + Renderable = { + Type = "RenderablePlaneImageLocal", + Enabled = false, + Size = 3.0E11, + Origin = "Center", + Billboard = true, + Texture = texturesPath .. "/marker.png", + BlendMode = "Additive" + }, + GUI = { + Name = "Earth Marker", + Path = "/Solar System/Planets/Earth" + } } assetHelper.registerSceneGraphNodesAndExport(asset, { EarthMarker }) asset.meta = { - Name = "Earth marker", - Version = "1.0", - Description = [[ Earth marker with name, sized for Solar System view]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"EarthMarker"} + Name = "Earth marker", + Version = "1.0", + Description = [[ Earth marker with name, sized for Solar System view]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license", + Identifiers = {"EarthMarker"} } diff --git a/data/assets/scene/solarsystem/planets/earth/moon/default_layers.asset b/data/assets/scene/solarsystem/planets/earth/moon/default_layers.asset index 956609cac7..a3e6183411 100644 --- a/data/assets/scene/solarsystem/planets/earth/moon/default_layers.asset +++ b/data/assets/scene/solarsystem/planets/earth/moon/default_layers.asset @@ -22,8 +22,8 @@ asset.require(heightLayersPath .. "/loladem_sweden") -- Set enabled layers (temporary solution) -- @TODO: do this using a boolean that's passed to the 'asset.require' instead asset.onInitialize(function () - openspace.setPropertyValueSingle("Scene.Moon.Renderable.Layers.ColorLayers." .. - colorLayer.layer.Identifier .. ".Enabled", true) - openspace.setPropertyValueSingle("Scene.Moon.Renderable.Layers.HeightLayers." .. - heightLayer.layer.Identifier .. ".Enabled", true) + openspace.setPropertyValueSingle("Scene.Moon.Renderable.Layers.ColorLayers." .. + colorLayer.layer.Identifier .. ".Enabled", true) + openspace.setPropertyValueSingle("Scene.Moon.Renderable.Layers.HeightLayers." .. + heightLayer.layer.Identifier .. ".Enabled", true) end) diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/clemuvvis_sweden.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/clemuvvis_sweden.asset index 80b291dd11..da78621a3d 100644 --- a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/clemuvvis_sweden.asset +++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/clemuvvis_sweden.asset @@ -2,17 +2,17 @@ local mapServiceConfigs = asset.localResource("./../../map_service_configs") local globeIdentifier = asset.require("./../../moon").Moon.Identifier local layer = { - Identifier = "ClemUvvis_Sweden", - Name = "Clem Uvvis [Sweden]", - FilePath = mapServiceConfigs .. "/LiU/Clem_Uvvis.wms", - Settings = { - Gamma = 1.14, - Multiplier = 1.4 - } + Identifier = "ClemUvvis_Sweden", + Name = "Clem Uvvis [Sweden]", + FilePath = mapServiceConfigs .. "/LiU/Clem_Uvvis.wms", + Settings = { + Gamma = 1.14, + Multiplier = 1.4 + } } asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/clemuvvis_utah.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/clemuvvis_utah.asset index 148cc9872c..6373dc4567 100644 --- a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/clemuvvis_utah.asset +++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/clemuvvis_utah.asset @@ -2,17 +2,17 @@ local mapServiceConfigs = asset.localResource("./../../map_service_configs") local globeIdentifier = asset.require("./../../moon").Moon.Identifier local layer = { - Identifier = "ClemUvvis_Utah", - Name = "Clem Uvvis [Utah]", - FilePath = mapServiceConfigs .. "/Utah/ClemUvvis.wms", - Settings = { - Gamma = 1.14, - Multiplier = 1.4 - } + Identifier = "ClemUvvis_Utah", + Name = "Clem Uvvis [Utah]", + FilePath = mapServiceConfigs .. "/Utah/ClemUvvis.wms", + Settings = { + Gamma = 1.14, + Multiplier = 1.4 + } } asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/kaguya_sweden.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/kaguya_sweden.asset index e59fc485d2..0189128dfa 100644 --- a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/kaguya_sweden.asset +++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/kaguya_sweden.asset @@ -2,17 +2,17 @@ local mapServiceConfigs = asset.localResource("./../../map_service_configs") local globeIdentifier = asset.require("./../../moon").Moon.Identifier local layer = { - Identifier = "Kaguya_Sweden", - Name = "Kaguya [Sweden]", - FilePath = mapServiceConfigs .. "/LiU/Kaguya.vrt", - Settings = { - Gamma = 1.0, - Multiplier = 1.23 - } + Identifier = "Kaguya_Sweden", + Name = "Kaguya [Sweden]", + FilePath = mapServiceConfigs .. "/LiU/Kaguya.vrt", + Settings = { + Gamma = 1.0, + Multiplier = 1.23 + } } asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/kaguya_utah.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/kaguya_utah.asset index 1b0cb27c03..3b9b74da33 100644 --- a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/kaguya_utah.asset +++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/kaguya_utah.asset @@ -2,17 +2,17 @@ local mapServiceConfigs = asset.localResource("./../../map_service_configs") local globeIdentifier = asset.require("./../../moon").Moon.Identifier local layer = { - Identifier = "Kaguya_Utah", - Name = "Kaguya [Utah]", - FilePath = mapServiceConfigs .. "/Utah/Kaguya.vrt", - Settings = { - Gamma = 1.0, - Multiplier = 1.23 - } + Identifier = "Kaguya_Utah", + Name = "Kaguya [Utah]", + FilePath = mapServiceConfigs .. "/Utah/Kaguya.vrt", + Settings = { + Gamma = 1.0, + Multiplier = 1.23 + } } asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_clr_shade_sweden.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_clr_shade_sweden.asset index 989810f4ab..4fc3c33dca 100644 --- a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_clr_shade_sweden.asset +++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_clr_shade_sweden.asset @@ -2,13 +2,13 @@ local mapServiceConfigs = asset.localResource("./../../map_service_configs") local globeIdentifier = asset.require("./../../moon").Moon.Identifier local layer = { - Identifier = "Lola_Clr_Shade_Sweden", - Name = "Lola Color Shade [Sweden]", - FilePath = mapServiceConfigs .. "/LiU/Lola_Clr_Shade.wms" + Identifier = "Lola_Clr_Shade_Sweden", + Name = "Lola Color Shade [Sweden]", + FilePath = mapServiceConfigs .. "/LiU/Lola_Clr_Shade.wms" } asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_clr_shade_utah.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_clr_shade_utah.asset index c88cdb1077..6601a28585 100644 --- a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_clr_shade_utah.asset +++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_clr_shade_utah.asset @@ -2,13 +2,13 @@ local mapServiceConfigs = asset.localResource("./../../map_service_configs") local globeIdentifier = asset.require("./../../moon").Moon.Identifier local layer = { - Identifier = "Lola_Clr_Shade_Utah", - Name = "Lola Color Shade [Utah]", - FilePath = mapServiceConfigs .. "/Utah/LolaClrShade.wms" + Identifier = "Lola_Clr_Shade_Utah", + Name = "Lola Color Shade [Utah]", + FilePath = mapServiceConfigs .. "/Utah/LolaClrShade.wms" } asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_shade_sweden.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_shade_sweden.asset index 451ab441a8..142eb0a519 100644 --- a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_shade_sweden.asset +++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_shade_sweden.asset @@ -2,13 +2,13 @@ local mapServiceConfigs = asset.localResource("./../../map_service_configs") local globeIdentifier = asset.require("./../../moon").Moon.Identifier local layer = { - Identifier = "Lola_Shade_Sweden", - Name = "Lola Shade [Sweden]", - FilePath = mapServiceConfigs .. "/LiU/Lola_Shade.wms" + Identifier = "Lola_Shade_Sweden", + Name = "Lola Shade [Sweden]", + FilePath = mapServiceConfigs .. "/LiU/Lola_Shade.wms" } asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_shade_utah.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_shade_utah.asset index 3ccec433ba..90495dffed 100644 --- a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_shade_utah.asset +++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_shade_utah.asset @@ -2,13 +2,13 @@ local mapServiceConfigs = asset.localResource("./../../map_service_configs") local globeIdentifier = asset.require("./../../moon").Moon.Identifier local layer = { - Identifier = "Lola_Shade_Utah", - Name = "Lola Shade [Utah]", - FilePath = mapServiceConfigs .. "/Utah/LolaShade.wms" + Identifier = "Lola_Shade_Utah", + Name = "Lola Shade [Utah]", + FilePath = mapServiceConfigs .. "/Utah/LolaShade.wms" } asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/uvvishybrid_sweden.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/uvvishybrid_sweden.asset index 6d6e74de11..8cd547ae5b 100644 --- a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/uvvishybrid_sweden.asset +++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/uvvishybrid_sweden.asset @@ -2,17 +2,17 @@ local mapServiceConfigs = asset.localResource("./../../map_service_configs") local globeIdentifier = asset.require("./../../moon").Moon.Identifier local layer = { - Identifier = "UvvisHybrid_Sweden", - Name = "Uvvis Hybrid [Sweden]", - FilePath = mapServiceConfigs .. "/LiU/Uvvis_Hybrid.wms", - Settings = { - Gamma = 0.52, - Multiplier = 0.65 - } + Identifier = "UvvisHybrid_Sweden", + Name = "Uvvis Hybrid [Sweden]", + FilePath = mapServiceConfigs .. "/LiU/Uvvis_Hybrid.wms", + Settings = { + Gamma = 0.52, + Multiplier = 0.65 + } } asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/uvvishybrid_utah.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/uvvishybrid_utah.asset index 3c7e3c0c66..998b0e229f 100644 --- a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/uvvishybrid_utah.asset +++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/uvvishybrid_utah.asset @@ -2,17 +2,17 @@ local mapServiceConfigs = asset.localResource("./../../map_service_configs") local globeIdentifier = asset.require("./../../moon").Moon.Identifier local layer = { - Identifier = "UvvisHybrid_Utah", - Name = "Uvvis Hybrid [Utah]", - FilePath = mapServiceConfigs .. "/Utah/UvvisHybrid.wms", - Settings = { - Gamma = 0.52, - Multiplier = 0.65 - } + Identifier = "UvvisHybrid_Utah", + Name = "Uvvis Hybrid [Utah]", + FilePath = mapServiceConfigs .. "/Utah/UvvisHybrid.wms", + Settings = { + Gamma = 0.52, + Multiplier = 0.65 + } } asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/wac_sweden.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/wac_sweden.asset index 86e35e4cf8..7dd38504d2 100644 --- a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/wac_sweden.asset +++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/wac_sweden.asset @@ -2,14 +2,14 @@ local mapServiceConfigs = asset.localResource("./../../map_service_configs") local globeIdentifier = asset.require("./../../moon").Moon.Identifier local layer = { - Identifier = "WAC_Sweden", - Name = "WAC [Sweden]", - FilePath = mapServiceConfigs .. "/LiU/WAC.wms", - Settings = { Gamma = 0.84 } + Identifier = "WAC_Sweden", + Name = "WAC [Sweden]", + FilePath = mapServiceConfigs .. "/LiU/WAC.wms", + Settings = { Gamma = 0.84 } } asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/wac_utah.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/wac_utah.asset index 7ef4a615fe..cbdae49b2b 100644 --- a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/wac_utah.asset +++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/wac_utah.asset @@ -2,14 +2,14 @@ local mapServiceConfigs = asset.localResource("./../../map_service_configs") local globeIdentifier = asset.require("./../../moon").Moon.Identifier local layer = { - Identifier = "WAC_Utah", - Name = "WAC [Utah]", - FilePath = mapServiceConfigs .. "/Utah/Wac.wms", - Settings = { Gamma = 0.84 } + Identifier = "WAC_Utah", + Name = "WAC [Utah]", + FilePath = mapServiceConfigs .. "/Utah/Wac.wms", + Settings = { Gamma = 0.84 } } asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/heightlayers/loladem_sweden.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/heightlayers/loladem_sweden.asset index acf8751fc7..bd26c272f3 100644 --- a/data/assets/scene/solarsystem/planets/earth/moon/layers/heightlayers/loladem_sweden.asset +++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/heightlayers/loladem_sweden.asset @@ -2,15 +2,15 @@ local mapServiceConfigs = asset.localResource("./../../map_service_configs") local globeIdentifier = asset.require("./../../moon").Moon.Identifier local layer = { - Identifier = "LolaDem_Sweden", - Name = "Lola DEM [Sweden]", - FilePath = mapServiceConfigs .. "/LiU/Lola_DEM.wms", - TilePixelSize = 64, - Settings = { Multiplier = 0.5 } + Identifier = "LolaDem_Sweden", + Name = "Lola DEM [Sweden]", + FilePath = mapServiceConfigs .. "/LiU/Lola_DEM.wms", + TilePixelSize = 64, + Settings = { Multiplier = 0.5 } } asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "HeightLayers", layer) + openspace.globebrowsing.addLayer(globeIdentifier, "HeightLayers", layer) end) asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/heightlayers/loladem_utah.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/heightlayers/loladem_utah.asset index 79d6ef8180..9eea498607 100644 --- a/data/assets/scene/solarsystem/planets/earth/moon/layers/heightlayers/loladem_utah.asset +++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/heightlayers/loladem_utah.asset @@ -2,15 +2,15 @@ local mapServiceConfigs = asset.localResource("./../../map_service_configs") local globeIdentifier = asset.require("./../../moon").Moon.Identifier local layer = { - Identifier = "LolaDem_Utah", - Name = "Lola DEM [Utah]", - FilePath = mapServiceConfigs .. "/Utah/LolaDem.wms", - TilePixelSize = 64, - Settings = { Multiplier = 0.5 } + Identifier = "LolaDem_Utah", + Name = "Lola DEM [Utah]", + FilePath = mapServiceConfigs .. "/Utah/LolaDem.wms", + TilePixelSize = 64, + Settings = { Multiplier = 0.5 } } asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "HeightLayers", layer) + openspace.globebrowsing.addLayer(globeIdentifier, "HeightLayers", layer) end) asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/overlays/size_reference.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/overlays/size_reference.asset index 030be3572d..bea21e595a 100644 --- a/data/assets/scene/solarsystem/planets/earth/moon/layers/overlays/size_reference.asset +++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/overlays/size_reference.asset @@ -1,15 +1,15 @@ local moonAsset = asset.require("./../../moon").Moon local globeIdentifier = moonAsset.Identifier -local layer ={ - Identifier = "Size_Reference", - Name = "Size Reference", - Type = "SizeReferenceTileLayer", - Radii = moonAsset.Renderable.Radii +local layer = { + Identifier = "Size_Reference", + Name = "Size Reference", + Type = "SizeReferenceTileLayer", + Radii = moonAsset.Renderable.Radii } asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "Overlays", layer) + openspace.globebrowsing.addLayer(globeIdentifier, "Overlays", layer) end) asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/earth/moon/moon.asset b/data/assets/scene/solarsystem/planets/earth/moon/moon.asset index 160b880246..f24995d8bd 100644 --- a/data/assets/scene/solarsystem/planets/earth/moon/moon.asset +++ b/data/assets/scene/solarsystem/planets/earth/moon/moon.asset @@ -6,65 +6,65 @@ asset.require('spice/base') local labelsPath = asset.require('./moon_labels').LabelsPath local Moon = { - Identifier = "Moon", - Parent = transforms.EarthBarycenter.Identifier, - Transform = { - Translation = { - Type = "SpiceTranslation", - Target = "MOON", - Observer = "EARTH BARYCENTER" - }, - Rotation = { - Type = "SpiceRotation", - SourceFrame = "IAU_MOON", - DestinationFrame = "GALACTIC" - } + Identifier = "Moon", + Parent = transforms.EarthBarycenter.Identifier, + Transform = { + Translation = { + Type = "SpiceTranslation", + Target = "MOON", + Observer = "EARTH BARYCENTER" }, - Renderable = { - Type = "RenderableGlobe", - Radii = 1738140, - SegmentsPerPatch = 64, - Layers = {}, - ShadowGroup = { - Sources = { - { Name = sunAsset.Sun.Identifier, Radius = 696.3E6 }, - }, - Casters = { - { Name = earthAsset.Earth.Identifier, Radius = 6.371E6 }, - } - }, - Labels = { - Enable = false, - FileName = labelsPath .. "/moon.labels", - LabelAlignmentOption = "Horizontally", -- or Circularly - LabelsFontSize = 14.0, - LabelsSize = 8.0, - LabelsMinSize = 1.0, - LabelsMaxSize = 1500.0, - ProximityEnabled = false, - LabelsFadeInEnabled = true, - LabelsFadeOutEnabled = true, - FadeInStartingDistance = 500000.0, - FadeOutStartingDistance = 100000.0, - LabelsForceDomeRendering = true, - LabelsDistanceEPS = 1350000.0, - LabelsColor = { 1.0, 1.0, 0.0 } - } - }, - GUI = { - Path = "/Solar System/Planets/Earth/Moon" + Rotation = { + Type = "SpiceRotation", + SourceFrame = "IAU_MOON", + DestinationFrame = "GALACTIC" } + }, + Renderable = { + Type = "RenderableGlobe", + Radii = 1738140, + SegmentsPerPatch = 64, + Layers = {}, + ShadowGroup = { + Sources = { + { Name = sunAsset.Sun.Identifier, Radius = 696.3E6 }, + }, + Casters = { + { Name = earthAsset.Earth.Identifier, Radius = 6.371E6 }, + } + }, + Labels = { + Enable = false, + FileName = labelsPath .. "/moon.labels", + LabelAlignmentOption = "Horizontally", -- or Circularly + LabelsFontSize = 14.0, + LabelsSize = 8.0, + LabelsMinSize = 1.0, + LabelsMaxSize = 1500.0, + ProximityEnabled = false, + LabelsFadeInEnabled = true, + LabelsFadeOutEnabled = true, + FadeInStartingDistance = 500000.0, + FadeOutStartingDistance = 100000.0, + LabelsForceDomeRendering = true, + LabelsDistanceEPS = 1350000.0, + LabelsColor = { 1.0, 1.0, 0.0 } + } + }, + GUI = { + Path = "/Solar System/Planets/Earth/Moon" + } } assetHelper.registerSceneGraphNodesAndExport(asset, { Moon }) asset.meta = { - Name = "Moon", - Version = "1.0", - Description = [[ Moon globe with labels. ]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"Moon"} + Name = "Moon", + Version = "1.0", + Description = [[ Moon globe with labels. ]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license", + Identifiers = {"Moon"} } diff --git a/data/assets/scene/solarsystem/planets/earth/moon/moon_labels.asset b/data/assets/scene/solarsystem/planets/earth/moon/moon_labels.asset index 543fe45d03..7cdc6f6c2a 100644 --- a/data/assets/scene/solarsystem/planets/earth/moon/moon_labels.asset +++ b/data/assets/scene/solarsystem/planets/earth/moon/moon_labels.asset @@ -1,8 +1,8 @@ local LabelsPath = asset.syncedResource({ - Name = "Moon Labels", - Type = "HttpSynchronization", - Identifier = "moon_labels", - Version = 1 + Name = "Moon Labels", + Type = "HttpSynchronization", + Identifier = "moon_labels", + Version = 1 }) asset.export("LabelsPath", LabelsPath) diff --git a/data/assets/scene/solarsystem/planets/earth/moon/trail.asset b/data/assets/scene/solarsystem/planets/earth/moon/trail.asset index d60140bda5..18d859d9ba 100644 --- a/data/assets/scene/solarsystem/planets/earth/moon/trail.asset +++ b/data/assets/scene/solarsystem/planets/earth/moon/trail.asset @@ -5,36 +5,36 @@ asset.require('spice/base') local MoonTrail = { - Identifier = "MoonTrail", - Parent = transforms.EarthBarycenter.Identifier, - Renderable = { - Type = "RenderableTrailOrbit", - Translation = { - Type = "SpiceTranslation", - Target = "MOON", - Observer = "EARTH BARYCENTER" - }, - Color = { 0.5, 0.3, 0.3 }, - Period = 27, - Resolution = 1000, - Tag = { "moonTrail_solarSystem", "moonTrail_terrestrial", "moonTrail_earth" } + Identifier = "MoonTrail", + Parent = transforms.EarthBarycenter.Identifier, + Renderable = { + Type = "RenderableTrailOrbit", + Translation = { + Type = "SpiceTranslation", + Target = "MOON", + Observer = "EARTH BARYCENTER" }, - GUI = { - Name = "Moon Trail", - Path = "/Solar System/Planets/Earth/Moon" - } + Color = { 0.5, 0.3, 0.3 }, + Period = 27, + Resolution = 1000, + Tag = { "moonTrail_solarSystem", "moonTrail_terrestrial", "moonTrail_earth" } + }, + GUI = { + Name = "Moon Trail", + Path = "/Solar System/Planets/Earth/Moon" + } } assetHelper.registerSceneGraphNodesAndExport(asset, { MoonTrail }) asset.meta = { - Name = "Moon Trail", - Version = "1.0", - Description = [[ Moon Trail - This asset contains the trail of the Moon. + Name = "Moon Trail", + Version = "1.0", + Description = [[ Moon Trail - This asset contains the trail of the Moon. Data from NASA Spice (see base spice asset)]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"MoonTrail"} + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license", + Identifiers = {"MoonTrail"} } diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/communications/amateur.asset b/data/assets/scene/solarsystem/planets/earth/satellites/communications/amateur.asset index 93056ec693..b1d6370b17 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/communications/amateur.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/amateur.asset @@ -2,9 +2,9 @@ local assetHelper = asset.require('util/asset_helper') local shared = asset.require('util/tle_helper') local group = { - Title = "Amateur Radio", - Url = "http://www.celestrak.com/NORAD/elements/amateur.txt", - TrailColor = { 0.75, 0.75, 0.35 } + Title = "Amateur Radio", + Url = "http://www.celestrak.com/NORAD/elements/amateur.txt", + TrailColor = { 0.75, 0.75, 0.35 } } local tle = shared.downloadTLEFile(asset, group.Url, group.Title) diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/communications/experimental.asset b/data/assets/scene/solarsystem/planets/earth/satellites/communications/experimental.asset index 62ddde179b..d094eb3bd3 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/communications/experimental.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/experimental.asset @@ -2,9 +2,9 @@ local assetHelper = asset.require('util/asset_helper') local shared = asset.require('util/tle_helper') local group = { - Title = "Experimental", - Url = "http://www.celestrak.com/NORAD/elements/x-comm.txt", - TrailColor = { 0.75, 0.75, 0.35 } + Title = "Experimental", + Url = "http://www.celestrak.com/NORAD/elements/x-comm.txt", + TrailColor = { 0.75, 0.75, 0.35 } } local tle = shared.downloadTLEFile(asset, group.Url, group.Title) diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/communications/geostationary.asset b/data/assets/scene/solarsystem/planets/earth/satellites/communications/geostationary.asset index 5a2b92bbeb..aa17c4c902 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/communications/geostationary.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/geostationary.asset @@ -2,9 +2,9 @@ local assetHelper = asset.require('util/asset_helper') local shared = asset.require('util/tle_helper') local group = { - Title = "Geostationary", - Url = "http://celestrak.com/NORAD/elements/geo.txt", - TrailColor = { 0.9, 0.9, 0.0 } + Title = "Geostationary", + Url = "http://celestrak.com/NORAD/elements/geo.txt", + TrailColor = { 0.9, 0.9, 0.0 } } local tle = shared.downloadTLEFile(asset, group.Url, group.Title) diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/communications/globalstar.asset b/data/assets/scene/solarsystem/planets/earth/satellites/communications/globalstar.asset index 187da196dc..45057138bc 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/communications/globalstar.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/globalstar.asset @@ -2,9 +2,9 @@ local assetHelper = asset.require('util/asset_helper') local shared = asset.require('util/tle_helper') local group = { - Title = "GlobalStar", - Url = "http://www.celestrak.com/NORAD/elements/globalstar.txt", - TrailColor = { 0.75, 0.75, 0.35 } + Title = "GlobalStar", + Url = "http://www.celestrak.com/NORAD/elements/globalstar.txt", + TrailColor = { 0.75, 0.75, 0.35 } } local tle = shared.downloadTLEFile(asset, group.Url, group.Title) diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/communications/gorizont.asset b/data/assets/scene/solarsystem/planets/earth/satellites/communications/gorizont.asset index 968c7a0d52..5369ef8ad7 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/communications/gorizont.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/gorizont.asset @@ -2,9 +2,9 @@ local assetHelper = asset.require('util/asset_helper') local shared = asset.require('util/tle_helper') local group = { - Title = "Gorizont", - Url = "http://www.celestrak.com/NORAD/elements/gorizont.txt", - TrailColor = { 0.75, 0.75, 0.35 } + Title = "Gorizont", + Url = "http://www.celestrak.com/NORAD/elements/gorizont.txt", + TrailColor = { 0.75, 0.75, 0.35 } } local tle = shared.downloadTLEFile(asset, group.Url, group.Title) diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/communications/intelsat.asset b/data/assets/scene/solarsystem/planets/earth/satellites/communications/intelsat.asset index 6c63a7a152..e40a150e55 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/communications/intelsat.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/intelsat.asset @@ -2,9 +2,9 @@ local assetHelper = asset.require('util/asset_helper') local shared = asset.require('util/tle_helper') local group = { - Title = "Intelsat", - Url = "http://www.celestrak.com/NORAD/elements/intelsat.txt", - TrailColor = { 0.75, 0.75, 0.35 } + Title = "Intelsat", + Url = "http://www.celestrak.com/NORAD/elements/intelsat.txt", + TrailColor = { 0.75, 0.75, 0.35 } } local tle = shared.downloadTLEFile(asset, group.Url, group.Title) diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/communications/iridium.asset b/data/assets/scene/solarsystem/planets/earth/satellites/communications/iridium.asset index 9aef4acfa4..5d8708142f 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/communications/iridium.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/iridium.asset @@ -2,9 +2,9 @@ local assetHelper = asset.require('util/asset_helper') local shared = asset.require('util/tle_helper') local group = { - Title = "Iridium", - Url = "http://www.celestrak.com/NORAD/elements/iridium.txt", - TrailColor = { 0.75, 0.75, 0.35 } + Title = "Iridium", + Url = "http://www.celestrak.com/NORAD/elements/iridium.txt", + TrailColor = { 0.75, 0.75, 0.35 } } local tle = shared.downloadTLEFile(asset, group.Url, group.Title) diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/communications/iridium_next.asset b/data/assets/scene/solarsystem/planets/earth/satellites/communications/iridium_next.asset index 0acefd60bb..f37747ea8f 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/communications/iridium_next.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/iridium_next.asset @@ -2,9 +2,9 @@ local assetHelper = asset.require('util/asset_helper') local shared = asset.require('util/tle_helper') local group = { - Title = "Iridium NEXT", - Url = "http://www.celestrak.com/NORAD/elements/iridium-NEXT.txt", - TrailColor = { 0.75, 0.75, 0.35 } + Title = "Iridium NEXT", + Url = "http://www.celestrak.com/NORAD/elements/iridium-NEXT.txt", + TrailColor = { 0.75, 0.75, 0.35 } } local tle = shared.downloadTLEFile(asset, group.Url, group.Title) diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/communications/molniya.asset b/data/assets/scene/solarsystem/planets/earth/satellites/communications/molniya.asset index faa5e257cd..ed6e25b49a 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/communications/molniya.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/molniya.asset @@ -2,9 +2,9 @@ local assetHelper = asset.require('util/asset_helper') local shared = asset.require('util/tle_helper') local group = { - Title = "Molniya", - Url = "http://www.celestrak.com/NORAD/elements/molniya.txt", - TrailColor = { 0.75, 0.75, 0.35 } + Title = "Molniya", + Url = "http://www.celestrak.com/NORAD/elements/molniya.txt", + TrailColor = { 0.75, 0.75, 0.35 } } local tle = shared.downloadTLEFile(asset, group.Url, group.Title) diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/communications/orbcomm.asset b/data/assets/scene/solarsystem/planets/earth/satellites/communications/orbcomm.asset index 46a00682df..9fd8597db8 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/communications/orbcomm.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/orbcomm.asset @@ -2,9 +2,9 @@ local assetHelper = asset.require('util/asset_helper') local shared = asset.require('util/tle_helper') local group = { - Title = "Orbcomm", - Url = "http://www.celestrak.com/NORAD/elements/orbcomm.txt", - TrailColor = { 0.75, 0.75, 0.35 } + Title = "Orbcomm", + Url = "http://www.celestrak.com/NORAD/elements/orbcomm.txt", + TrailColor = { 0.75, 0.75, 0.35 } } local tle = shared.downloadTLEFile(asset, group.Url, group.Title) diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/communications/other_comm.asset b/data/assets/scene/solarsystem/planets/earth/satellites/communications/other_comm.asset index a389e514db..7c4621d189 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/communications/other_comm.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/other_comm.asset @@ -2,9 +2,9 @@ local assetHelper = asset.require('util/asset_helper') local shared = asset.require('util/tle_helper') local group = { - Title = "Other comm", - Url = "http://www.celestrak.com/NORAD/elements/other-comm.txt", - TrailColor = { 0.75, 0.75, 0.35 } + Title = "Other comm", + Url = "http://www.celestrak.com/NORAD/elements/other-comm.txt", + TrailColor = { 0.75, 0.75, 0.35 } } local tle = shared.downloadTLEFile(asset, group.Url, group.Title) diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/communications/raduga.asset b/data/assets/scene/solarsystem/planets/earth/satellites/communications/raduga.asset index 61b2511d13..054816b80c 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/communications/raduga.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/raduga.asset @@ -2,9 +2,9 @@ local assetHelper = asset.require('util/asset_helper') local shared = asset.require('util/tle_helper') local group = { - Title = "Raduga", - Url = "http://www.celestrak.com/NORAD/elements/raduga.txt", - TrailColor = { 0.75, 0.75, 0.35 } + Title = "Raduga", + Url = "http://www.celestrak.com/NORAD/elements/raduga.txt", + TrailColor = { 0.75, 0.75, 0.35 } } local tle = shared.downloadTLEFile(asset, group.Url, group.Title) diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/communications/ses.asset b/data/assets/scene/solarsystem/planets/earth/satellites/communications/ses.asset index 5589bc9f2d..6f19efa0ac 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/communications/ses.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/ses.asset @@ -2,9 +2,9 @@ local assetHelper = asset.require('util/asset_helper') local shared = asset.require('util/tle_helper') local group = { - Title = "SES", - Url = "http://www.celestrak.com/NORAD/elements/ses.txt", - TrailColor = { 0.75, 0.75, 0.35 } + Title = "SES", + Url = "http://www.celestrak.com/NORAD/elements/ses.txt", + TrailColor = { 0.75, 0.75, 0.35 } } local tle = shared.downloadTLEFile(asset, group.Url, group.Title) diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_asat.asset b/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_asat.asset index 0335bc5466..93df258312 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_asat.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_asat.asset @@ -2,9 +2,9 @@ local assetHelper = asset.require('util/asset_helper') local shared = asset.require('util/tle_helper') local group = { - Title = "Indian ASAT test Debris", - Url = "http://www.celestrak.com/NORAD/elements/2019-006.txt", - TrailColor = { 0.25, 0.35, 0.45 } + Title = "Indian ASAT test Debris", + Url = "http://www.celestrak.com/NORAD/elements/2019-006.txt", + TrailColor = { 0.25, 0.35, 0.45 } } local tle = shared.downloadTLEFile(asset, group.Url, group.Title) diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_breezem.asset b/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_breezem.asset index ca65fa548c..602f400de3 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_breezem.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_breezem.asset @@ -2,9 +2,9 @@ local assetHelper = asset.require('util/asset_helper') local shared = asset.require('util/tle_helper') local group = { - Title = "Breeze-M Breakup", - Url = "http://www.celestrak.com/NORAD/elements/2012-044.txt", - TrailColor = { 0.25, 0.35, 0.45 } + Title = "Breeze-M Breakup", + Url = "http://www.celestrak.com/NORAD/elements/2012-044.txt", + TrailColor = { 0.25, 0.35, 0.45 } } local tle = shared.downloadTLEFile(asset, group.Url, group.Title) diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_fengyun.asset b/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_fengyun.asset index f6ac4c803a..fe48a9cd20 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_fengyun.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_fengyun.asset @@ -2,9 +2,9 @@ local assetHelper = asset.require('util/asset_helper') local shared = asset.require('util/tle_helper') local group = { - Title = "Fengyun Debris", - Url = "http://www.celestrak.com/NORAD/elements/1999-025.txt", - TrailColor = { 0.784, 1.0, 0.737 } + Title = "Fengyun Debris", + Url = "http://www.celestrak.com/NORAD/elements/1999-025.txt", + TrailColor = { 0.784, 1.0, 0.737 } } local tle = shared.downloadTLEFile(asset, group.Url, group.Title) diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_iridium33.asset b/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_iridium33.asset index 4d4ee16f8a..1d1235028d 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_iridium33.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_iridium33.asset @@ -2,9 +2,9 @@ local assetHelper = asset.require('util/asset_helper') local shared = asset.require('util/tle_helper') local group = { - Title = "Iridium 33 Debris", - Url = "http://www.celestrak.com/NORAD/elements/iridium-33-debris.txt", - TrailColor = { 0.8, 0.0, 0.3 } + Title = "Iridium 33 Debris", + Url = "http://www.celestrak.com/NORAD/elements/iridium-33-debris.txt", + TrailColor = { 0.8, 0.0, 0.3 } } local tle = shared.downloadTLEFile(asset, group.Url, group.Title) diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_kosmos2251.asset b/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_kosmos2251.asset index 6d84fd8247..6522de59ab 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_kosmos2251.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_kosmos2251.asset @@ -2,9 +2,9 @@ local assetHelper = asset.require('util/asset_helper') local shared = asset.require('util/tle_helper') local group = { - Title = "Kosmos 2251 Debris", - Url = "http://www.celestrak.com/NORAD/elements/cosmos-2251-debris.txt", - TrailColor = { 0.66, 0.8, 0.5 } + Title = "Kosmos 2251 Debris", + Url = "http://www.celestrak.com/NORAD/elements/cosmos-2251-debris.txt", + TrailColor = { 0.66, 0.8, 0.5 } } local tle = shared.downloadTLEFile(asset, group.Url, group.Title) diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/debris/volume/cartesian_volume.asset b/data/assets/scene/solarsystem/planets/earth/satellites/debris/volume/cartesian_volume.asset index 27f651d20f..1e3b606a76 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/debris/volume/cartesian_volume.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/debris/volume/cartesian_volume.asset @@ -10,28 +10,28 @@ local transforms = asset.require("scene/solarsystem/planets/earth/transforms") local maxApogee = 2 * 10946320; local volume = { - Identifier = "DebrisVolume - Cartesian", - Parent = transforms.EarthInertial.Identifier, - Renderable = { - Type = "RenderableTimeVaryingVolume", - SourceDirectory = asset.localResource("generatedCartesian"), - TransferFunction = asset.localResource("transferfunction.txt"), - StepSize = 0.01, - MinValue = 0, - MaxValue = 1, - GridType = "Cartesian", - SecondsBefore = 50*365*24*60*60, - SecondsAfter = 50*365*24*60*60 - }, - GUI = { - Path = "/Volumes" - }, - Transform = { - Scale = { - Type = "StaticScale", - Scale = maxApogee -- do not multiply this. That will not show real representation. - } + Identifier = "DebrisVolume - Cartesian", + Parent = transforms.EarthInertial.Identifier, + Renderable = { + Type = "RenderableTimeVaryingVolume", + SourceDirectory = asset.localResource("generatedCartesian"), + TransferFunction = asset.localResource("transferfunction.txt"), + StepSize = 0.01, + MinValue = 0, + MaxValue = 1, + GridType = "Cartesian", + SecondsBefore = 50*365*24*60*60, + SecondsAfter = 50*365*24*60*60 + }, + GUI = { + Path = "/Volumes" + }, + Transform = { + Scale = { + Type = "StaticScale", + Scale = maxApogee -- do not multiply this. That will not show real representation. } + } } local objects = { volume } diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/debris/volume/spherical_volume.asset b/data/assets/scene/solarsystem/planets/earth/satellites/debris/volume/spherical_volume.asset index 85abc72975..f0e5218cb0 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/debris/volume/spherical_volume.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/debris/volume/spherical_volume.asset @@ -10,28 +10,28 @@ local transforms = asset.require("scene/solarsystem/planets/earth/transforms") local maxApogee = 10946320; local volume = { - Identifier = "DebrisVolume - Spherical", - Parent = transforms.EarthInertial.Identifier, - Renderable = { - Type = "RenderableTimeVaryingVolume", - SourceDirectory = asset.localResource("generated"), - TransferFunction = asset.localResource("transferfunction.txt"), - StepSize = 0.01, - MinValue = 0, - MaxValue = 1, - GridType = "Spherical", - SecondsBefore = 50*365*24*60*60, - SecondsAfter = 50*365*24*60*60 - }, - GUI = { - Path = "/Volumes" - }, - Transform = { - Scale = { - Type = "StaticScale", - Scale = maxApogee --do not multiply this. That will not show real representation. - } + Identifier = "DebrisVolume - Spherical", + Parent = transforms.EarthInertial.Identifier, + Renderable = { + Type = "RenderableTimeVaryingVolume", + SourceDirectory = asset.localResource("generated"), + TransferFunction = asset.localResource("transferfunction.txt"), + StepSize = 0.01, + MinValue = 0, + MaxValue = 1, + GridType = "Spherical", + SecondsBefore = 50*365*24*60*60, + SecondsAfter = 50*365*24*60*60 + }, + GUI = { + Path = "/Volumes" + }, + Transform = { + Scale = { + Type = "StaticScale", + Scale = maxApogee --do not multiply this. That will not show real representation. } + } } local objects = { volume } diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/misc/brightest.asset b/data/assets/scene/solarsystem/planets/earth/satellites/misc/brightest.asset index 6a74e9e875..9dd6222fc4 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/misc/brightest.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/misc/brightest.asset @@ -2,9 +2,9 @@ local assetHelper = asset.require('util/asset_helper') local shared = asset.require('util/tle_helper') local group = { - Title = "100 Brightest", - Url = "http://www.celestrak.com/NORAD/elements/visual.txt", - TrailColor = { 0.55, 0.25, 0.65 } + Title = "100 Brightest", + Url = "http://www.celestrak.com/NORAD/elements/visual.txt", + TrailColor = { 0.55, 0.25, 0.65 } } local tle = shared.downloadTLEFile(asset, group.Url, group.Title) diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/misc/cubesats.asset b/data/assets/scene/solarsystem/planets/earth/satellites/misc/cubesats.asset index b53e0fa281..1f9ac6c110 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/misc/cubesats.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/misc/cubesats.asset @@ -2,9 +2,9 @@ local assetHelper = asset.require('util/asset_helper') local shared = asset.require('util/tle_helper') local group = { - Title = "CubeSat", - Url = "http://www.celestrak.com/NORAD/elements/cubesat.txt", - TrailColor = { 0.75, 0.75, 0.35 } + Title = "CubeSat", + Url = "http://www.celestrak.com/NORAD/elements/cubesat.txt", + TrailColor = { 0.75, 0.75, 0.35 } } local tle = shared.downloadTLEFile(asset, group.Url, group.Title) diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/misc/iss.asset b/data/assets/scene/solarsystem/planets/earth/satellites/misc/iss.asset index eee82d3659..54defe6c21 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/misc/iss.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/misc/iss.asset @@ -34,9 +34,9 @@ local initializeAndAddNodes = function() LineNumber = 1 }, Rotation = { - Type = "SpiceRotation", - SourceFrame = "GALACTIC", - DestinationFrame = "J2000", + Type = "SpiceRotation", + SourceFrame = "GALACTIC", + DestinationFrame = "J2000", } }, Tag = { "earth_satellite", "ISS" }, @@ -50,11 +50,11 @@ local initializeAndAddNodes = function() Parent = iss.Identifier, Transform = { Rotation = { - Type = "FixedRotation", - Attached = "ISSparentNode", - XAxis = { 0.01, -1.0, 0.56 }, - XAxisOrthogonal = true, - YAxis = transforms.EarthInertial.Identifier + Type = "FixedRotation", + Attached = "ISSparentNode", + XAxis = { 0.01, -1.0, 0.56 }, + XAxisOrthogonal = true, + YAxis = transforms.EarthInertial.Identifier } }, Renderable = { @@ -73,9 +73,9 @@ local initializeAndAddNodes = function() DisableFaceCulling = true }, GUI = { - Name = "ISSparentNode", - Path = "/Solar System/Planets/Earth/Satellites/ISS", - Hidden = true, + Name = "ISSparentNode", + Path = "/Solar System/Planets/Earth/Satellites/ISS", + Hidden = true, } } @@ -83,20 +83,20 @@ local initializeAndAddNodes = function() Identifier = identifier .. "_trail", Parent = transforms.EarthInertial.Identifier, Renderable = { - Type = "RenderableTrailOrbit", - Translation = { - Type = "TLETranslation", - Body = identifier, - Observer = transforms.EarthInertial.Identifier, - File = path, - LineNumber = 1, - RenderBinMode = "PostDeferredTransparent" - }, - Color = { 0.9, 0.6715, 0.0 }, - Fade = 1.5, - Period = period, - Resolution = 320 + Type = "RenderableTrailOrbit", + Translation = { + Type = "TLETranslation", + Body = identifier, + Observer = transforms.EarthInertial.Identifier, + File = path, + LineNumber = 1, + RenderBinMode = "PostDeferredTransparent" }, + Color = { 0.9, 0.6715, 0.0 }, + Fade = 1.5, + Period = period, + Resolution = 320 + }, Tag = { "earth_satellite", "ISS" }, GUI = { Name = "ISS Trail", @@ -109,27 +109,27 @@ local initializeAndAddNodes = function() Parent = iss.Identifier, Renderable = { - Enabled = false, - Type = "RenderableLabels", - LabelText = "ISS", - FontSize = 100.0, - LabelSize = 3.4, - LabelMaxSize = 100.0, - LabelMinSize = 1.0, - LabelOrientationOption = "Camera View Direction", - BlendMode = "Additive", - EnableFading = true, - FadeStartUnit = "au", - FadeStartDistance = 0.15, - FadeStartSpeed = 1.0, - FadeEndUnit = "au", - FadeEndDistance = 15.0, - FadeEndSpeed = 25.0 + Enabled = false, + Type = "RenderableLabels", + LabelText = "ISS", + FontSize = 100.0, + LabelSize = 3.4, + LabelMaxSize = 100.0, + LabelMinSize = 1.0, + LabelOrientationOption = "Camera View Direction", + BlendMode = "Additive", + EnableFading = true, + FadeStartUnit = "au", + FadeStartDistance = 0.15, + FadeStartSpeed = 1.0, + FadeEndUnit = "au", + FadeEndDistance = 15.0, + FadeEndSpeed = 25.0 }, Tag = { "solarsystem_labels" }, GUI = { - Name = "ISS Label", - Path = "/Solar System/Planets/Earth/Satellites" + Name = "ISS Label", + Path = "/Solar System/Planets/Earth/Satellites" } } @@ -154,11 +154,11 @@ end) asset.meta = { - Name = "ISS", - Version = "1.0", - Description = [[ Model and Trail for ISS. Model from NASA 3D models, trail from - CELESTRAK]], - Author = "OpenSpace Team", - URL = "https://celestrak.com/", - License = "NASA" + Name = "ISS", + Version = "1.0", + Description = [[ Model and Trail for ISS. Model from NASA 3D models, trail from + CELESTRAK]], + Author = "OpenSpace Team", + URL = "https://celestrak.com/", + License = "NASA" } diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/misc/military.asset b/data/assets/scene/solarsystem/planets/earth/satellites/misc/military.asset index eba2695caa..8b159fdff1 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/misc/military.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/misc/military.asset @@ -2,9 +2,9 @@ local assetHelper = asset.require('util/asset_helper') local shared = asset.require('util/tle_helper') local group = { - Title = "Military", - Url = "http://www.celestrak.com/NORAD/elements/military.txt", - TrailColor = { 0.75, 0.75, 0.35 } + Title = "Military", + Url = "http://www.celestrak.com/NORAD/elements/military.txt", + TrailColor = { 0.75, 0.75, 0.35 } } local tle = shared.downloadTLEFile(asset, group.Url, group.Title) diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/misc/other.asset b/data/assets/scene/solarsystem/planets/earth/satellites/misc/other.asset index a389e6510d..3918837b54 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/misc/other.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/misc/other.asset @@ -2,9 +2,9 @@ local assetHelper = asset.require('util/asset_helper') local shared = asset.require('util/tle_helper') local group = { - Title = "Other", - Url = "http://www.celestrak.com/NORAD/elements/other.txt", - TrailColor = { 0.75, 0.75, 0.35 } + Title = "Other", + Url = "http://www.celestrak.com/NORAD/elements/other.txt", + TrailColor = { 0.75, 0.75, 0.35 } } local tle = shared.downloadTLEFile(asset, group.Url, group.Title) diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/misc/radar.asset b/data/assets/scene/solarsystem/planets/earth/satellites/misc/radar.asset index 64204ffd3f..9c997c75c3 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/misc/radar.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/misc/radar.asset @@ -2,9 +2,9 @@ local assetHelper = asset.require('util/asset_helper') local shared = asset.require('util/tle_helper') local group = { - Title = "Radar Calibration", - Url = "http://www.celestrak.com/NORAD/elements/radar.txt", - TrailColor = { 0.75, 0.75, 0.35 } + Title = "Radar Calibration", + Url = "http://www.celestrak.com/NORAD/elements/radar.txt", + TrailColor = { 0.75, 0.75, 0.35 } } local tle = shared.downloadTLEFile(asset, group.Url, group.Title) diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/misc/spacestations.asset b/data/assets/scene/solarsystem/planets/earth/satellites/misc/spacestations.asset index f9f974a730..bcd888013c 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/misc/spacestations.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/misc/spacestations.asset @@ -2,9 +2,9 @@ local assetHelper = asset.require('util/asset_helper') local shared = asset.require('util/tle_helper') local group = { - Title = "SpaceStations", - Url = "http://celestrak.com/NORAD/elements/stations.txt", - TrailColor = { 0.9, 0.1, 0.0 } + Title = "SpaceStations", + Url = "http://celestrak.com/NORAD/elements/stations.txt", + TrailColor = { 0.9, 0.1, 0.0 } } local tle = shared.downloadTLEFile(asset, group.Url, group.Title) diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/misc/tle-new.asset b/data/assets/scene/solarsystem/planets/earth/satellites/misc/tle-new.asset index 506dd7bb48..81ada563fc 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/misc/tle-new.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/misc/tle-new.asset @@ -2,9 +2,9 @@ local assetHelper = asset.require('util/asset_helper') local shared = asset.require('util/tle_helper') local group = { - Title = "Last 30 Days", - Url = "http://www.celestrak.com/NORAD/elements/tle-new.txt", - TrailColor = { 0.65, 0.25, 0.45 } + Title = "Last 30 Days", + Url = "http://www.celestrak.com/NORAD/elements/tle-new.txt", + TrailColor = { 0.65, 0.25, 0.45 } } local tle = shared.downloadTLEFile(asset, group.Url, group.Title) diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/navigation/beidou.asset b/data/assets/scene/solarsystem/planets/earth/satellites/navigation/beidou.asset index 47fe0930be..d5ccf64db5 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/navigation/beidou.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/navigation/beidou.asset @@ -2,9 +2,9 @@ local assetHelper = asset.require('util/asset_helper') local shared = asset.require('util/tle_helper') local group = { - Title = "Beidou", - Url = "http://www.celestrak.com/NORAD/elements/beidou.txt", - TrailColor = { 0.75, 0.75, 0.35 } + Title = "Beidou", + Url = "http://www.celestrak.com/NORAD/elements/beidou.txt", + TrailColor = { 0.75, 0.75, 0.35 } } local tle = shared.downloadTLEFile(asset, group.Url, group.Title) diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/navigation/galileo.asset b/data/assets/scene/solarsystem/planets/earth/satellites/navigation/galileo.asset index f3c2d976f3..bf1d460a7e 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/navigation/galileo.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/navigation/galileo.asset @@ -2,9 +2,9 @@ local assetHelper = asset.require('util/asset_helper') local shared = asset.require('util/tle_helper') local group = { - Title = "Galileo", - Url = "http://www.celestrak.com/NORAD/elements/galileo.txt", - TrailColor = { 0.75, 0.75, 0.35 } + Title = "Galileo", + Url = "http://www.celestrak.com/NORAD/elements/galileo.txt", + TrailColor = { 0.75, 0.75, 0.35 } } local tle = shared.downloadTLEFile(asset, group.Url, group.Title) diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/navigation/glosnass.asset b/data/assets/scene/solarsystem/planets/earth/satellites/navigation/glosnass.asset index b0223450c3..550b895287 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/navigation/glosnass.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/navigation/glosnass.asset @@ -2,9 +2,9 @@ local assetHelper = asset.require('util/asset_helper') local shared = asset.require('util/tle_helper') local group = { - Title = "Glosnass", - Url = "http://www.celestrak.com/NORAD/elements/glo-ops.txt", - TrailColor = { 0.75, 0.75, 0.35 } + Title = "Glosnass", + Url = "http://www.celestrak.com/NORAD/elements/glo-ops.txt", + TrailColor = { 0.75, 0.75, 0.35 } } local tle = shared.downloadTLEFile(asset, group.Url, group.Title) diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/navigation/gps.asset b/data/assets/scene/solarsystem/planets/earth/satellites/navigation/gps.asset index e08e162862..ba3f603851 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/navigation/gps.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/navigation/gps.asset @@ -2,9 +2,9 @@ local assetHelper = asset.require('util/asset_helper') local shared = asset.require('util/tle_helper') local group = { - Title = "GPS", - Url = "http://celestrak.com/NORAD/elements/gps-ops.txt", - TrailColor = { 0.9, 0.5, 0.0 } + Title = "GPS", + Url = "http://celestrak.com/NORAD/elements/gps-ops.txt", + TrailColor = { 0.9, 0.5, 0.0 } } local tle = shared.downloadTLEFile(asset, group.Url, group.Title) diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/navigation/musson.asset b/data/assets/scene/solarsystem/planets/earth/satellites/navigation/musson.asset index efccb05950..50a0792a4e 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/navigation/musson.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/navigation/musson.asset @@ -2,9 +2,9 @@ local assetHelper = asset.require('util/asset_helper') local shared = asset.require('util/tle_helper') local group = { - Title = "Russian LEO Navigation", - Url = "http://www.celestrak.com/NORAD/elements/musson.txt", - TrailColor = { 0.75, 0.75, 0.35 } + Title = "Russian LEO Navigation", + Url = "http://www.celestrak.com/NORAD/elements/musson.txt", + TrailColor = { 0.75, 0.75, 0.35 } } local tle = shared.downloadTLEFile(asset, group.Url, group.Title) diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/navigation/nnss.asset b/data/assets/scene/solarsystem/planets/earth/satellites/navigation/nnss.asset index 3be4a576ec..0085bbffda 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/navigation/nnss.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/navigation/nnss.asset @@ -2,9 +2,9 @@ local assetHelper = asset.require('util/asset_helper') local shared = asset.require('util/tle_helper') local group = { - Title = "Navy Navigation Satellite System", - Url = "http://www.celestrak.com/NORAD/elements/nnss.txt", - TrailColor = { 0.75, 0.75, 0.35 } + Title = "Navy Navigation Satellite System", + Url = "http://www.celestrak.com/NORAD/elements/nnss.txt", + TrailColor = { 0.75, 0.75, 0.35 } } local tle = shared.downloadTLEFile(asset, group.Url, group.Title) diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/navigation/sbas.asset b/data/assets/scene/solarsystem/planets/earth/satellites/navigation/sbas.asset index 58458638c4..a63ef7b565 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/navigation/sbas.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/navigation/sbas.asset @@ -2,9 +2,9 @@ local assetHelper = asset.require('util/asset_helper') local shared = asset.require('util/tle_helper') local group = { - Title = "Satellite Based Augmentation System", - Url = "http://www.celestrak.com/NORAD/elements/sbas.txt", - TrailColor = { 0.75, 0.75, 0.35 } + Title = "Satellite Based Augmentation System", + Url = "http://www.celestrak.com/NORAD/elements/sbas.txt", + TrailColor = { 0.75, 0.75, 0.35 } } local tle = shared.downloadTLEFile(asset, group.Url, group.Title) diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/satellites_all.asset b/data/assets/scene/solarsystem/planets/earth/satellites/satellites_all.asset index 953bb149ec..ea203b1ca0 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/satellites_all.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/satellites_all.asset @@ -9,11 +9,11 @@ asset.require('./satellites_weather') asset.meta = { - Name = "Satellites All", - Version = "1.0", - Description = [[ Meta asset for all satellites of Earth. Containing all other meta - assets.]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license" + Name = "Satellites All", + Version = "1.0", + Description = [[ Meta asset for all satellites of Earth. Containing all other meta + assets.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/satellites_communications.asset b/data/assets/scene/solarsystem/planets/earth/satellites/satellites_communications.asset index 6341917a7d..be723c02ee 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/satellites_communications.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/satellites_communications.asset @@ -14,12 +14,12 @@ asset.require('./communications/molniya') asset.meta = { - Name = "Satellites Communications", - Version = "1.0", - Description = [[ Meta asset for communications satellites of Earth. Containing groups: - geostationary, intelsat, ses, iridium, iridium_next, orbcomm, globalstar, amateur, - experimental, other_comm, gorizont, raduga and molniya.]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license" + Name = "Satellites Communications", + Version = "1.0", + Description = [[ Meta asset for communications satellites of Earth. Containing groups: + geostationary, intelsat, ses, iridium, iridium_next, orbcomm, globalstar, amateur, + experimental, other_comm, gorizont, raduga and molniya.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/satellites_debris.asset b/data/assets/scene/solarsystem/planets/earth/satellites/satellites_debris.asset index 04f73ac275..ad84683154 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/satellites_debris.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/satellites_debris.asset @@ -6,12 +6,12 @@ asset.require('./debris/debris_kosmos2251') asset.meta = { - Name = "Satellites Debris", - Version = "1.0", - Description = [[ Meta asset for space debris of Earth. Containing groups: - debris_asat, debris_breezem, debris_fengyun, debris_iridium33, and - debris_kosmos2251.]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license" + Name = "Satellites Debris", + Version = "1.0", + Description = [[ Meta asset for space debris of Earth. Containing groups: + debris_asat, debris_breezem, debris_fengyun, debris_iridium33, and + debris_kosmos2251.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/satellites_interesting.asset b/data/assets/scene/solarsystem/planets/earth/satellites/satellites_interesting.asset index e5ae453077..afc723d4a8 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/satellites_interesting.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/satellites_interesting.asset @@ -7,11 +7,11 @@ asset.require('./misc/tle-new') asset.meta = { - Name = "Satellites Interesting", - Version = "1.0", - Description = [[ Meta asset for interesting satellites of Earth. Containing groups: - brightest, geostationary, gps, spacestations, iss, and tle-new.]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license" + Name = "Satellites Interesting", + Version = "1.0", + Description = [[ Meta asset for interesting satellites of Earth. Containing groups: + brightest, geostationary, gps, spacestations, iss, and tle-new.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/satellites_misc.asset b/data/assets/scene/solarsystem/planets/earth/satellites/satellites_misc.asset index e44d1b4c6b..7e82acabf8 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/satellites_misc.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/satellites_misc.asset @@ -5,11 +5,11 @@ asset.require('./misc/other') asset.meta = { - Name = "Satellites Misc", - Version = "1.0", - Description = [[ Meta asset for misc satellites of Earth. Containing groups: - military, radar, cubesats, and other.]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license" + Name = "Satellites Misc", + Version = "1.0", + Description = [[ Meta asset for misc satellites of Earth. Containing groups: + military, radar, cubesats, and other.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/satellites_navigation.asset b/data/assets/scene/solarsystem/planets/earth/satellites/satellites_navigation.asset index 4ba584613d..473013b07b 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/satellites_navigation.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/satellites_navigation.asset @@ -8,11 +8,11 @@ asset.require('./navigation/sbas') asset.meta = { - Name = "Satellites Navigation", - Version = "1.0", - Description = [[ Meta asset for navigation satellites of Earth. Containing groups: - beidou, galileo, glosnass, gps, musson, nnss, and sbas.]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license" + Name = "Satellites Navigation", + Version = "1.0", + Description = [[ Meta asset for navigation satellites of Earth. Containing groups: + beidou, galileo, glosnass, gps, musson, nnss, and sbas.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/satellites_science.asset b/data/assets/scene/solarsystem/planets/earth/satellites/satellites_science.asset index b4fcc359c9..d235eda9e1 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/satellites_science.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/satellites_science.asset @@ -5,11 +5,11 @@ asset.require('./science/education') asset.meta = { - Name = "Satellites Science", - Version = "1.0", - Description = [[ Meta asset for science satellites of Earth. Containing groups: - spaceearth, geodetic, engineering, and education.]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license" + Name = "Satellites Science", + Version = "1.0", + Description = [[ Meta asset for science satellites of Earth. Containing groups: + spaceearth, geodetic, engineering, and education.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/satellites_weather.asset b/data/assets/scene/solarsystem/planets/earth/satellites/satellites_weather.asset index e3177c98b2..1a8097a0c8 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/satellites_weather.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/satellites_weather.asset @@ -11,11 +11,11 @@ asset.require('./weather/weather') asset.meta = { - Name = "Satellites Weather", - Version = "1.0", - Description = [[ Meta asset for weather satellites of Earth. Containing groups: argos, - dmc, earth_resources, geos, noaa, planet, sarsat, spire, tdrss, and weather.]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license" + Name = "Satellites Weather", + Version = "1.0", + Description = [[ Meta asset for weather satellites of Earth. Containing groups: argos, + dmc, earth_resources, geos, noaa, planet, sarsat, spire, tdrss, and weather.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/science/education.asset b/data/assets/scene/solarsystem/planets/earth/satellites/science/education.asset index d7a42c5fde..f9aa07460f 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/science/education.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/science/education.asset @@ -2,9 +2,9 @@ local assetHelper = asset.require('util/asset_helper') local shared = asset.require('util/tle_helper') local group = { - Title = "Education", - Url = "http://www.celestrak.com/NORAD/elements/education.txt", - TrailColor = { 0.75, 0.75, 0.35 } + Title = "Education", + Url = "http://www.celestrak.com/NORAD/elements/education.txt", + TrailColor = { 0.75, 0.75, 0.35 } } local tle = shared.downloadTLEFile(asset, group.Url, group.Title) diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/science/engineering.asset b/data/assets/scene/solarsystem/planets/earth/satellites/science/engineering.asset index faa6febc16..a59de0b948 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/science/engineering.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/science/engineering.asset @@ -2,9 +2,9 @@ local assetHelper = asset.require('util/asset_helper') local shared = asset.require('util/tle_helper') local group = { - Title = "Engineering", - Url = "http://www.celestrak.com/NORAD/elements/engineering.txt", - TrailColor = { 0.75, 0.75, 0.35 } + Title = "Engineering", + Url = "http://www.celestrak.com/NORAD/elements/engineering.txt", + TrailColor = { 0.75, 0.75, 0.35 } } local tle = shared.downloadTLEFile(asset, group.Url, group.Title) diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/science/geodetic.asset b/data/assets/scene/solarsystem/planets/earth/satellites/science/geodetic.asset index d2613c699e..87daed06dc 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/science/geodetic.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/science/geodetic.asset @@ -2,9 +2,9 @@ local assetHelper = asset.require('util/asset_helper') local shared = asset.require('util/tle_helper') local group = { - Title = "Geodect", - Url = "http://www.celestrak.com/NORAD/elements/geodetic.txt", - TrailColor = { 0.75, 0.75, 0.35 } + Title = "Geodect", + Url = "http://www.celestrak.com/NORAD/elements/geodetic.txt", + TrailColor = { 0.75, 0.75, 0.35 } } local tle = shared.downloadTLEFile(asset, group.Url, group.Title) diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/science/spaceearth.asset b/data/assets/scene/solarsystem/planets/earth/satellites/science/spaceearth.asset index e6d3513857..fad2ab9354 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/science/spaceearth.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/science/spaceearth.asset @@ -2,9 +2,9 @@ local assetHelper = asset.require('util/asset_helper') local shared = asset.require('util/tle_helper') local group = { - Title = "Space & Earth Science", - Url = "http://www.celestrak.com/NORAD/elements/science.txt", - TrailColor = { 0.75, 0.75, 0.35 } + Title = "Space & Earth Science", + Url = "http://www.celestrak.com/NORAD/elements/science.txt", + TrailColor = { 0.75, 0.75, 0.35 } } local tle = shared.downloadTLEFile(asset, group.Url, group.Title) diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/weather/aqua.asset b/data/assets/scene/solarsystem/planets/earth/satellites/weather/aqua.asset index a056478bdf..96c6e5561b 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/weather/aqua.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/aqua.asset @@ -11,7 +11,6 @@ local tle = satelliteHelper.downloadTLEFile(asset, url, identifier, filename) asset.onInitialize(function () - local lineElement = satelliteHelper.makeSingleLineElement(tle, filename) local period = satelliteHelper.getPeriodFromElement(lineElement) local path = tle .. "/" .. filename @@ -29,9 +28,9 @@ asset.onInitialize(function () LineNumber = 1 }, Rotation = { - Type = "SpiceRotation", - SourceFrame = "GALACTIC", - DestinationFrame = "J2000", + Type = "SpiceRotation", + SourceFrame = "GALACTIC", + DestinationFrame = "J2000", } }, Tag = { "earth_satellite", "Aqua" }, @@ -44,20 +43,20 @@ asset.onInitialize(function () Identifier = identifier .. "_trail", Parent = transforms.EarthInertial.Identifier, Renderable = { - Type = "RenderableTrailOrbit", - Translation = { - Type = "TLETranslation", - Body = identifier, - Observer = transforms.EarthInertial.Identifier, - File = path, - LineNumber = 1, - RenderBinMode = "PostDeferredTransparent" - }, - Color = { 0.9, 0.6715, 0.0 }, - Fade = 1.5, - Period = period, - Resolution = 320 + Type = "RenderableTrailOrbit", + Translation = { + Type = "TLETranslation", + Body = identifier, + Observer = transforms.EarthInertial.Identifier, + File = path, + LineNumber = 1, + RenderBinMode = "PostDeferredTransparent" }, + Color = { 0.9, 0.6715, 0.0 }, + Fade = 1.5, + Period = period, + Resolution = 320 + }, Tag = { "earth_satellite", "Aqua" }, GUI = { Name = "Terra Trail", @@ -70,22 +69,22 @@ asset.onInitialize(function () Parent = Aqua.Identifier, Renderable = { - Enabled = false, - Type = "RenderableLabels", - LabelText = "SNPP", - FontSize = 100.0, - LabelSize = 4.0, - LabelMaxSize = 100.0, - LabelMinSize = 1.0, - LabelOrientationOption = "Camera View Direction", - BlendMode = "Additive", - EnableFading = true, - FadeStartUnit = "au", - FadeStartDistance = 0.15, - FadeStartSpeed = 1.0, - FadeEndUnit = "au", - FadeEndDistance = 15.0, - FadeEndSpeed = 25.0 + Enabled = false, + Type = "RenderableLabels", + LabelText = "SNPP", + FontSize = 100.0, + LabelSize = 4.0, + LabelMaxSize = 100.0, + LabelMinSize = 1.0, + LabelOrientationOption = "Camera View Direction", + BlendMode = "Additive", + EnableFading = true, + FadeStartUnit = "au", + FadeStartDistance = 0.15, + FadeStartSpeed = 1.0, + FadeEndUnit = "au", + FadeEndDistance = 15.0, + FadeEndSpeed = 25.0 }, Tag = { "solarsystem_labels" }, GUI = { @@ -111,11 +110,11 @@ end) asset.meta = { - Name = "Aqua", - Version = "1.0", - Description = [[ Trail for Aqua. trail from - CELESTRAK. Can be used in conjuntion with Aqua Modis (Temporal) layer for Earth]], - Author = "OpenSpace Team", - URL = "https://celestrak.com/", - License = "NASA" + Name = "Aqua", + Version = "1.0", + Description = [[ Trail for Aqua. trail from + CELESTRAK. Can be used in conjuntion with Aqua Modis (Temporal) layer for Earth]], + Author = "OpenSpace Team", + URL = "https://celestrak.com/", + License = "NASA" } diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/weather/argos.asset b/data/assets/scene/solarsystem/planets/earth/satellites/weather/argos.asset index 75d572299e..332778d5af 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/weather/argos.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/argos.asset @@ -2,9 +2,9 @@ local assetHelper = asset.require('util/asset_helper') local shared = asset.require('util/tle_helper') local group = { - Title = "ARGOS", - Url = "http://www.celestrak.com/NORAD/elements/argos.txt", - TrailColor = { 0.75, 0.75, 0.35 } + Title = "ARGOS", + Url = "http://www.celestrak.com/NORAD/elements/argos.txt", + TrailColor = { 0.75, 0.75, 0.35 } } local tle = shared.downloadTLEFile(asset, group.Url, group.Title) diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/weather/dmc.asset b/data/assets/scene/solarsystem/planets/earth/satellites/weather/dmc.asset index eb95d7e6e1..0eb43d7c33 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/weather/dmc.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/dmc.asset @@ -2,9 +2,9 @@ local assetHelper = asset.require('util/asset_helper') local shared = asset.require('util/tle_helper') local group = { - Title = "Disaster Monitoring", - Url = "http://www.celestrak.com/NORAD/elements/dmc.txt", - TrailColor = { 0.75, 0.75, 0.35 } + Title = "Disaster Monitoring", + Url = "http://www.celestrak.com/NORAD/elements/dmc.txt", + TrailColor = { 0.75, 0.75, 0.35 } } local tle = shared.downloadTLEFile(asset, group.Url, group.Title) diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/weather/earth_resources.asset b/data/assets/scene/solarsystem/planets/earth/satellites/weather/earth_resources.asset index e3ad206277..77e3a76d2c 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/weather/earth_resources.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/earth_resources.asset @@ -2,9 +2,9 @@ local assetHelper = asset.require('util/asset_helper') local shared = asset.require('util/tle_helper') local group = { - Title = "Earth Resources", - Url = "http://www.celestrak.com/NORAD/elements/resource.txt", - TrailColor = { 0.75, 0.75, 0.35 } + Title = "Earth Resources", + Url = "http://www.celestrak.com/NORAD/elements/resource.txt", + TrailColor = { 0.75, 0.75, 0.35 } } local tle = shared.downloadTLEFile(asset, group.Url, group.Title) diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/weather/goes.asset b/data/assets/scene/solarsystem/planets/earth/satellites/weather/goes.asset index 55a2584643..789103e5f4 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/weather/goes.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/goes.asset @@ -2,9 +2,9 @@ local assetHelper = asset.require('util/asset_helper') local shared = asset.require('util/tle_helper') local group = { - Title = "GOES", - Url = "http://www.celestrak.com/NORAD/elements/goes.txt", - TrailColor = { 0.75, 0.75, 0.35 } + Title = "GOES", + Url = "http://www.celestrak.com/NORAD/elements/goes.txt", + TrailColor = { 0.75, 0.75, 0.35 } } local tle = shared.downloadTLEFile(asset, group.Url, group.Title) diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/weather/noaa.asset b/data/assets/scene/solarsystem/planets/earth/satellites/weather/noaa.asset index 85c7f97798..4bac8d1821 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/weather/noaa.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/noaa.asset @@ -2,9 +2,9 @@ local assetHelper = asset.require('util/asset_helper') local shared = asset.require('util/tle_helper') local group = { - Title = "NOAA", - Url = "http://www.celestrak.com/NORAD/elements/noaa.txt", - TrailColor = { 0.75, 0.75, 0.35 } + Title = "NOAA", + Url = "http://www.celestrak.com/NORAD/elements/noaa.txt", + TrailColor = { 0.75, 0.75, 0.35 } } local tle = shared.downloadTLEFile(asset, group.Url, group.Title) diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/weather/planet.asset b/data/assets/scene/solarsystem/planets/earth/satellites/weather/planet.asset index bb5f00625b..9e7d126a20 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/weather/planet.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/planet.asset @@ -2,9 +2,9 @@ local assetHelper = asset.require('util/asset_helper') local shared = asset.require('util/tle_helper') local group = { - Title = "Planet", - Url = "http://www.celestrak.com/NORAD/elements/planet.txt", - TrailColor = { 0.75, 0.75, 0.35 } + Title = "Planet", + Url = "http://www.celestrak.com/NORAD/elements/planet.txt", + TrailColor = { 0.75, 0.75, 0.35 } } local tle = shared.downloadTLEFile(asset, group.Url, group.Title) diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/weather/sarsat.asset b/data/assets/scene/solarsystem/planets/earth/satellites/weather/sarsat.asset index 64ef4004e5..56ba2e8f69 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/weather/sarsat.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/sarsat.asset @@ -2,9 +2,9 @@ local assetHelper = asset.require('util/asset_helper') local shared = asset.require('util/tle_helper') local group = { - Title = "Search & Rescue (SARSAT)", - Url = "http://www.celestrak.com/NORAD/elements/sarsat.txt", - TrailColor = { 0.75, 0.75, 0.35 } + Title = "Search & Rescue (SARSAT)", + Url = "http://www.celestrak.com/NORAD/elements/sarsat.txt", + TrailColor = { 0.75, 0.75, 0.35 } } local tle = shared.downloadTLEFile(asset, group.Url, group.Title) diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/weather/snpp.asset b/data/assets/scene/solarsystem/planets/earth/satellites/weather/snpp.asset index eeec482047..9564cd31d6 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/weather/snpp.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/snpp.asset @@ -29,9 +29,9 @@ asset.onInitialize(function () LineNumber = 1 }, Rotation = { - Type = "SpiceRotation", - SourceFrame = "GALACTIC", - DestinationFrame = "J2000", + Type = "SpiceRotation", + SourceFrame = "GALACTIC", + DestinationFrame = "J2000", } }, Tag = { "earth_satellite", "SNPP" }, @@ -45,20 +45,20 @@ asset.onInitialize(function () Identifier = identifier .. "_trail", Parent = transforms.EarthInertial.Identifier, Renderable = { - Type = "RenderableTrailOrbit", - Translation = { - Type = "TLETranslation", - Body = identifier, - Observer = transforms.EarthInertial.Identifier, - File = path, - LineNumber = 1, - RenderBinMode = "PostDeferredTransparent" - }, - Color = { 0.9, 0.6715, 0.0 }, - Fade = 1.5, - Period = period, - Resolution = 320 + Type = "RenderableTrailOrbit", + Translation = { + Type = "TLETranslation", + Body = identifier, + Observer = transforms.EarthInertial.Identifier, + File = path, + LineNumber = 1, + RenderBinMode = "PostDeferredTransparent" }, + Color = { 0.9, 0.6715, 0.0 }, + Fade = 1.5, + Period = period, + Resolution = 320 + }, Tag = { "earth_satellite", "SNPP" }, GUI = { Name = "SNPP Trail", @@ -71,27 +71,27 @@ asset.onInitialize(function () Parent = SNPP.Identifier, Renderable = { - Enabled = false, - Type = "RenderableLabels", - LabelText = "SNPP", - FontSize = 100.0, - LabelSize = 4.0, - LabelMaxSize = 100.0, - LabelMinSize = 1.0, - LabelOrientationOption = "Camera View Direction", - BlendMode = "Additive", - EnableFading = true, - FadeStartUnit = "au", - FadeStartDistance = 0.15, - FadeStartSpeed = 1.0, - FadeEndUnit = "au", - FadeEndDistance = 15.0, - FadeEndSpeed = 25.0 + Enabled = false, + Type = "RenderableLabels", + LabelText = "SNPP", + FontSize = 100.0, + LabelSize = 4.0, + LabelMaxSize = 100.0, + LabelMinSize = 1.0, + LabelOrientationOption = "Camera View Direction", + BlendMode = "Additive", + EnableFading = true, + FadeStartUnit = "au", + FadeStartDistance = 0.15, + FadeStartSpeed = 1.0, + FadeEndUnit = "au", + FadeEndDistance = 15.0, + FadeEndSpeed = 25.0 }, Tag = { "solarsystem_labels" }, GUI = { - Name = "SNPP Label", - Path = "/Solar System/Planets/Earth" + Name = "SNPP Label", + Path = "/Solar System/Planets/Earth" } } @@ -113,11 +113,11 @@ end) asset.meta = { - Name = "SNPP", - Version = "1.0", - Description = [[ Trail for SNPP. trail from - CELESTRAK. Can be used in conjunction with VIIRS SNPP (Temporal) layer for Earth.]], - Author = "OpenSpace Team", - URL = "https://celestrak.com/", - License = "NASA" + Name = "SNPP", + Version = "1.0", + Description = [[ Trail for SNPP. trail from + CELESTRAK. Can be used in conjunction with VIIRS SNPP (Temporal) layer for Earth.]], + Author = "OpenSpace Team", + URL = "https://celestrak.com/", + License = "NASA" } diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/weather/spire.asset b/data/assets/scene/solarsystem/planets/earth/satellites/weather/spire.asset index 92c25df702..a237421533 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/weather/spire.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/spire.asset @@ -2,9 +2,9 @@ local assetHelper = asset.require('util/asset_helper') local shared = asset.require('util/tle_helper') local group = { - Title = "Spire", - Url = "http://www.celestrak.com/NORAD/elements/spire.txt", - TrailColor = { 0.75, 0.75, 0.35 } + Title = "Spire", + Url = "http://www.celestrak.com/NORAD/elements/spire.txt", + TrailColor = { 0.75, 0.75, 0.35 } } local tle = shared.downloadTLEFile(asset, group.Url, group.Title) diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/weather/tdrss.asset b/data/assets/scene/solarsystem/planets/earth/satellites/weather/tdrss.asset index 0ec30cab29..ec271ecb19 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/weather/tdrss.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/tdrss.asset @@ -2,9 +2,9 @@ local assetHelper = asset.require('util/asset_helper') local shared = asset.require('util/tle_helper') local group = { - Title = "Tracking and Data Relay Satellite System (TDRSS)", - Url = "http://www.celestrak.com/NORAD/elements/tdrss.txt", - TrailColor = { 0.75, 0.75, 0.35 } + Title = "Tracking and Data Relay Satellite System (TDRSS)", + Url = "http://www.celestrak.com/NORAD/elements/tdrss.txt", + TrailColor = { 0.75, 0.75, 0.35 } } local tle = shared.downloadTLEFile(asset, group.Url, group.Title) diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/weather/terra.asset b/data/assets/scene/solarsystem/planets/earth/satellites/weather/terra.asset index 8b130ebf9b..9065e44536 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/weather/terra.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/terra.asset @@ -29,9 +29,9 @@ asset.onInitialize(function () LineNumber = 1 }, Rotation = { - Type = "SpiceRotation", - SourceFrame = "GALACTIC", - DestinationFrame = "J2000", + Type = "SpiceRotation", + SourceFrame = "GALACTIC", + DestinationFrame = "J2000", } }, Tag = { "earth_satellite", "Terra" }, @@ -45,20 +45,20 @@ asset.onInitialize(function () Identifier = identifier .. "_trail", Parent = transforms.EarthInertial.Identifier, Renderable = { - Type = "RenderableTrailOrbit", - Translation = { - Type = "TLETranslation", - Body = identifier, - Observer = transforms.EarthInertial.Identifier, - File = path, - LineNumber = 1, - RenderBinMode = "PostDeferredTransparent" - }, - Color = { 0.9, 0.6715, 0.0 }, - Fade = 1.5, - Period = period, - Resolution = 320 + Type = "RenderableTrailOrbit", + Translation = { + Type = "TLETranslation", + Body = identifier, + Observer = transforms.EarthInertial.Identifier, + File = path, + LineNumber = 1, + RenderBinMode = "PostDeferredTransparent" }, + Color = { 0.9, 0.6715, 0.0 }, + Fade = 1.5, + Period = period, + Resolution = 320 + }, Tag = { "earth_satellite", "Terra" }, GUI = { Name = "Terra Trail", @@ -71,27 +71,27 @@ asset.onInitialize(function () Parent = Terra.Identifier, Renderable = { - Enabled = false, - Type = "RenderableLabels", - LabelText = "SNPP", - FontSize = 100.0, - LabelSize = 4.0, - LabelMaxSize = 100.0, - LabelMinSize = 1.0, - LabelOrientationOption = "Camera View Direction", - BlendMode = "Additive", - EnableFading = true, - FadeStartUnit = "au", - FadeStartDistance = 0.15, - FadeStartSpeed = 1.0, - FadeEndUnit = "au", - FadeEndDistance = 15.0, - FadeEndSpeed = 25.0 + Enabled = false, + Type = "RenderableLabels", + LabelText = "SNPP", + FontSize = 100.0, + LabelSize = 4.0, + LabelMaxSize = 100.0, + LabelMinSize = 1.0, + LabelOrientationOption = "Camera View Direction", + BlendMode = "Additive", + EnableFading = true, + FadeStartUnit = "au", + FadeStartDistance = 0.15, + FadeStartSpeed = 1.0, + FadeEndUnit = "au", + FadeEndDistance = 15.0, + FadeEndSpeed = 25.0 }, Tag = { "solarsystem_labels" }, GUI = { - Name = "Terra Label", - Path = "/Solar System/Planets/Earth" + Name = "Terra Label", + Path = "/Solar System/Planets/Earth" } } @@ -112,11 +112,11 @@ end) asset.meta = { - Name = "Terra", - Version = "1.0", - Description = [[ Trail for Terra. trail from + Name = "Terra", + Version = "1.0", + Description = [[ Trail for Terra. trail from CELESTRAK. Can be used in conjuntion with Terra Modis (Temporal) layer for Earth]], - Author = "OpenSpace Team", - URL = "https://celestrak.com/", - License = "NASA" + Author = "OpenSpace Team", + URL = "https://celestrak.com/", + License = "NASA" } diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/weather/weather.asset b/data/assets/scene/solarsystem/planets/earth/satellites/weather/weather.asset index c23e0910b6..e1448013e5 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/weather/weather.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/weather.asset @@ -2,9 +2,9 @@ local assetHelper = asset.require('util/asset_helper') local shared = asset.require('util/tle_helper') local group = { - Title = "Weather", - Url = "http://www.celestrak.com/NORAD/elements/weather.txt", - TrailColor = { 0.75, 0.75, 0.35 } + Title = "Weather", + Url = "http://www.celestrak.com/NORAD/elements/weather.txt", + TrailColor = { 0.75, 0.75, 0.35 } } local tle = shared.downloadTLEFile(asset, group.Url, group.Title) diff --git a/data/assets/scene/solarsystem/planets/earth/trail.asset b/data/assets/scene/solarsystem/planets/earth/trail.asset index 87dc7806fa..39870cc5af 100644 --- a/data/assets/scene/solarsystem/planets/earth/trail.asset +++ b/data/assets/scene/solarsystem/planets/earth/trail.asset @@ -5,36 +5,36 @@ asset.require("spice/base") local EarthTrail = { - Identifier = "EarthTrail", - Parent = transforms.SolarSystemBarycenter.Identifier, - Renderable = { - Type = "RenderableTrailOrbit", - Translation = { - Type = "SpiceTranslation", - Target = "EARTH", - Observer = "SUN" - }, - Color = { 0.5, 0.8, 1.0 }, - Period = 365.242, - Resolution = 1000, - Tag = { "planetTrail_solarSystem", "planetTrail_terrestrial" } + Identifier = "EarthTrail", + Parent = transforms.SolarSystemBarycenter.Identifier, + Renderable = { + Type = "RenderableTrailOrbit", + Translation = { + Type = "SpiceTranslation", + Target = "EARTH", + Observer = "SUN" }, - GUI = { - Name = "Earth Trail", - Path = "/Solar System/Planets/Earth" - } + Color = { 0.5, 0.8, 1.0 }, + Period = 365.242, + Resolution = 1000, + Tag = { "planetTrail_solarSystem", "planetTrail_terrestrial" } + }, + GUI = { + Name = "Earth Trail", + Path = "/Solar System/Planets/Earth" + } } assetHelper.registerSceneGraphNodesAndExport(asset, { EarthTrail }) asset.meta = { - Name = "Earth Trail", - Version = "1.0", - Description = [[ Trail of Earth as observed by the Sun. Data from NASA Spice (see - base spice asset)]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"EarthTrail"} + Name = "Earth Trail", + Version = "1.0", + Description = [[ Trail of Earth as observed by the Sun. Data from NASA Spice (see + base spice asset)]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license", + Identifiers = {"EarthTrail"} } diff --git a/data/assets/scene/solarsystem/planets/earth/transforms.asset b/data/assets/scene/solarsystem/planets/earth/transforms.asset index a5b066b7fc..7717c89707 100644 --- a/data/assets/scene/solarsystem/planets/earth/transforms.asset +++ b/data/assets/scene/solarsystem/planets/earth/transforms.asset @@ -5,89 +5,89 @@ asset.require("spice/base") local EarthBarycenter = { - Identifier = "EarthBarycenter", - Parent = transforms.SolarSystemBarycenter.Identifier, - Transform = { - Translation = { - Type = "SpiceTranslation", - Target = "EARTH BARYCENTER", - Observer = "SUN" - } - }, - GUI = { - Name = "Earth Barycenter", - Path = "/Solar System/Planets/Earth", - Hidden = true + Identifier = "EarthBarycenter", + Parent = transforms.SolarSystemBarycenter.Identifier, + Transform = { + Translation = { + Type = "SpiceTranslation", + Target = "EARTH BARYCENTER", + Observer = "SUN" } + }, + GUI = { + Name = "Earth Barycenter", + Path = "/Solar System/Planets/Earth", + Hidden = true + } } local EarthCenter = { - Identifier = "EarthCenter", - Parent = EarthBarycenter.Identifier, - Transform = { - Translation = { - Type = "SpiceTranslation", - Target = "EARTH", - Observer = "EARTH BARYCENTER" - } - }, - GUI = { - Name = "Earth Center", - Path = "/Solar System/Planets/Earth", - Hidden = true + Identifier = "EarthCenter", + Parent = EarthBarycenter.Identifier, + Transform = { + Translation = { + Type = "SpiceTranslation", + Target = "EARTH", + Observer = "EARTH BARYCENTER" } + }, + GUI = { + Name = "Earth Center", + Path = "/Solar System/Planets/Earth", + Hidden = true + } } local EarthInertial = { - -- The default reference frame for Earth-orbiting satellites - Identifier = "EarthInertial", - Parent = EarthCenter.Identifier, - Transform = { - Rotation = { - Type = "SpiceRotation", - SourceFrame = "J2000", - DestinationFrame = "GALACTIC", - } - }, - GUI = { - Name = "Earth Inertial", - Path = "/Solar System/Planets/Earth", - Hidden = true + -- The default reference frame for Earth-orbiting satellites + Identifier = "EarthInertial", + Parent = EarthCenter.Identifier, + Transform = { + Rotation = { + Type = "SpiceRotation", + SourceFrame = "J2000", + DestinationFrame = "GALACTIC", } + }, + GUI = { + Name = "Earth Inertial", + Path = "/Solar System/Planets/Earth", + Hidden = true + } } local EarthIAU = { - Identifier = "EarthIAU", - Parent = EarthCenter.Identifier, - Transform = { - Rotation = { - Type = "SpiceRotation", - SourceFrame = "IAU_EARTH", - DestinationFrame = "GALACTIC", - } - }, - GUI = { - Name = "Earth IAU", - Path = "/Solar System/Planets/Earth", - Hidden = true + Identifier = "EarthIAU", + Parent = EarthCenter.Identifier, + Transform = { + Rotation = { + Type = "SpiceRotation", + SourceFrame = "IAU_EARTH", + DestinationFrame = "GALACTIC", } + }, + GUI = { + Name = "Earth IAU", + Path = "/Solar System/Planets/Earth", + Hidden = true + } } assetHelper.registerSceneGraphNodesAndExport(asset, { - EarthBarycenter, - EarthCenter, - EarthInertial, - EarthIAU + EarthBarycenter, + EarthCenter, + EarthInertial, + EarthIAU }) asset.meta = { - Name = "Earth Transforms", - Version = "1.0", - Description = [[ Earth transforms: Earth Barycenter, Earth Center, Earth Inertial, - Earth IAU. A scene graph node is created for each transform.]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"EarthBarycenter", "EarthCenter", "EarthInertial", "EarthIAU"} + Name = "Earth Transforms", + Version = "1.0", + Description = [[ Earth transforms: Earth Barycenter, Earth Center, Earth Inertial, + Earth IAU. A scene graph node is created for each transform.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license", + Identifiers = {"EarthBarycenter", "EarthCenter", "EarthInertial", "EarthIAU"} } diff --git a/data/assets/scene/solarsystem/planets/jupiter/callisto/callisto.asset b/data/assets/scene/solarsystem/planets/jupiter/callisto/callisto.asset index 580e6c72ca..f62b20513d 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/callisto/callisto.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/callisto/callisto.asset @@ -6,60 +6,60 @@ local kernel = asset.require('../kernels').jup310 local labelsPath = asset.require('../jupiter_globelabels').LabelsPath local Callisto = { - Identifier = "Callisto", - Parent = transforms.JupiterBarycenter.Identifier, - Transform = { - Rotation = { - Type = "SpiceRotation", - SourceFrame = "IAU_CALLISTO", - DestinationFrame = "GALACTIC", - Kernels = kernel - }, - Translation = { - Type = "SpiceTranslation", - Target = "CALLISTO", - Observer = "JUPITER BARYCENTER", - Kernels = kernel - } + Identifier = "Callisto", + Parent = transforms.JupiterBarycenter.Identifier, + Transform = { + Rotation = { + Type = "SpiceRotation", + SourceFrame = "IAU_CALLISTO", + DestinationFrame = "GALACTIC", + Kernels = kernel }, - Renderable = { - Type = "RenderableGlobe", - Radii = 2410000, - SegmentsPerPatch = 64, - Layers = {}, - Labels = { - Enable = false, - FileName = labelsPath .. "/callisto.labels", - LabelAlignmentOption = "Horizontally", -- or Circularly - LabelsFontSize = 40.0, - LabelsSize = 10.5, - LabelsMinSize = 1.0, - LabelsMaxSize = 1500.0, - ProximityEnabled = false, - LabelsFadeInEnabled = true, - LabelsFadeOutEnabled = true, - FadeInStartingDistance = 15000000.0, - FadeOutStartingDistance = 5000000.0, - LabelsForceDomeRendering = true, - LabelsDistanceEPS = 1350000.0, - LabelsColor = { 1.0, 1.0, 0.0 } - } - }, - Tag = { "moon_solarSystem", "moon_giants", "moon_jupiter" }, - GUI = { - Path = "/Solar System/Planets/Jupiter/Moons" + Translation = { + Type = "SpiceTranslation", + Target = "CALLISTO", + Observer = "JUPITER BARYCENTER", + Kernels = kernel } + }, + Renderable = { + Type = "RenderableGlobe", + Radii = 2410000, + SegmentsPerPatch = 64, + Layers = {}, + Labels = { + Enable = false, + FileName = labelsPath .. "/callisto.labels", + LabelAlignmentOption = "Horizontally", -- or Circularly + LabelsFontSize = 40.0, + LabelsSize = 10.5, + LabelsMinSize = 1.0, + LabelsMaxSize = 1500.0, + ProximityEnabled = false, + LabelsFadeInEnabled = true, + LabelsFadeOutEnabled = true, + FadeInStartingDistance = 15000000.0, + FadeOutStartingDistance = 5000000.0, + LabelsForceDomeRendering = true, + LabelsDistanceEPS = 1350000.0, + LabelsColor = { 1.0, 1.0, 0.0 } + } + }, + Tag = { "moon_solarSystem", "moon_giants", "moon_jupiter" }, + GUI = { + Path = "/Solar System/Planets/Jupiter/Moons" + } } assetHelper.registerSceneGraphNodesAndExport(asset, { Callisto }) asset.meta = { - Name = "Callisto", - Version = "1.0", - Description = [[ Callisto globe with labels.]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"Callisto"} + Name = "Callisto", + Version = "1.0", + Description = [[ Callisto globe with labels.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license", + Identifiers = {"Callisto"} } diff --git a/data/assets/scene/solarsystem/planets/jupiter/callisto/callisto_textures.asset b/data/assets/scene/solarsystem/planets/jupiter/callisto/callisto_textures.asset index c1d6a77a78..80621e6bee 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/callisto/callisto_textures.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/callisto/callisto_textures.asset @@ -1,7 +1,7 @@ local TexturesPath = asset.syncedResource({ - Name = "Callisto Textures", - Type = "HttpSynchronization", - Identifier = "callisto_textures", - Version = 1 + Name = "Callisto Textures", + Type = "HttpSynchronization", + Identifier = "callisto_textures", + Version = 1 }) asset.export("TexturesPath", TexturesPath) diff --git a/data/assets/scene/solarsystem/planets/jupiter/callisto/default_layers.asset b/data/assets/scene/solarsystem/planets/jupiter/callisto/default_layers.asset index 3a25007312..2aa008311f 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/callisto/default_layers.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/callisto/default_layers.asset @@ -5,16 +5,16 @@ local colorLayer = asset.require(colorLayersPath .. "/callisto_texture") -- Set enabled layers (temporary solution) -- @TODO: do this using a boolean that's passed to the 'asset.require' instead asset.onInitialize(function () - openspace.setPropertyValueSingle("Scene.Callisto.Renderable.Layers.ColorLayers." .. - colorLayer.layer.Identifier .. ".Enabled", true) + openspace.setPropertyValueSingle("Scene.Callisto.Renderable.Layers.ColorLayers." .. + colorLayer.layer.Identifier .. ".Enabled", true) end) asset.meta = { - Name = "Default Callisto Layers", - Version = "1.0", - Description = [[ Default Callisto layers are: Callisto Texture]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license" + Name = "Default Callisto Layers", + Version = "1.0", + Description = [[ Default Callisto layers are: Callisto Texture]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/jupiter/callisto/layers/colorlayers/callisto_texture.asset b/data/assets/scene/solarsystem/planets/jupiter/callisto/layers/colorlayers/callisto_texture.asset index e65a91c782..9cd2d1cf52 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/callisto/layers/colorlayers/callisto_texture.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/callisto/layers/colorlayers/callisto_texture.asset @@ -2,22 +2,22 @@ local texturesPath = asset.require("./../../callisto_textures").TexturesPath local globeIdentifier = asset.require("./../../callisto").Callisto.Identifier local layer = { - Identifier = "Texture", - FilePath = texturesPath .. "/callisto.jpg", + Identifier = "Texture", + FilePath = texturesPath .. "/callisto.jpg", } asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) asset.export("layer", layer) asset.meta = { - Name = "Callisto Texutre", - Version = "1.0", - Description = [[ Default jpg texture for Callisto]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license", + Name = "Callisto Texutre", + Version = "1.0", + Description = [[ Default jpg texture for Callisto]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license", } diff --git a/data/assets/scene/solarsystem/planets/jupiter/callisto/trail.asset b/data/assets/scene/solarsystem/planets/jupiter/callisto/trail.asset index 847ae5e43e..898bb93374 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/callisto/trail.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/callisto/trail.asset @@ -6,37 +6,37 @@ local kernel = asset.require('../kernels').jup310 local CallistoTrail = { - Identifier = "CallistoTrail", - Parent = transforms.JupiterBarycenter.Identifier, - Renderable = { - Type = "RenderableTrailOrbit", - Translation = { - Type = "SpiceTranslation", - Target = "CALLISTO", - Observer = "JUPITER BARYCENTER", - Kernels = kernel - }, - Color = { 0.4, 0.3, 0.01 }, - Period = 17.0, - Resolution = 1000 + Identifier = "CallistoTrail", + Parent = transforms.JupiterBarycenter.Identifier, + Renderable = { + Type = "RenderableTrailOrbit", + Translation = { + Type = "SpiceTranslation", + Target = "CALLISTO", + Observer = "JUPITER BARYCENTER", + Kernels = kernel }, - Tag = { "moonTrail_solarSystem", "moonTrail_giants", "moonTrail_jupiter" }, - GUI = { - Name = "Callisto Trail", - Path = "/Solar System/Planets/Jupiter/Moons" - } + Color = { 0.4, 0.3, 0.01 }, + Period = 17.0, + Resolution = 1000 + }, + Tag = { "moonTrail_solarSystem", "moonTrail_giants", "moonTrail_jupiter" }, + GUI = { + Name = "Callisto Trail", + Path = "/Solar System/Planets/Jupiter/Moons" + } } assetHelper.registerSceneGraphNodesAndExport(asset, { CallistoTrail }) asset.meta = { - Name = "Callisto Trail", - Version = "1.0", - Description = [[ Trail of Callisto as observed by the Jupiter. Data from NASA Spice - (see base spice asset)]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"CallistoTrail"} + Name = "Callisto Trail", + Version = "1.0", + Description = [[ Trail of Callisto as observed by the Jupiter. Data from NASA Spice + (see base spice asset)]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license", + Identifiers = {"CallistoTrail"} } diff --git a/data/assets/scene/solarsystem/planets/jupiter/default_layers.asset b/data/assets/scene/solarsystem/planets/jupiter/default_layers.asset index 90e28e7615..7c1ae73f88 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/default_layers.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/default_layers.asset @@ -5,16 +5,16 @@ local colorLayer = asset.require(colorLayersPath .. "/jupiter_texture") -- Set enabled layers (temporary solution) -- @TODO: do this using a boolean that's passed to the 'asset.require' instead asset.onInitialize(function () - openspace.setPropertyValueSingle("Scene.Jupiter.Renderable.Layers.ColorLayers." .. - colorLayer.layer.Identifier .. ".Enabled", true) + openspace.setPropertyValueSingle("Scene.Jupiter.Renderable.Layers.ColorLayers." .. + colorLayer.layer.Identifier .. ".Enabled", true) end) asset.meta = { - Name = "Default Jupiter Layers", - Version = "1.0", - Description = [[ Default Jupiter layers are: Jupiter Texture]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license" + Name = "Default Jupiter Layers", + Version = "1.0", + Description = [[ Default Jupiter layers are: Jupiter Texture]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/jupiter/europa/default_layers.asset b/data/assets/scene/solarsystem/planets/jupiter/europa/default_layers.asset index fb98ba0847..926c4cc1fa 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/europa/default_layers.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/europa/default_layers.asset @@ -6,16 +6,16 @@ local colorLayer = asset.require(colorLayersPath .. "/voyager_global_mosaic") -- Set enabled layers (temporary solution) -- @TODO: do this using a boolean that's passed to the 'asset.require' instead asset.onInitialize(function () - openspace.setPropertyValueSingle("Scene.Europa.Renderable.Layers.ColorLayers." .. - colorLayer.layer.Identifier .. ".Enabled", true) + openspace.setPropertyValueSingle("Scene.Europa.Renderable.Layers.ColorLayers." .. + colorLayer.layer.Identifier .. ".Enabled", true) end) asset.meta = { - Name = "Default Europa Layers", - Version = "1.0", - Description = [[ Default Europa layers are: Europa Texture]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license" + Name = "Default Europa Layers", + Version = "1.0", + Description = [[ Default Europa layers are: Europa Texture]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/jupiter/europa/europa.asset b/data/assets/scene/solarsystem/planets/jupiter/europa/europa.asset index d3e29eba08..670ee9c7c8 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/europa/europa.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/europa/europa.asset @@ -6,60 +6,60 @@ local kernel = asset.require('../kernels').jup310 local labelsPath = asset.require('../jupiter_globelabels').LabelsPath local Europa = { - Identifier = "Europa", - Parent = transforms.JupiterBarycenter.Identifier, - Transform = { - Rotation = { - Type = "SpiceRotation", - SourceFrame = "IAU_EUROPA", - DestinationFrame = "GALACTIC", - Kernels = kernel - }, - Translation = { - Type = "SpiceTranslation", - Target = "EUROPA", - Observer = "JUPITER BARYCENTER", - Kernels = kernel - } + Identifier = "Europa", + Parent = transforms.JupiterBarycenter.Identifier, + Transform = { + Rotation = { + Type = "SpiceRotation", + SourceFrame = "IAU_EUROPA", + DestinationFrame = "GALACTIC", + Kernels = kernel }, - Renderable = { - Type = "RenderableGlobe", - Radii = 1560800, - SegmentsPerPatch = 64, - Layers = {}, - Labels = { - Enable = false, - FileName = labelsPath .. "/europa.labels", - LabelAlignmentOption = "Horizontally", -- or Circularly - LabelsFontSize = 40.0, - LabelsSize = 10.0, - LabelsMinSize = 1.0, - LabelsMaxSize = 1500.0, - ProximityEnabled = false, - LabelsFadeInEnabled = true, - LabelsFadeOutEnabled = true, - FadeInStartingDistance = 8000000.0, - FadeOutStartingDistance = 5000000.0, - LabelsForceDomeRendering = true, - LabelsDistanceEPS = 700000.0, - LabelsColor = { 1.0, 1.0, 0.0 } - } - }, - Tag = { "moon_solarSystem", "moon_giants", "moon_jupiter" }, - GUI = { - Path = "/Solar System/Planets/Jupiter/Moons" + Translation = { + Type = "SpiceTranslation", + Target = "EUROPA", + Observer = "JUPITER BARYCENTER", + Kernels = kernel } + }, + Renderable = { + Type = "RenderableGlobe", + Radii = 1560800, + SegmentsPerPatch = 64, + Layers = {}, + Labels = { + Enable = false, + FileName = labelsPath .. "/europa.labels", + LabelAlignmentOption = "Horizontally", -- or Circularly + LabelsFontSize = 40.0, + LabelsSize = 10.0, + LabelsMinSize = 1.0, + LabelsMaxSize = 1500.0, + ProximityEnabled = false, + LabelsFadeInEnabled = true, + LabelsFadeOutEnabled = true, + FadeInStartingDistance = 8000000.0, + FadeOutStartingDistance = 5000000.0, + LabelsForceDomeRendering = true, + LabelsDistanceEPS = 700000.0, + LabelsColor = { 1.0, 1.0, 0.0 } + } + }, + Tag = { "moon_solarSystem", "moon_giants", "moon_jupiter" }, + GUI = { + Path = "/Solar System/Planets/Jupiter/Moons" + } } assetHelper.registerSceneGraphNodesAndExport(asset, { Europa }) asset.meta = { - Name = "Mimas", - Version = "1.0", - Description = [[ Europa globe with labels.]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"Europa"} + Name = "Mimas", + Version = "1.0", + Description = [[ Europa globe with labels.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license", + Identifiers = {"Europa"} } diff --git a/data/assets/scene/solarsystem/planets/jupiter/europa/europa_textures.asset b/data/assets/scene/solarsystem/planets/jupiter/europa/europa_textures.asset index ebd8095845..a1eb48b59e 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/europa/europa_textures.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/europa/europa_textures.asset @@ -1,7 +1,7 @@ local TexturesPath = asset.syncedResource({ - Name = "Europa Textures", - Type = "HttpSynchronization", - Identifier = "europa_textures", - Version = 1 + Name = "Europa Textures", + Type = "HttpSynchronization", + Identifier = "europa_textures", + Version = 1 }) asset.export("TexturesPath", TexturesPath) diff --git a/data/assets/scene/solarsystem/planets/jupiter/europa/layers/colorlayers/europa_texture.asset b/data/assets/scene/solarsystem/planets/jupiter/europa/layers/colorlayers/europa_texture.asset index 45c9eedce5..ed5e691509 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/europa/layers/colorlayers/europa_texture.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/europa/layers/colorlayers/europa_texture.asset @@ -2,22 +2,22 @@ local texturesPath = asset.require("./../../europa_textures").TexturesPath local globeIdentifier = asset.require("./../../europa").Europa.Identifier local layer = { - Identifier = "Texture", - FilePath = texturesPath .. "/europa.jpg", + Identifier = "Texture", + FilePath = texturesPath .. "/europa.jpg", } asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) asset.export("layer", layer) asset.meta = { - Name = "Europa Texutre", - Version = "1.0", - Description = [[ Default jpg texture for Europa]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license" + Name = "Europa Texutre", + Version = "1.0", + Description = [[ Default jpg texture for Europa]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/jupiter/europa/layers/colorlayers/voyager_global_mosaic.asset b/data/assets/scene/solarsystem/planets/jupiter/europa/layers/colorlayers/voyager_global_mosaic.asset index 6438fe1b5b..2fc9a355b5 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/europa/layers/colorlayers/voyager_global_mosaic.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/europa/layers/colorlayers/voyager_global_mosaic.asset @@ -2,34 +2,34 @@ local map_service_configs = asset.localResource("./../../map_service_configs") local globeIdentifier = asset.require("./../../europa").Europa.Identifier local layer = { - Identifier = "Voyager_Global_Mosaic", - Name = "Voyager Global Mosaic [Sweden]", - FilePath = map_service_configs .. "/LiU/Voyager_GalileoSSI_global_mosaic_500m.wms", - BlendMode = "Color", + Identifier = "Voyager_Global_Mosaic", + Name = "Voyager Global Mosaic [Sweden]", + FilePath = map_service_configs .. "/LiU/Voyager_GalileoSSI_global_mosaic_500m.wms", + BlendMode = "Color", } asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) asset.export("layer", layer) asset.meta = { - Name = "Voyager Global Mosaic", - Version = "1.0", - Description = [[ Europa Voyager - Galileo SSI Global Mosaic 500m v2. This global map - base of Europa utilizes the best image quality and moderate resolution coverage - supplied by the Galileo SSI (Solid-State Imaging) instrument and Voyager 1 and 2. - The image data was selected on the basis of overall image quality, reasonable - input resolution (from 20 km/pixel for gap fill to as high as 200 meters per - pixel[m]), and availability of moderate viewing and sun angles for topography. - The map projections are based on a sphere having a radius of 1,562.09 kilometers. - A Simple Cylindrical projection was used at a resolution of 500 m. (Description - from URL)]], - Author = "USGS", - URL = "https://astrogeology.usgs.gov/search/map/Europa/Voyager-Galileo/" .. - "Europa_Voyager_GalileoSSI_global_mosaic_500m", - License = "NASA/PDS", - Identifiers = {"Voyager_Global_Mosaic"} + Name = "Voyager Global Mosaic", + Version = "1.0", + Description = [[ Europa Voyager - Galileo SSI Global Mosaic 500m v2. This global map + base of Europa utilizes the best image quality and moderate resolution coverage + supplied by the Galileo SSI (Solid-State Imaging) instrument and Voyager 1 and 2. + The image data was selected on the basis of overall image quality, reasonable + input resolution (from 20 km/pixel for gap fill to as high as 200 meters per + pixel[m]), and availability of moderate viewing and sun angles for topography. + The map projections are based on a sphere having a radius of 1,562.09 kilometers. + A Simple Cylindrical projection was used at a resolution of 500 m. (Description + from URL)]], + Author = "USGS", + URL = "https://astrogeology.usgs.gov/search/map/Europa/Voyager-Galileo/" .. + "Europa_Voyager_GalileoSSI_global_mosaic_500m", + License = "NASA/PDS", + Identifiers = {"Voyager_Global_Mosaic"} } diff --git a/data/assets/scene/solarsystem/planets/jupiter/europa/trail.asset b/data/assets/scene/solarsystem/planets/jupiter/europa/trail.asset index 7ed601c78a..3ceac18c53 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/europa/trail.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/europa/trail.asset @@ -6,37 +6,37 @@ local kernel = asset.require('../kernels').jup310 local EuropaTrail = { - Identifier = "EuropaTrail", - Parent = transforms.JupiterBarycenter.Identifier, - Renderable = { - Type = "RenderableTrailOrbit", - Translation = { - Type = "SpiceTranslation", - Target = "EUROPA", - Observer = "JUPITER BARYCENTER", - Kernels = kernel - }, - Color = { 0.5, 0.3, 0.3 }, - Period = 85.0 / 24.0, - Resolution = 1000 + Identifier = "EuropaTrail", + Parent = transforms.JupiterBarycenter.Identifier, + Renderable = { + Type = "RenderableTrailOrbit", + Translation = { + Type = "SpiceTranslation", + Target = "EUROPA", + Observer = "JUPITER BARYCENTER", + Kernels = kernel }, - Tag = { "moonTrail_solarSystem", "moonTrail_giants", "moonTrail_jupiter" }, - GUI = { - Name = "Europa Trail", - Path = "/Solar System/Planets/Jupiter/Moons" - } + Color = { 0.5, 0.3, 0.3 }, + Period = 85.0 / 24.0, + Resolution = 1000 + }, + Tag = { "moonTrail_solarSystem", "moonTrail_giants", "moonTrail_jupiter" }, + GUI = { + Name = "Europa Trail", + Path = "/Solar System/Planets/Jupiter/Moons" + } } assetHelper.registerSceneGraphNodesAndExport(asset, { EuropaTrail }) asset.meta = { - Name = "Europa Trail", - Version = "1.0", - Description = [[ Trail of Europa as observed by the Jupiter. Data from NASA Spice (see - base spice asset)]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"EuropaTrail"} + Name = "Europa Trail", + Version = "1.0", + Description = [[ Trail of Europa as observed by the Jupiter. Data from NASA Spice (see + base spice asset)]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license", + Identifiers = {"EuropaTrail"} } diff --git a/data/assets/scene/solarsystem/planets/jupiter/ganymede/default_layers.asset b/data/assets/scene/solarsystem/planets/jupiter/ganymede/default_layers.asset index 28575c7e7c..b44fbbb498 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/ganymede/default_layers.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/ganymede/default_layers.asset @@ -5,16 +5,16 @@ local colorLayer = asset.require(colorLayersPath .. "/ganymede_texture") -- Set enabled layers (temporary solution) -- @TODO: do this using a boolean that's passed to the 'asset.require' instead asset.onInitialize(function () - openspace.setPropertyValueSingle("Scene.Ganymede.Renderable.Layers.ColorLayers." .. - colorLayer.layer.Identifier .. ".Enabled", true) + openspace.setPropertyValueSingle("Scene.Ganymede.Renderable.Layers.ColorLayers." .. + colorLayer.layer.Identifier .. ".Enabled", true) end) asset.meta = { - Name = "Default Ganymede Layers", - Version = "1.0", - Description = [[ Default Ganymede layers are: Ganymede Texture]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license" + Name = "Default Ganymede Layers", + Version = "1.0", + Description = [[ Default Ganymede layers are: Ganymede Texture]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/jupiter/ganymede/ganymede.asset b/data/assets/scene/solarsystem/planets/jupiter/ganymede/ganymede.asset index 0e53d189d1..182b8751e9 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/ganymede/ganymede.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/ganymede/ganymede.asset @@ -6,60 +6,60 @@ local kernel = asset.require('../kernels').jup310 local labelsPath = asset.require('../jupiter_globelabels').LabelsPath local Ganymede = { - Identifier = "Ganymede", - Parent = transforms.JupiterBarycenter.Identifier, - Transform = { - Rotation = { - Type = "SpiceRotation", - SourceFrame = "IAU_GANYMEDE", - DestinationFrame = "GALACTIC", - Kernels = kernel - }, - Translation = { - Type = "SpiceTranslation", - Target = "GANYMEDE", - Observer = "JUPITER BARYCENTER", - Kernels = kernel - } + Identifier = "Ganymede", + Parent = transforms.JupiterBarycenter.Identifier, + Transform = { + Rotation = { + Type = "SpiceRotation", + SourceFrame = "IAU_GANYMEDE", + DestinationFrame = "GALACTIC", + Kernels = kernel }, - Renderable = { - Type = "RenderableGlobe", - Radii = 2631000, - SegmentsPerPatch = 64, - Layers = {}, - Labels = { - Enable = false, - FileName = labelsPath .. "/ganymede.labels", - LabelAlignmentOption = "Horizontally", -- or Circularly - LabelsFontSize = 40.0, - LabelsSize = 10.5, - LabelsMinSize = 1.0, - LabelsMaxSize = 1500.0, - ProximityEnabled = false, - LabelsFadeInEnabled = true, - LabelsFadeOutEnabled = true, - FadeInStartingDistance = 8000000.0, - FadeOutStartingDistance = 2250000.0, - LabelsForceDomeRendering = true, - LabelsDistanceEPS = 1750000.0, - LabelsColor = {1.0, 1.0, 0.0} - } - }, - Tag = { "moon_solarSystem", "moon_giants", "moon_jupiter" }, - GUI = { - Path = "/Solar System/Planets/Jupiter/Moons" + Translation = { + Type = "SpiceTranslation", + Target = "GANYMEDE", + Observer = "JUPITER BARYCENTER", + Kernels = kernel } + }, + Renderable = { + Type = "RenderableGlobe", + Radii = 2631000, + SegmentsPerPatch = 64, + Layers = {}, + Labels = { + Enable = false, + FileName = labelsPath .. "/ganymede.labels", + LabelAlignmentOption = "Horizontally", -- or Circularly + LabelsFontSize = 40.0, + LabelsSize = 10.5, + LabelsMinSize = 1.0, + LabelsMaxSize = 1500.0, + ProximityEnabled = false, + LabelsFadeInEnabled = true, + LabelsFadeOutEnabled = true, + FadeInStartingDistance = 8000000.0, + FadeOutStartingDistance = 2250000.0, + LabelsForceDomeRendering = true, + LabelsDistanceEPS = 1750000.0, + LabelsColor = {1.0, 1.0, 0.0} + } + }, + Tag = { "moon_solarSystem", "moon_giants", "moon_jupiter" }, + GUI = { + Path = "/Solar System/Planets/Jupiter/Moons" + } } assetHelper.registerSceneGraphNodesAndExport(asset, { Ganymede }) asset.meta = { - Name = "Ganymede", - Version = "1.0", - Description = [[ Ganymede globe with labels.]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"Ganymede"} + Name = "Ganymede", + Version = "1.0", + Description = [[ Ganymede globe with labels.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license", + Identifiers = {"Ganymede"} } diff --git a/data/assets/scene/solarsystem/planets/jupiter/ganymede/ganymede_textures.asset b/data/assets/scene/solarsystem/planets/jupiter/ganymede/ganymede_textures.asset index e96a231214..e27f858103 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/ganymede/ganymede_textures.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/ganymede/ganymede_textures.asset @@ -1,7 +1,7 @@ local TexturesPath = asset.syncedResource({ - Name = "Ganymede Textures", - Type = "HttpSynchronization", - Identifier = "ganymede_textures", - Version = 1 + Name = "Ganymede Textures", + Type = "HttpSynchronization", + Identifier = "ganymede_textures", + Version = 1 }) asset.export("TexturesPath", TexturesPath) diff --git a/data/assets/scene/solarsystem/planets/jupiter/ganymede/layers/colorlayers/ganymede_texture.asset b/data/assets/scene/solarsystem/planets/jupiter/ganymede/layers/colorlayers/ganymede_texture.asset index dbd3d147ec..6cddc4d319 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/ganymede/layers/colorlayers/ganymede_texture.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/ganymede/layers/colorlayers/ganymede_texture.asset @@ -2,22 +2,22 @@ local texturesPath = asset.require("./../../ganymede_textures").TexturesPath local globeIdentifier = asset.require("./../../ganymede").Ganymede.Identifier local layer = { - Identifier = "Texture", - FilePath = texturesPath .. "/ganymede.jpg", + Identifier = "Texture", + FilePath = texturesPath .. "/ganymede.jpg", } asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) asset.export("layer", layer) asset.meta = { - Name = "Ganymede Texutre", - Version = "1.0", - Description = [[ Default jpg texture for Ganymede]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license" + Name = "Ganymede Texutre", + Version = "1.0", + Description = [[ Default jpg texture for Ganymede]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/jupiter/ganymede/trail.asset b/data/assets/scene/solarsystem/planets/jupiter/ganymede/trail.asset index e0b7a0eefd..c8b3a37e20 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/ganymede/trail.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/ganymede/trail.asset @@ -6,37 +6,37 @@ local kernel = asset.require('../kernels').jup310 local GanymedeTrail = { - Identifier = "GanymedeTrail", - Parent = transforms.JupiterBarycenter.Identifier, - Renderable = { - Type = "RenderableTrailOrbit", - Translation = { - Type = "SpiceTranslation", - Target = "GANYMEDE", - Observer = "JUPITER BARYCENTER", - Kernels = kernel - }, - Color = { 0.4, 0.3, 0.3 }, - Period = 172.0 / 24.0, - Resolution = 1000 + Identifier = "GanymedeTrail", + Parent = transforms.JupiterBarycenter.Identifier, + Renderable = { + Type = "RenderableTrailOrbit", + Translation = { + Type = "SpiceTranslation", + Target = "GANYMEDE", + Observer = "JUPITER BARYCENTER", + Kernels = kernel }, - Tag = { "moonTrail_solarSystem", "moonTrail_giants", "moonTrail_jupiter" }, - GUI = { - Name = "Ganymede Trail", - Path = "/Solar System/Planets/Jupiter/Moons" - } + Color = { 0.4, 0.3, 0.3 }, + Period = 172.0 / 24.0, + Resolution = 1000 + }, + Tag = { "moonTrail_solarSystem", "moonTrail_giants", "moonTrail_jupiter" }, + GUI = { + Name = "Ganymede Trail", + Path = "/Solar System/Planets/Jupiter/Moons" + } } assetHelper.registerSceneGraphNodesAndExport(asset, { GanymedeTrail }) asset.meta = { - Name = "Ganymede Trail", - Version = "1.0", - Description = [[ Trail of Ganymede as observed by the Jupiter. Data from NASA Spice - (see base spice asset)]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"GanymedeTrail"} + Name = "Ganymede Trail", + Version = "1.0", + Description = [[ Trail of Ganymede as observed by the Jupiter. Data from NASA Spice + (see base spice asset)]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license", + Identifiers = {"GanymedeTrail"} } diff --git a/data/assets/scene/solarsystem/planets/jupiter/io/default_layers.asset b/data/assets/scene/solarsystem/planets/jupiter/io/default_layers.asset index 88ea13de9c..e1d9a5cc67 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/io/default_layers.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/io/default_layers.asset @@ -5,16 +5,16 @@ local colorLayer = asset.require(colorLayersPath .. "/io_texture") -- Set enabled layers (temporary solution) -- @TODO: do this using a boolean that's passed to the 'asset.require' instead asset.onInitialize(function () - openspace.setPropertyValueSingle("Scene.Io.Renderable.Layers.ColorLayers." .. - colorLayer.layer.Identifier .. ".Enabled", true) + openspace.setPropertyValueSingle("Scene.Io.Renderable.Layers.ColorLayers." .. + colorLayer.layer.Identifier .. ".Enabled", true) end) asset.meta = { - Name = "Default Io Layers", - Version = "1.0", - Description = [[ Default Io layers are: Io Texture]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license" + Name = "Default Io Layers", + Version = "1.0", + Description = [[ Default Io layers are: Io Texture]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/jupiter/io/io.asset b/data/assets/scene/solarsystem/planets/jupiter/io/io.asset index 20f2d5a2b6..50e84eaa6a 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/io/io.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/io/io.asset @@ -6,60 +6,60 @@ local kernel = asset.require('../kernels').jup310 local labelsPath = asset.require('../jupiter_globelabels').LabelsPath local Io = { - Identifier = "Io", - Parent = transforms.JupiterBarycenter.Identifier, - Transform = { - Rotation = { - Type = "SpiceRotation", - SourceFrame = "IAU_IO", - DestinationFrame = "GALACTIC", - Kernels = kernel - }, - Translation = { - Type = "SpiceTranslation", - Target = "IO", - Observer = "JUPITER BARYCENTER", - Kernels = kernel - } + Identifier = "Io", + Parent = transforms.JupiterBarycenter.Identifier, + Transform = { + Rotation = { + Type = "SpiceRotation", + SourceFrame = "IAU_IO", + DestinationFrame = "GALACTIC", + Kernels = kernel }, - Renderable = { - Type = "RenderableGlobe", - Radii = 1821600, - SegmentsPerPatch = 64, - Layers = {}, - Labels = { - Enable = false, - FileName = labelsPath .. "/io.labels", - LabelAlignmentOption = "Horizontally", -- or Circularly - LabelsFontSize = 40.0, - LabelsSize = 10.0, - LabelsMinSize = 1.0, - LabelsMaxSize = 1500.0, - ProximityEnabled = false, - LabelsFadeInEnabled = true, - LabelsFadeOutEnabled = true, - FadeInStartingDistance = 8500000.0, - FadeOutStartingDistance = 4000000.0, - LabelsForceDomeRendering = true, - LabelsDistanceEPS = 1000000.0, - LabelsColor = { 1.0, 1.0, 0.0 } - } - }, - Tag = { "moon_solarSystem", "moon_giants", "moon_jupiter" }, - GUI = { - Path = "/Solar System/Planets/Jupiter/Moons" + Translation = { + Type = "SpiceTranslation", + Target = "IO", + Observer = "JUPITER BARYCENTER", + Kernels = kernel } + }, + Renderable = { + Type = "RenderableGlobe", + Radii = 1821600, + SegmentsPerPatch = 64, + Layers = {}, + Labels = { + Enable = false, + FileName = labelsPath .. "/io.labels", + LabelAlignmentOption = "Horizontally", -- or Circularly + LabelsFontSize = 40.0, + LabelsSize = 10.0, + LabelsMinSize = 1.0, + LabelsMaxSize = 1500.0, + ProximityEnabled = false, + LabelsFadeInEnabled = true, + LabelsFadeOutEnabled = true, + FadeInStartingDistance = 8500000.0, + FadeOutStartingDistance = 4000000.0, + LabelsForceDomeRendering = true, + LabelsDistanceEPS = 1000000.0, + LabelsColor = { 1.0, 1.0, 0.0 } + } + }, + Tag = { "moon_solarSystem", "moon_giants", "moon_jupiter" }, + GUI = { + Path = "/Solar System/Planets/Jupiter/Moons" + } } assetHelper.registerSceneGraphNodesAndExport(asset, { Io }) asset.meta = { - Name = "Io", - Version = "1.0", - Description = [[ Io globe with labels.]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"Io"} + Name = "Io", + Version = "1.0", + Description = [[ Io globe with labels.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license", + Identifiers = {"Io"} } diff --git a/data/assets/scene/solarsystem/planets/jupiter/io/io_textures.asset b/data/assets/scene/solarsystem/planets/jupiter/io/io_textures.asset index e6d7b81991..36b55fdc1e 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/io/io_textures.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/io/io_textures.asset @@ -1,7 +1,7 @@ local TexturesPath = asset.syncedResource({ - Name = "Io Textures", - Type = "HttpSynchronization", - Identifier = "io_textures", - Version = 1 + Name = "Io Textures", + Type = "HttpSynchronization", + Identifier = "io_textures", + Version = 1 }) asset.export("TexturesPath", TexturesPath) diff --git a/data/assets/scene/solarsystem/planets/jupiter/io/layers/colorlayers/io_texture.asset b/data/assets/scene/solarsystem/planets/jupiter/io/layers/colorlayers/io_texture.asset index efa39f0b3d..1e7eb5517e 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/io/layers/colorlayers/io_texture.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/io/layers/colorlayers/io_texture.asset @@ -2,22 +2,22 @@ local texturesPath = asset.require("./../../io_textures").TexturesPath local globeIdentifier = asset.require("./../../io").Io.Identifier local layer = { - Identifier = "Texture", - FilePath = texturesPath .. "/io.jpg", + Identifier = "Texture", + FilePath = texturesPath .. "/io.jpg", } asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) asset.export("layer", layer) asset.meta = { - Name = "Io Texutre", - Version = "1.0", - Description = [[ Default jpg texture for Io]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license" + Name = "Io Texutre", + Version = "1.0", + Description = [[ Default jpg texture for Io]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/jupiter/io/trail.asset b/data/assets/scene/solarsystem/planets/jupiter/io/trail.asset index b05d0b488e..63dcfd15d5 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/io/trail.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/io/trail.asset @@ -6,37 +6,37 @@ local kernel = asset.require('../kernels').jup310 local IoTrail = { - Identifier = "IoTrail", - Parent = transforms.JupiterBarycenter.Identifier, - Renderable = { - Type = "RenderableTrailOrbit", - Translation = { - Type = "SpiceTranslation", - Target = "IO", - Observer = "JUPITER BARYCENTER", - Kernels = kernel - }, - Color = { 0.4, 0.4, 0.2 }, - Period = 42.0 / 24.0, - Resolution = 1000 + Identifier = "IoTrail", + Parent = transforms.JupiterBarycenter.Identifier, + Renderable = { + Type = "RenderableTrailOrbit", + Translation = { + Type = "SpiceTranslation", + Target = "IO", + Observer = "JUPITER BARYCENTER", + Kernels = kernel }, - Tag = { "moonTrail_solarSystem", "moonTrail_giants", "moonTrail_jupiter" }, - GUI = { - Name = "Io Trail", - Path = "/Solar System/Planets/Jupiter/Moons" - } + Color = { 0.4, 0.4, 0.2 }, + Period = 42.0 / 24.0, + Resolution = 1000 + }, + Tag = { "moonTrail_solarSystem", "moonTrail_giants", "moonTrail_jupiter" }, + GUI = { + Name = "Io Trail", + Path = "/Solar System/Planets/Jupiter/Moons" + } } assetHelper.registerSceneGraphNodesAndExport(asset, { IoTrail }) asset.meta = { - Name = "Io Trail", - Version = "1.0", - Description = [[ Trail of Io as observed by the Jupiter. Data from NASA Spice (see - base spice asset)]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"IoTrail"} + Name = "Io Trail", + Version = "1.0", + Description = [[ Trail of Io as observed by the Jupiter. Data from NASA Spice (see + base spice asset)]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license", + Identifiers = {"IoTrail"} } diff --git a/data/assets/scene/solarsystem/planets/jupiter/jupiter.asset b/data/assets/scene/solarsystem/planets/jupiter/jupiter.asset index 80f4bbd695..c24a8d9789 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/jupiter.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/jupiter.asset @@ -4,68 +4,68 @@ asset.require("spice/base") asset.require('./trail') local Jupiter = { - Identifier = "Jupiter", - Parent = transforms.JupiterBarycenter.Identifier, - Transform = { - Rotation = { - Type = "SpiceRotation", - SourceFrame = "IAU_JUPITER", - DestinationFrame = "GALACTIC" - } - }, - Renderable = { - Type = "RenderableGlobe", - Radii = { 71492000.0, 71492000.0, 66854000.0 }, - SegmentsPerPatch = 64, - Layers = {}, - ShadowGroup = { - Sources = { - { Name = "Sun", Radius = 696.3E6 }, - }, - Casters = { - { Name = "Ganymede", Radius = 2631000 }, - { Name = "Io", Radius = 1821600 }, - { Name = "Europa", Radius = 1560800 }, - { Name = "Callisto", Radius = 2410000 } - } - } - }, - Tag = { "planet_solarSystem", "planet_giants" }, - GUI = { - Path = "/Solar System/Planets/Jupiter" + Identifier = "Jupiter", + Parent = transforms.JupiterBarycenter.Identifier, + Transform = { + Rotation = { + Type = "SpiceRotation", + SourceFrame = "IAU_JUPITER", + DestinationFrame = "GALACTIC" } + }, + Renderable = { + Type = "RenderableGlobe", + Radii = { 71492000.0, 71492000.0, 66854000.0 }, + SegmentsPerPatch = 64, + Layers = {}, + ShadowGroup = { + Sources = { + { Name = "Sun", Radius = 696.3E6 }, + }, + Casters = { + { Name = "Ganymede", Radius = 2631000 }, + { Name = "Io", Radius = 1821600 }, + { Name = "Europa", Radius = 1560800 }, + { Name = "Callisto", Radius = 2410000 } + } + } + }, + Tag = { "planet_solarSystem", "planet_giants" }, + GUI = { + Path = "/Solar System/Planets/Jupiter" + } } local JupiterLabel = { - Identifier = "JupiterLabel", - Parent = Jupiter.Identifier, - Renderable = { - Enabled = false, - Type = "RenderableLabels", - LabelText = "Jupiter", - FontSize = 100.0, - LabelSize = 8.6, - LabelMaxSize = 100.0, - LabelMinSize = 1.0, - LabelOrientationOption = "Camera View Direction", - BlendMode = "Additive" - }, - Tag = { "solarsystem_labels" }, - GUI = { - Name = "Jupiter Label", - Path = "/Solar System/Planets/Jupiter" - } + Identifier = "JupiterLabel", + Parent = Jupiter.Identifier, + Renderable = { + Enabled = false, + Type = "RenderableLabels", + LabelText = "Jupiter", + FontSize = 100.0, + LabelSize = 8.6, + LabelMaxSize = 100.0, + LabelMinSize = 1.0, + LabelOrientationOption = "Camera View Direction", + BlendMode = "Additive" + }, + Tag = { "solarsystem_labels" }, + GUI = { + Name = "Jupiter Label", + Path = "/Solar System/Planets/Jupiter" + } } assetHelper.registerSceneGraphNodesAndExport(asset, { Jupiter, JupiterLabel }) asset.meta = { - Name = "Jupiter", - Version = "1.0", - Description = [[ Jupiter globe, and main planet label.]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"Jupiter", "JupiterLabel"} + Name = "Jupiter", + Version = "1.0", + Description = [[ Jupiter globe, and main planet label.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license", + Identifiers = {"Jupiter", "JupiterLabel"} } diff --git a/data/assets/scene/solarsystem/planets/jupiter/jupiter_globelabels.asset b/data/assets/scene/solarsystem/planets/jupiter/jupiter_globelabels.asset index 92fbf9efea..c13b0b0f4b 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/jupiter_globelabels.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/jupiter_globelabels.asset @@ -1,7 +1,7 @@ local LabelsPath = asset.syncedResource({ - Name = "Callisto Labels", - Type = "HttpSynchronization", - Identifier = "jupiter_labels", - Version = 1 + Name = "Callisto Labels", + Type = "HttpSynchronization", + Identifier = "jupiter_labels", + Version = 1 }) asset.export("LabelsPath", LabelsPath) diff --git a/data/assets/scene/solarsystem/planets/jupiter/jupiter_textures.asset b/data/assets/scene/solarsystem/planets/jupiter/jupiter_textures.asset index 421670579f..c82f34e5a6 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/jupiter_textures.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/jupiter_textures.asset @@ -1,7 +1,7 @@ local TexturesPath = asset.syncedResource({ - Name = "Jupiter Textures", - Type = "HttpSynchronization", - Identifier = "jupiter_textures", - Version = 1 + Name = "Jupiter Textures", + Type = "HttpSynchronization", + Identifier = "jupiter_textures", + Version = 1 }) asset.export("TexturesPath", TexturesPath) diff --git a/data/assets/scene/solarsystem/planets/jupiter/kernels.asset b/data/assets/scene/solarsystem/planets/jupiter/kernels.asset index d6346db64d..0a015021b8 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/kernels.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/kernels.asset @@ -1,8 +1,8 @@ local Kernels = asset.syncedResource({ - Name = "Jupiter Spice Kernels", - Type = "HttpSynchronization", - Identifier = "jupiter_kernels", - Version = 1 + Name = "Jupiter Spice Kernels", + Type = "HttpSynchronization", + Identifier = "jupiter_kernels", + Version = 1 }) asset.export("jup310", Kernels .. '/jup310.bsp') @@ -10,10 +10,10 @@ asset.export("jup341", Kernels .. '/jup341.bsp') asset.meta = { - Name = "Jupiter Spice Kernels", - Version = "1.0", - Description = [[ Generic SPICE kernels for Jupiter.]], - Author = "OpenSpace Team", - URL = "https://naif.jpl.nasa.gov/pub/naif/pds/wgc/kernels/spk/", - License = "NASA" + Name = "Jupiter Spice Kernels", + Version = "1.0", + Description = [[ Generic SPICE kernels for Jupiter.]], + Author = "OpenSpace Team", + URL = "https://naif.jpl.nasa.gov/pub/naif/pds/wgc/kernels/spk/", + License = "NASA" } diff --git a/data/assets/scene/solarsystem/planets/jupiter/layers/colorlayers/jupiter_texture.asset b/data/assets/scene/solarsystem/planets/jupiter/layers/colorlayers/jupiter_texture.asset index 395196807a..0a9de27073 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/layers/colorlayers/jupiter_texture.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/layers/colorlayers/jupiter_texture.asset @@ -2,22 +2,22 @@ local texturesPath = asset.require("./../../jupiter_textures").TexturesPath local globeIdentifier = asset.require("./../../jupiter").Jupiter.Identifier local layer = { - Identifier = "Texture", - FilePath = texturesPath .. "/jupiter.jpg", + Identifier = "Texture", + FilePath = texturesPath .. "/jupiter.jpg", } asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) asset.export("layer", layer) asset.meta = { - Name = "Jupiter Texutre", - Version = "1.0", - Description = [[ Default jpg texture for Jupiter]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license" + Name = "Jupiter Texutre", + Version = "1.0", + Description = [[ Default jpg texture for Jupiter]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/jupiter/major_moons.asset b/data/assets/scene/solarsystem/planets/jupiter/major_moons.asset index 693a481429..196e4d4209 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/major_moons.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/major_moons.asset @@ -5,11 +5,11 @@ asset.require('./io/io') asset.meta = { - Name = "Jupiter Major Moons", - Version = "1.0", - Description = [[ Meta asset containing Jupiters major moons: Callisto, Europa, - Ganymede, and Io]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license" + Name = "Jupiter Major Moons", + Version = "1.0", + Description = [[ Meta asset containing Jupiters major moons: Callisto, Europa, + Ganymede, and Io]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/jupiter/minor/ananke_group.asset b/data/assets/scene/solarsystem/planets/jupiter/minor/ananke_group.asset index 46078d22eb..b9cfabaede 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/minor/ananke_group.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/minor/ananke_group.asset @@ -10,218 +10,218 @@ local parentSpice = "JUPITER BARYCENTER" local tags = { "moon_solarSystem", "moon_giants", "moon_jupiter", "moon_ananke"} local trailColor = { 0.4, 0.3, 0.01 } local trailTags = { - "moonTrail_solarSystem", - "moonTrail_giants", - "moonTrail_jupiter", - "moonTrail_minor" + "moonTrail_solarSystem", + "moonTrail_giants", + "moonTrail_jupiter", + "moonTrail_minor" } local anankeGroup = { - { - Identifier = "S2010J2", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "552", - Radii = { 1000, 1000, 1000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Name = "S/2010 J 2", - Path = "/Solar System/Planets/Jupiter/Moons/Ananke Group" - }, - TrailColor = trailColor, - OrbitPeriod = 588.36, - Kernels = kernel + { + Identifier = "S2010J2", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice }, - { - Identifier = "Thelxinoe", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "THELXINOE", - Radii = { 2000, 2000, 2000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Path = "/Solar System/Planets/Jupiter/Moons/Ananke Group" - }, - TrailColor = trailColor, - OrbitPeriod = 597.61, - Kernels = kernel + Spice = "552", + Radii = { 1000, 1000, 1000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Name = "S/2010 J 2", + Path = "/Solar System/Planets/Jupiter/Moons/Ananke Group" }, - { - Identifier = "Euanthe", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "EUANTHE", - Radii = { 3000, 3000, 3000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Path = "/Solar System/Planets/Jupiter/Moons/Ananke Group" - }, - TrailColor = trailColor, - OrbitPeriod = 598.09, - Kernels = kernel + TrailColor = trailColor, + OrbitPeriod = 588.36, + Kernels = kernel + }, + { + Identifier = "Thelxinoe", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice }, - { - Identifier = "Iocaste", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "IOCASTE", - Radii = { 5000, 5000, 5000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Path = "/Solar System/Planets/Jupiter/Moons/Ananke Group" - }, - TrailColor = trailColor, - OrbitPeriod = 609.43, - Kernels = kernel + Spice = "THELXINOE", + Radii = { 2000, 2000, 2000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Path = "/Solar System/Planets/Jupiter/Moons/Ananke Group" }, - { - Identifier = "S2003J16", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "55068", - Radii = { 2000, 2000, 2000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Name = "S/2003 J 16", - Path = "/Solar System/Planets/Jupiter/Moons/Ananke Group" - }, - TrailColor = trailColor, - OrbitPeriod = 610.36, - Kernels = kernel + TrailColor = trailColor, + OrbitPeriod = 597.61, + Kernels = kernel + }, + { + Identifier = "Euanthe", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice }, - { - Identifier = "Praxidike", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "PRAXIDIKE", - Radii = { 7000, 7000, 7000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Path = "/Solar System/Planets/Jupiter/Moons/Ananke Group" - }, - TrailColor = trailColor, - OrbitPeriod = 613.90, - Kernels = kernel + Spice = "EUANTHE", + Radii = { 3000, 3000, 3000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Path = "/Solar System/Planets/Jupiter/Moons/Ananke Group" }, - { - Identifier = "Harpalyke", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "HARPALYKE", - Radii = { 4000, 4000, 4000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Path = "/Solar System/Planets/Jupiter/Moons/Ananke Group" - }, - TrailColor = trailColor, - OrbitPeriod = 624.54, - Kernels = kernel + TrailColor = trailColor, + OrbitPeriod = 598.09, + Kernels = kernel + }, + { + Identifier = "Iocaste", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice }, - { - Identifier = "Mneme", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "MNEME", - Radii = { 2000, 2000, 2000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Path = "/Solar System/Planets/Jupiter/Moons/Ananke Group" - }, - TrailColor = trailColor, - OrbitPeriod = 627.48, - Kernels = kernel + Spice = "IOCASTE", + Radii = { 5000, 5000, 5000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Path = "/Solar System/Planets/Jupiter/Moons/Ananke Group" }, - { - Identifier = "Hermippe", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "HERMIPPE", - Radii = { 4000, 4000, 4000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Path = "/Solar System/Planets/Jupiter/Moons/Ananke Group" - }, - TrailColor = trailColor, - OrbitPeriod = 629.81, - Kernels = kernel + TrailColor = trailColor, + OrbitPeriod = 609.43, + Kernels = kernel + }, + { + Identifier = "S2003J16", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice }, - { - Identifier = "Thyone", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "THYONE", - Radii = { 4000, 4000, 4000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Path = "/Solar System/Planets/Jupiter/Moons/Ananke Group" - }, - TrailColor = trailColor, - OrbitPeriod = 639.80, - Kernels = kernel + Spice = "55068", + Radii = { 2000, 2000, 2000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Name = "S/2003 J 16", + Path = "/Solar System/Planets/Jupiter/Moons/Ananke Group" }, - { - Identifier = "Ananke", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "ANANKE", - Radii = { 28000, 28000, 28000 }, - TrailTags = trailTags, - Tags = tags, - GUI = { - Path = "/Solar System/Planets/Jupiter/Moons/Ananke Group" - }, - TrailColor = trailColor, - OrbitPeriod = 640.38, - Kernels = kernel - } + TrailColor = trailColor, + OrbitPeriod = 610.36, + Kernels = kernel + }, + { + Identifier = "Praxidike", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice + }, + Spice = "PRAXIDIKE", + Radii = { 7000, 7000, 7000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Path = "/Solar System/Planets/Jupiter/Moons/Ananke Group" + }, + TrailColor = trailColor, + OrbitPeriod = 613.90, + Kernels = kernel + }, + { + Identifier = "Harpalyke", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice + }, + Spice = "HARPALYKE", + Radii = { 4000, 4000, 4000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Path = "/Solar System/Planets/Jupiter/Moons/Ananke Group" + }, + TrailColor = trailColor, + OrbitPeriod = 624.54, + Kernels = kernel + }, + { + Identifier = "Mneme", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice + }, + Spice = "MNEME", + Radii = { 2000, 2000, 2000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Path = "/Solar System/Planets/Jupiter/Moons/Ananke Group" + }, + TrailColor = trailColor, + OrbitPeriod = 627.48, + Kernels = kernel + }, + { + Identifier = "Hermippe", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice + }, + Spice = "HERMIPPE", + Radii = { 4000, 4000, 4000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Path = "/Solar System/Planets/Jupiter/Moons/Ananke Group" + }, + TrailColor = trailColor, + OrbitPeriod = 629.81, + Kernels = kernel + }, + { + Identifier = "Thyone", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice + }, + Spice = "THYONE", + Radii = { 4000, 4000, 4000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Path = "/Solar System/Planets/Jupiter/Moons/Ananke Group" + }, + TrailColor = trailColor, + OrbitPeriod = 639.80, + Kernels = kernel + }, + { + Identifier = "Ananke", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice + }, + Spice = "ANANKE", + Radii = { 28000, 28000, 28000 }, + TrailTags = trailTags, + Tags = tags, + GUI = { + Path = "/Solar System/Planets/Jupiter/Moons/Ananke Group" + }, + TrailColor = trailColor, + OrbitPeriod = 640.38, + Kernels = kernel + } } assetHelper.registerSceneGraphNodesAndExport( - asset, - proceduralGlobes.createGlobes(anankeGroup) + asset, + proceduralGlobes.createGlobes(anankeGroup) ) asset.meta = { - Name = "Jupiter Ananke Group Moons", - Version = "1.0", - Description = [[ Procedural Globe asset containing Jupiter's Ananke Group - moons: S2010J2, Thelxinoe, Euanthe, Iocaste, S2003J16, Praxidike, Harpalyke, - Mneme, Hermippe, Thyone, and Ananke. Blank globes - and SPICE trails are generated for each moon.]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license" + Name = "Jupiter Ananke Group Moons", + Version = "1.0", + Description = [[ Procedural Globe asset containing Jupiter's Ananke Group + moons: S2010J2, Thelxinoe, Euanthe, Iocaste, S2003J16, Praxidike, Harpalyke, + Mneme, Hermippe, Thyone, and Ananke. Blank globes + and SPICE trails are generated for each moon.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/jupiter/minor/carme_group.asset b/data/assets/scene/solarsystem/planets/jupiter/minor/carme_group.asset index bc4338cd11..e6b56d1db4 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/minor/carme_group.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/minor/carme_group.asset @@ -10,286 +10,286 @@ local parentSpice = "JUPITER BARYCENTER" local tags = { "moon_solarSystem", "moon_giants", "moon_jupiter", "moon_carme" } local trailColor = { 0.4, 0.3, 0.01 } local trailTags = { - "moonTrail_solarSystem", - "moonTrail_giants", - "moonTrail_jupiter", - "moonTrail_minor" + "moonTrail_solarSystem", + "moonTrail_giants", + "moonTrail_jupiter", + "moonTrail_minor" } local carmeGroup = { - { - Identifier = "Herse", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "HERSE", - Radii = { 2000, 2000, 2000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Path = "/Solar System/Planets/Jupiter/Moons/Carme Group" - }, - TrailColor = trailColor, - OrbitPeriod = 672.75, - Kernels = kernel + { + Identifier = "Herse", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice }, - { - Identifier = "Aitne", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "AITNE", - Radii = { 3000, 3000, 3000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Path = "/Solar System/Planets/Jupiter/Moons/Carme Group" - }, - TrailColor = trailColor, - OrbitPeriod = 679.64, - Kernels = kernel + Spice = "HERSE", + Radii = { 2000, 2000, 2000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Path = "/Solar System/Planets/Jupiter/Moons/Carme Group" }, - { - Identifier = "Kale", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "KALE", - Radii = { 2000, 2000, 2000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Path = "/Solar System/Planets/Jupiter/Moons/Carme Group" - }, - TrailColor = trailColor, - OrbitPeriod = 685.32, - Kernels = kernel + TrailColor = trailColor, + OrbitPeriod = 672.75, + Kernels = kernel + }, + { + Identifier = "Aitne", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice }, - { - Identifier = "Taygete", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "TAYGETE", - Radii = { 5000, 5000, 5000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Path = "/Solar System/Planets/Jupiter/Moons/Carme Group" - }, - TrailColor = trailColor, - OrbitPeriod = 686.67, - Kernels = kernel + Spice = "AITNE", + Radii = { 3000, 3000, 3000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Path = "/Solar System/Planets/Jupiter/Moons/Carme Group" }, - { - Identifier = "Chaldene", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "CHALDENE", - Radii = { 4000, 4000, 4000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Path = "/Solar System/Planets/Jupiter/Moons/Carme Group" - }, - TrailColor = trailColor, - OrbitPeriod = 699.33, - Kernels = kernel + TrailColor = trailColor, + OrbitPeriod = 679.64, + Kernels = kernel + }, + { + Identifier = "Kale", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice }, - { - Identifier = "Erinome", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "ERINOME", - Radii = { 3000, 3000, 3000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Path = "/Solar System/Planets/Jupiter/Moons/Carme Group" - }, - TrailColor = trailColor, - OrbitPeriod = 711.96, - Kernels = kernel + Spice = "KALE", + Radii = { 2000, 2000, 2000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Path = "/Solar System/Planets/Jupiter/Moons/Carme Group" }, - { - Identifier = "Kallichore", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "KALLICHORE", - Radii = { 2000, 2000, 2000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Path = "/Solar System/Planets/Jupiter/Moons/Carme Group" - }, - TrailColor = trailColor, - OrbitPeriod = 717.81, - Kernels = kernel + TrailColor = trailColor, + OrbitPeriod = 685.32, + Kernels = kernel + }, + { + Identifier = "Taygete", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice }, - { - Identifier = "Kalyke", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "KALYKE", - Radii = { 5000, 5000, 5000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Path = "/Solar System/Planets/Jupiter/Moons/Carme Group" - }, - TrailColor = trailColor, - OrbitPeriod = 721.02, - Kernels = kernel + Spice = "TAYGETE", + Radii = { 5000, 5000, 5000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Path = "/Solar System/Planets/Jupiter/Moons/Carme Group" }, - { - Identifier = "Pasithee", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "PASITHEE", - Radii = { 2000, 2000, 2000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Path = "/Solar System/Planets/Jupiter/Moons/Carme Group" - }, - TrailColor = trailColor, - OrbitPeriod = 726.93, - Kernels = kernel + TrailColor = trailColor, + OrbitPeriod = 686.67, + Kernels = kernel + }, + { + Identifier = "Chaldene", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice }, - { - Identifier = "S2010J1", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "551", - Radii = { 2000, 2000, 2000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Name = "S/2010 J 1", - Path = "/Solar System/Planets/Jupiter/Moons/Carme Group" - }, - TrailColor = trailColor, - OrbitPeriod = 722.83, - Kernels = kernel + Spice = "CHALDENE", + Radii = { 4000, 4000, 4000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Path = "/Solar System/Planets/Jupiter/Moons/Carme Group" }, - { - Identifier = "Eukelade", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "EUKELADE", - Radii = { 4000, 4000, 4000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Path = "/Solar System/Planets/Jupiter/Moons/Carme Group" - }, - TrailColor = trailColor, - OrbitPeriod = 735.20, - Kernels = kernel + TrailColor = trailColor, + OrbitPeriod = 699.33, + Kernels = kernel + }, + { + Identifier = "Erinome", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice }, - { - Identifier = "Arche", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "ARCHE", - Radii = { 3000, 3000, 3000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Path = "/Solar System/Planets/Jupiter/Moons/Carme Group" - }, - TrailColor = trailColor, - OrbitPeriod = 746.19, - Kernels = kernel + Spice = "ERINOME", + Radii = { 3000, 3000, 3000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Path = "/Solar System/Planets/Jupiter/Moons/Carme Group" }, - { - Identifier = "Isonoe", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "ISONOE", - Radii = { 4000, 4000, 4000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Path = "/Solar System/Planets/Jupiter/Moons/Carme Group" - }, - TrailColor = trailColor, - OrbitPeriod = 750.13, - Kernels = kernel + TrailColor = trailColor, + OrbitPeriod = 711.96, + Kernels = kernel + }, + { + Identifier = "Kallichore", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice }, - { - Identifier = "Carme", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "CARME", - Radii = { 46000, 46000, 46000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Path = "/Solar System/Planets/Jupiter/Moons/Carme Group" - }, - TrailColor = trailColor, - OrbitPeriod = 763.95, - Kernels = kernel + Spice = "KALLICHORE", + Radii = { 2000, 2000, 2000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Path = "/Solar System/Planets/Jupiter/Moons/Carme Group" }, - { - Identifier = "S2003J5", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "557", - Radii = { 4000, 4000, 4000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Name = "S/2003 J 5", - Path = "/Solar System/Planets/Jupiter/Moons/Carme Group" - }, - TrailColor = trailColor, - OrbitPeriod = 758.34, - Kernels = kernel + TrailColor = trailColor, + OrbitPeriod = 717.81, + Kernels = kernel + }, + { + Identifier = "Kalyke", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice }, + Spice = "KALYKE", + Radii = { 5000, 5000, 5000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Path = "/Solar System/Planets/Jupiter/Moons/Carme Group" + }, + TrailColor = trailColor, + OrbitPeriod = 721.02, + Kernels = kernel + }, + { + Identifier = "Pasithee", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice + }, + Spice = "PASITHEE", + Radii = { 2000, 2000, 2000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Path = "/Solar System/Planets/Jupiter/Moons/Carme Group" + }, + TrailColor = trailColor, + OrbitPeriod = 726.93, + Kernels = kernel + }, + { + Identifier = "S2010J1", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice + }, + Spice = "551", + Radii = { 2000, 2000, 2000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Name = "S/2010 J 1", + Path = "/Solar System/Planets/Jupiter/Moons/Carme Group" + }, + TrailColor = trailColor, + OrbitPeriod = 722.83, + Kernels = kernel + }, + { + Identifier = "Eukelade", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice + }, + Spice = "EUKELADE", + Radii = { 4000, 4000, 4000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Path = "/Solar System/Planets/Jupiter/Moons/Carme Group" + }, + TrailColor = trailColor, + OrbitPeriod = 735.20, + Kernels = kernel + }, + { + Identifier = "Arche", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice + }, + Spice = "ARCHE", + Radii = { 3000, 3000, 3000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Path = "/Solar System/Planets/Jupiter/Moons/Carme Group" + }, + TrailColor = trailColor, + OrbitPeriod = 746.19, + Kernels = kernel + }, + { + Identifier = "Isonoe", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice + }, + Spice = "ISONOE", + Radii = { 4000, 4000, 4000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Path = "/Solar System/Planets/Jupiter/Moons/Carme Group" + }, + TrailColor = trailColor, + OrbitPeriod = 750.13, + Kernels = kernel + }, + { + Identifier = "Carme", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice + }, + Spice = "CARME", + Radii = { 46000, 46000, 46000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Path = "/Solar System/Planets/Jupiter/Moons/Carme Group" + }, + TrailColor = trailColor, + OrbitPeriod = 763.95, + Kernels = kernel + }, + { + Identifier = "S2003J5", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice + }, + Spice = "557", + Radii = { 4000, 4000, 4000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Name = "S/2003 J 5", + Path = "/Solar System/Planets/Jupiter/Moons/Carme Group" + }, + TrailColor = trailColor, + OrbitPeriod = 758.34, + Kernels = kernel + } } assetHelper.registerSceneGraphNodesAndExport( - asset, - proceduralGlobes.createGlobes(carmeGroup) + asset, + proceduralGlobes.createGlobes(carmeGroup) ) asset.meta = { - Name = "Jupiter Carme Group Moons", - Version = "1.0", - Description = [[ Procedural Globe asset containing Jupiter's Carme Group - moons: Herse, Aitne, Kale, Taygete, Chaldene, Erinome, Kallichore, Kalyke, - Pasithee, S2010J1, Eukelade, Arche, Isonoe, Carme, and S2003J5. Blank globes - and SPICE trails are generated for each moon.]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license" + Name = "Jupiter Carme Group Moons", + Version = "1.0", + Description = [[ Procedural Globe asset containing Jupiter's Carme Group + moons: Herse, Aitne, Kale, Taygete, Chaldene, Erinome, Kallichore, Kalyke, + Pasithee, S2010J1, Eukelade, Arche, Isonoe, Carme, and S2003J5. Blank globes + and SPICE trails are generated for each moon.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/jupiter/minor/carpo_group.asset b/data/assets/scene/solarsystem/planets/jupiter/minor/carpo_group.asset index 134bc166c1..7fcb8e9cdc 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/minor/carpo_group.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/minor/carpo_group.asset @@ -10,45 +10,45 @@ local parentSpice = "JUPITER BARYCENTER" local tags = { "moon_solarSystem", "moon_giants", "moon_jupiter", "moon_carpo" } local trailColor = { 0.4, 0.3, 0.01 } local trailTags = { - "moonTrail_solarSystem", - "moonTrail_giants", - "moonTrail_jupiter", - "moonTrail_minor" + "moonTrail_solarSystem", + "moonTrail_giants", + "moonTrail_jupiter", + "moonTrail_minor" } local carpoGroup = { - { - Identifier = "Carpo", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "CARPO", - Radii = { 3000, 3000, 3000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Path = "/Solar System/Planets/Jupiter/Moons/Carpo Group" - }, - TrailColor = trailColor, - OrbitPeriod = 458.62, - Kernels = kernel - } + { + Identifier = "Carpo", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice + }, + Spice = "CARPO", + Radii = { 3000, 3000, 3000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Path = "/Solar System/Planets/Jupiter/Moons/Carpo Group" + }, + TrailColor = trailColor, + OrbitPeriod = 458.62, + Kernels = kernel + } } assetHelper.registerSceneGraphNodesAndExport( - asset, - proceduralGlobes.createGlobes(carpoGroup) + asset, + proceduralGlobes.createGlobes(carpoGroup) ) asset.meta = { - Name = "Jupiter Carpo Group Moons", - Version = "1.0", - Description = [[ Procedural Globe asset containing Jupiter's Carpo Group - moons: Carpo. Blank globes and SPICE trails - are generated for each moon.]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license" + Name = "Jupiter Carpo Group Moons", + Version = "1.0", + Description = [[ Procedural Globe asset containing Jupiter's Carpo Group + moons: Carpo. Blank globes and SPICE trails + are generated for each moon.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/jupiter/minor/himalia_group.asset b/data/assets/scene/solarsystem/planets/jupiter/minor/himalia_group.asset index 6d95b0614a..fa9117c43c 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/minor/himalia_group.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/minor/himalia_group.asset @@ -10,114 +10,114 @@ local parentSpice = "JUPITER BARYCENTER" local tags = { "moon_solarSystem", "moon_giants", "moon_jupiter", "moon_himalia" } local trailColor = { 0.4, 0.3, 0.01 } local trailTags = { - "moonTrail_solarSystem", - "moonTrail_giants", - "moonTrail_jupiter", - "moonTrail_minor" + "moonTrail_solarSystem", + "moonTrail_giants", + "moonTrail_jupiter", + "moonTrail_minor" } local himaliaGroup = { - { - Identifier = "Leda", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "LEDA", - Radii = { 16000, 16000, 16000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Path = "/Solar System/Planets/Jupiter/Moons/Himalia Group" - }, - TrailColor = trailColor, - OrbitPeriod = 240.82, - Kernels = kernel + { + Identifier = "Leda", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice }, - { - Identifier = "Himalia", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "HIMALIA", - Radii = { 170000, 170000, 170000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Path = "/Solar System/Planets/Jupiter/Moons/Himalia Group" - }, - TrailColor = trailColor, - OrbitPeriod = 250.23, - Kernels = kernel + Spice = "LEDA", + Radii = { 16000, 16000, 16000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Path = "/Solar System/Planets/Jupiter/Moons/Himalia Group" }, - { - Identifier = "Lysithea", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "LYSITHEA", - Radii = { 36000, 36000, 36000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Path = "/Solar System/Planets/Jupiter/Moons/Himalia Group" - }, - TrailColor = trailColor, - OrbitPeriod = 259.89, - Kernels = kernel + TrailColor = trailColor, + OrbitPeriod = 240.82, + Kernels = kernel + }, + { + Identifier = "Himalia", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice }, - { - Identifier = "Elara", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "ELARA", - Radii = { 86000, 86000, 86000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Path = "/Solar System/Planets/Jupiter/Moons/Himalia Group" - }, - TrailColor = trailColor, - OrbitPeriod = 257.62, - Kernels = kernel + Spice = "HIMALIA", + Radii = { 170000, 170000, 170000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Path = "/Solar System/Planets/Jupiter/Moons/Himalia Group" }, - { - Identifier = "Dia", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - -- Spice = "DIA", -- The Identifier is not correctly registered in the Spice kernel - Spice = "553", - Radii = { 4000, 4000, 4000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Path = "/Solar System/Planets/Jupiter/Moons/Himalia Group" - }, - TrailColor = trailColor, - OrbitPeriod = 287.93, - Kernels = kernel - } + TrailColor = trailColor, + OrbitPeriod = 250.23, + Kernels = kernel + }, + { + Identifier = "Lysithea", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice + }, + Spice = "LYSITHEA", + Radii = { 36000, 36000, 36000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Path = "/Solar System/Planets/Jupiter/Moons/Himalia Group" + }, + TrailColor = trailColor, + OrbitPeriod = 259.89, + Kernels = kernel + }, + { + Identifier = "Elara", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice + }, + Spice = "ELARA", + Radii = { 86000, 86000, 86000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Path = "/Solar System/Planets/Jupiter/Moons/Himalia Group" + }, + TrailColor = trailColor, + OrbitPeriod = 257.62, + Kernels = kernel + }, + { + Identifier = "Dia", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice + }, + -- Spice = "DIA", -- The Identifier is not correctly registered in the Spice kernel + Spice = "553", + Radii = { 4000, 4000, 4000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Path = "/Solar System/Planets/Jupiter/Moons/Himalia Group" + }, + TrailColor = trailColor, + OrbitPeriod = 287.93, + Kernels = kernel + } } assetHelper.registerSceneGraphNodesAndExport( - asset, - proceduralGlobes.createGlobes(himaliaGroup) + asset, + proceduralGlobes.createGlobes(himaliaGroup) ) asset.meta = { - Name = "Jupiter Himalia Group Moons", - Version = "1.0", - Description = [[ Procedural Globe asset containing Jupiter's Himalia Group - moons: Leda, Himalia, Lysithea, Elara and Dia. Blank globes and SPICE trails - are generated for each moon.]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license" + Name = "Jupiter Himalia Group Moons", + Version = "1.0", + Description = [[ Procedural Globe asset containing Jupiter's Himalia Group + moons: Leda, Himalia, Lysithea, Elara and Dia. Blank globes and SPICE trails + are generated for each moon.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/jupiter/minor/inner_group.asset b/data/assets/scene/solarsystem/planets/jupiter/minor/inner_group.asset index 03a29d37a4..63a0ae8d98 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/minor/inner_group.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/minor/inner_group.asset @@ -10,81 +10,81 @@ local parentSpice = "JUPITER BARYCENTER" local tags = { "moon_solarSystem", "moon_giants", "moon_jupiter", "moon_inner" } local trailColor = { 0.4, 0.3, 0.01 } local trailTags = { - "moonTrail_solarSystem", - "moonTrail_giants", - "moonTrail_jupiter", - "moonTrail_minor" + "moonTrail_solarSystem", + "moonTrail_giants", + "moonTrail_jupiter", + "moonTrail_minor" } local innerMoons = { - { - Identifier = "Metis", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "METIS", - Radii = { 60000, 40000, 34000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Path = "/Solar System/Planets/Jupiter/Moons/Inner Group" - }, - TrailColor = trailColor, - OrbitPeriod = 0.117912037, - Kernels = kernel + { + Identifier = "Metis", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice }, - { - Identifier = "Adrastea", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "ADRASTEA", - Radii = { 20000, 16000, 14000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Path = "/Solar System/Planets/Jupiter/Moons/Inner Group" - }, - TrailColor = trailColor, - OrbitPeriod = 0.2982638889, - Kernels = kernel + Spice = "METIS", + Radii = { 60000, 40000, 34000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Path = "/Solar System/Planets/Jupiter/Moons/Inner Group" }, - { - Identifier = "Amalthea", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "AMALTHEA", - Radii = { 250000, 146000, 128000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Path = "/Solar System/Planets/Jupiter/Moons/Inner Group" - }, - TrailColor = trailColor, - OrbitPeriod = 0.4981828704, - Kernels = kernel + TrailColor = trailColor, + OrbitPeriod = 0.117912037, + Kernels = kernel + }, + { + Identifier = "Adrastea", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice }, - { - Identifier = "Thebe", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "THEBE", - Radii = { 116000, 98000, 84000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Path = "/Solar System/Planets/Jupiter/Moons/Inner Group" - }, - TrailColor = trailColor, - OrbitPeriod = 0.6745023148, - Kernels = kernel - } + Spice = "ADRASTEA", + Radii = { 20000, 16000, 14000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Path = "/Solar System/Planets/Jupiter/Moons/Inner Group" + }, + TrailColor = trailColor, + OrbitPeriod = 0.2982638889, + Kernels = kernel + }, + { + Identifier = "Amalthea", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice + }, + Spice = "AMALTHEA", + Radii = { 250000, 146000, 128000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Path = "/Solar System/Planets/Jupiter/Moons/Inner Group" + }, + TrailColor = trailColor, + OrbitPeriod = 0.4981828704, + Kernels = kernel + }, + { + Identifier = "Thebe", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice + }, + Spice = "THEBE", + Radii = { 116000, 98000, 84000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Path = "/Solar System/Planets/Jupiter/Moons/Inner Group" + }, + TrailColor = trailColor, + OrbitPeriod = 0.6745023148, + Kernels = kernel + } } assetHelper.registerSceneGraphNodesAndExport( @@ -94,12 +94,12 @@ assetHelper.registerSceneGraphNodesAndExport( asset.meta = { - Name = "Jupiter Inner Group Moons", - Version = "1.0", - Description = [[ Procedural Globe asset containing Jupiter's Inner Group - moons: Metis, Adrastea, Amalthea, and Thebe. Blank globes and SPICE trails - are generated for each moon.]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license" + Name = "Jupiter Inner Group Moons", + Version = "1.0", + Description = [[ Procedural Globe asset containing Jupiter's Inner Group + moons: Metis, Adrastea, Amalthea, and Thebe. Blank globes and SPICE trails + are generated for each moon.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/jupiter/minor/other_groups.asset b/data/assets/scene/solarsystem/planets/jupiter/minor/other_groups.asset index 172d67e99e..644d959083 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/minor/other_groups.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/minor/other_groups.asset @@ -10,172 +10,172 @@ local parentSpice = "JUPITER BARYCENTER" local tags = { "moon_solarSystem", "moon_giants", "moon_jupiter", "moon_other" } local trailColor = { 0.4, 0.3, 0.01 } local trailTags = { - "moonTrail_solarSystem", - "moonTrail_giants", - "moonTrail_jupiter", - "moonTrail_minor" + "moonTrail_solarSystem", + "moonTrail_giants", + "moonTrail_jupiter", + "moonTrail_minor" } local otherGroups = { - { - Identifier = "S2003J12", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "55066", - Radii = { 1000, 1000, 1000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Name = "S/2003 J 12", - Path = "/Solar System/Planets/Jupiter/Moons/Other Groups" - }, - TrailColor = trailColor, - OrbitPeriod = 482.69, - Kernels = kernel + { + Identifier = "S2003J12", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice }, - { - Identifier = "S/2003J3", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "55061", - Radii = { 2000, 2000, 2000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Name = "S/2003 J 3", - Path = "/Solar System/Planets/Jupiter/Moons/Other Groups" - }, - TrailColor = trailColor, - OrbitPeriod = 561.52, - Kernels = kernel + Spice = "55066", + Radii = { 1000, 1000, 1000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Name = "S/2003 J 12", + Path = "/Solar System/Planets/Jupiter/Moons/Other Groups" }, - { - Identifier = "S2011J1", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "55074", - Radii = { 1000, 1000, 1000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Name = "S/2011 J 1", - Path = "/Solar System/Planets/Jupiter/Moons/Other Groups" - }, - TrailColor = trailColor, - OrbitPeriod = 582.22, - Kernels = kernel + TrailColor = trailColor, + OrbitPeriod = 482.69, + Kernels = kernel + }, + { + Identifier = "S/2003J3", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice }, - { - Identifier = "S2003J19", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "55070", - Radii = { 2000, 2000, 2000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Name = "S/2003 J 19", - Path = "/Solar System/Planets/Jupiter/Moons/Other Groups" - }, - TrailColor = trailColor, - OrbitPeriod = 699.12, - Kernels = kernel + Spice = "55061", + Radii = { 2000, 2000, 2000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Name = "S/2003 J 3", + Path = "/Solar System/Planets/Jupiter/Moons/Other Groups" }, - { - Identifier = "S2003J10", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "55065", - Radii = { 2000, 2000, 2000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Name = "S/2003 J 10", - Path = "/Solar System/Planets/Jupiter/Moons/Other Groups" - }, - TrailColor = trailColor, - OrbitPeriod = 700.13, - Kernels = kernel + TrailColor = trailColor, + OrbitPeriod = 561.52, + Kernels = kernel + }, + { + Identifier = "S2011J1", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice }, - { - Identifier = "S2003J23", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "55071", - Radii = { 2000, 2000, 2000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Name = "S/2003 J 23", - Path = "/Solar System/Planets/Jupiter/Moons/Other Groups" - }, - TrailColor = trailColor, - OrbitPeriod = 700.54, - Kernels = kernel + Spice = "55074", + Radii = { 1000, 1000, 1000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Name = "S/2011 J 1", + Path = "/Solar System/Planets/Jupiter/Moons/Other Groups" }, - { - Identifier = "S2003J9", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "55064", - Radii = { 2000, 2000, 2000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Name = "S/2003 J 9", - Path = "/Solar System/Planets/Jupiter/Moons/Other Groups" - }, - TrailColor = trailColor, - OrbitPeriod = 752.84, - Kernels = kernel + TrailColor = trailColor, + OrbitPeriod = 582.22, + Kernels = kernel + }, + { + Identifier = "S2003J19", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice }, - { - Identifier = "S2003J2", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "55060", - Radii = { 2000, 2000, 2000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Name = "S/2003 J 2", - Path = "/Solar System/Planets/Jupiter/Moons/Other Groups" - }, - TrailColor = trailColor, - OrbitPeriod = 981.55, - Kernels = kernel - } + Spice = "55070", + Radii = { 2000, 2000, 2000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Name = "S/2003 J 19", + Path = "/Solar System/Planets/Jupiter/Moons/Other Groups" + }, + TrailColor = trailColor, + OrbitPeriod = 699.12, + Kernels = kernel + }, + { + Identifier = "S2003J10", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice + }, + Spice = "55065", + Radii = { 2000, 2000, 2000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Name = "S/2003 J 10", + Path = "/Solar System/Planets/Jupiter/Moons/Other Groups" + }, + TrailColor = trailColor, + OrbitPeriod = 700.13, + Kernels = kernel + }, + { + Identifier = "S2003J23", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice + }, + Spice = "55071", + Radii = { 2000, 2000, 2000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Name = "S/2003 J 23", + Path = "/Solar System/Planets/Jupiter/Moons/Other Groups" + }, + TrailColor = trailColor, + OrbitPeriod = 700.54, + Kernels = kernel + }, + { + Identifier = "S2003J9", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice + }, + Spice = "55064", + Radii = { 2000, 2000, 2000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Name = "S/2003 J 9", + Path = "/Solar System/Planets/Jupiter/Moons/Other Groups" + }, + TrailColor = trailColor, + OrbitPeriod = 752.84, + Kernels = kernel + }, + { + Identifier = "S2003J2", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice + }, + Spice = "55060", + Radii = { 2000, 2000, 2000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Name = "S/2003 J 2", + Path = "/Solar System/Planets/Jupiter/Moons/Other Groups" + }, + TrailColor = trailColor, + OrbitPeriod = 981.55, + Kernels = kernel + } } assetHelper.registerSceneGraphNodesAndExport( - asset, - proceduralGlobes.createGlobes(otherGroups) + asset, + proceduralGlobes.createGlobes(otherGroups) ) asset.meta = { - Name = "Jupiter Pasiphae Other Moons", - Version = "1.0", - Description = [[ Procedural Globe asset containing Jupiter's Other Group - moons: S2003J12, S/2003J3, S2011J1, S2003J19, S2003J10, S2003J23, S2003J9, - and S2003J2. Blank globes and SPICE trails are generated for each moon.]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license" + Name = "Jupiter Pasiphae Other Moons", + Version = "1.0", + Description = [[ Procedural Globe asset containing Jupiter's Other Group + moons: S2003J12, S/2003J3, S2011J1, S2003J19, S2003J10, S2003J23, S2003J9, + and S2003J2. Blank globes and SPICE trails are generated for each moon.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/jupiter/minor/pasiphae_group.asset b/data/assets/scene/solarsystem/planets/jupiter/minor/pasiphae_group.asset index 83d827e04c..4576f4e782 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/minor/pasiphae_group.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/minor/pasiphae_group.asset @@ -10,359 +10,359 @@ local parentSpice = "JUPITER BARYCENTER" local tags = { "moon_solarSystem", "moon_giants", "moon_jupiter", "moon_pasiphae" } local trailColor = { 0.4, 0.3, 0.01 } local trailTags = { - "moonTrail_solarSystem", - "moonTrail_giants", - "moonTrail_jupiter", - "moonTrail_minor" + "moonTrail_solarSystem", + "moonTrail_giants", + "moonTrail_jupiter", + "moonTrail_minor" } local pasiphaeGroup = { - { - Identifier = "Euporie", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "EUPORIE", - Radii = { 2000, 2000, 2000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Path = "/Solar System/Planets/Jupiter/Moons/Pasiphae Group" - }, - TrailColor = trailColor, - OrbitPeriod = 538.78, - Kernels = kernel + { + Identifier = "Euporie", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice }, - { - Identifier = "S2003J18", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "555", - Radii = { 2000, 2000, 2000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Name = "S/2003 J 18", - Path = "/Solar System/Planets/Jupiter/Moons/Pasiphae Group" - }, - TrailColor = trailColor, - OrbitPeriod = 587.38, - Kernels = kernel + Spice = "EUPORIE", + Radii = { 2000, 2000, 2000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Path = "/Solar System/Planets/Jupiter/Moons/Pasiphae Group" }, - { - Identifier = "Helike", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "HELIKE", - Radii = { 4000, 4000, 4000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Path = "/Solar System/Planets/Jupiter/Moons/Pasiphae Group" - }, - TrailColor = trailColor, - OrbitPeriod = 601.40, - Kernels = kernel + TrailColor = trailColor, + OrbitPeriod = 538.78, + Kernels = kernel + }, + { + Identifier = "S2003J18", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice }, - { - Identifier = "Orthosie", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "ORTHOSIE", - Radii = { 2000, 2000, 2000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Path = "/Solar System/Planets/Jupiter/Moons/Pasiphae Group" - }, - TrailColor = trailColor, - OrbitPeriod = 602.62, - Kernels = kernel + Spice = "555", + Radii = { 2000, 2000, 2000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Name = "S/2003 J 18", + Path = "/Solar System/Planets/Jupiter/Moons/Pasiphae Group" }, - { - Identifier = "S2016J1", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "554", - Radii = { 3000, 3000, 3000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Name = "S/2016 J 1", - Path = "/Solar System/Planets/Jupiter/Moons/Pasiphae Group" - }, - TrailColor = trailColor, - OrbitPeriod = 603.83, - Kernels = kernel + TrailColor = trailColor, + OrbitPeriod = 587.38, + Kernels = kernel + }, + { + Identifier = "Helike", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice }, - { - Identifier = "S2003J15", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "558", - Radii = { 2000, 2000, 2000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Name = "S/2003 J 15", - Path = "/Solar System/Planets/Jupiter/Moons/Pasiphae Group" - }, - TrailColor = trailColor, - OrbitPeriod = 699.68, - Kernels = kernel + Spice = "HELIKE", + Radii = { 4000, 4000, 4000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Path = "/Solar System/Planets/Jupiter/Moons/Pasiphae Group" }, - { - Identifier = "Aoede", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "AOEDE", - Radii = { 4000, 4000, 4000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Path = "/Solar System/Planets/Jupiter/Moons/Pasiphae Group" - }, - TrailColor = trailColor, - OrbitPeriod = 714.66, - Kernels = kernel + TrailColor = trailColor, + OrbitPeriod = 601.40, + Kernels = kernel + }, + { + Identifier = "Orthosie", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice }, - { - Identifier = "Callirrhoe", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "CALLIRRHOE", - Radii = { 9000, 9000, 9000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Path = "/Solar System/Planets/Jupiter/Moons/Pasiphae Group" - }, - TrailColor = trailColor, - OrbitPeriod = 727.11, - Kernels = kernel + Spice = "ORTHOSIE", + Radii = { 2000, 2000, 2000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Path = "/Solar System/Planets/Jupiter/Moons/Pasiphae Group" }, - { - Identifier = "Eurydome", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "EURYDOME", - Radii = { 3000, 3000, 3000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Path = "/Solar System/Planets/Jupiter/Moons/Pasiphae Group" - }, - TrailColor = trailColor, - OrbitPeriod = 723.36, - Kernels = kernel + TrailColor = trailColor, + OrbitPeriod = 602.62, + Kernels = kernel + }, + { + Identifier = "S2016J1", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice }, - { - Identifier = "Kore", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "KORE", - Radii = { 2000, 2000, 2000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Path = "/Solar System/Planets/Jupiter/Moons/Pasiphae Group" - }, - TrailColor = trailColor, - OrbitPeriod = 776.02, - Kernels = kernel + Spice = "554", + Radii = { 3000, 3000, 3000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Name = "S/2016 J 1", + Path = "/Solar System/Planets/Jupiter/Moons/Pasiphae Group" }, - { - Identifier = "Cyllene", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "CYLLENE", - Radii = { 2000, 2000, 2000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Path = "/Solar System/Planets/Jupiter/Moons/Pasiphae Group" - }, - TrailColor = trailColor, - OrbitPeriod = 731.10, - Kernels = kernel + TrailColor = trailColor, + OrbitPeriod = 603.83, + Kernels = kernel + }, + { + Identifier = "S2003J15", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice }, - { - Identifier = "S2011J2", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "556", - Radii = { 1000, 1000, 1000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Name = "S/2011 J 2", - Path = "/Solar System/Planets/Jupiter/Moons/Pasiphae Group" - }, - TrailColor = trailColor, - OrbitPeriod = 731.32, - Kernels = kernel + Spice = "558", + Radii = { 2000, 2000, 2000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Name = "S/2003 J 15", + Path = "/Solar System/Planets/Jupiter/Moons/Pasiphae Group" }, - { - Identifier = "S2017J1", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "559", - Radii = { 2000, 2000, 2000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Name = "S/2017 J 1", - Path = "/Solar System/Planets/Jupiter/Moons/Pasiphae Group" - }, - TrailColor = trailColor, - OrbitPeriod = 734.15, - Kernels = kernel + TrailColor = trailColor, + OrbitPeriod = 699.68, + Kernels = kernel + }, + { + Identifier = "Aoede", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice }, - { - Identifier = "S2003J4", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "55062", - Radii = { 2000, 2000, 2000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Name = "S/2003 J 4", - Path = "/Solar System/Planets/Jupiter/Moons/Pasiphae Group" - }, - TrailColor = trailColor, - OrbitPeriod = 739.29, - Kernels = kernel + Spice = "AOEDE", + Radii = { 4000, 4000, 4000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Path = "/Solar System/Planets/Jupiter/Moons/Pasiphae Group" }, - { - Identifier = "Pasiphae", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "PASIPHAE", - Radii = { 60000, 60000, 60000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Path = "/Solar System/Planets/Jupiter/Moons/Pasiphae Group" - }, - TrailColor = trailColor, - OrbitPeriod = 739.80, - Kernels = kernel + TrailColor = trailColor, + OrbitPeriod = 714.66, + Kernels = kernel + }, + { + Identifier = "Callirrhoe", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice }, - { - Identifier = "Hegemone", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "HEGEMONE", - Radii = { 3000, 3000, 3000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Path = "/Solar System/Planets/Jupiter/Moons/Pasiphae Group" - }, - TrailColor = trailColor, - OrbitPeriod = 745.50, - Kernels = kernel + Spice = "CALLIRRHOE", + Radii = { 9000, 9000, 9000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Path = "/Solar System/Planets/Jupiter/Moons/Pasiphae Group" }, - { - Identifier = "Sinope", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "SINOPE", - Radii = { 38000, 38000, 38000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Path = "/Solar System/Planets/Jupiter/Moons/Pasiphae Group" - }, - TrailColor = trailColor, - OrbitPeriod = 739.33, - Kernels = kernel + TrailColor = trailColor, + OrbitPeriod = 727.11, + Kernels = kernel + }, + { + Identifier = "Eurydome", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice }, - { - Identifier = "Sponde", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "SPONDE", - Radii = { 2000, 2000, 2000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Path = "/Solar System/Planets/Jupiter/Moons/Pasiphae Group" - }, - TrailColor = trailColor, - OrbitPeriod = 771.60, - Kernels = kernel + Spice = "EURYDOME", + Radii = { 3000, 3000, 3000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Path = "/Solar System/Planets/Jupiter/Moons/Pasiphae Group" }, - { - Identifier = "Autonoe", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "AUTONOE", - Radii = { 4000, 4000, 4000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Path = "/Solar System/Planets/Jupiter/Moons/Pasiphae Group" - }, - TrailColor = trailColor, - OrbitPeriod = 772.17, - Kernels = kernel + TrailColor = trailColor, + OrbitPeriod = 723.36, + Kernels = kernel + }, + { + Identifier = "Kore", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice }, - { - Identifier = "Megaclite", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - -- sic: The Identifier in the SPICE kernel is wrong - Spice = "MAGACLITE", - Radii = { 5000, 5000, 5000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Path = "/Solar System/Planets/Jupiter/Moons/Pasiphae Group" - }, - TrailColor = trailColor, - OrbitPeriod = 792.44, - Kernels = kernel - } + Spice = "KORE", + Radii = { 2000, 2000, 2000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Path = "/Solar System/Planets/Jupiter/Moons/Pasiphae Group" + }, + TrailColor = trailColor, + OrbitPeriod = 776.02, + Kernels = kernel + }, + { + Identifier = "Cyllene", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice + }, + Spice = "CYLLENE", + Radii = { 2000, 2000, 2000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Path = "/Solar System/Planets/Jupiter/Moons/Pasiphae Group" + }, + TrailColor = trailColor, + OrbitPeriod = 731.10, + Kernels = kernel + }, + { + Identifier = "S2011J2", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice + }, + Spice = "556", + Radii = { 1000, 1000, 1000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Name = "S/2011 J 2", + Path = "/Solar System/Planets/Jupiter/Moons/Pasiphae Group" + }, + TrailColor = trailColor, + OrbitPeriod = 731.32, + Kernels = kernel + }, + { + Identifier = "S2017J1", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice + }, + Spice = "559", + Radii = { 2000, 2000, 2000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Name = "S/2017 J 1", + Path = "/Solar System/Planets/Jupiter/Moons/Pasiphae Group" + }, + TrailColor = trailColor, + OrbitPeriod = 734.15, + Kernels = kernel + }, + { + Identifier = "S2003J4", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice + }, + Spice = "55062", + Radii = { 2000, 2000, 2000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Name = "S/2003 J 4", + Path = "/Solar System/Planets/Jupiter/Moons/Pasiphae Group" + }, + TrailColor = trailColor, + OrbitPeriod = 739.29, + Kernels = kernel + }, + { + Identifier = "Pasiphae", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice + }, + Spice = "PASIPHAE", + Radii = { 60000, 60000, 60000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Path = "/Solar System/Planets/Jupiter/Moons/Pasiphae Group" + }, + TrailColor = trailColor, + OrbitPeriod = 739.80, + Kernels = kernel + }, + { + Identifier = "Hegemone", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice + }, + Spice = "HEGEMONE", + Radii = { 3000, 3000, 3000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Path = "/Solar System/Planets/Jupiter/Moons/Pasiphae Group" + }, + TrailColor = trailColor, + OrbitPeriod = 745.50, + Kernels = kernel + }, + { + Identifier = "Sinope", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice + }, + Spice = "SINOPE", + Radii = { 38000, 38000, 38000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Path = "/Solar System/Planets/Jupiter/Moons/Pasiphae Group" + }, + TrailColor = trailColor, + OrbitPeriod = 739.33, + Kernels = kernel + }, + { + Identifier = "Sponde", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice + }, + Spice = "SPONDE", + Radii = { 2000, 2000, 2000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Path = "/Solar System/Planets/Jupiter/Moons/Pasiphae Group" + }, + TrailColor = trailColor, + OrbitPeriod = 771.60, + Kernels = kernel + }, + { + Identifier = "Autonoe", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice + }, + Spice = "AUTONOE", + Radii = { 4000, 4000, 4000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Path = "/Solar System/Planets/Jupiter/Moons/Pasiphae Group" + }, + TrailColor = trailColor, + OrbitPeriod = 772.17, + Kernels = kernel + }, + { + Identifier = "Megaclite", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice + }, + -- sic: The Identifier in the SPICE kernel is wrong + Spice = "MAGACLITE", + Radii = { 5000, 5000, 5000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Path = "/Solar System/Planets/Jupiter/Moons/Pasiphae Group" + }, + TrailColor = trailColor, + OrbitPeriod = 792.44, + Kernels = kernel + } } assetHelper.registerSceneGraphNodesAndExport( diff --git a/data/assets/scene/solarsystem/planets/jupiter/minor/themisto_group.asset b/data/assets/scene/solarsystem/planets/jupiter/minor/themisto_group.asset index c493ec9359..0a2299e611 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/minor/themisto_group.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/minor/themisto_group.asset @@ -10,43 +10,43 @@ local parentSpice = "JUPITER BARYCENTER" local tags = { "moon_solarSystem", "moon_giants", "moon_jupiter", "moon_themisto" } local trailColor = { 0.4, 0.3, 0.01 } local trailTags = { - "moonTrail_solarSystem", - "moonTrail_giants", - "moonTrail_jupiter", - "moonTrail_minor" + "moonTrail_solarSystem", + "moonTrail_giants", + "moonTrail_jupiter", + "moonTrail_minor" } local themistoGroup = { - { - Identifier = "Themisto", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "THEMISTO", - Radii = { 8000, 8000, 8000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Path = "/Solar System/Planets/Jupiter/Moons/Themisto Group" - }, - TrailColor = trailColor, - OrbitPeriod = 129.87, - Kernels = kernel - } + { + Identifier = "Themisto", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice + }, + Spice = "THEMISTO", + Radii = { 8000, 8000, 8000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Path = "/Solar System/Planets/Jupiter/Moons/Themisto Group" + }, + TrailColor = trailColor, + OrbitPeriod = 129.87, + Kernels = kernel + } } assetHelper.registerSceneGraphNodesAndExport( - asset, - proceduralGlobes.createGlobes(themistoGroup) + asset, + proceduralGlobes.createGlobes(themistoGroup) ) asset.meta = { - Name = "Jupiter Themisto Group Moons", - Version = "1.0", - Description = [[ Procedural Globe asset containing Jupiter's Themisto Group - moons: Themisto. Blank globes and SPICE trails are generated for each moon.]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license" + Name = "Jupiter Themisto Group Moons", + Version = "1.0", + Description = [[ Procedural Globe asset containing Jupiter's Themisto Group + moons: Themisto. Blank globes and SPICE trails are generated for each moon.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/jupiter/minor_moons.asset b/data/assets/scene/solarsystem/planets/jupiter/minor_moons.asset index 8c48b6f6ac..f935b5d485 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/minor_moons.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/minor_moons.asset @@ -9,11 +9,11 @@ asset.require('./minor/themisto_group') asset.meta = { - Name = "Jupiter Minor Moons", - Version = "1.0", - Description = [[ Meta asset containing eight moon groups: Ananke, Carme, Carpo, - Himalia, Pasiphae, Themisto, Inner, and Other]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license" + Name = "Jupiter Minor Moons", + Version = "1.0", + Description = [[ Meta asset containing eight moon groups: Ananke, Carme, Carpo, + Himalia, Pasiphae, Themisto, Inner, and Other]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/jupiter/trail.asset b/data/assets/scene/solarsystem/planets/jupiter/trail.asset index 5e8830cbc7..7f5c7347b1 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/trail.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/trail.asset @@ -5,36 +5,36 @@ asset.require("spice/base") local JupiterTrail = { - Identifier = "JupiterTrail", - Parent = transforms.SolarSystemBarycenter.Identifier, - Renderable = { - Type = "RenderableTrailOrbit", - Translation = { - Type = "SpiceTranslation", - Target = "JUPITER BARYCENTER", - Observer = "SUN" - }, - Color = { 0.8, 0.7, 0.7 }, - Period = 4330.595, - Resolution = 1000 + Identifier = "JupiterTrail", + Parent = transforms.SolarSystemBarycenter.Identifier, + Renderable = { + Type = "RenderableTrailOrbit", + Translation = { + Type = "SpiceTranslation", + Target = "JUPITER BARYCENTER", + Observer = "SUN" }, - Tag = { "planetTrail_solarSystem", "planetTrail_giants" }, - GUI = { - Name = "Jupiter Trail", - Path = "/Solar System/Planets/Jupiter" - } + Color = { 0.8, 0.7, 0.7 }, + Period = 4330.595, + Resolution = 1000 + }, + Tag = { "planetTrail_solarSystem", "planetTrail_giants" }, + GUI = { + Name = "Jupiter Trail", + Path = "/Solar System/Planets/Jupiter" + } } assetHelper.registerSceneGraphNodesAndExport(asset, { JupiterTrail }) asset.meta = { - Name = "Jupiter Trail", - Version = "1.0", - Description = [[ Trail of Jupiter as observed by the Sun. Data from NASA Spice (see - base spice asset)]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"JupiterTrail"} + Name = "Jupiter Trail", + Version = "1.0", + Description = [[ Trail of Jupiter as observed by the Sun. Data from NASA Spice (see + base spice asset)]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license", + Identifiers = {"JupiterTrail"} } diff --git a/data/assets/scene/solarsystem/planets/jupiter/trail_earth.asset b/data/assets/scene/solarsystem/planets/jupiter/trail_earth.asset index 64c2d7798f..50dd1cf706 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/trail_earth.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/trail_earth.asset @@ -6,37 +6,37 @@ asset.require("spice/base") local JupiterTrailEarth = { - Identifier = "JupiterTrailEarth", - Parent = earthTransforms.EarthBarycenter.Identifier, - Renderable = { - Type = "RenderableTrailOrbit", - Translation = { - Type = "SpiceTranslation", - Target = "JUPITER BARYCENTER", - Observer = "EARTH" - }, - Color = { 1.0, 0.5, 0.2 }, - Period = 224.695, - Resolution = 1000, - Enabled = false + Identifier = "JupiterTrailEarth", + Parent = earthTransforms.EarthBarycenter.Identifier, + Renderable = { + Type = "RenderableTrailOrbit", + Translation = { + Type = "SpiceTranslation", + Target = "JUPITER BARYCENTER", + Observer = "EARTH" }, - Tag = { "planetTrail_solarSystem_alt", "planetTrail_terrestrial_alt" }, - GUI = { - Name = "Jupiter trail from Earth", - Path = "/Solar System/Planets/Jupiter", - Hidden = false - } + Color = { 1.0, 0.5, 0.2 }, + Period = 224.695, + Resolution = 1000, + Enabled = false + }, + Tag = { "planetTrail_solarSystem_alt", "planetTrail_terrestrial_alt" }, + GUI = { + Name = "Jupiter trail from Earth", + Path = "/Solar System/Planets/Jupiter", + Hidden = false + } } asset.meta = { - Name = "Jupiter Trail from Earth", - Version = "1.0", - Description = [[ Trail of Jupiter as observed by the Earth. Data from NASA - SPICE (see base spice asset)]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"VenusTrailEarth"} + Name = "Jupiter Trail from Earth", + Version = "1.0", + Description = [[ Trail of Jupiter as observed by the Earth. Data from NASA + SPICE (see base spice asset)]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license", + Identifiers = {"VenusTrailEarth"} } assetHelper.registerSceneGraphNodesAndExport(asset, { JupiterTrailEarth }) diff --git a/data/assets/scene/solarsystem/planets/jupiter/transforms.asset b/data/assets/scene/solarsystem/planets/jupiter/transforms.asset index e4795f3afc..28db943e93 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/transforms.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/transforms.asset @@ -5,31 +5,31 @@ asset.require("spice/base") local JupiterBarycenter = { - Identifier = "JupiterBarycenter", - Parent = sun_transforms_asset.SolarSystemBarycenter.Identifier, - Transform = { - Translation = { - Type = "SpiceTranslation", - Target = "JUPITER BARYCENTER", - Observer = "SUN" - } - }, - GUI = { - Name = "Jupiter Barycenter", - Path = "/Solar System/Planets/Jupiter", - Hidden = true + Identifier = "JupiterBarycenter", + Parent = sun_transforms_asset.SolarSystemBarycenter.Identifier, + Transform = { + Translation = { + Type = "SpiceTranslation", + Target = "JUPITER BARYCENTER", + Observer = "SUN" } + }, + GUI = { + Name = "Jupiter Barycenter", + Path = "/Solar System/Planets/Jupiter", + Hidden = true + } } assetHelper.registerSceneGraphNodesAndExport(asset, { JupiterBarycenter }) asset.meta = { - Name = "Jupiter Transforms", - Version = "1.0", - Description = [[ Jupiter Barycenter transform]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"JupiterBarycenter"} + Name = "Jupiter Transforms", + Version = "1.0", + Description = [[ Jupiter Barycenter transform]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license", + Identifiers = {"JupiterBarycenter"} } diff --git a/data/assets/scene/solarsystem/planets/mars/atmosphere.asset b/data/assets/scene/solarsystem/planets/mars/atmosphere.asset index ff627cb98a..53d218bf08 100644 --- a/data/assets/scene/solarsystem/planets/mars/atmosphere.asset +++ b/data/assets/scene/solarsystem/planets/mars/atmosphere.asset @@ -7,50 +7,50 @@ local Atmosphere = { Identifier = "MarsAtmosphere", Parent = transforms.Mars.Identifier, Renderable = { - Type = "RenderableAtmosphere", - -- Atmosphere radius in Km - AtmosphereHeight = 3463.17495 - 3386.190, - PlanetRadius = 3386.190, - PlanetAverageGroundReflectance = 0.1, - GroundRadianceEmission = 0.37, - SunIntensity = 13.1, - MieScatteringExtinctionPropCoefficient = 0.23862, - Rayleigh = { - Coefficients = { - -- Wavelengths are given in 10^-9m - Wavelengths = { 680, 550, 440 }, - -- Reflection coefficients are given in km^-1 - Scattering = { 19.918E-3, 13.57E-3, 5.75E-3 } - -- In Rayleigh scattering, the coefficients of - -- absorption and scattering are the same. - }, - -- Thichkness of atmosphere if its density were uniform, in Km - H_R = 10.43979 + Type = "RenderableAtmosphere", + -- Atmosphere radius in Km + AtmosphereHeight = 3463.17495 - 3386.190, + PlanetRadius = 3386.190, + PlanetAverageGroundReflectance = 0.1, + GroundRadianceEmission = 0.37, + SunIntensity = 13.1, + MieScatteringExtinctionPropCoefficient = 0.23862, + Rayleigh = { + Coefficients = { + -- Wavelengths are given in 10^-9m + Wavelengths = { 680, 550, 440 }, + -- Reflection coefficients are given in km^-1 + Scattering = { 19.918E-3, 13.57E-3, 5.75E-3 } + -- In Rayleigh scattering, the coefficients of + -- absorption and scattering are the same. }, - -- Default - Mie = { - Coefficients = { - -- Reflection coefficients are given in km^-1 - Scattering = { 53.61771e-3, 53.61771e-3, 53.61771e-3 }, - -- Extinction coefficients are a fraction of the Scattering coefficients - Extinction = { 53.61771e-3/0.98979, 53.61771e-3/0.98979, 53.61771e-3/0.98979 } - }, - -- Mie Height scale (atmosphere thickness for constant density) in Km - H_M = 3.09526, - -- Mie Phase Function Value (G e [-1.0, 1.0]. - -- If G = 1.0, Mie phase function = Rayleigh Phase Function) - G = 0.85 + -- Thichkness of atmosphere if its density were uniform, in Km + H_R = 10.43979 + }, + -- Default + Mie = { + Coefficients = { + -- Reflection coefficients are given in km^-1 + Scattering = { 53.61771e-3, 53.61771e-3, 53.61771e-3 }, + -- Extinction coefficients are a fraction of the Scattering coefficients + Extinction = { 53.61771e-3/0.98979, 53.61771e-3/0.98979, 53.61771e-3/0.98979 } }, - Debug = { - -- PreCalculatedTextureScale is a float from 1.0 to N, with N > 0.0 and N in Naturals (i.e., 1, 2, 3, 4, 5....) - PreCalculatedTextureScale = 1.0, - SaveCalculatedTextures = false - } + -- Mie Height scale (atmosphere thickness for constant density) in Km + H_M = 3.09526, + -- Mie Phase Function Value (G e [-1.0, 1.0]. + -- If G = 1.0, Mie phase function = Rayleigh Phase Function) + G = 0.85 + }, + Debug = { + -- PreCalculatedTextureScale is a float from 1.0 to N, with N > 0.0 and N in Naturals (i.e., 1, 2, 3, 4, 5....) + PreCalculatedTextureScale = 1.0, + SaveCalculatedTextures = false + } }, GUI = { - Name = "Mars Atmosphere", - Path = "/Solar System/Planets/Mars", - Description = [[ Atmosphere of Mars.]] + Name = "Mars Atmosphere", + Path = "/Solar System/Planets/Mars", + Description = [[ Atmosphere of Mars.]] } } @@ -58,11 +58,11 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { Atmosphere }) asset.meta = { - Name = "Mars Atmosphere", - Version = "1.0", - Description = [[ RenderableAtmosphere for Mars.]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"MarsAtmosphere"} + Name = "Mars Atmosphere", + Version = "1.0", + Description = [[ RenderableAtmosphere for Mars.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license", + Identifiers = {"MarsAtmosphere"} } diff --git a/data/assets/scene/solarsystem/planets/mars/default_layers.asset b/data/assets/scene/solarsystem/planets/mars/default_layers.asset index bfdb18a019..db06a922b2 100644 --- a/data/assets/scene/solarsystem/planets/mars/default_layers.asset +++ b/data/assets/scene/solarsystem/planets/mars/default_layers.asset @@ -33,20 +33,20 @@ asset.require(overlaysPath .. "/size_reference") -- Set enabled layers (temporary solution) -- @TODO: do this using a boolean that's passed to the 'asset.require' instead asset.onInitialize(function () - openspace.setPropertyValueSingle("Scene.Mars.Renderable.Layers.ColorLayers." .. - colorLayer.layer.Identifier .. ".Enabled", true) - openspace.setPropertyValueSingle("Scene.Mars.Renderable.Layers.HeightLayers." .. - heightLayer.layer.Identifier .. ".Enabled", true) + openspace.setPropertyValueSingle("Scene.Mars.Renderable.Layers.ColorLayers." .. + colorLayer.layer.Identifier .. ".Enabled", true) + openspace.setPropertyValueSingle("Scene.Mars.Renderable.Layers.HeightLayers." .. + heightLayer.layer.Identifier .. ".Enabled", true) end) asset.meta = { - Name = "Default Mars Layers", - Version = "1.1", - Description = [[ Default Mars layers are: MOC WA Color, Viking MDIM, MOLA Pseudo - Color, MOLA HRSC, Themis IR Day, Themis IR Night, CTX Mosaic, CTX Blended - beta01, HiRISE, and HiRISE Local Set]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license" + Name = "Default Mars Layers", + Version = "1.1", + Description = [[ Default Mars layers are: MOC WA Color, Viking MDIM, MOLA Pseudo + Color, MOLA HRSC, Themis IR Day, Themis IR Night, CTX Mosaic, CTX Blended + beta01, HiRISE, and HiRISE Local Set]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_blended_01.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_blended_01.asset index 2ced7b9bcb..bf644867fd 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_blended_01.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_blended_01.asset @@ -2,45 +2,45 @@ local mapServiceConfigs = asset.localResource("./../../map_service_configs") local globeIdentifier = asset.require("./../../mars").Mars.Identifier local layer = { - Identifier = "CTX_blended_01", - Name = "CTX Blended beta01", - FilePath = mapServiceConfigs .. "/ESRI/CTX/CTXblended.vrt", - BlendMode = "Color", - Settings = { - Gamma = 2.14, - Multiplier = 1.54 - }, - Description = [[This product contains CTX data through MRO release 45, CTX mission - phase J21 (December 1, 2017). The mosaic is comprised of 74,196 separate CTX - images out of 95,106 available (78.0%). Orbits not included were either (1) low - signal/noise (increased atmospheric opacity), or (2) redundant coverage (stereo - targets, change detection, etc.). With low-quality images removed, the mosaic - covers 97.3% of Mars. The mosaic covers 88°S to 88°N. All data are resampled to - 5.0 m/px, including 2,334 orbits (3.14%) that are natively higher resolution than - 5.0 m/px, though no images are higher resolution than 4.93 m/px. The planet was - divided into 3,960 4°x4° tiles, which are not blended with each other in this - version. As we describe below, every pixel can be traced to its host orbit through - vectorized seam-maps that are provided with every tile. These seam-maps provide - pixel-for-pixel spatial documentation of image seams, to prevent misinterpretation - of seams as possible landforms and to provide instant access to original data. A - completely seamless CTX mosaic is currently infeasible, so seam-maps are required - to prevent misinterpretation. (Description from URL)]], + Identifier = "CTX_blended_01", + Name = "CTX Blended beta01", + FilePath = mapServiceConfigs .. "/ESRI/CTX/CTXblended.vrt", + BlendMode = "Color", + Settings = { + Gamma = 2.14, + Multiplier = 1.54 + }, + Description = [[This product contains CTX data through MRO release 45, CTX mission + phase J21 (December 1, 2017). The mosaic is comprised of 74,196 separate CTX + images out of 95,106 available (78.0%). Orbits not included were either (1) low + signal/noise (increased atmospheric opacity), or (2) redundant coverage (stereo + targets, change detection, etc.). With low-quality images removed, the mosaic + covers 97.3% of Mars. The mosaic covers 88°S to 88°N. All data are resampled to + 5.0 m/px, including 2,334 orbits (3.14%) that are natively higher resolution than + 5.0 m/px, though no images are higher resolution than 4.93 m/px. The planet was + divided into 3,960 4°x4° tiles, which are not blended with each other in this + version. As we describe below, every pixel can be traced to its host orbit through + vectorized seam-maps that are provided with every tile. These seam-maps provide + pixel-for-pixel spatial documentation of image seams, to prevent misinterpretation + of seams as possible landforms and to provide instant access to original data. A + completely seamless CTX mosaic is currently infeasible, so seam-maps are required + to prevent misinterpretation. (Description from URL)]], } asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) asset.export("layer", layer) asset.meta = { - Name = "CTX Blended beta01", - Version = "1.0", - Description = [[New blended CTX map for Mars from CalTech Murray lab. This map is - hosted by ESRI.]], - Author = "Caltech Murray Lab", - URL = "http://murray-lab.caltech.edu/CTX/", - License = "Esri Master License Agreement", - Identifiers = {"CTX_blended_01"} + Name = "CTX Blended beta01", + Version = "1.0", + Description = [[New blended CTX map for Mars from CalTech Murray lab. This map is + hosted by ESRI.]], + Author = "Caltech Murray Lab", + URL = "http://murray-lab.caltech.edu/CTX/", + License = "Esri Master License Agreement", + Identifiers = {"CTX_blended_01"} } diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_mosaic_sweden.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_mosaic_sweden.asset index f5113c579d..9b414b1fc3 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_mosaic_sweden.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_mosaic_sweden.asset @@ -2,14 +2,14 @@ local mapServiceConfigs = asset.localResource("./../../map_service_configs") local globeIdentifier = asset.require("./../../mars").Mars.Identifier local layer = { - Identifier = "CTX_Mosaic_Sweden", - Name = "CTX Mosaic [Sweden]", - FilePath = mapServiceConfigs .. "/LiU/CTX.wms", - BlendMode = "Color" + Identifier = "CTX_Mosaic_Sweden", + Name = "CTX Mosaic [Sweden]", + FilePath = mapServiceConfigs .. "/LiU/CTX.wms", + BlendMode = "Color" } asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_mosaic_utah.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_mosaic_utah.asset index 136eb1107a..1b7342a8d1 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_mosaic_utah.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_mosaic_utah.asset @@ -2,14 +2,14 @@ local mapServiceConfigs = asset.localResource("./../../map_service_configs") local globeIdentifier = asset.require("./../../mars").Mars.Identifier local layer = { - Identifier = "CTX_Mosaic_Utah", - Name = "CTX Mosaic [Utah]", - FilePath = mapServiceConfigs .. "/Utah/CTX.wms", - BlendMode = "Color" + Identifier = "CTX_Mosaic_Utah", + Name = "CTX Mosaic [Utah]", + FilePath = mapServiceConfigs .. "/Utah/CTX.wms", + BlendMode = "Color" } asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/fallbacks/mars_texture.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/fallbacks/mars_texture.asset index d0cdd92783..beb227466d 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/fallbacks/mars_texture.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/fallbacks/mars_texture.asset @@ -1,19 +1,19 @@ local texturesPath = asset.require("./../../../mars_textures").TexturesPath local layer = { - Identifier = "Mars_Texture", - Name = "Mars Texture", - FilePath = texturesPath .. "/mars.jpg", + Identifier = "Mars_Texture", + Name = "Mars Texture", + FilePath = texturesPath .. "/mars.jpg", } asset.export("layer", layer) asset.meta = { - Name = "Mars Texutre", - Version = "1.0", - Description = [[ Default jpg texture for Mars]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license" + Name = "Mars Texutre", + Version = "1.0", + Description = [[ Default jpg texture for Mars]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/hirise.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/hirise.asset index 716e504cca..c3bedbb9a9 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/hirise.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/hirise.asset @@ -2,41 +2,41 @@ local mapServiceConfigs = asset.localResource("./../../map_service_configs") local globeIdentifier = asset.require("./../../mars").Mars.Identifier local layer = { - Identifier = "HiRISE-PSP", - Name = "HiRISE", - FilePath = mapServiceConfigs .. "/ESRI/HiRISE/HiRISE_PSP.vrt", - BlendMode = "Color", - Settings = { - Gamma = 1.0, - Multiplier = 1.0 - }, - Description = [[This layer is an equatorial uncontrolled composite mosaic of the - HiRISE imagery, using all available red band images released through 2018. The - HiRISE instrument, operated by the University of Arizona, is on board NASA's - 2005 Mars Reconnaissance Orbiter (MRO). While the resolution of the imagery is - very high, the imagery is somewhat limited in spatial extent, covering only about - 3% of the plant's surface. The images in this layer are spatially located using - only the initial spacecraft pointing information. All source images used in the - construction of this layer were produced by the team at the University of Arizona. - This tiled web service, as hosted by Esri, is made available using lossy Jpeg - compression using an 8 bit data range, using a linear stretch from the original - 10 bit range. (Description from URL)]], + Identifier = "HiRISE-PSP", + Name = "HiRISE", + FilePath = mapServiceConfigs .. "/ESRI/HiRISE/HiRISE_PSP.vrt", + BlendMode = "Color", + Settings = { + Gamma = 1.0, + Multiplier = 1.0 + }, + Description = [[This layer is an equatorial uncontrolled composite mosaic of the + HiRISE imagery, using all available red band images released through 2018. The + HiRISE instrument, operated by the University of Arizona, is on board NASA's + 2005 Mars Reconnaissance Orbiter (MRO). While the resolution of the imagery is + very high, the imagery is somewhat limited in spatial extent, covering only about + 3% of the plant's surface. The images in this layer are spatially located using + only the initial spacecraft pointing information. All source images used in the + construction of this layer were produced by the team at the University of Arizona. + This tiled web service, as hosted by Esri, is made available using lossy Jpeg + compression using an 8 bit data range, using a linear stretch from the original + 10 bit range. (Description from URL)]], } asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) asset.export("layer", layer) asset.meta = { - Name = "HiRISE", - Version = "1.0", - Description = [[Updated HiRISE layer for Mars with raw unselected imagery. This map is - hosted by ESRI.]], - Author = "esri_astro", - URL = "https://www.arcgis.com/home/item.html?id=c1c4c750a2154842ae523c984cc14fa5", - License = "Esri Master License Agreement", - Identifiers = {"HiRISE-PSP"} + Name = "HiRISE", + Version = "1.0", + Description = [[Updated HiRISE layer for Mars with raw unselected imagery. This map is + hosted by ESRI.]], + Author = "esri_astro", + URL = "https://www.arcgis.com/home/item.html?id=c1c4c750a2154842ae523c984cc14fa5", + License = "Esri Master License Agreement", + Identifiers = {"HiRISE-PSP"} } diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/hirisels.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/hirisels.asset index 1ce80e2d49..5dd9e190c5 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/hirisels.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/hirisels.asset @@ -2,40 +2,40 @@ local mapServiceConfigs = asset.localResource("./../../map_service_configs") local globeIdentifier = asset.require("./../../mars").Mars.Identifier local layer = { - Identifier = "HiRISE-LS", - Name = "HiRISE Local Set", - FilePath = mapServiceConfigs .. "/ESRI/HiRISE/HiRISELS.vrt", - BlendMode = "Color", - Description = [[ HiRISE (High Resolution Imaging Science Experiment) is the most - powerful camera ever sent to another planet, one of six instruments onboard the - Mars Reconnaissance Orbiter. We launched in 2005, arrived at Mars in 2006 and have - been imaging ever since. Our camera’s high resolution capability (imaging up to 30 - centimeters per pixel) remains unprecedented for any existing orbiter in the study - of the Red Planet, as well as being an indispensable instrument for helping to - select landing sites for robotic and future human exploration. In the past decade, - we’ve also imaged avalanches in progress, and discovered dark flows that may or - may not be briny seeps. Hundreds of science papers have been published with our - data. (Description from URL). This map contains a subet set of the HiRISE - imagaery, only containing locations where a corresponding HiRISE digital terrain - model (DTM) was available as of 2018.]], + Identifier = "HiRISE-LS", + Name = "HiRISE Local Set", + FilePath = mapServiceConfigs .. "/ESRI/HiRISE/HiRISELS.vrt", + BlendMode = "Color", + Description = [[ HiRISE (High Resolution Imaging Science Experiment) is the most + powerful camera ever sent to another planet, one of six instruments onboard the + Mars Reconnaissance Orbiter. We launched in 2005, arrived at Mars in 2006 and have + been imaging ever since. Our camera’s high resolution capability (imaging up to 30 + centimeters per pixel) remains unprecedented for any existing orbiter in the study + of the Red Planet, as well as being an indispensable instrument for helping to + select landing sites for robotic and future human exploration. In the past decade, + we’ve also imaged avalanches in progress, and discovered dark flows that may or + may not be briny seeps. Hundreds of science papers have been published with our + data. (Description from URL). This map contains a subet set of the HiRISE + imagaery, only containing locations where a corresponding HiRISE digital terrain + model (DTM) was available as of 2018.]], } asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) asset.export("layer", layer) asset.meta = { - Name = "HiRISE Local Set", - Version = "1.0", - Description = [[HiRISE layer for images with corresponding DEMs. This map is - hosted by ESRI.]], - Author = "USGS", - URL = "https://www.uahirise.org", - License = "Esri Master License Agreement", - Identifiers = {"HiRISE-LS"} + Name = "HiRISE Local Set", + Version = "1.0", + Description = [[HiRISE layer for images with corresponding DEMs. This map is + hosted by ESRI.]], + Author = "USGS", + URL = "https://www.uahirise.org", + License = "Esri Master License Agreement", + Identifiers = {"HiRISE-LS"} } diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mars_texture.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mars_texture.asset index fdba12b9bb..125d653a4b 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mars_texture.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mars_texture.asset @@ -2,24 +2,24 @@ local texturesPath = asset.require("./../../mars_textures").TexturesPath local globeIdentifier = asset.require("./../../mars").Mars.Identifier local layer = { - Identifier = "Mars_Texture", - Name = "Mars Texture", - FilePath = texturesPath .. "/mars.jpg", - Description = [[ Default jpg texture for Mars]] + Identifier = "Mars_Texture", + Name = "Mars Texture", + FilePath = texturesPath .. "/mars.jpg", + Description = [[ Default jpg texture for Mars]] } asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) asset.export("layer", layer) asset.meta = { - Name = "Mars Texutre", - Version = "1.0", - Description = [[ Jpg texture for Mars, available for offline use.]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license" + Name = "Mars Texutre", + Version = "1.0", + Description = [[ Jpg texture for Mars, available for offline use.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/moc_wa_color_liu.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/moc_wa_color_liu.asset index f55aa9264b..71cf10ad69 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/moc_wa_color_liu.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/moc_wa_color_liu.asset @@ -4,34 +4,34 @@ local globeIdentifier = asset.require("./../../mars").Mars.Identifier local fallbackLayer = asset.require("./fallbacks/mars_texture").layer local layer = { - Identifier = "MOC_WA_Color_LiU", - Name = "MOC WA Color [Sweden]", - FilePath = mapServiceConfigs .. "/LiU/Color.wms", - Settings = { - Gamma = 1.6, - Multiplier = 1.07 - }, - Fallback = fallbackLayer, - Description = [[This map is an AMNH version of the global mossaic produced by the - Mars Global Surveyor Wide Angle Camera. This version has color added and the - shadows subdued based on the MOLA DTM. Data Reference: - https://www.jpl.nasa.gov/spaceimages/details.php?id=PIA03467.]], + Identifier = "MOC_WA_Color_LiU", + Name = "MOC WA Color [Sweden]", + FilePath = mapServiceConfigs .. "/LiU/Color.wms", + Settings = { + Gamma = 1.6, + Multiplier = 1.07 + }, + Fallback = fallbackLayer, + Description = [[This map is an AMNH version of the global mossaic produced by the + Mars Global Surveyor Wide Angle Camera. This version has color added and the + shadows subdued based on the MOLA DTM. Data Reference: + https://www.jpl.nasa.gov/spaceimages/details.php?id=PIA03467.]], } asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) asset.export("layer", layer) asset.meta = { - Name = "MOC WA Color [Sweden]", - Version = "1.0", - Description = [[Main color map layer for Mars. This map is hosted - on the OpenSpace server in Sweden.]], - Author = "OpenSpace Team", - URL = "http://www.openspaceproject.com", - License = "NASA/PDS", - Identifiers = {"MOLA_HRSC_Sweden"} + Name = "MOC WA Color [Sweden]", + Version = "1.0", + Description = [[Main color map layer for Mars. This map is hosted + on the OpenSpace server in Sweden.]], + Author = "OpenSpace Team", + URL = "http://www.openspaceproject.com", + License = "NASA/PDS", + Identifiers = {"MOLA_HRSC_Sweden"} } diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/moc_wa_color_utah.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/moc_wa_color_utah.asset index 36f5f9778e..d62edc34ed 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/moc_wa_color_utah.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/moc_wa_color_utah.asset @@ -4,34 +4,34 @@ local globeIdentifier = asset.require("./../../mars").Mars.Identifier local fallbackLayer = asset.require("./fallbacks/mars_texture").layer local layer = { - Identifier = "MOC_WA_Color_Utah", - Name = "MOC WA Color [Utah]", - FilePath = mapServiceConfigs .. "/Utah/Mars_Color.wms", - Settings = { - Gamma = 1.6, - Multiplier = 1.07 - }, - Fallback = fallbackLayer, - Description = [[This map is an AMNH version of the global mossaic produced by the - Mars Global Surveyor Wide Angle Camera. This version has color added and the - shadows subdued based on the MOLA DTM. Data Reference: - https://www.jpl.nasa.gov/spaceimages/details.php?id=PIA03467]], + Identifier = "MOC_WA_Color_Utah", + Name = "MOC WA Color [Utah]", + FilePath = mapServiceConfigs .. "/Utah/Mars_Color.wms", + Settings = { + Gamma = 1.6, + Multiplier = 1.07 + }, + Fallback = fallbackLayer, + Description = [[This map is an AMNH version of the global mossaic produced by the + Mars Global Surveyor Wide Angle Camera. This version has color added and the + shadows subdued based on the MOLA DTM. Data Reference: + https://www.jpl.nasa.gov/spaceimages/details.php?id=PIA03467]], } asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) asset.export("layer", layer) asset.meta = { - Name = "MOC WA Color [Utah]", - Version = "1.0", - Description = [[Main color map layer for Mars. This map is hosted - on the OpenSpace server in Utah.]], - Author = "OpenSpace Team", - URL = "http://www.openspaceproject.com", - License = "NASA/PDS", - Identifiers = {"MOC_WA_Color_Utah"} + Name = "MOC WA Color [Utah]", + Version = "1.0", + Description = [[Main color map layer for Mars. This map is hosted + on the OpenSpace server in Utah.]], + Author = "OpenSpace Team", + URL = "http://www.openspaceproject.com", + License = "NASA/PDS", + Identifiers = {"MOC_WA_Color_Utah"} } diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_hrsc_sweden.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_hrsc_sweden.asset index 07bd5a83f4..d532c11131 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_hrsc_sweden.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_hrsc_sweden.asset @@ -2,29 +2,29 @@ local mapServiceConfigs = asset.localResource("./../../map_service_configs") local globeIdentifier = asset.require("./../../mars").Mars.Identifier local layer = { - Identifier = "MOLA_HRSC_Sweden", - Name = "MOLA HRSC [Sweden]", - FilePath = mapServiceConfigs .. "/LiU/Mola_HRSC.wms", - Description = [[ This map layer is colorzied based elevation data from MOLA and HRSC. - Compared to MOLA Psuedo Color, this layer has no terrain shading, which is - suitable for use when combing with other layers. Data Reference: - https://astrogeology.usgs.gov/search/map/Mars/Topography/HRSC_MOLA_Blend/Mars_HRSC_MOLA_BlendDEM_Global_200mp_v2]], + Identifier = "MOLA_HRSC_Sweden", + Name = "MOLA HRSC [Sweden]", + FilePath = mapServiceConfigs .. "/LiU/Mola_HRSC.wms", + Description = [[ This map layer is colorzied based elevation data from MOLA and HRSC. + Compared to MOLA Psuedo Color, this layer has no terrain shading, which is + suitable for use when combing with other layers. Data Reference: + https://astrogeology.usgs.gov/search/map/Mars/Topography/HRSC_MOLA_Blend/Mars_HRSC_MOLA_BlendDEM_Global_200mp_v2]], } asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) asset.export("layer", layer) asset.meta = { - Name = "MOLA HRSC [Sweden]", - Version = "1.0", - Description = [[ Colorzied elevation data for Mars. This map is hosted on the - OpenSpace server in Sweden.]], - Author = "OpenSpace Team", - URL = "http://www.openspaceproject.com", - License = "NASA/PDS", - Identifiers = {"MOLA_HRSC_Sweden"} + Name = "MOLA HRSC [Sweden]", + Version = "1.0", + Description = [[ Colorzied elevation data for Mars. This map is hosted on the + OpenSpace server in Sweden.]], + Author = "OpenSpace Team", + URL = "http://www.openspaceproject.com", + License = "NASA/PDS", + Identifiers = {"MOLA_HRSC_Sweden"} } diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_hrsc_utah.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_hrsc_utah.asset index 8a65c5510f..faf06c205d 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_hrsc_utah.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_hrsc_utah.asset @@ -2,29 +2,29 @@ local mapServiceConfigs = asset.localResource("./../../map_service_configs") local globeIdentifier = asset.require("./../../mars").Mars.Identifier local layer = { - Identifier = "MOLA_HRSC_Utah", - Name = "MOLA HRSC [Utah]", - FilePath = mapServiceConfigs .. "/Utah/Mola_HRSC.wms", - Description = [[ This map layer is colorzied based elevation data from MOLA and HRSC. - Compared to MOLA Psuedo Color, this layer has no terrain shading, which is - suitable for use when combing with other layers. Data Reference: - https://astrogeology.usgs.gov/search/map/Mars/Topography/HRSC_MOLA_Blend/Mars_HRSC_MOLA_BlendDEM_Global_200mp_v2]], + Identifier = "MOLA_HRSC_Utah", + Name = "MOLA HRSC [Utah]", + FilePath = mapServiceConfigs .. "/Utah/Mola_HRSC.wms", + Description = [[ This map layer is colorzied based elevation data from MOLA and HRSC. + Compared to MOLA Psuedo Color, this layer has no terrain shading, which is + suitable for use when combing with other layers. Data Reference: + https://astrogeology.usgs.gov/search/map/Mars/Topography/HRSC_MOLA_Blend/Mars_HRSC_MOLA_BlendDEM_Global_200mp_v2]], } asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) asset.export("layer", layer) asset.meta = { - Name = "MOLA HRSC [Utah]", - Version = "1.0", - Description = [[ Colorzied elevation data for Mars. This map is hosted on the - OpenSpace server in Sweden.]], - Author = "OpenSpace Team", - URL = "http://www.openspaceproject.com", - License = "NASA/PDS", - Identifiers = {"MOLA_HRSC_Sweden"} + Name = "MOLA HRSC [Utah]", + Version = "1.0", + Description = [[ Colorzied elevation data for Mars. This map is hosted on the + OpenSpace server in Sweden.]], + Author = "OpenSpace Team", + URL = "http://www.openspaceproject.com", + License = "NASA/PDS", + Identifiers = {"MOLA_HRSC_Sweden"} } diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_pseudo_color_sweden.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_pseudo_color_sweden.asset index 5420bbcad2..f2595009a5 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_pseudo_color_sweden.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_pseudo_color_sweden.asset @@ -2,40 +2,40 @@ local mapServiceConfigs = asset.localResource("./../../map_service_configs") local globeIdentifier = asset.require("./../../mars").Mars.Identifier local layer = { - Identifier = "MOLA_Pseudo_Color_Sweden", - Name = "MOLA Pseudo Color [Sweden]", - FilePath = mapServiceConfigs .. "/LiU/Mola_PseudoColor.wms", - Description = [[This map is based on data from the Mars Orbiter Laser Altimeter (MOLA) - (Smith, et al., 2001), an instrument on NASA’s Mars Global Surveyor (MGS) - spacecraft (Albee, et al., 2001). The image used for the base of this map - represents more than 600 million measurements gathered between 1999 and 2001, - adjusted for consistency (Neumann, et al., 2001; Neumann, et al., 2003) and - converted to planetary radii. These have been converted to elevations above the - areoid as determined from a Martian gravity field solution GMM-2B (Lemoine, et - al., 2001), truncated to degree and order 50, and oriented according to current - standards (see below). The average accuracy of each point is originally ~100 - meters in horizontal position and ~1 meter in radius (Neumann, et al., 2001; - Neumann, et al., 2003). However, the total elevation uncertainty is at least ±3 m - due to the global error in the areoid (±1.8 meters; Lemoine, et al., 2001) and - regional uncertainties in its shape (Neumann, 2002). Pixel resolution of this map - is 463 meters per pixel (m). (Description from URL). Data Reference: (See URL).]], + Identifier = "MOLA_Pseudo_Color_Sweden", + Name = "MOLA Pseudo Color [Sweden]", + FilePath = mapServiceConfigs .. "/LiU/Mola_PseudoColor.wms", + Description = [[This map is based on data from the Mars Orbiter Laser Altimeter (MOLA) + (Smith, et al., 2001), an instrument on NASA’s Mars Global Surveyor (MGS) + spacecraft (Albee, et al., 2001). The image used for the base of this map + represents more than 600 million measurements gathered between 1999 and 2001, + adjusted for consistency (Neumann, et al., 2001; Neumann, et al., 2003) and + converted to planetary radii. These have been converted to elevations above the + areoid as determined from a Martian gravity field solution GMM-2B (Lemoine, et + al., 2001), truncated to degree and order 50, and oriented according to current + standards (see below). The average accuracy of each point is originally ~100 + meters in horizontal position and ~1 meter in radius (Neumann, et al., 2001; + Neumann, et al., 2003). However, the total elevation uncertainty is at least ±3 m + due to the global error in the areoid (±1.8 meters; Lemoine, et al., 2001) and + regional uncertainties in its shape (Neumann, 2002). Pixel resolution of this map + is 463 meters per pixel (m). (Description from URL). Data Reference: (See URL).]], } asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) asset.export("layer", layer) asset.meta = { - Name = "MOLA Pseudo Color [Sweden]", - Version = "1.0", - Description = [[ Colorzied elevation data for Mars (with shading). This map is hosted - on the OpenSpace server in Sweden.]], - Author = "USGS", - URL = "https://astrogeology.usgs.gov/search/map/Mars/GlobalSurveyor/MOLA/" .. - "Mars_MGS_MOLA_ClrShade_merge_global_463m", - License = "NASA/PDS", - Identifiers = {"MOLA_Pseudo_Color_Sweden"} + Name = "MOLA Pseudo Color [Sweden]", + Version = "1.0", + Description = [[ Colorzied elevation data for Mars (with shading). This map is hosted + on the OpenSpace server in Sweden.]], + Author = "USGS", + URL = "https://astrogeology.usgs.gov/search/map/Mars/GlobalSurveyor/MOLA/" .. + "Mars_MGS_MOLA_ClrShade_merge_global_463m", + License = "NASA/PDS", + Identifiers = {"MOLA_Pseudo_Color_Sweden"} } diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_pseudo_color_utah.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_pseudo_color_utah.asset index 4057051c9b..06ab2bdca2 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_pseudo_color_utah.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_pseudo_color_utah.asset @@ -2,23 +2,23 @@ local mapServiceConfigs = asset.localResource("./../../map_service_configs") local globeIdentifier = asset.require("./../../mars").Mars.Identifier local layer = { - Identifier = "MOLA_Pseudo_Color_Utah", - Name = "MOLA Pseudo Color [Utah]", - FilePath = mapServiceConfigs .. "/Utah/Mola_PseudoColor.wms", - Description = [[This map is based on data from the Mars Orbiter Laser Altimeter (MOLA) - (Smith, et al., 2001), an instrument on NASA’s Mars Global Surveyor (MGS) - spacecraft (Albee, et al., 2001). The image used for the base of this map - represents more than 600 million measurements gathered between 1999 and 2001, - adjusted for consistency (Neumann, et al., 2001; Neumann, et al., 2003) and - converted to planetary radii. These have been converted to elevations above the - areoid as determined from a Martian gravity field solution GMM-2B (Lemoine, et - al., 2001), truncated to degree and order 50, and oriented according to current - standards (see below). The average accuracy of each point is originally ~100 - meters in horizontal position and ~1 meter in radius (Neumann, et al., 2001; - Neumann, et al., 2003). However, the total elevation uncertainty is at least ±3 m - due to the global error in the areoid (±1.8 meters; Lemoine, et al., 2001) and - regional uncertainties in its shape (Neumann, 2002). Pixel resolution of this map - is 463 meters per pixel (m). (Description from URL). Data Reference: (See URL)]], + Identifier = "MOLA_Pseudo_Color_Utah", + Name = "MOLA Pseudo Color [Utah]", + FilePath = mapServiceConfigs .. "/Utah/Mola_PseudoColor.wms", + Description = [[This map is based on data from the Mars Orbiter Laser Altimeter (MOLA) + (Smith, et al., 2001), an instrument on NASA’s Mars Global Surveyor (MGS) + spacecraft (Albee, et al., 2001). The image used for the base of this map + represents more than 600 million measurements gathered between 1999 and 2001, + adjusted for consistency (Neumann, et al., 2001; Neumann, et al., 2003) and + converted to planetary radii. These have been converted to elevations above the + areoid as determined from a Martian gravity field solution GMM-2B (Lemoine, et + al., 2001), truncated to degree and order 50, and oriented according to current + standards (see below). The average accuracy of each point is originally ~100 + meters in horizontal position and ~1 meter in radius (Neumann, et al., 2001; + Neumann, et al., 2003). However, the total elevation uncertainty is at least ±3 m + due to the global error in the areoid (±1.8 meters; Lemoine, et al., 2001) and + regional uncertainties in its shape (Neumann, 2002). Pixel resolution of this map + is 463 meters per pixel (m). (Description from URL). Data Reference: (See URL)]], } asset.onInitialize(function () @@ -29,13 +29,13 @@ asset.export("layer", layer) asset.meta = { - Name = "MOLA Pseudo Color [Utah]", - Version = "1.0", - Description = [[ Colorzied elevation data for Mars (with shading). This map is hosted - on the OpenSpace server in Utah.]], - Author = "USGS", - URL = "https://astrogeology.usgs.gov/search/map/Mars/GlobalSurveyor/MOLA/" .. - "Mars_MGS_MOLA_ClrShade_merge_global_463m", - License = "NASA/PDS", - Identifiers = {"MOLA_Pseudo_Color_Utah"} + Name = "MOLA Pseudo Color [Utah]", + Version = "1.0", + Description = [[ Colorzied elevation data for Mars (with shading). This map is hosted + on the OpenSpace server in Utah.]], + Author = "USGS", + URL = "https://astrogeology.usgs.gov/search/map/Mars/GlobalSurveyor/MOLA/" .. + "Mars_MGS_MOLA_ClrShade_merge_global_463m", + License = "NASA/PDS", + Identifiers = {"MOLA_Pseudo_Color_Utah"} } diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_day_sweden.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_day_sweden.asset index cb18e6a17f..8f31b54ba7 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_day_sweden.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_day_sweden.asset @@ -2,37 +2,37 @@ local mapServiceConfigs = asset.localResource("./../../map_service_configs") local globeIdentifier = asset.require("./../../mars").Mars.Identifier local layer = { - Identifier = "Themis_IR_Day_Sweden", - Name = "Themis IR Day [Sweden]", - FilePath = mapServiceConfigs .. "/LiU/Themis_IR_Day.wms", - BlendMode = "Color", - Description = [[This mosaic represents the Thermal Emission Imaging System (THEMIS) - -daytime infrared (IR) 100 meter/pixel mosaic (version 12) released in the summer - of 2014 by Arizona State University. Values represent only a visual representation - of day-time temperatures. The original values have been stretched and blended to - make a more seamless mosaic.

Reference: * Edwards, C. S., K. J. Nowicki, - P. R. Christensen, J. Hill, N. Gorelick, and K. Murray (2011), Mosaicking of - global planetary image datasets: 1. Techniques and data processing for Thermal - Emission Imaging System (THEMIS) multi‐spectral data, J. Geophys. Res., 116, - E10008, doi:10.1029/2010JE003755. http://dx.doi.org/10.1029/2010JE003755 - (Description from URL).]], + Identifier = "Themis_IR_Day_Sweden", + Name = "Themis IR Day [Sweden]", + FilePath = mapServiceConfigs .. "/LiU/Themis_IR_Day.wms", + BlendMode = "Color", + Description = [[This mosaic represents the Thermal Emission Imaging System (THEMIS) + -daytime infrared (IR) 100 meter/pixel mosaic (version 12) released in the summer + of 2014 by Arizona State University. Values represent only a visual representation + of day-time temperatures. The original values have been stretched and blended to + make a more seamless mosaic.

Reference: * Edwards, C. S., K. J. Nowicki, + P. R. Christensen, J. Hill, N. Gorelick, and K. Murray (2011), Mosaicking of + global planetary image datasets: 1. Techniques and data processing for Thermal + Emission Imaging System (THEMIS) multi‐spectral data, J. Geophys. Res., 116, + E10008, doi:10.1029/2010JE003755. http://dx.doi.org/10.1029/2010JE003755 + (Description from URL).]], } asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) asset.export("layer", layer) asset.meta = { - Name = "Themis IR Day [Sweden]", - Version = "1.0", - Description = [[Themis Day layer for Mars. This map is hosted on the OpenSpace server - in Sweden.]], - Author = "USGS", - URL = "https://astrogeology.usgs.gov/search/map/Mars/Odyssey/THEMIS-IR-Mosaic-ASU/" .. - "Mars_MO_THEMIS-IR-Day_mosaic_global_100m_v12", - License = "NASA/PDS", - Identifiers = {"Themis_IR_Day_Sweden"} + Name = "Themis IR Day [Sweden]", + Version = "1.0", + Description = [[Themis Day layer for Mars. This map is hosted on the OpenSpace server + in Sweden.]], + Author = "USGS", + URL = "https://astrogeology.usgs.gov/search/map/Mars/Odyssey/THEMIS-IR-Mosaic-ASU/" .. + "Mars_MO_THEMIS-IR-Day_mosaic_global_100m_v12", + License = "NASA/PDS", + Identifiers = {"Themis_IR_Day_Sweden"} } diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_day_utah.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_day_utah.asset index 1063556825..d01800cf9e 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_day_utah.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_day_utah.asset @@ -2,37 +2,37 @@ local mapServiceConfigs = asset.localResource("./../../map_service_configs") local globeIdentifier = asset.require("./../../mars").Mars.Identifier local layer = { - Identifier = "Themis_IR_Day_Utah", - Name = "Themis IR Day [Utah]", - FilePath = mapServiceConfigs .. "/Utah/Themis_IR_Day.wms", - BlendMode = "Color", - Description = [[This mosaic represents the Thermal Emission Imaging System (THEMIS) - -daytime infrared (IR) 100 meter/pixel mosaic (version 12) released in the summer - of 2014 by Arizona State University. Values represent only a visual representation - of day-time temperatures. The original values have been stretched and blended to - make a more seamless mosaic.

Reference: * Edwards, C. S., K. J. Nowicki, - P. R. Christensen, J. Hill, N. Gorelick, and K. Murray (2011), Mosaicking of - global planetary image datasets: 1. Techniques and data processing for Thermal - Emission Imaging System (THEMIS) multi‐spectral data, J. Geophys. Res., 116, - E10008, doi:10.1029/2010JE003755. http://dx.doi.org/10.1029/2010JE003755 - (Description from URL).]], + Identifier = "Themis_IR_Day_Utah", + Name = "Themis IR Day [Utah]", + FilePath = mapServiceConfigs .. "/Utah/Themis_IR_Day.wms", + BlendMode = "Color", + Description = [[This mosaic represents the Thermal Emission Imaging System (THEMIS) + -daytime infrared (IR) 100 meter/pixel mosaic (version 12) released in the summer + of 2014 by Arizona State University. Values represent only a visual representation + of day-time temperatures. The original values have been stretched and blended to + make a more seamless mosaic.

Reference: * Edwards, C. S., K. J. Nowicki, + P. R. Christensen, J. Hill, N. Gorelick, and K. Murray (2011), Mosaicking of + global planetary image datasets: 1. Techniques and data processing for Thermal + Emission Imaging System (THEMIS) multi‐spectral data, J. Geophys. Res., 116, + E10008, doi:10.1029/2010JE003755. http://dx.doi.org/10.1029/2010JE003755 + (Description from URL).]], } asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) asset.export("layer", layer) asset.meta = { - Name = "Themis IR Day [Utah]", - Version = "1.0", - Description = [[Themis Day layer for Mars. This map is hosted on the OpenSpace server - in Utah.]], - Author = "USGS", - URL = "https://astrogeology.usgs.gov/search/map/Mars/Odyssey/THEMIS-IR-Mosaic-ASU/" .. - "Mars_MO_THEMIS-IR-Day_mosaic_global_100m_v12", - License = "NASA/PDS", - Identifiers = {"Themis_IR_Day_Utah"} + Name = "Themis IR Day [Utah]", + Version = "1.0", + Description = [[Themis Day layer for Mars. This map is hosted on the OpenSpace server + in Utah.]], + Author = "USGS", + URL = "https://astrogeology.usgs.gov/search/map/Mars/Odyssey/THEMIS-IR-Mosaic-ASU/" .. + "Mars_MO_THEMIS-IR-Day_mosaic_global_100m_v12", + License = "NASA/PDS", + Identifiers = {"Themis_IR_Day_Utah"} } diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_night_sweden.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_night_sweden.asset index 04977ad8a2..d4bfd6a9ad 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_night_sweden.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_night_sweden.asset @@ -2,38 +2,38 @@ local mapServiceConfigs = asset.localResource("./../../map_service_configs") local globeIdentifier = asset.require("./../../mars").Mars.Identifier local layer = { - Identifier = "Themis_IR_Night_Sweden", - Name = "Themis IR Night [Sweden]", - FilePath = mapServiceConfigs .. "/LiU/Themis_IR_Night.wms", - BlendMode = "Color", - Description = [[This mosaic represents the Thermal Emission Imaging System (THEMIS) - -nighttime infrared (IR) 100 meter/pixel mosaic (version 12) released in the - summer of 2014 by Arizona State University. Values represent only a visual - representation of night-time temperatures. The original values have been stretched - and blended to make a more seamless mosaic. Coverage is only from 60N to 60S - latitude.

Reference: * Edwards, C.S., K. J. Nowicki, P. R. Christensen, - J. Hill, N. Gorelick, and K. Murray (2011), Mosaicking of global planetary image - datasets: 1. Techniques and data processing for Thermal Emission Imaging System - (THEMIS) multi‐spectral data, J. Geophys. Res., 116, E10008, - doi:10.1029/2010JE003755. http://dx.doi.org/10.1029/2010JE003755 (Description from - URL).]], + Identifier = "Themis_IR_Night_Sweden", + Name = "Themis IR Night [Sweden]", + FilePath = mapServiceConfigs .. "/LiU/Themis_IR_Night.wms", + BlendMode = "Color", + Description = [[This mosaic represents the Thermal Emission Imaging System (THEMIS) + -nighttime infrared (IR) 100 meter/pixel mosaic (version 12) released in the + summer of 2014 by Arizona State University. Values represent only a visual + representation of night-time temperatures. The original values have been stretched + and blended to make a more seamless mosaic. Coverage is only from 60N to 60S + latitude.

Reference: * Edwards, C.S., K. J. Nowicki, P. R. Christensen, + J. Hill, N. Gorelick, and K. Murray (2011), Mosaicking of global planetary image + datasets: 1. Techniques and data processing for Thermal Emission Imaging System + (THEMIS) multi‐spectral data, J. Geophys. Res., 116, E10008, + doi:10.1029/2010JE003755. http://dx.doi.org/10.1029/2010JE003755 (Description from + URL).]], } asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) asset.export("layer", layer) asset.meta = { - Name = "Themis IR Night [Sweden]", - Version = "1.0", - Description = [[Themis Night layer for Mars. This map is hosted on the OpenSpace - server in Sweden.]], - Author = "USGS", - URL = "https://astrogeology.usgs.gov/search/map/Mars/Odyssey/THEMIS-IR-Mosaic-ASU/" .. - "Mars_MO_THEMIS-IR-Night_mosaic_60N60S_100m_v14", - License = "NASA/PDS", - Identifiers = {"Themis_IR_Night_Sweden"} + Name = "Themis IR Night [Sweden]", + Version = "1.0", + Description = [[Themis Night layer for Mars. This map is hosted on the OpenSpace + server in Sweden.]], + Author = "USGS", + URL = "https://astrogeology.usgs.gov/search/map/Mars/Odyssey/THEMIS-IR-Mosaic-ASU/" .. + "Mars_MO_THEMIS-IR-Night_mosaic_60N60S_100m_v14", + License = "NASA/PDS", + Identifiers = {"Themis_IR_Night_Sweden"} } diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_night_utah.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_night_utah.asset index c6dd7fca7c..b2f1b72f38 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_night_utah.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_night_utah.asset @@ -2,38 +2,38 @@ local mapServiceConfigs = asset.localResource("./../../map_service_configs") local globeIdentifier = asset.require("./../../mars").Mars.Identifier local layer = { - Identifier = "Themis_IR_Night_Utah", - Name = "Themis IR Night [Utah]", - FilePath = mapServiceConfigs .. "/Utah/Themis_IR_Night.wms", - BlendMode = "Color", - Description = [[This mosaic represents the Thermal Emission Imaging System (THEMIS) - -nighttime infrared (IR) 100 meter/pixel mosaic (version 12) released in the - summer of 2014 by Arizona State University. Values represent only a visual - representation of night-time temperatures. The original values have been stretched - and blended to make a more seamless mosaic. Coverage is only from 60N to 60S - latitude.

Reference: * Edwards, C.S., K. J. Nowicki, P. R. Christensen, - J. Hill, N. Gorelick, and K. Murray (2011), Mosaicking of global planetary image - datasets: 1. Techniques and data processing for Thermal Emission Imaging System - (THEMIS) multi‐spectral data, J. Geophys. Res., 116, E10008, - doi:10.1029/2010JE003755. http://dx.doi.org/10.1029/2010JE003755 (Description from - URL).]], + Identifier = "Themis_IR_Night_Utah", + Name = "Themis IR Night [Utah]", + FilePath = mapServiceConfigs .. "/Utah/Themis_IR_Night.wms", + BlendMode = "Color", + Description = [[This mosaic represents the Thermal Emission Imaging System (THEMIS) + -nighttime infrared (IR) 100 meter/pixel mosaic (version 12) released in the + summer of 2014 by Arizona State University. Values represent only a visual + representation of night-time temperatures. The original values have been stretched + and blended to make a more seamless mosaic. Coverage is only from 60N to 60S + latitude.

Reference: * Edwards, C.S., K. J. Nowicki, P. R. Christensen, + J. Hill, N. Gorelick, and K. Murray (2011), Mosaicking of global planetary image + datasets: 1. Techniques and data processing for Thermal Emission Imaging System + (THEMIS) multi‐spectral data, J. Geophys. Res., 116, E10008, + doi:10.1029/2010JE003755. http://dx.doi.org/10.1029/2010JE003755 (Description from + URL).]], } asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) asset.export("layer", layer) asset.meta = { - Name = "Themis IR Night [Utah]", - Version = "1.0", - Description = [[Themis Night layer for Mars. This map is hosted on the OpenSpace - server in Utah.]], - Author = "USGS", - URL = "https://astrogeology.usgs.gov/search/map/Mars/Odyssey/THEMIS-IR-Mosaic-ASU/" .. - "Mars_MO_THEMIS-IR-Night_mosaic_60N60S_100m_v14", - License = "NASA/PDS", - Identifiers = {"Themis_IR_Night_Utah"} + Name = "Themis IR Night [Utah]", + Version = "1.0", + Description = [[Themis Night layer for Mars. This map is hosted on the OpenSpace + server in Utah.]], + Author = "USGS", + URL = "https://astrogeology.usgs.gov/search/map/Mars/Odyssey/THEMIS-IR-Mosaic-ASU/" .. + "Mars_MO_THEMIS-IR-Night_mosaic_60N60S_100m_v14", + License = "NASA/PDS", + Identifiers = {"Themis_IR_Night_Utah"} } diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/viking_mdim_sweden.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/viking_mdim_sweden.asset index e0fd344b2f..dc2d73a5d6 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/viking_mdim_sweden.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/viking_mdim_sweden.asset @@ -2,45 +2,45 @@ local mapServiceConfigs = asset.localResource("./../../map_service_configs") local globeIdentifier = asset.require("./../../mars").Mars.Identifier local layer = { - Identifier = "Viking_MDIM_Sweden", - Name = "Viking MDIM [Sweden]", - FilePath = mapServiceConfigs .. "/LiU/MDIM.wms", - Description = [[This global image map of Mars has a resolution of 256 pixels/degree - (scale approximately 232 meters per pixel (m) at the equator). The colorized - mosaic was completed by NASA AMES which warped the original Viking colorized - mosaic and blended over the latest black/white Mars Digital Image Model - (MDIM 2.1). The positional accuracy of features in MDIM 2.1 is estimated to be - roughly one pixel (200 m), compared to 3 km for MDIM 2.0 released in 2001 and >6 - km for MDIM 1.0 released in 1991. In addition to relatively imprecise geodetic - control, the previous mosaics were affected by changing definitions of - cartographic parameters (such as the definition of zero longitude), - resulting in an overall longitude shift of as much as 0.2° between the early MDIMs - and other datasets. The new mosaic uses the most recent coordinate system - definitions for Mars. These definitions have been widely adopted by NASA missions - and other users of planetary data and are likely to remain in use for a decade or - more. As a result, MDIM 2.1 not only registers precisely with data from current - missions such as Mars Global Surveyor (MGS) and 2001 Mars Odyssey but will serve - as an accurate basemap on which data from future missions can be plotted. - (Description from URL).

References: Williams, D. R. (2018). Viking - Mission to Mars. https://nssdc.gsfc.nasa.gov/planetary/viking.html Additional - references available here: http://astrogeology.usgs.gov/maps/mdim-2-1 ]], + Identifier = "Viking_MDIM_Sweden", + Name = "Viking MDIM [Sweden]", + FilePath = mapServiceConfigs .. "/LiU/MDIM.wms", + Description = [[This global image map of Mars has a resolution of 256 pixels/degree + (scale approximately 232 meters per pixel (m) at the equator). The colorized + mosaic was completed by NASA AMES which warped the original Viking colorized + mosaic and blended over the latest black/white Mars Digital Image Model + (MDIM 2.1). The positional accuracy of features in MDIM 2.1 is estimated to be + roughly one pixel (200 m), compared to 3 km for MDIM 2.0 released in 2001 and >6 + km for MDIM 1.0 released in 1991. In addition to relatively imprecise geodetic + control, the previous mosaics were affected by changing definitions of + cartographic parameters (such as the definition of zero longitude), + resulting in an overall longitude shift of as much as 0.2° between the early MDIMs + and other datasets. The new mosaic uses the most recent coordinate system + definitions for Mars. These definitions have been widely adopted by NASA missions + and other users of planetary data and are likely to remain in use for a decade or + more. As a result, MDIM 2.1 not only registers precisely with data from current + missions such as Mars Global Surveyor (MGS) and 2001 Mars Odyssey but will serve + as an accurate basemap on which data from future missions can be plotted. + (Description from URL).

References: Williams, D. R. (2018). Viking + Mission to Mars. https://nssdc.gsfc.nasa.gov/planetary/viking.html Additional + references available here: http://astrogeology.usgs.gov/maps/mdim-2-1 ]], } asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) asset.export("layer", layer) asset.meta = { - Name = "Viking MDIM [Sweden]", - Version = "1.0", - Description = [[ Alternate image layer for Mars. This map is hosted - on the OpenSpace server in Sweden.]], - Author = "USGS", - URL = "https://astrogeology.usgs.gov/search/map/Mars/Viking/MDIM21/" .. - "Mars_Viking_MDIM21_ClrMosaic_global_232m", - License = "NASA/PDS", - Identifiers = {"Viking_MDIM_Sweden"} + Name = "Viking MDIM [Sweden]", + Version = "1.0", + Description = [[ Alternate image layer for Mars. This map is hosted + on the OpenSpace server in Sweden.]], + Author = "USGS", + URL = "https://astrogeology.usgs.gov/search/map/Mars/Viking/MDIM21/" .. + "Mars_Viking_MDIM21_ClrMosaic_global_232m", + License = "NASA/PDS", + Identifiers = {"Viking_MDIM_Sweden"} } diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/viking_mdim_utah.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/viking_mdim_utah.asset index 5cf52c5fc1..d5d9fe3faf 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/viking_mdim_utah.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/viking_mdim_utah.asset @@ -2,45 +2,45 @@ local mapServiceConfigs = asset.localResource("./../../map_service_configs") local globeIdentifier = asset.require("./../../mars").Mars.Identifier local layer = { - Identifier = "Viking_MDIM_Utah", - Name = "Viking MDIM [Utah]", - FilePath = mapServiceConfigs .. "/Utah/Mdim.wms", - Description = [[This global image map of Mars has a resolution of 256 pixels/degree - (scale approximately 232 meters per pixel (m) at the equator). The colorized - mosaic was completed by NASA AMES which warped the original Viking colorized - mosaic and blended over the latest black/white Mars Digital Image Model - (MDIM 2.1). The positional accuracy of features in MDIM 2.1 is estimated to be - roughly one pixel (200 m), compared to 3 km for MDIM 2.0 released in 2001 and >6 - km for MDIM 1.0 released in 1991. In addition to relatively imprecise geodetic - control, the previous mosaics were affected by changing definitions of - cartographic parameters (such as the definition of zero longitude), - resulting in an overall longitude shift of as much as 0.2° between the early MDIMs - and other datasets. The new mosaic uses the most recent coordinate system - definitions for Mars. These definitions have been widely adopted by NASA missions - and other users of planetary data and are likely to remain in use for a decade or - more. As a result, MDIM 2.1 not only registers precisely with data from current - missions such as Mars Global Surveyor (MGS) and 2001 Mars Odyssey but will serve - as an accurate basemap on which data from future missions can be plotted. - (Description from URL).

References: Williams, D. R. (2018). Viking - Mission to Mars. https://nssdc.gsfc.nasa.gov/planetary/viking.html Additional - references available here: http://astrogeology.usgs.gov/maps/mdim-2-1 ]], + Identifier = "Viking_MDIM_Utah", + Name = "Viking MDIM [Utah]", + FilePath = mapServiceConfigs .. "/Utah/Mdim.wms", + Description = [[This global image map of Mars has a resolution of 256 pixels/degree + (scale approximately 232 meters per pixel (m) at the equator). The colorized + mosaic was completed by NASA AMES which warped the original Viking colorized + mosaic and blended over the latest black/white Mars Digital Image Model + (MDIM 2.1). The positional accuracy of features in MDIM 2.1 is estimated to be + roughly one pixel (200 m), compared to 3 km for MDIM 2.0 released in 2001 and >6 + km for MDIM 1.0 released in 1991. In addition to relatively imprecise geodetic + control, the previous mosaics were affected by changing definitions of + cartographic parameters (such as the definition of zero longitude), + resulting in an overall longitude shift of as much as 0.2° between the early MDIMs + and other datasets. The new mosaic uses the most recent coordinate system + definitions for Mars. These definitions have been widely adopted by NASA missions + and other users of planetary data and are likely to remain in use for a decade or + more. As a result, MDIM 2.1 not only registers precisely with data from current + missions such as Mars Global Surveyor (MGS) and 2001 Mars Odyssey but will serve + as an accurate basemap on which data from future missions can be plotted. + (Description from URL).

References: Williams, D. R. (2018). Viking + Mission to Mars. https://nssdc.gsfc.nasa.gov/planetary/viking.html Additional + references available here: http://astrogeology.usgs.gov/maps/mdim-2-1 ]], } asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) asset.export("layer", layer) asset.meta = { - Name = "Viking MDIM [Utah]", - Version = "1.0", - Description = [[ Alternate image layer for Mars. This map is hosted - on the OpenSpace server in Utah.]], - Author = "USGS", - URL = "https://astrogeology.usgs.gov/search/map/Mars/Viking/MDIM21/" .. - "Mars_Viking_MDIM21_ClrMosaic_global_232m", - License = "NASA/PDS", - Identifiers = {"Viking_MDIM_Utah"} + Name = "Viking MDIM [Utah]", + Version = "1.0", + Description = [[ Alternate image layer for Mars. This map is hosted + on the OpenSpace server in Utah.]], + Author = "USGS", + URL = "https://astrogeology.usgs.gov/search/map/Mars/Viking/MDIM21/" .. + "Mars_Viking_MDIM21_ClrMosaic_global_232m", + License = "NASA/PDS", + Identifiers = {"Viking_MDIM_Utah"} } diff --git a/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/hirisels.asset b/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/hirisels.asset index 01adfc48b6..795213cff8 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/hirisels.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/hirisels.asset @@ -2,38 +2,38 @@ local mapServiceConfigs = asset.localResource("./../../map_service_configs") local globeIdentifier = asset.require("./../../mars").Mars.Identifier local layer = { - Identifier = "HiRISE-LS-DEM", - Name = "HiRISE Local Set DEM", - FilePath = mapServiceConfigs .. "/ESRI/HiRISE/HiRISE_DEM.dem", - Description = [[ HiRISE (High Resolution Imaging Science Experiment) is the most - powerful camera ever sent to another planet, one of six instruments onboard the - Mars Reconnaissance Orbiter. We launched in 2005, arrived at Mars in 2006 and have - been imaging ever since. Our camera’s high resolution capability (imaging up to 30 - centimeters per pixel) remains unprecedented for any existing orbiter in the study - of the Red Planet, as well as being an indispensable instrument for helping to - select landing sites for robotic and future human exploration. In the past decade, - we’ve also imaged avalanches in progress, and discovered dark flows that may or - may not be briny seeps. Hundreds of science papers have been published with our - data. (Description from URL). This map contains a subet set of the HiRISE - DEM where available as of 2018.]], + Identifier = "HiRISE-LS-DEM", + Name = "HiRISE Local Set DEM", + FilePath = mapServiceConfigs .. "/ESRI/HiRISE/HiRISE_DEM.dem", + Description = [[ HiRISE (High Resolution Imaging Science Experiment) is the most + powerful camera ever sent to another planet, one of six instruments onboard the + Mars Reconnaissance Orbiter. We launched in 2005, arrived at Mars in 2006 and have + been imaging ever since. Our camera’s high resolution capability (imaging up to 30 + centimeters per pixel) remains unprecedented for any existing orbiter in the study + of the Red Planet, as well as being an indispensable instrument for helping to + select landing sites for robotic and future human exploration. In the past decade, + we’ve also imaged avalanches in progress, and discovered dark flows that may or + may not be briny seeps. Hundreds of science papers have been published with our + data. (Description from URL). This map contains a subet set of the HiRISE + DEM where available as of 2018.]], } asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "HeightLayers", layer) + openspace.globebrowsing.addLayer(globeIdentifier, "HeightLayers", layer) end) asset.export("layer", layer) asset.meta = { - Name = "HiRISE Local Set DEM", - Version = "1.0", - Description = [[HiRISE DEM layer for corresponding Local Set imager. This map is - hosted by ESRI.]], - Author = "USGS", - URL = "https://www.uahirise.org", - License = "Esri Master License Agreement", - Identifiers = {"HiRISE-LS-DEM"} + Name = "HiRISE Local Set DEM", + Version = "1.0", + Description = [[HiRISE DEM layer for corresponding Local Set imager. This map is + hosted by ESRI.]], + Author = "USGS", + URL = "https://www.uahirise.org", + License = "Esri Master License Agreement", + Identifiers = {"HiRISE-LS-DEM"} } diff --git a/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/mola_europe.asset b/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/mola_europe.asset index 0be40ea886..7943fe4196 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/mola_europe.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/mola_europe.asset @@ -2,41 +2,41 @@ local mapServiceConfigs = asset.localResource("./../../map_service_configs") local globeIdentifier = asset.require("./../../mars").Mars.Identifier local layer = { - Identifier = "Mola_Europe", - Name = "Mola Elevation [Sweden]", - FilePath = mapServiceConfigs .. "/LiU/Mola_Elevation.wms", - TilePixelSize = 90, - Description = [[ This digital elevation model (DEM) is based on data from the Mars - Orbiter Laser Altimeter (MOLA; Smith et al., 2001), an instrument on NASA's Mars - Global Surveyor (MGS) spacecraft (Albee et al., 2001). The MOLA DEM represents - more than 600 million measurements gathered between 1999 and 2001, adjusted for - consistency (Neumann et al., 2001; Neumann, Smith & Zuber, 2003) and converted to - planetary radii. These have been converted to elevations above the areoid as - determined from a Martian gravity field solution GMM-2B (Lemoine et al., 2001), - truncated to degree and order 50, and oriented according to current standards. - The average accuracy of each point is originally ~100 meters in horizontal - position and ~1 meter in radius (Neumann et al., 2001). However, the total - elevation uncertainty is at least ±3 m due to the global error in the areoid - (±1.8 meters; Neumann et al., 2001) and regional uncertainties in its shape - (Neumann, 2002). Pixel resolution is 463 meters per pixel (m). (Description from - URL). Data Reference: (See URL).]], + Identifier = "Mola_Europe", + Name = "Mola Elevation [Sweden]", + FilePath = mapServiceConfigs .. "/LiU/Mola_Elevation.wms", + TilePixelSize = 90, + Description = [[ This digital elevation model (DEM) is based on data from the Mars + Orbiter Laser Altimeter (MOLA; Smith et al., 2001), an instrument on NASA's Mars + Global Surveyor (MGS) spacecraft (Albee et al., 2001). The MOLA DEM represents + more than 600 million measurements gathered between 1999 and 2001, adjusted for + consistency (Neumann et al., 2001; Neumann, Smith & Zuber, 2003) and converted to + planetary radii. These have been converted to elevations above the areoid as + determined from a Martian gravity field solution GMM-2B (Lemoine et al., 2001), + truncated to degree and order 50, and oriented according to current standards. + The average accuracy of each point is originally ~100 meters in horizontal + position and ~1 meter in radius (Neumann et al., 2001). However, the total + elevation uncertainty is at least ±3 m due to the global error in the areoid + (±1.8 meters; Neumann et al., 2001) and regional uncertainties in its shape + (Neumann, 2002). Pixel resolution is 463 meters per pixel (m). (Description from + URL). Data Reference: (See URL).]], } asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "HeightLayers", layer) + openspace.globebrowsing.addLayer(globeIdentifier, "HeightLayers", layer) end) asset.export("layer", layer) asset.meta = { - Name = "Mola Elevation [Sweden]", - Version = "1.0", - Author = "USGS", - Description = [[ Global elevation layer for Mars. This layer is hosted on the - OpenSpace server in Sweden.]], - URL = "https://astrogeology.usgs.gov/search/map/Mars/GlobalSurveyor/MOLA/" .. - "Mars_MGS_MOLA_DEM_mosaic_global_463m", - License = "NASA/PDS", - Identifiers = {"Mola_Europe"} + Name = "Mola Elevation [Sweden]", + Version = "1.0", + Author = "USGS", + Description = [[ Global elevation layer for Mars. This layer is hosted on the + OpenSpace server in Sweden.]], + URL = "https://astrogeology.usgs.gov/search/map/Mars/GlobalSurveyor/MOLA/" .. + "Mars_MGS_MOLA_DEM_mosaic_global_463m", + License = "NASA/PDS", + Identifiers = {"Mola_Europe"} } diff --git a/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/mola_utah.asset b/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/mola_utah.asset index e934a7c26d..ed377660bc 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/mola_utah.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/mola_utah.asset @@ -2,41 +2,41 @@ local mapServiceConfigs = asset.localResource("./../../map_service_configs") local globeIdentifier = asset.require("./../../mars").Mars.Identifier local layer = { - Identifier = "Mola_Utah", - Name = "Mola Elevation [Utah]", - FilePath = mapServiceConfigs .. "/Utah/Mola_Elevation.wms", - TilePixelSize = 90, - Description = [[ This digital elevation model (DEM) is based on data from the Mars - Orbiter Laser Altimeter (MOLA; Smith et al., 2001), an instrument on NASA's Mars - Global Surveyor (MGS) spacecraft (Albee et al., 2001). The MOLA DEM represents - more than 600 million measurements gathered between 1999 and 2001, adjusted for - consistency (Neumann et al., 2001; Neumann, Smith & Zuber, 2003) and converted to - planetary radii. These have been converted to elevations above the areoid as - determined from a Martian gravity field solution GMM-2B (Lemoine et al., 2001), - truncated to degree and order 50, and oriented according to current standards. - The average accuracy of each point is originally ~100 meters in horizontal - position and ~1 meter in radius (Neumann et al., 2001). However, the total - elevation uncertainty is at least ±3 m due to the global error in the areoid - (±1.8 meters; Neumann et al., 2001) and regional uncertainties in its shape - (Neumann, 2002). Pixel resolution is 463 meters per pixel (m). (Description from - URL). Data Reference: (See URL).]], + Identifier = "Mola_Utah", + Name = "Mola Elevation [Utah]", + FilePath = mapServiceConfigs .. "/Utah/Mola_Elevation.wms", + TilePixelSize = 90, + Description = [[ This digital elevation model (DEM) is based on data from the Mars + Orbiter Laser Altimeter (MOLA; Smith et al., 2001), an instrument on NASA's Mars + Global Surveyor (MGS) spacecraft (Albee et al., 2001). The MOLA DEM represents + more than 600 million measurements gathered between 1999 and 2001, adjusted for + consistency (Neumann et al., 2001; Neumann, Smith & Zuber, 2003) and converted to + planetary radii. These have been converted to elevations above the areoid as + determined from a Martian gravity field solution GMM-2B (Lemoine et al., 2001), + truncated to degree and order 50, and oriented according to current standards. + The average accuracy of each point is originally ~100 meters in horizontal + position and ~1 meter in radius (Neumann et al., 2001). However, the total + elevation uncertainty is at least ±3 m due to the global error in the areoid + (±1.8 meters; Neumann et al., 2001) and regional uncertainties in its shape + (Neumann, 2002). Pixel resolution is 463 meters per pixel (m). (Description from + URL). Data Reference: (See URL).]], } asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "HeightLayers", layer) + openspace.globebrowsing.addLayer(globeIdentifier, "HeightLayers", layer) end) asset.export("layer", layer) asset.meta = { - Name = "Mola Elevation [Utah]", - Version = "1.0", - Description = [[ Global elevation layer for Mars. This layer is hosted on the - OpenSpace server in Utah.]], - Author = "USGS", - URL = "https://astrogeology.usgs.gov/search/map/Mars/GlobalSurveyor/MOLA/" .. - "Mars_MGS_MOLA_DEM_mosaic_global_463m", - License = "NASA/PDS", - Identifiers = {"Mola_Utah"} + Name = "Mola Elevation [Utah]", + Version = "1.0", + Description = [[ Global elevation layer for Mars. This layer is hosted on the + OpenSpace server in Utah.]], + Author = "USGS", + URL = "https://astrogeology.usgs.gov/search/map/Mars/GlobalSurveyor/MOLA/" .. + "Mars_MGS_MOLA_DEM_mosaic_global_463m", + License = "NASA/PDS", + Identifiers = {"Mola_Utah"} } diff --git a/data/assets/scene/solarsystem/planets/mars/layers/overlays/indices.asset b/data/assets/scene/solarsystem/planets/mars/layers/overlays/indices.asset index b74a9c5d2f..84a291e4a8 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/overlays/indices.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/overlays/indices.asset @@ -1,12 +1,12 @@ local globeIdentifier = asset.require("./../../mars").Mars.Identifier local layer = { - Identifier = "Indices", - Type = "TileIndexTileLayer" + Identifier = "Indices", + Type = "TileIndexTileLayer" } asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "Overlays", layer) + openspace.globebrowsing.addLayer(globeIdentifier, "Overlays", layer) end) asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/mars/layers/overlays/size_reference.asset b/data/assets/scene/solarsystem/planets/mars/layers/overlays/size_reference.asset index 27dd05460f..0fa6e5d926 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/overlays/size_reference.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/overlays/size_reference.asset @@ -2,14 +2,14 @@ local marsAsset = asset.require("./../../mars").Mars local globeIdentifier = marsAsset.Identifier local layer ={ - Identifier = "Size_Reference", - Name = "Size Reference", - Type = "SizeReferenceTileLayer", - Radii = marsAsset.Renderable.Radii + Identifier = "Size_Reference", + Name = "Size Reference", + Type = "SizeReferenceTileLayer", + Radii = marsAsset.Renderable.Radii } asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "Overlays", layer) + openspace.globebrowsing.addLayer(globeIdentifier, "Overlays", layer) end) asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/mars/mar097.asset b/data/assets/scene/solarsystem/planets/mars/mar097.asset index 42513084d3..70af8b1c5f 100644 --- a/data/assets/scene/solarsystem/planets/mars/mar097.asset +++ b/data/assets/scene/solarsystem/planets/mars/mar097.asset @@ -1,8 +1,8 @@ local Kernels = asset.syncedResource({ - Name = "Mars Spice Kernels", - Type = "HttpSynchronization", - Identifier = "mars_kernels", - Version = 1 + Name = "Mars Spice Kernels", + Type = "HttpSynchronization", + Identifier = "mars_kernels", + Version = 1 }) asset.export("Kernels", Kernels .. '/mar097.bsp') diff --git a/data/assets/scene/solarsystem/planets/mars/mars.asset b/data/assets/scene/solarsystem/planets/mars/mars.asset index e96320563a..c169c8a568 100644 --- a/data/assets/scene/solarsystem/planets/mars/mars.asset +++ b/data/assets/scene/solarsystem/planets/mars/mars.asset @@ -8,83 +8,83 @@ local labelsPath = asset.require('./mars_globelabels').LabelsPath local marsRadii = { 3396190.0, 3396190.0, 3396190.0 } local Mars = { - Identifier = "Mars", - Parent = transforms.MarsBarycenter.Identifier, - Transform = { - Rotation = { - Type = "SpiceRotation", - SourceFrame = "IAU_MARS", - DestinationFrame = "GALACTIC" - } - }, - Renderable = { - Type = "RenderableGlobe", - Radii = marsRadii, - SegmentsPerPatch = 90, - Layers = {}, - Labels = { - Enable = false, - FileName = labelsPath .. "/mars.labels", - LabelAlignmentOption = "Horizontally", -- or Circularly - LabelsFontSize = 14.0, - LabelsSize = 9.0, - LabelsMinSize = 1.0, - LabelsMaxSize = 1500.0, - ProximityEnabled = false, - LabelsFadeInEnabled = true, - LabelsFadeOutEnabled = true, - FadeInStartingDistance = 2000000.0, - FadeOutStartingDistance = 750000.0, - LabelsForceDomeRendering = true, - LabelsDistanceEPS = 2500000.0, - LabelsColor = { 1.0, 1.0, 0.0 } - } - }, - Tag = { "planet_solarSystem", "planet_terrestrial" }, - GUI = { - Name = "Mars", - Path = "/Solar System/Planets/Mars", - Description = [[ Main globe for Mars with labels and map layers.]] + Identifier = "Mars", + Parent = transforms.MarsBarycenter.Identifier, + Transform = { + Rotation = { + Type = "SpiceRotation", + SourceFrame = "IAU_MARS", + DestinationFrame = "GALACTIC" } + }, + Renderable = { + Type = "RenderableGlobe", + Radii = marsRadii, + SegmentsPerPatch = 90, + Layers = {}, + Labels = { + Enable = false, + FileName = labelsPath .. "/mars.labels", + LabelAlignmentOption = "Horizontally", -- or Circularly + LabelsFontSize = 14.0, + LabelsSize = 9.0, + LabelsMinSize = 1.0, + LabelsMaxSize = 1500.0, + ProximityEnabled = false, + LabelsFadeInEnabled = true, + LabelsFadeOutEnabled = true, + FadeInStartingDistance = 2000000.0, + FadeOutStartingDistance = 750000.0, + LabelsForceDomeRendering = true, + LabelsDistanceEPS = 2500000.0, + LabelsColor = { 1.0, 1.0, 0.0 } + } + }, + Tag = { "planet_solarSystem", "planet_terrestrial" }, + GUI = { + Name = "Mars", + Path = "/Solar System/Planets/Mars", + Description = [[ Main globe for Mars with labels and map layers.]] + } } local MarsLabel = { - Identifier = "MarsLabel", - Parent = Mars.Identifier, - Renderable = { - Enabled = false, - Type = "RenderableLabels", - LabelText = "Mars", - FontSize = 100.0, - LabelSize = 8.5, - LabelMaxSize = 100.0, - LabelMinSize = 1.0, - LabelOrientationOption = "Camera View Direction", - BlendMode = "Additive", - TransformationMatrix = { - 1.0, 0.0, 0.0, -8.0E6, - 0.0, 1.0, 0.0, 0.0, - 0.0, 0.0, 1.0, 1.0E7, - 0.0, 0.0, 0.0, 1.0 - }, + Identifier = "MarsLabel", + Parent = Mars.Identifier, + Renderable = { + Enabled = false, + Type = "RenderableLabels", + LabelText = "Mars", + FontSize = 100.0, + LabelSize = 8.5, + LabelMaxSize = 100.0, + LabelMinSize = 1.0, + LabelOrientationOption = "Camera View Direction", + BlendMode = "Additive", + TransformationMatrix = { + 1.0, 0.0, 0.0, -8.0E6, + 0.0, 1.0, 0.0, 0.0, + 0.0, 0.0, 1.0, 1.0E7, + 0.0, 0.0, 0.0, 1.0 }, - Tag = { "solarsystem_labels" }, - GUI = { - Name = "Mars Label", - Path = "/Solar System/Planets/Mars", - Description = [[ Main label for Mars]] - } + }, + Tag = { "solarsystem_labels" }, + GUI = { + Name = "Mars Label", + Path = "/Solar System/Planets/Mars", + Description = [[ Main label for Mars]] + } } assetHelper.registerSceneGraphNodesAndExport(asset, { Mars, MarsLabel }) asset.meta = { - Name = "Mars", - Version = "1.0", - Description = [[ Mars globe, and main globe label.]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"Mars", "MarsLabel"} + Name = "Mars", + Version = "1.0", + Description = [[ Mars globe, and main globe label.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license", + Identifiers = {"Mars", "MarsLabel"} } diff --git a/data/assets/scene/solarsystem/planets/mars/mars_globelabels.asset b/data/assets/scene/solarsystem/planets/mars/mars_globelabels.asset index 9ac0a372d7..ca47fef12e 100644 --- a/data/assets/scene/solarsystem/planets/mars/mars_globelabels.asset +++ b/data/assets/scene/solarsystem/planets/mars/mars_globelabels.asset @@ -1,7 +1,7 @@ local LabelsPath = asset.syncedResource({ - Name = "Mars Labels", - Type = "HttpSynchronization", - Identifier = "mars_labels", - Version = 1 + Name = "Mars Labels", + Type = "HttpSynchronization", + Identifier = "mars_labels", + Version = 1 }) asset.export("LabelsPath", LabelsPath) diff --git a/data/assets/scene/solarsystem/planets/mars/mars_textures.asset b/data/assets/scene/solarsystem/planets/mars/mars_textures.asset index 946d20314a..757bad1d08 100644 --- a/data/assets/scene/solarsystem/planets/mars/mars_textures.asset +++ b/data/assets/scene/solarsystem/planets/mars/mars_textures.asset @@ -1,7 +1,7 @@ local TexturesPath = asset.syncedResource({ - Name = "Mars Textures", - Type = "HttpSynchronization", - Identifier = "mars_textures", - Version = 1 + Name = "Mars Textures", + Type = "HttpSynchronization", + Identifier = "mars_textures", + Version = 1 }) asset.export("TexturesPath", TexturesPath) diff --git a/data/assets/scene/solarsystem/planets/mars/moons/deimos.asset b/data/assets/scene/solarsystem/planets/mars/moons/deimos.asset index b200cef599..a7b3d5e7aa 100644 --- a/data/assets/scene/solarsystem/planets/mars/moons/deimos.asset +++ b/data/assets/scene/solarsystem/planets/mars/moons/deimos.asset @@ -4,68 +4,67 @@ local kernels = asset.require('../mar097').Kernels local Deimos = { - Identifier = "Deimos", - Parent = transforms.MarsBarycenter.Identifier, - Transform = { - Rotation = { - Type = "SpiceRotation", - SourceFrame = "IAU_DEIMOS", - DestinationFrame = "GALACTIC", - Kernels = kernels - }, - Translation = { - Type = "SpiceTranslation", - Target = "DEIMOS", - Observer = "MARS BARYCENTER", - Kernels = kernels - } + Identifier = "Deimos", + Parent = transforms.MarsBarycenter.Identifier, + Transform = { + Rotation = { + Type = "SpiceRotation", + SourceFrame = "IAU_DEIMOS", + DestinationFrame = "GALACTIC", + Kernels = kernels }, - Renderable = { - Type = "RenderableGlobe", - Radii = { 15000, 12200, 11000 }, - SegmentsPerPatch = 90, - Layers = { - } - }, - Tag = { "moon_solarSystem", "moon_terrestrial", "moon_mars" }, - GUI = { - Name = "Deimos", - Path = "/Solar System/Planets/Mars", - Description = [[One of two moons of Mars.]] + Translation = { + Type = "SpiceTranslation", + Target = "DEIMOS", + Observer = "MARS BARYCENTER", + Kernels = kernels } + }, + Renderable = { + Type = "RenderableGlobe", + Radii = { 15000, 12200, 11000 }, + SegmentsPerPatch = 90, + Layers = {} + }, + Tag = { "moon_solarSystem", "moon_terrestrial", "moon_mars" }, + GUI = { + Name = "Deimos", + Path = "/Solar System/Planets/Mars", + Description = [[One of two moons of Mars.]] + } } local DeimosTrail = { - Identifier = "DeimosTrail", - Parent = transforms.MarsBarycenter.Identifier, - Renderable = { - Type = "RenderableTrailOrbit", - Translation = { - Type = "SpiceTranslation", - Target = "DEIMOS", - Observer = "MARS BARYCENTER" - }, - Color = { 1.0, 0.605, 0.420 }, - Period = 1.263, - Resolution = 1000 + Identifier = "DeimosTrail", + Parent = transforms.MarsBarycenter.Identifier, + Renderable = { + Type = "RenderableTrailOrbit", + Translation = { + Type = "SpiceTranslation", + Target = "DEIMOS", + Observer = "MARS BARYCENTER" }, - Tag = { "moonTrail_solarSystem", "moonTrail_terrestrial", "moonTrail_mars" }, - GUI = { - Name = "Deimos Trail", - Path = "/Solar System/Planets/Mars", - Description = [[Trail for Deimos]] - } + Color = { 1.0, 0.605, 0.420 }, + Period = 1.263, + Resolution = 1000 + }, + Tag = { "moonTrail_solarSystem", "moonTrail_terrestrial", "moonTrail_mars" }, + GUI = { + Name = "Deimos Trail", + Path = "/Solar System/Planets/Mars", + Description = [[Trail for Deimos]] + } } assetHelper.registerSceneGraphNodesAndExport(asset, { Deimos, DeimosTrail }) asset.meta = { - Name = "Deimos", - Version = "1.0", - Description = [[ RenderableGlobe and Trail for Deimos.]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"Deimos", "DeimosTrail"} + Name = "Deimos", + Version = "1.0", + Description = [[ RenderableGlobe and Trail for Deimos.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license", + Identifiers = {"Deimos", "DeimosTrail"} } diff --git a/data/assets/scene/solarsystem/planets/mars/moons/layers/colorlayers/deimos_viking.asset b/data/assets/scene/solarsystem/planets/mars/moons/layers/colorlayers/deimos_viking.asset index a339e5b425..e2d8bcc965 100644 --- a/data/assets/scene/solarsystem/planets/mars/moons/layers/colorlayers/deimos_viking.asset +++ b/data/assets/scene/solarsystem/planets/mars/moons/layers/colorlayers/deimos_viking.asset @@ -1,29 +1,28 @@ local globeIdentifier = asset.require("./../../deimos").Deimos.Identifier local layer = { - Identifier = "Deimos_Global_Mosaic_USGS", - Name = "Deimos Global Mosaic [USGS]", - Enabled = true, - FilePath = "WMS:https://wms.wr.usgs.gov/cgi-bin/mapserv?map=/maps/mars/deimos_simp_cyl.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&LAYERS=Deimos_Simple_Cylindrical_Rasters&SRS=EPSG:4326&BBOX=-180,-90,360,90", - Description = [[ This Viking-based cylindrical map of Deimos was created by Philip + Identifier = "Deimos_Global_Mosaic_USGS", + Name = "Deimos Global Mosaic [USGS]", + Enabled = true, + FilePath = "WMS:https://wms.wr.usgs.gov/cgi-bin/mapserv?map=/maps/mars/deimos_simp_cyl.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&LAYERS=Deimos_Simple_Cylindrical_Rasters&SRS=EPSG:4326&BBOX=-180,-90,360,90", + Description = [[ This Viking-based cylindrical map of Deimos was created by Philip Stooke with the assistance of Chris Jongkind and Megan Arntz. Control is based on a shape model and mosaic by Peter Thomas and colleagues at Cornell University. Date released 26 October 2001. (Description from URL)]] } asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) asset.export("layer", layer) asset.meta = { - Name = "Deimos Global Mosaic [USGS]", - Version = "1.0", - Author = "Philip Stooke/NASA", - URL = "https://astrowebmaps.wr.usgs.gov/webmapatlas/Layers/maps.html", - License = "NASA/PDS", - Identifiers = {'Deimos_Global_Mosaic_USGS'} - + Name = "Deimos Global Mosaic [USGS]", + Version = "1.0", + Author = "Philip Stooke/NASA", + URL = "https://astrowebmaps.wr.usgs.gov/webmapatlas/Layers/maps.html", + License = "NASA/PDS", + Identifiers = {'Deimos_Global_Mosaic_USGS'} } diff --git a/data/assets/scene/solarsystem/planets/mars/moons/layers/colorlayers/phobos_viking.asset b/data/assets/scene/solarsystem/planets/mars/moons/layers/colorlayers/phobos_viking.asset index 6a0c5b8d9a..a753881a56 100644 --- a/data/assets/scene/solarsystem/planets/mars/moons/layers/colorlayers/phobos_viking.asset +++ b/data/assets/scene/solarsystem/planets/mars/moons/layers/colorlayers/phobos_viking.asset @@ -1,26 +1,25 @@ local globeIdentifier = asset.require("./../../phobos").Phobos.Identifier local layer = { - Identifier = "Phobos_Global_Shaded_Relief_USGS", - Name = "Phobos Global Shaded Relief [USGS]", - Enabled = true, - FilePath = "WMS:https://wms.wr.usgs.gov/cgi-bin/mapserv?map=/maps/mars/phobos_simp_cyl.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&LAYERS=Phobos_Simple_Cylindrical_Rasters&SRS=EPSG:4326&BBOX=-180,-90,360,90", - Description = [[ Viking-base Phobos shaded relief created by USGS.]] + Identifier = "Phobos_Global_Shaded_Relief_USGS", + Name = "Phobos Global Shaded Relief [USGS]", + Enabled = true, + FilePath = "WMS:https://wms.wr.usgs.gov/cgi-bin/mapserv?map=/maps/mars/phobos_simp_cyl.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&LAYERS=Phobos_Simple_Cylindrical_Rasters&SRS=EPSG:4326&BBOX=-180,-90,360,90", + Description = [[ Viking-base Phobos shaded relief created by USGS.]] } asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) asset.export("layer", layer) asset.meta = { - Name = "Phobos Global Shaded Relief [USGS]", - Version = "1.0", - Author = "USGS/NASA", - URL = "https://astrowebmaps.wr.usgs.gov/webmapatlas/Layers/maps.html", - License = "NASA/PDS", - Identifiers = {'Phobos_Global_Shaded_Relief_USGS'} - + Name = "Phobos Global Shaded Relief [USGS]", + Version = "1.0", + Author = "USGS/NASA", + URL = "https://astrowebmaps.wr.usgs.gov/webmapatlas/Layers/maps.html", + License = "NASA/PDS", + Identifiers = {'Phobos_Global_Shaded_Relief_USGS'} } diff --git a/data/assets/scene/solarsystem/planets/mars/moons/phobos.asset b/data/assets/scene/solarsystem/planets/mars/moons/phobos.asset index 99bcf87cc6..353c73e320 100644 --- a/data/assets/scene/solarsystem/planets/mars/moons/phobos.asset +++ b/data/assets/scene/solarsystem/planets/mars/moons/phobos.asset @@ -4,68 +4,67 @@ local kernels = asset.require('../mar097').Kernels local Phobos = { - Identifier = "Phobos", - Parent = transforms.MarsBarycenter.Identifier, - Transform = { - Rotation = { - Type = "SpiceRotation", - SourceFrame = "IAU_PHOBOS", - DestinationFrame = "GALACTIC", - Kernels = kernels - }, - Translation = { - Type = "SpiceTranslation", - Target = "PHOBOS", - Observer = "MARS BARYCENTER", - Kernels = kernels - } + Identifier = "Phobos", + Parent = transforms.MarsBarycenter.Identifier, + Transform = { + Rotation = { + Type = "SpiceRotation", + SourceFrame = "IAU_PHOBOS", + DestinationFrame = "GALACTIC", + Kernels = kernels }, - Renderable = { - Type = "RenderableGlobe", - Radii = { 27000, 22000, 18000 }, - SegmentsPerPatch = 90, - Layers = { - } - }, - Tag = { "moon_solarSystem", "moon_terrestrial", "moon_mars" }, - GUI = { - Name = "Phobos", - Path = "/Solar System/Planets/Mars", - Description = [[One of two moons of Mars.]] + Translation = { + Type = "SpiceTranslation", + Target = "PHOBOS", + Observer = "MARS BARYCENTER", + Kernels = kernels } + }, + Renderable = { + Type = "RenderableGlobe", + Radii = { 27000, 22000, 18000 }, + SegmentsPerPatch = 90, + Layers = {} + }, + Tag = { "moon_solarSystem", "moon_terrestrial", "moon_mars" }, + GUI = { + Name = "Phobos", + Path = "/Solar System/Planets/Mars", + Description = [[One of two moons of Mars.]] + } } local PhobosTrail = { - Identifier = "PhobosTrail", - Parent = transforms.MarsBarycenter.Identifier, - Renderable = { - Type = "RenderableTrailOrbit", - Translation = { - Type = "SpiceTranslation", - Target = "PHOBOS", - Observer = "MARS BARYCENTER" - }, - Color = { 1.0, 0.605, 0.420 }, - Period = 0.31891023, - Resolution = 1000 + Identifier = "PhobosTrail", + Parent = transforms.MarsBarycenter.Identifier, + Renderable = { + Type = "RenderableTrailOrbit", + Translation = { + Type = "SpiceTranslation", + Target = "PHOBOS", + Observer = "MARS BARYCENTER" }, - Tag = { "moonTrail_solarSystem", "moonTrail_terrestrial", "moonTrail_mars" }, - GUI = { - Name = "Phobos Trail", - Path = "/Solar System/Planets/Mars", - Description = [[Trail for Phobos.]] - } + Color = { 1.0, 0.605, 0.420 }, + Period = 0.31891023, + Resolution = 1000 + }, + Tag = { "moonTrail_solarSystem", "moonTrail_terrestrial", "moonTrail_mars" }, + GUI = { + Name = "Phobos Trail", + Path = "/Solar System/Planets/Mars", + Description = [[Trail for Phobos.]] + } } assetHelper.registerSceneGraphNodesAndExport(asset, { Phobos, PhobosTrail }) asset.meta = { - Name = "Phobos", - Version = "1.0", - Description = [[ RenderableGlobe and Trail for Phobos.]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"Phobos", "PhobosTrail"} + Name = "Phobos", + Version = "1.0", + Description = [[ RenderableGlobe and Trail for Phobos.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license", + Identifiers = {"Phobos", "PhobosTrail"} } diff --git a/data/assets/scene/solarsystem/planets/mars/trail.asset b/data/assets/scene/solarsystem/planets/mars/trail.asset index a92011e04e..1922c582ea 100644 --- a/data/assets/scene/solarsystem/planets/mars/trail.asset +++ b/data/assets/scene/solarsystem/planets/mars/trail.asset @@ -5,37 +5,37 @@ asset.require("spice/base") local MarsTrail = { - Identifier = "MarsTrail", - Parent = transforms.SolarSystemBarycenter.Identifier, - Renderable = { - Type = "RenderableTrailOrbit", - Translation = { - Type = "SpiceTranslation", - Target = "MARS BARYCENTER", - Observer = "SUN" - }, - Color = { 0.814, 0.305, 0.220 }, - Period = 686.973, - Resolution = 1000 + Identifier = "MarsTrail", + Parent = transforms.SolarSystemBarycenter.Identifier, + Renderable = { + Type = "RenderableTrailOrbit", + Translation = { + Type = "SpiceTranslation", + Target = "MARS BARYCENTER", + Observer = "SUN" }, - Tag = { "planetTrail_solarSystem", "planetTrail_terrestrial" }, - GUI = { - Name = "Mars Trail", - Path = "/Solar System/Planets/Mars", - Description = [[ Trail of Mars as observed by the Sun. Data from NASA Spice (see - base spice asset)]], - } + Color = { 0.814, 0.305, 0.220 }, + Period = 686.973, + Resolution = 1000 + }, + Tag = { "planetTrail_solarSystem", "planetTrail_terrestrial" }, + GUI = { + Name = "Mars Trail", + Path = "/Solar System/Planets/Mars", + Description = [[ Trail of Mars as observed by the Sun. Data from NASA Spice (see + base spice asset)]], + } } assetHelper.registerSceneGraphNodesAndExport(asset, { MarsTrail }) asset.meta = { - Name = "Mars Trail", - Version = "1.0", - Description = [[ Main Mars trail from SPICE.]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"MarsTrail"} + Name = "Mars Trail", + Version = "1.0", + Description = [[ Main Mars trail from SPICE.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license", + Identifiers = {"MarsTrail"} } diff --git a/data/assets/scene/solarsystem/planets/mars/trail_earth.asset b/data/assets/scene/solarsystem/planets/mars/trail_earth.asset index 4565a8d6a7..62286cbae2 100644 --- a/data/assets/scene/solarsystem/planets/mars/trail_earth.asset +++ b/data/assets/scene/solarsystem/planets/mars/trail_earth.asset @@ -6,39 +6,39 @@ asset.require("spice/base") local MarsTrailEarth = { - Identifier = "MarsTrailEarth", - Parent = earthTransforms.EarthBarycenter.Identifier, - Renderable = { - Type = "RenderableTrailOrbit", - Translation = { - Type = "SpiceTranslation", - Target = "MARS BARYCENTER", - Observer = "EARTH" - }, - Color = { 1.0, 0.5, 0.2 }, - Period = 224.695, - Resolution = 1000, - Enabled = false + Identifier = "MarsTrailEarth", + Parent = earthTransforms.EarthBarycenter.Identifier, + Renderable = { + Type = "RenderableTrailOrbit", + Translation = { + Type = "SpiceTranslation", + Target = "MARS BARYCENTER", + Observer = "EARTH" }, - Tag = { "planetTrail_solarSystem_alt", "planetTrail_terrestrial_alt" }, - GUI = { - Name = "Mars trail from Earth", - Path = "/Solar System/Planets/Mars", - Hidden = false, - Description = [[ Trail of Mars as observed by the Earth]], - } + Color = { 1.0, 0.5, 0.2 }, + Period = 224.695, + Resolution = 1000, + Enabled = false + }, + Tag = { "planetTrail_solarSystem_alt", "planetTrail_terrestrial_alt" }, + GUI = { + Name = "Mars trail from Earth", + Path = "/Solar System/Planets/Mars", + Hidden = false, + Description = [[ Trail of Mars as observed by the Earth]], + } } assetHelper.registerSceneGraphNodesAndExport(asset, { MarsTrailEarth }) asset.meta = { - Name = "Mars Trail from Earth", - Version = "1.0", - Description = [[ Trail of Mars, parented to Earth with Earth as the SPICE observer. - Data from NASA SPICE (see base spice asset)]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"MarsTrailEarth"} + Name = "Mars Trail from Earth", + Version = "1.0", + Description = [[ Trail of Mars, parented to Earth with Earth as the SPICE observer. + Data from NASA SPICE (see base spice asset)]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license", + Identifiers = {"MarsTrailEarth"} } diff --git a/data/assets/scene/solarsystem/planets/mars/transforms.asset b/data/assets/scene/solarsystem/planets/mars/transforms.asset index a7d410d5c1..1ec160733b 100644 --- a/data/assets/scene/solarsystem/planets/mars/transforms.asset +++ b/data/assets/scene/solarsystem/planets/mars/transforms.asset @@ -3,32 +3,32 @@ local transforms = asset.require('scene/solarsystem/sun/transforms') asset.require("spice/base") local MarsBarycenter = { - Identifier = "MarsBarycenter", - Parent = transforms.SolarSystemBarycenter.Identifier, - Transform = { - Translation = { - Type = "SpiceTranslation", - Target = "MARS BARYCENTER", - Observer = "SUN" - } - }, - GUI = { - Name = "Mars Barycenter", - Path = "/Solar System/Planets/Mars", - Hidden = true, - Description = [[ SPICE Translation for targeting Mars Barycenter]], + Identifier = "MarsBarycenter", + Parent = transforms.SolarSystemBarycenter.Identifier, + Transform = { + Translation = { + Type = "SpiceTranslation", + Target = "MARS BARYCENTER", + Observer = "SUN" } + }, + GUI = { + Name = "Mars Barycenter", + Path = "/Solar System/Planets/Mars", + Hidden = true, + Description = [[ SPICE Translation for targeting Mars Barycenter]], + } } assetHelper.registerSceneGraphNodesAndExport(asset, { MarsBarycenter }) asset.meta = { - Name = "Mars Transforms", - Version = "1.0", - Description = [[ Transform with position for Mars.]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"MarsBarycenter"} + Name = "Mars Transforms", + Version = "1.0", + Description = [[ Transform with position for Mars.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license", + Identifiers = {"MarsBarycenter"} } diff --git a/data/assets/scene/solarsystem/planets/mercury/default_layers.asset b/data/assets/scene/solarsystem/planets/mercury/default_layers.asset index d815269d83..1193812a21 100644 --- a/data/assets/scene/solarsystem/planets/mercury/default_layers.asset +++ b/data/assets/scene/solarsystem/planets/mercury/default_layers.asset @@ -38,19 +38,19 @@ asset.require(colorLayersPath .. "/ssimap_02122015") -- Set enabled layers (temporary solution) -- @TODO: do this using a boolean that's passed to the 'asset.require' instead asset.onInitialize(function () - openspace.setPropertyValueSingle("Scene.Mercury.Renderable.Layers.ColorLayers." .. - colorLayer.layer.Identifier .. ".Enabled", true) + openspace.setPropertyValueSingle("Scene.Mercury.Renderable.Layers.ColorLayers." .. + colorLayer.layer.Identifier .. ".Enabled", true) end) asset.meta = { - Name = "Default Mercury Layers", - Version = "1.0", - Description = [[ Default Mercury layers are: Messenger MDIS, Messenger Mosaic2, - Messenger BDR, Messenger MDR, Messenger MP3, Messenger Hie, Messenger Hiw, - Messenger LOI, Messenger SHADE, Aluminum Abundance, Calcium Abundance, Iron - Abundance, Magnesium Abundance, and Silicon Abundance]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license" + Name = "Default Mercury Layers", + Version = "1.0", + Description = [[ Default Mercury layers are: Messenger MDIS, Messenger Mosaic2, + Messenger BDR, Messenger MDR, Messenger MP3, Messenger Hie, Messenger Hiw, + Messenger LOI, Messenger SHADE, Aluminum Abundance, Calcium Abundance, Iron + Abundance, Magnesium Abundance, and Silicon Abundance]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/alsimap_02122015.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/alsimap_02122015.asset index 5d6343e53f..7ded2c0167 100644 --- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/alsimap_02122015.asset +++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/alsimap_02122015.asset @@ -2,14 +2,14 @@ local texturesPath = asset.require("./../../mercury_textures").TexturesPath local globeIdentifier = asset.require("./../../mercury").Mercury.Identifier local layer = { - Name = "Aluminium Abundance", - Identifier = "alsimap_02122015", - FilePath = texturesPath .. "/alsimap_02122015.png", - BlendMode = "Multiply", + Name = "Aluminium Abundance", + Identifier = "alsimap_02122015", + FilePath = texturesPath .. "/alsimap_02122015.png", + BlendMode = "Multiply", } asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/casimap_02122015.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/casimap_02122015.asset index 65cce51790..32f3535fd6 100644 --- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/casimap_02122015.asset +++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/casimap_02122015.asset @@ -2,14 +2,14 @@ local texturesPath = asset.require("./../../mercury_textures").TexturesPath local globeIdentifier = asset.require("./../../mercury").Mercury.Identifier local layer = { - Name = "Calcium Abundance", - Identifier = "casimap_02122015", - FilePath = texturesPath .. "/casimap_02122015.png", - BlendMode = "Multiply", + Name = "Calcium Abundance", + Identifier = "casimap_02122015", + FilePath = texturesPath .. "/casimap_02122015.png", + BlendMode = "Multiply", } asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/fesimap_02122015.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/fesimap_02122015.asset index f8413736b9..dd3c272b19 100644 --- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/fesimap_02122015.asset +++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/fesimap_02122015.asset @@ -2,14 +2,14 @@ local texturesPath = asset.require("./../../mercury_textures").TexturesPath local globeIdentifier = asset.require("./../../mercury").Mercury.Identifier local layer = { - Name = "Iron Abundance", - Identifier = "fesimap_02122015", - FilePath = texturesPath .. "/fesimap_02122015.png", - BlendMode = "Multiply", + Name = "Iron Abundance", + Identifier = "fesimap_02122015", + FilePath = texturesPath .. "/fesimap_02122015.png", + BlendMode = "Multiply", } asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_bdr_sweden.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_bdr_sweden.asset index f2e2c76b17..5c1be9ae17 100644 --- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_bdr_sweden.asset +++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_bdr_sweden.asset @@ -2,14 +2,14 @@ local mapServiceConfigs = asset.localResource("./../../map_service_configs") local globeIdentifier = asset.require("./../../mercury").Mercury.Identifier local layer = { - Identifier = "Messenger_BDR_Sweden", - Name = "Messenger BDR [Sweden]", - FilePath = mapServiceConfigs .. "/LiU/Messenger_BDR.wms", - TilePixelSize = 360, + Identifier = "Messenger_BDR_Sweden", + Name = "Messenger BDR [Sweden]", + FilePath = mapServiceConfigs .. "/LiU/Messenger_BDR.wms", + TilePixelSize = 360, } asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_bdr_utah.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_bdr_utah.asset index 5a982326a3..739f312e00 100644 --- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_bdr_utah.asset +++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_bdr_utah.asset @@ -2,14 +2,14 @@ local mapServiceConfigs = asset.localResource("./../../map_service_configs") local globeIdentifier = asset.require("./../../mercury").Mercury.Identifier local layer = { - Identifier = "Messenger_BDR_Utah", - Name = "Messenger BDR [Utah]", - FilePath = mapServiceConfigs .. "/Utah/MessengerBDR.wms", - TilePixelSize = 360, + Identifier = "Messenger_BDR_Utah", + Name = "Messenger BDR [Utah]", + FilePath = mapServiceConfigs .. "/Utah/MessengerBDR.wms", + TilePixelSize = 360, } asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hie_sweden.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hie_sweden.asset index 78c4936ba8..808b5726c9 100644 --- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hie_sweden.asset +++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hie_sweden.asset @@ -2,13 +2,13 @@ local mapServiceConfigs = asset.localResource("./../../map_service_configs") local globeIdentifier = asset.require("./../../mercury").Mercury.Identifier local layer = { - Identifier = "Messenger_HIE_Sweden", - Name = "Messenger HIE [Sweden]", - FilePath = mapServiceConfigs .. "/LiU/Messenger_HIE.wms", + Identifier = "Messenger_HIE_Sweden", + Name = "Messenger HIE [Sweden]", + FilePath = mapServiceConfigs .. "/LiU/Messenger_HIE.wms", } asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hie_utah.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hie_utah.asset index 7691c0ce8a..0e5c229df6 100644 --- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hie_utah.asset +++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hie_utah.asset @@ -2,13 +2,13 @@ local mapServiceConfigs = asset.localResource("./../../map_service_configs") local globeIdentifier = asset.require("./../../mercury").Mercury.Identifier local layer = { - Identifier = "Messenger_HIE_Utah", - Name = "Messenger HIE [Utah]", - FilePath = mapServiceConfigs .. "/Utah/MessengerHIE.wms", + Identifier = "Messenger_HIE_Utah", + Name = "Messenger HIE [Utah]", + FilePath = mapServiceConfigs .. "/Utah/MessengerHIE.wms", } asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hiw_sweden.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hiw_sweden.asset index 280ac3eb9e..bb2fd1bf06 100644 --- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hiw_sweden.asset +++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hiw_sweden.asset @@ -2,13 +2,13 @@ local mapServiceConfigs = asset.localResource("./../../map_service_configs") local globeIdentifier = asset.require("./../../mercury").Mercury.Identifier local layer = { - Identifier = "Messenger_HIW_Sweden", - Name = "Messenger HIW [Sweden]", - FilePath = mapServiceConfigs .. "/LiU/Messenger_HIW.wms", + Identifier = "Messenger_HIW_Sweden", + Name = "Messenger HIW [Sweden]", + FilePath = mapServiceConfigs .. "/LiU/Messenger_HIW.wms", } asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hiw_utah.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hiw_utah.asset index 6f2bc6d5b2..4eccc97a04 100644 --- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hiw_utah.asset +++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hiw_utah.asset @@ -2,13 +2,13 @@ local mapServiceConfigs = asset.localResource("./../../map_service_configs") local globeIdentifier = asset.require("./../../mercury").Mercury.Identifier local layer = { - Identifier = "Messenger_HIW_Utah", - Name = "Messenger HIW [Utah]", - FilePath = mapServiceConfigs .. "/Utah/MessengerHIW.wms", + Identifier = "Messenger_HIW_Utah", + Name = "Messenger HIW [Utah]", + FilePath = mapServiceConfigs .. "/Utah/MessengerHIW.wms", } asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_loi_sweden.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_loi_sweden.asset index 72bbc5b90e..a6f1749c87 100644 --- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_loi_sweden.asset +++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_loi_sweden.asset @@ -2,13 +2,13 @@ local mapServiceConfigs = asset.localResource("./../../map_service_configs") local globeIdentifier = asset.require("./../../mercury").Mercury.Identifier local layer = { - Identifier = "Messenger_LOI_Sweden", - Name = "Messenger LOI [Sweden]", - FilePath = mapServiceConfigs .. "/LiU/Messenger_LOI.wms", + Identifier = "Messenger_LOI_Sweden", + Name = "Messenger LOI [Sweden]", + FilePath = mapServiceConfigs .. "/LiU/Messenger_LOI.wms", } asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_loi_utah.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_loi_utah.asset index 1a6dbafe0c..c4bfe727b5 100644 --- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_loi_utah.asset +++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_loi_utah.asset @@ -2,13 +2,13 @@ local mapServiceConfigs = asset.localResource("./../../map_service_configs") local globeIdentifier = asset.require("./../../mercury").Mercury.Identifier local layer = { - Identifier = "Messenger_LOI_Utah", - Name = "Messenger LOI [Utah]", - FilePath = mapServiceConfigs .. "/Utah/MessengerLOI.wms", + Identifier = "Messenger_LOI_Utah", + Name = "Messenger LOI [Utah]", + FilePath = mapServiceConfigs .. "/Utah/MessengerLOI.wms", } asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mdis_sweden.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mdis_sweden.asset index b9d4e7b2d4..541c360148 100644 --- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mdis_sweden.asset +++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mdis_sweden.asset @@ -2,13 +2,13 @@ local mapServiceConfigs = asset.localResource("./../../map_service_configs") local globeIdentifier = asset.require("./../../mercury").Mercury.Identifier local layer = { - Identifier = "Messenger_MDIS_Sweden", - Name = "Messenger MDIS [Sweden]", - FilePath = mapServiceConfigs .. "/LiU/Messenger_MDIS.wms", + Identifier = "Messenger_MDIS_Sweden", + Name = "Messenger MDIS [Sweden]", + FilePath = mapServiceConfigs .. "/LiU/Messenger_MDIS.wms", } asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mdis_utah.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mdis_utah.asset index b70a1a5ee2..231aa8bba8 100644 --- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mdis_utah.asset +++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mdis_utah.asset @@ -2,13 +2,13 @@ local mapServiceConfigs = asset.localResource("./../../map_service_configs") local globeIdentifier = asset.require("./../../mercury").Mercury.Identifier local layer = { - Identifier = "Messenger_MDIS_Utah", - Name = "Messenger MDIS [Utah]", - FilePath = mapServiceConfigs .. "/Utah/MessengerMDIS.wms", + Identifier = "Messenger_MDIS_Utah", + Name = "Messenger MDIS [Utah]", + FilePath = mapServiceConfigs .. "/Utah/MessengerMDIS.wms", } asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mdr_utah.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mdr_utah.asset index 823f41c2e8..01a5d89f63 100644 --- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mdr_utah.asset +++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mdr_utah.asset @@ -2,13 +2,13 @@ local mapServiceConfigs = asset.localResource("./../../map_service_configs") local globeIdentifier = asset.require("./../../mercury").Mercury.Identifier local layer = { - Identifier = "Messenger_MDR_Utah", - Name = "Messenger MDR [Utah]", - FilePath = mapServiceConfigs .. "/Utah/MessengerMDR.wms", + Identifier = "Messenger_MDR_Utah", + Name = "Messenger MDR [Utah]", + FilePath = mapServiceConfigs .. "/Utah/MessengerMDR.wms", } asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic2_sweden.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic2_sweden.asset index 19360c6b35..ea4103fb23 100644 --- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic2_sweden.asset +++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic2_sweden.asset @@ -2,13 +2,13 @@ local mapServiceConfigs = asset.localResource("./../../map_service_configs") local globeIdentifier = asset.require("./../../mercury").Mercury.Identifier local layer = { - Identifier = "Messenger_Mosaic2_Sweden", - Name = "Messenger Mosaic2 [Sweden]", - FilePath = mapServiceConfigs .. "/LiU/Messenger_Mosaic_2.wms", + Identifier = "Messenger_Mosaic2_Sweden", + Name = "Messenger Mosaic2 [Sweden]", + FilePath = mapServiceConfigs .. "/LiU/Messenger_Mosaic_2.wms", } asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic2_utah.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic2_utah.asset index ffc60b6d2d..b2779a0203 100644 --- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic2_utah.asset +++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic2_utah.asset @@ -2,13 +2,13 @@ local mapServiceConfigs = asset.localResource("./../../map_service_configs") local globeIdentifier = asset.require("./../../mercury").Mercury.Identifier local layer = { - Identifier = "Messenger_Mosaic2_Utah", - Name = "Messenger Mosaic2 [Utah]", - FilePath = mapServiceConfigs .. "/Utah/MessengerMosaic2.wms", + Identifier = "Messenger_Mosaic2_Utah", + Name = "Messenger Mosaic2 [Utah]", + FilePath = mapServiceConfigs .. "/Utah/MessengerMosaic2.wms", } asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic_sweden.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic_sweden.asset index b076345663..8ba07d375f 100644 --- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic_sweden.asset +++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic_sweden.asset @@ -2,13 +2,13 @@ local mapServiceConfigs = asset.localResource("./../../map_service_configs") local globeIdentifier = asset.require("./../../mercury").Mercury.Identifier local layer = { - Identifier = "Messenger_Mosaic_Sweden", - Name = "Messenger Mosaic [Sweden]", - FilePath = mapServiceConfigs .. "/LiU/Messenger_Mosaic.wms" + Identifier = "Messenger_Mosaic_Sweden", + Name = "Messenger Mosaic [Sweden]", + FilePath = mapServiceConfigs .. "/LiU/Messenger_Mosaic.wms" } asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic_utah.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic_utah.asset index eedb57aa13..9e6f140cb4 100644 --- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic_utah.asset +++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic_utah.asset @@ -2,13 +2,13 @@ local mapServiceConfigs = asset.localResource("./../../map_service_configs") local globeIdentifier = asset.require("./../../mercury").Mercury.Identifier local layer = { - Identifier = "Messenger_Mosaic_Utah", - Name = "Messenger Mosaic [Utah]", - FilePath = mapServiceConfigs .. "/Utah/MessengerMosaic.wms" + Identifier = "Messenger_Mosaic_Utah", + Name = "Messenger Mosaic [Utah]", + FilePath = mapServiceConfigs .. "/Utah/MessengerMosaic.wms" } asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mp3_utah.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mp3_utah.asset index 2ac4465b94..e9599d9bc6 100644 --- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mp3_utah.asset +++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mp3_utah.asset @@ -2,13 +2,13 @@ local mapServiceConfigs = asset.localResource("./../../map_service_configs") local globeIdentifier = asset.require("./../../mercury").Mercury.Identifier local layer = { - Identifier = "Messenger_MP3_Utah", - Name = "Messenger MP3 [Utah]", - FilePath = mapServiceConfigs .. "/Utah/MessengerMP3.wms", + Identifier = "Messenger_MP3_Utah", + Name = "Messenger MP3 [Utah]", + FilePath = mapServiceConfigs .. "/Utah/MessengerMP3.wms", } asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_shade_sweden.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_shade_sweden.asset index 5f6c56aa35..75e1311ce6 100644 --- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_shade_sweden.asset +++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_shade_sweden.asset @@ -2,18 +2,18 @@ local mapServiceConfigs = asset.localResource("./../../map_service_configs") local globeIdentifier = asset.require("./../../mercury").Mercury.Identifier local layer = { - Identifier = "Messenger_SHADE_Sweden", - Name = "Messenger SHADE [Sweden]", - FilePath = mapServiceConfigs .. "/LiU/Messenger_SHADE.wms", - Settings = { - Gamma = 1.33, - Multiplier = 1.15 - }, - BlendMode = "Multiply", + Identifier = "Messenger_SHADE_Sweden", + Name = "Messenger SHADE [Sweden]", + FilePath = mapServiceConfigs .. "/LiU/Messenger_SHADE.wms", + Settings = { + Gamma = 1.33, + Multiplier = 1.15 + }, + BlendMode = "Multiply", } asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_shade_utah.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_shade_utah.asset index dba443c440..db21653329 100644 --- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_shade_utah.asset +++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_shade_utah.asset @@ -2,18 +2,18 @@ local mapServiceConfigs = asset.localResource("./../../map_service_configs") local globeIdentifier = asset.require("./../../mercury").Mercury.Identifier local layer = { - Identifier = "Messenger_SHADE_Utah", - Name = "Messenger SHADE [Utah]", - FilePath = mapServiceConfigs .. "/Utah/MessengerSHADE.wms", - Settings = { - Gamma = 1.33, - Multiplier = 1.15 - }, - BlendMode = "Multiply", + Identifier = "Messenger_SHADE_Utah", + Name = "Messenger SHADE [Utah]", + FilePath = mapServiceConfigs .. "/Utah/MessengerSHADE.wms", + Settings = { + Gamma = 1.33, + Multiplier = 1.15 + }, + BlendMode = "Multiply", } asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/mgsimap_02122015.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/mgsimap_02122015.asset index 5e1a9fb48b..8dbb6ce060 100644 --- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/mgsimap_02122015.asset +++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/mgsimap_02122015.asset @@ -2,18 +2,18 @@ local texturesPath = asset.require("./../../mercury_textures").TexturesPath local globeIdentifier = asset.require("./../../mercury").Mercury.Identifier local layer = { - Name = "Magnesium Abundance", - Identifier = "mgsimap_02122015", - FilePath = texturesPath .. "/mgsimap_02122015.png", - Settings = { - Gamma = 1.33, - Multiplier = 1.15 - }, - BlendMode = "Multiply", + Name = "Magnesium Abundance", + Identifier = "mgsimap_02122015", + FilePath = texturesPath .. "/mgsimap_02122015.png", + Settings = { + Gamma = 1.33, + Multiplier = 1.15 + }, + BlendMode = "Multiply", } asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/ssimap_02122015.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/ssimap_02122015.asset index 7139cffd5f..8922f0cdfb 100644 --- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/ssimap_02122015.asset +++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/ssimap_02122015.asset @@ -2,14 +2,14 @@ local texturesPath = asset.require("./../../mercury_textures").TexturesPath local globeIdentifier = asset.require("./../../mercury").Mercury.Identifier local layer = { - Name = "Silicon Abundance", - Identifier = "ssimap_02122015", - FilePath = texturesPath .. "/ssimap_02122015.png", - BlendMode = "Multiply", + Name = "Silicon Abundance", + Identifier = "ssimap_02122015", + FilePath = texturesPath .. "/ssimap_02122015.png", + BlendMode = "Multiply", } asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/mercury/mercury.asset b/data/assets/scene/solarsystem/planets/mercury/mercury.asset index 4ce1efa083..f1ea2d6c06 100644 --- a/data/assets/scene/solarsystem/planets/mercury/mercury.asset +++ b/data/assets/scene/solarsystem/planets/mercury/mercury.asset @@ -6,77 +6,77 @@ asset.require("spice/base") asset.require('./trail') local Mercury = { - Identifier = "Mercury", - Parent = transforms.MercuryBarycenter.Identifier, - Transform = { - Rotation = { - Type = "SpiceRotation", - SourceFrame = "IAU_MERCURY", - DestinationFrame = "GALACTIC" - } - }, - Renderable = { - Type = "RenderableGlobe", - Radii = 2439700, - Frame = "IAU_MERCURY", - Body = "MERCURY", - CameraMinHeight = 300, - SegmentsPerPatch = 64, - Layers = {}, - Labels = { - Enable = false, - FileName = labelsPath .. "/Mercury.labels", - LabelAlignmentOption = "Horizontally", -- or Circularly - LabelsFontSize = 22.0, - LabelsSize = 10.0, - LabelsMinSize = 1.0, - LabelsMaxSize = 1500.0, - ProximityEnabled = false, - LabelsFadeInEnabled = true, - LabelsFadeOutEnabled = true, - FadeInStartingDistance = 5000000.0, - FadeOutStartingDistance = 1800000.0, - LabelsForceDomeRendering = true, - LabelsDistanceEPS = 1500000.0, - LabelsColor = { 1.0, 1.0, 0.0 } - } - }, - Tag = { "planet_solarSystem", "planet_terrestrial" }, - GUI = { - Path = "/Solar System/Planets/Mercury" + Identifier = "Mercury", + Parent = transforms.MercuryBarycenter.Identifier, + Transform = { + Rotation = { + Type = "SpiceRotation", + SourceFrame = "IAU_MERCURY", + DestinationFrame = "GALACTIC" } + }, + Renderable = { + Type = "RenderableGlobe", + Radii = 2439700, + Frame = "IAU_MERCURY", + Body = "MERCURY", + CameraMinHeight = 300, + SegmentsPerPatch = 64, + Layers = {}, + Labels = { + Enable = false, + FileName = labelsPath .. "/Mercury.labels", + LabelAlignmentOption = "Horizontally", -- or Circularly + LabelsFontSize = 22.0, + LabelsSize = 10.0, + LabelsMinSize = 1.0, + LabelsMaxSize = 1500.0, + ProximityEnabled = false, + LabelsFadeInEnabled = true, + LabelsFadeOutEnabled = true, + FadeInStartingDistance = 5000000.0, + FadeOutStartingDistance = 1800000.0, + LabelsForceDomeRendering = true, + LabelsDistanceEPS = 1500000.0, + LabelsColor = { 1.0, 1.0, 0.0 } + } + }, + Tag = { "planet_solarSystem", "planet_terrestrial" }, + GUI = { + Path = "/Solar System/Planets/Mercury" + } } local MercuryLabel = { - Identifier = "MercuryLabel", - Parent = Mercury.Identifier, - Renderable = { - Enabled = false, - Type = "RenderableLabels", - LabelText = "Mercury", - FontSize = 100.0, - LabelSize = 8.3, - LabelMaxSize = 100.0, - LabelMinSize = 1.0, - LabelOrientationOption = "Camera View Direction", - BlendMode = "Additive" - }, - Tag = { "solarsystem_labels" }, - GUI = { - Name = "Mercury Label", - Path = "/Solar System/Planets/Mercury", - } + Identifier = "MercuryLabel", + Parent = Mercury.Identifier, + Renderable = { + Enabled = false, + Type = "RenderableLabels", + LabelText = "Mercury", + FontSize = 100.0, + LabelSize = 8.3, + LabelMaxSize = 100.0, + LabelMinSize = 1.0, + LabelOrientationOption = "Camera View Direction", + BlendMode = "Additive" + }, + Tag = { "solarsystem_labels" }, + GUI = { + Name = "Mercury Label", + Path = "/Solar System/Planets/Mercury", + } } assetHelper.registerSceneGraphNodesAndExport(asset, { Mercury, MercuryLabel }) asset.meta = { - Name = "Mercury", - Version = "1.0", - Description = [[ Mercury globe with labels, and main planet label.]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"Mercury" , "MercuryLabel"} + Name = "Mercury", + Version = "1.0", + Description = [[ Mercury globe with labels, and main planet label.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license", + Identifiers = {"Mercury" , "MercuryLabel"} } diff --git a/data/assets/scene/solarsystem/planets/mercury/mercury_globelabels.asset b/data/assets/scene/solarsystem/planets/mercury/mercury_globelabels.asset index 49b6148dfa..14cbb35a14 100644 --- a/data/assets/scene/solarsystem/planets/mercury/mercury_globelabels.asset +++ b/data/assets/scene/solarsystem/planets/mercury/mercury_globelabels.asset @@ -1,7 +1,7 @@ local LabelsPath = asset.syncedResource({ - Name = "Mercury Labels", - Type = "HttpSynchronization", - Identifier = "mercury_labels", - Version = 1 + Name = "Mercury Labels", + Type = "HttpSynchronization", + Identifier = "mercury_labels", + Version = 1 }) asset.export("LabelsPath", LabelsPath) \ No newline at end of file diff --git a/data/assets/scene/solarsystem/planets/mercury/mercury_textures.asset b/data/assets/scene/solarsystem/planets/mercury/mercury_textures.asset index cc275ee677..3ff8488a6d 100644 --- a/data/assets/scene/solarsystem/planets/mercury/mercury_textures.asset +++ b/data/assets/scene/solarsystem/planets/mercury/mercury_textures.asset @@ -1,7 +1,7 @@ local TexturesPath = asset.syncedResource({ - Name = "Mercury Textures", - Type = "HttpSynchronization", - Identifier = "mercury_abundance_textures", - Version = 1 + Name = "Mercury Textures", + Type = "HttpSynchronization", + Identifier = "mercury_abundance_textures", + Version = 1 }) asset.export("TexturesPath", TexturesPath) diff --git a/data/assets/scene/solarsystem/planets/mercury/trail.asset b/data/assets/scene/solarsystem/planets/mercury/trail.asset index c13026c14b..40628994a2 100644 --- a/data/assets/scene/solarsystem/planets/mercury/trail.asset +++ b/data/assets/scene/solarsystem/planets/mercury/trail.asset @@ -5,37 +5,37 @@ asset.require("spice/base") local MercuryTrail = { - Identifier = "MercuryTrail", - Parent = transforms.SolarSystemBarycenter.Identifier, - Renderable = { - Type = "RenderableTrailOrbit", - Translation = { - Type = "SpiceTranslation", - Target = "MERCURY", - Observer = "SUN" - }, - Color = { 0.6, 0.5, 0.5 }, - Period = 87.968, - Resolution = 1000 + Identifier = "MercuryTrail", + Parent = transforms.SolarSystemBarycenter.Identifier, + Renderable = { + Type = "RenderableTrailOrbit", + Translation = { + Type = "SpiceTranslation", + Target = "MERCURY", + Observer = "SUN" }, - Tag = { "planetTrail_solarSystem", "planetTrail_terrestrial" }, - GUI = { - Name = "Mercury Trail", - Path = "/Solar System/Planets/Mercury", - Description = [[ Trail of Mercury as observed by the Sun.]], - } + Color = { 0.6, 0.5, 0.5 }, + Period = 87.968, + Resolution = 1000 + }, + Tag = { "planetTrail_solarSystem", "planetTrail_terrestrial" }, + GUI = { + Name = "Mercury Trail", + Path = "/Solar System/Planets/Mercury", + Description = [[ Trail of Mercury as observed by the Sun.]], + } } assetHelper.registerSceneGraphNodesAndExport(asset, { MercuryTrail }) asset.meta = { - Name = "Mercury Trail", - Version = "1.0", - Description = [[ Main trail for Mercury. Data from NASA Spice (see - base spice asset)]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"MercuryTrail"} + Name = "Mercury Trail", + Version = "1.0", + Description = [[ Main trail for Mercury. Data from NASA Spice (see + base spice asset)]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license", + Identifiers = {"MercuryTrail"} } diff --git a/data/assets/scene/solarsystem/planets/mercury/trail_earth.asset b/data/assets/scene/solarsystem/planets/mercury/trail_earth.asset index 6f9c702a2a..1b0a35d935 100644 --- a/data/assets/scene/solarsystem/planets/mercury/trail_earth.asset +++ b/data/assets/scene/solarsystem/planets/mercury/trail_earth.asset @@ -6,39 +6,39 @@ asset.require("spice/base") local MercuryTrailEarth = { - Identifier = "MercuryTrailEarth", - Parent = earthTransforms.EarthBarycenter.Identifier, - Renderable = { - Type = "RenderableTrailOrbit", - Translation = { - Type = "SpiceTranslation", - Target = "MERCURY BARYCENTER", - Observer = "EARTH" - }, - Color = { 1.0, 0.5, 0.2 }, - Period = 224.695, - Resolution = 1000, - Enabled = false + Identifier = "MercuryTrailEarth", + Parent = earthTransforms.EarthBarycenter.Identifier, + Renderable = { + Type = "RenderableTrailOrbit", + Translation = { + Type = "SpiceTranslation", + Target = "MERCURY BARYCENTER", + Observer = "EARTH" }, - Tag = { "planetTrail_solarSystem_alt", "planetTrail_terrestrial_alt" }, - GUI = { - Name = "Mercury trail from Earth", - Path = "/Solar System/Planets/Mercury", - Hidden = false, - Description = [[ Trail of Mercury as observed by the Earth.]], - } + Color = { 1.0, 0.5, 0.2 }, + Period = 224.695, + Resolution = 1000, + Enabled = false + }, + Tag = { "planetTrail_solarSystem_alt", "planetTrail_terrestrial_alt" }, + GUI = { + Name = "Mercury trail from Earth", + Path = "/Solar System/Planets/Mercury", + Hidden = false, + Description = [[ Trail of Mercury as observed by the Earth.]], + } } assetHelper.registerSceneGraphNodesAndExport(asset, { MercuryTrailEarth }) asset.meta = { - Name = "Mercury Trail from Earth", - Version = "1.0", - Description = [[ Alternate trail of Mercury, as observed by the Earth rather then the - Sun.]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"MercuryTrailEarth"} + Name = "Mercury Trail from Earth", + Version = "1.0", + Description = [[ Alternate trail of Mercury, as observed by the Earth rather then the + Sun.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license", + Identifiers = {"MercuryTrailEarth"} } diff --git a/data/assets/scene/solarsystem/planets/mercury/transforms.asset b/data/assets/scene/solarsystem/planets/mercury/transforms.asset index 8cb25558bf..21b85f696b 100644 --- a/data/assets/scene/solarsystem/planets/mercury/transforms.asset +++ b/data/assets/scene/solarsystem/planets/mercury/transforms.asset @@ -3,32 +3,32 @@ local transforms = asset.require('scene/solarsystem/sun/transforms') asset.require("spice/base") local MercuryBarycenter = { - Identifier = "MercuryBarycenter", - Parent = transforms.SolarSystemBarycenter.Identifier, - Transform = { - Translation = { - Type = "SpiceTranslation", - Target = "MERCURY", - Observer = "SUN" - } - }, - GUI = { - Name = "Mercury Barycenter", - Path = "/Solar System/Planets/Mercury", - Hidden = true, - Description = [[ Mercury Barycenter position]], + Identifier = "MercuryBarycenter", + Parent = transforms.SolarSystemBarycenter.Identifier, + Transform = { + Translation = { + Type = "SpiceTranslation", + Target = "MERCURY", + Observer = "SUN" } + }, + GUI = { + Name = "Mercury Barycenter", + Path = "/Solar System/Planets/Mercury", + Hidden = true, + Description = [[ Mercury Barycenter position]], + } } assetHelper.registerSceneGraphNodesAndExport(asset, { MercuryBarycenter }) asset.meta = { - Name = "Mercury Transforms", - Version = "1.0", - Description = [[ Mercury Barycenter transform]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"MercuryBarycenter"} + Name = "Mercury Transforms", + Version = "1.0", + Description = [[ Mercury Barycenter transform]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license", + Identifiers = {"MercuryBarycenter"} } diff --git a/data/assets/scene/solarsystem/planets/neptune/default_layers.asset b/data/assets/scene/solarsystem/planets/neptune/default_layers.asset index 4f16da0714..aa5c63aeb5 100644 --- a/data/assets/scene/solarsystem/planets/neptune/default_layers.asset +++ b/data/assets/scene/solarsystem/planets/neptune/default_layers.asset @@ -5,16 +5,16 @@ local colorLayer = asset.require(colorLayersPath .. "/neptune_texture") -- Set enabled layers (temporary solution) -- @TODO: do this using a boolean that's passed to the 'asset.require' instead asset.onInitialize(function () - openspace.setPropertyValueSingle("Scene.Neptune.Renderable.Layers.ColorLayers." .. - colorLayer.layer.Identifier .. ".Enabled", true) + openspace.setPropertyValueSingle("Scene.Neptune.Renderable.Layers.ColorLayers." .. + colorLayer.layer.Identifier .. ".Enabled", true) end) asset.meta = { - Name = "Default Neptune Layers", - Version = "1.0", - Description = [[ Default Neptune layers are: Neptune Texture]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license" + Name = "Default Neptune Layers", + Version = "1.0", + Description = [[ Default Neptune layers are: Neptune Texture]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/neptune/inner_moons.asset b/data/assets/scene/solarsystem/planets/neptune/inner_moons.asset index 582fd9f83b..3a6dddaba4 100644 --- a/data/assets/scene/solarsystem/planets/neptune/inner_moons.asset +++ b/data/assets/scene/solarsystem/planets/neptune/inner_moons.asset @@ -13,148 +13,148 @@ local parentSpice = "NEPTUNE BARYCENTER" local tags = { "moon_solarSystem", "moon_giants", "moon_neptune", "moon_inner" } local trailColor = { 0.2, 0.5, 0.75 } local trailTags = { - "moonTrail_solarSystem", - "moonTrail_giants", - "moonTrail_neptune", - "moonTrail_minor" + "moonTrail_solarSystem", + "moonTrail_giants", + "moonTrail_neptune", + "moonTrail_minor" } local innerMoons = { - { - Identifier = "Naiad", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "NAIAD", - Radii = { 96000, 60000, 52000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Path = "/Solar System/Planets/Neptune/Moons/Inner Moons" - }, - TrailColor = trailColor, - OrbitPeriod = 0.294, - Kernels = kernel088 + { + Identifier = "Naiad", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice }, - { - Identifier = "Thalassa", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "THALASSA", - Radii = { 108000, 100000, 52000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Path = "/Solar System/Planets/Neptune/Moons/Inner Moons" - }, - TrailColor = trailColor, - OrbitPeriod = 0.311, - Kernels = kernel088 + Spice = "NAIAD", + Radii = { 96000, 60000, 52000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Path = "/Solar System/Planets/Neptune/Moons/Inner Moons" }, - { - Identifier = "Despina", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "DESPINA", - Radii = { 180000, 148000, 128000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Path = "/Solar System/Planets/Neptune/Moons/Inner Moons" - }, - TrailColor = trailColor, - OrbitPeriod = 0.335, - Kernels = kernel088 + TrailColor = trailColor, + OrbitPeriod = 0.294, + Kernels = kernel088 + }, + { + Identifier = "Thalassa", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice }, - { - Identifier = "Galatea", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "GALATEA", - Radii = { 204000, 184000, 144000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Path = "/Solar System/Planets/Neptune/Moons/Inner Moons" - }, - TrailColor = trailColor, - OrbitPeriod = 0.429, - Kernels = kernel088 + Spice = "THALASSA", + Radii = { 108000, 100000, 52000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Path = "/Solar System/Planets/Neptune/Moons/Inner Moons" }, - { - Identifier = "Larissa", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "LARISSA", - Radii = { 216000, 204000, 168000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Path = "/Solar System/Planets/Neptune/Moons/Inner Moons" - }, - TrailColor = trailColor, - OrbitPeriod = 0.555, - Kernels = kernel088 + TrailColor = trailColor, + OrbitPeriod = 0.311, + Kernels = kernel088 + }, + { + Identifier = "Despina", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice }, - { - Identifier = "S2004N1", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "814", - Radii = { 16000, 16000, 16000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Name = "S/2004 N 1", - Path = "/Solar System/Planets/Neptune/Moons/Inner Moons" - }, - TrailColor = trailColor, - OrbitPeriod = 0.936, - Kernels = kernel088 + Spice = "DESPINA", + Radii = { 180000, 148000, 128000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Path = "/Solar System/Planets/Neptune/Moons/Inner Moons" }, - { - Identifier = "Proteus", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "PROTEUS", - Radii = { 436000, 416000, 402000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Path = "/Solar System/Planets/Neptune/Moons/Inner Moons" - }, - TrailColor = trailColor, - OrbitPeriod = 1.122, - Kernels = kernel081 - } + TrailColor = trailColor, + OrbitPeriod = 0.335, + Kernels = kernel088 + }, + { + Identifier = "Galatea", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice + }, + Spice = "GALATEA", + Radii = { 204000, 184000, 144000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Path = "/Solar System/Planets/Neptune/Moons/Inner Moons" + }, + TrailColor = trailColor, + OrbitPeriod = 0.429, + Kernels = kernel088 + }, + { + Identifier = "Larissa", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice + }, + Spice = "LARISSA", + Radii = { 216000, 204000, 168000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Path = "/Solar System/Planets/Neptune/Moons/Inner Moons" + }, + TrailColor = trailColor, + OrbitPeriod = 0.555, + Kernels = kernel088 + }, + { + Identifier = "S2004N1", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice + }, + Spice = "814", + Radii = { 16000, 16000, 16000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Name = "S/2004 N 1", + Path = "/Solar System/Planets/Neptune/Moons/Inner Moons" + }, + TrailColor = trailColor, + OrbitPeriod = 0.936, + Kernels = kernel088 + }, + { + Identifier = "Proteus", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice + }, + Spice = "PROTEUS", + Radii = { 436000, 416000, 402000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Path = "/Solar System/Planets/Neptune/Moons/Inner Moons" + }, + TrailColor = trailColor, + OrbitPeriod = 1.122, + Kernels = kernel081 + } } assetHelper.registerSceneGraphNodesAndExport( - asset, - proceduralGlobes.createGlobes(innerMoons) + asset, + proceduralGlobes.createGlobes(innerMoons) ) asset.meta = { - Name = "Neptune Inner Moons", - Version = "1.0", - Description = [[ Procedural Globe asset containing Neptune' inner prograde moons: - Naiad, Thalassa, Despina, Galatea, Larissa, S2004N1, and Proteus. Blank globes and - SPICE trails are generated for each moon.]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license" + Name = "Neptune Inner Moons", + Version = "1.0", + Description = [[ Procedural Globe asset containing Neptune' inner prograde moons: + Naiad, Thalassa, Despina, Galatea, Larissa, S2004N1, and Proteus. Blank globes and + SPICE trails are generated for each moon.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/neptune/irregular_prograde_moons.asset b/data/assets/scene/solarsystem/planets/neptune/irregular_prograde_moons.asset index 826e6366c4..810434bbc0 100644 --- a/data/assets/scene/solarsystem/planets/neptune/irregular_prograde_moons.asset +++ b/data/assets/scene/solarsystem/planets/neptune/irregular_prograde_moons.asset @@ -13,79 +13,79 @@ local parentSpice = "NEPTUNE BARYCENTER" local tags = { "moon_solarSystem", "moon_giants", "moon_neptune", "moon_irregular_prograde" } local trailColor = { 0.2, 0.5, 0.75 } local trailTags = { - "moonTrail_solarSystem", - "moonTrail_giants", - "moonTrail_neptune", - "moonTrail_minor" + "moonTrail_solarSystem", + "moonTrail_giants", + "moonTrail_neptune", + "moonTrail_minor" } local irregularProgradeMoons = { - { - Identifier = "Halimede", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "HALIMEDE", - Radii = { 62000, 62000, 62000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Path = "/Solar System/Planets/Neptune/Moons/Irregular Prograde Moons" - }, - TrailColor = trailColor, - OrbitPeriod = 1879.08, - Kernels = kernel086 + { + Identifier = "Halimede", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice }, - { - Identifier = "Psamathe", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "PSAMATHE", - Radii = { 40000, 40000, 40000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Path = "/Solar System/Planets/Neptune/Moons/Irregular Prograde Moons" - }, - TrailColor = trailColor, - OrbitPeriod = 9074.3, - Kernels = kernel086 + Spice = "HALIMEDE", + Radii = { 62000, 62000, 62000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Path = "/Solar System/Planets/Neptune/Moons/Irregular Prograde Moons" }, - { - Identifier = "Neso", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "NESO", - Radii = { 60000, 60000, 60000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Path = "/Solar System/Planets/Neptune/Moons/Irregular Prograde Moons" + TrailColor = trailColor, + OrbitPeriod = 1879.08, + Kernels = kernel086 + }, + { + Identifier = "Psamathe", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice }, - TrailColor = trailColor, - OrbitPeriod = 9740.73, - Kernels = kernel086 - } + Spice = "PSAMATHE", + Radii = { 40000, 40000, 40000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Path = "/Solar System/Planets/Neptune/Moons/Irregular Prograde Moons" + }, + TrailColor = trailColor, + OrbitPeriod = 9074.3, + Kernels = kernel086 + }, + { + Identifier = "Neso", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice + }, + Spice = "NESO", + Radii = { 60000, 60000, 60000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Path = "/Solar System/Planets/Neptune/Moons/Irregular Prograde Moons" + }, + TrailColor = trailColor, + OrbitPeriod = 9740.73, + Kernels = kernel086 + } } assetHelper.registerSceneGraphNodesAndExport( - asset, - proceduralGlobes.createGlobes(irregularProgradeMoons) + asset, + proceduralGlobes.createGlobes(irregularProgradeMoons) ) asset.meta = { - Name = "Neptune Irregular Prograde Moons", - Version = "1.0", - Description = [[ Procedural Globe asset containing Neptune' irregular prograde - moons: Halimede, Psamathe and Neso. Blank globes and SPICE trails are generated for - each moon.]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license" + Name = "Neptune Irregular Prograde Moons", + Version = "1.0", + Description = [[ Procedural Globe asset containing Neptune' irregular prograde + moons: Halimede, Psamathe and Neso. Blank globes and SPICE trails are generated for + each moon.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/neptune/irregular_retrograde_moons.asset b/data/assets/scene/solarsystem/planets/neptune/irregular_retrograde_moons.asset index e40bdb9962..badb4eb266 100644 --- a/data/assets/scene/solarsystem/planets/neptune/irregular_retrograde_moons.asset +++ b/data/assets/scene/solarsystem/planets/neptune/irregular_retrograde_moons.asset @@ -12,79 +12,79 @@ local parentSpice = "NEPTUNE BARYCENTER" local tags = { "moon_solarSystem", "moon_giants", "moon_neptune", "moon_irregular_retrograde" } local trailColor = { 0.2, 0.5, 0.75 } local trailTags = { - "moonTrail_solarSystem", - "moonTrail_giants", - "moonTrail_neptune", - "moonTrail_minor" + "moonTrail_solarSystem", + "moonTrail_giants", + "moonTrail_neptune", + "moonTrail_minor" } local irregularRetrogradeMoons = { - { - Identifier = "Nereid", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "NEREID", - Radii = { 340000, 340000, 340000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Path = "/Solar System/Planets/Neptune/Moons/Irregular Retrograde Moons" - }, - TrailColor = trailColor, - OrbitPeriod = 360.13, - Kernels = kernel081 + { + Identifier = "Nereid", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice }, - { - Identifier = "Sao", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "SAO", - Radii = { 44000, 44000, 44000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Path = "/Solar System/Planets/Neptune/Moons/Irregular Retrograde Moons" - }, - TrailColor = trailColor, - OrbitPeriod = 2912.72, - Kernels = kernel086 + Spice = "NEREID", + Radii = { 340000, 340000, 340000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Path = "/Solar System/Planets/Neptune/Moons/Irregular Retrograde Moons" }, - { - Identifier = "Laomedeia", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "LAOMEDEIA", - Radii = { 42000, 42000, 42000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Path = "/Solar System/Planets/Neptune/Moons/Irregular Retrograde Moons" - }, - TrailColor = trailColor, - OrbitPeriod = 3171.33, - Kernels = kernel086 - } + TrailColor = trailColor, + OrbitPeriod = 360.13, + Kernels = kernel081 + }, + { + Identifier = "Sao", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice + }, + Spice = "SAO", + Radii = { 44000, 44000, 44000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Path = "/Solar System/Planets/Neptune/Moons/Irregular Retrograde Moons" + }, + TrailColor = trailColor, + OrbitPeriod = 2912.72, + Kernels = kernel086 + }, + { + Identifier = "Laomedeia", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice + }, + Spice = "LAOMEDEIA", + Radii = { 42000, 42000, 42000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Path = "/Solar System/Planets/Neptune/Moons/Irregular Retrograde Moons" + }, + TrailColor = trailColor, + OrbitPeriod = 3171.33, + Kernels = kernel086 + } } assetHelper.registerSceneGraphNodesAndExport( - asset, - proceduralGlobes.createGlobes(irregularRetrogradeMoons) + asset, + proceduralGlobes.createGlobes(irregularRetrogradeMoons) ) asset.meta = { - Name = "Neptune Irregular Retrograde Moons", - Version = "1.0", - Description = [[ Procedural Globe asset containing Neptune' irregular retrograde - moons: Nereid, Sao and Laomedeia. Blank globes and SPICE trails are generated for - each moon.]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license" + Name = "Neptune Irregular Retrograde Moons", + Version = "1.0", + Description = [[ Procedural Globe asset containing Neptune' irregular retrograde + moons: Nereid, Sao and Laomedeia. Blank globes and SPICE trails are generated for + each moon.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/neptune/kernels.asset b/data/assets/scene/solarsystem/planets/neptune/kernels.asset index 588330a97f..8898ad4e7f 100644 --- a/data/assets/scene/solarsystem/planets/neptune/kernels.asset +++ b/data/assets/scene/solarsystem/planets/neptune/kernels.asset @@ -1,8 +1,8 @@ local Kernels = asset.syncedResource({ - Name = "Neptune Spice Kernels", - Type = "HttpSynchronization", - Identifier = "neptune_kernels", - Version = 1 + Name = "Neptune Spice Kernels", + Type = "HttpSynchronization", + Identifier = "neptune_kernels", + Version = 1 }) asset.export("nep081", Kernels .. '/nep081.bsp') @@ -12,10 +12,10 @@ asset.export("nep088", Kernels .. '/nep088.bsp') asset.meta = { - Name = "Neptune Spice Kernels", - Version = "1.0", - Description = [[ Generic SPICE kernels for Neptune.]], - Author = "OpenSpace Team", - URL = "https://naif.jpl.nasa.gov/pub/naif/pds/wgc/kernels/spk/", - License = "NASA" + Name = "Neptune Spice Kernels", + Version = "1.0", + Description = [[ Generic SPICE kernels for Neptune.]], + Author = "OpenSpace Team", + URL = "https://naif.jpl.nasa.gov/pub/naif/pds/wgc/kernels/spk/", + License = "NASA" } diff --git a/data/assets/scene/solarsystem/planets/neptune/layers/colorlayers/neptune_texture.asset b/data/assets/scene/solarsystem/planets/neptune/layers/colorlayers/neptune_texture.asset index ce7d259b94..5ee223dfa1 100644 --- a/data/assets/scene/solarsystem/planets/neptune/layers/colorlayers/neptune_texture.asset +++ b/data/assets/scene/solarsystem/planets/neptune/layers/colorlayers/neptune_texture.asset @@ -2,22 +2,22 @@ local texturesPath = asset.require("./../../neptune_textures").TexturesPath local globeIdentifier = asset.require("./../../neptune").Neptune.Identifier local layer = { - Identifier = "Texture", - FilePath = texturesPath .. "/neptune.jpg", + Identifier = "Texture", + FilePath = texturesPath .. "/neptune.jpg", } asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) asset.export("layer", layer) asset.meta = { - Name = "Neptune Texutre", - Version = "1.0", - Description = [[ Default jpg texture for Neptune]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license" + Name = "Neptune Texutre", + Version = "1.0", + Description = [[ Default jpg texture for Neptune]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/neptune/major_moons.asset b/data/assets/scene/solarsystem/planets/neptune/major_moons.asset index eb4df5b6cf..df57e32d64 100644 --- a/data/assets/scene/solarsystem/planets/neptune/major_moons.asset +++ b/data/assets/scene/solarsystem/planets/neptune/major_moons.asset @@ -2,10 +2,10 @@ asset.require('./triton') asset.meta = { - Name = "Neptune Minor Moons", - Version = "1.0", - Description = [[ Meta asset containing Neptune's major moon: Triton]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license" + Name = "Neptune Minor Moons", + Version = "1.0", + Description = [[ Meta asset containing Neptune's major moon: Triton]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/neptune/neptune.asset b/data/assets/scene/solarsystem/planets/neptune/neptune.asset index 5a3fa3df6b..1b53920d46 100644 --- a/data/assets/scene/solarsystem/planets/neptune/neptune.asset +++ b/data/assets/scene/solarsystem/planets/neptune/neptune.asset @@ -4,60 +4,60 @@ asset.require("spice/base") asset.require('./trail') local Neptune = { - Identifier = "Neptune", - Parent = transforms.NeptuneBarycenter.Identifier, - Transform = { - Rotation = { - Type = "SpiceRotation", - SourceFrame = "IAU_NEPTUNE", - DestinationFrame = "GALACTIC" - } - }, - Renderable = { - Type = "RenderableGlobe", - Radii = { 24764000.0, 24764000.0, 24314000.0 }, - SegmentsPerPatch = 64, - Layers = {} - }, - Tag = { "planet_solarSystem", "planet_giants" }, - GUI = { - Name = "Neptune", - Path = "/Solar System/Planets/Neptune", - Description = [[Neptune globe]] + Identifier = "Neptune", + Parent = transforms.NeptuneBarycenter.Identifier, + Transform = { + Rotation = { + Type = "SpiceRotation", + SourceFrame = "IAU_NEPTUNE", + DestinationFrame = "GALACTIC" } + }, + Renderable = { + Type = "RenderableGlobe", + Radii = { 24764000.0, 24764000.0, 24314000.0 }, + SegmentsPerPatch = 64, + Layers = {} + }, + Tag = { "planet_solarSystem", "planet_giants" }, + GUI = { + Name = "Neptune", + Path = "/Solar System/Planets/Neptune", + Description = [[Neptune globe]] + } } local NeptuneLabel = { - Identifier = "NeptuneLabel", - Parent = Neptune.Identifier, - Renderable = { - Enabled = false, - Type = "RenderableLabels", - LabelText = "Neptune", - FontSize = 100.0, - LabelSize = 8.8, - LabelMaxSize = 100.0, - LabelMinSize = 1.0, - LabelOrientationOption = "Camera View Direction", - BlendMode = "Additive" - }, - Tag = { "solarsystem_labels" }, - GUI = { - Name = "Neptune Label", - Path = "/Solar System/Planets/Neptune", - Description = [[ Main planet label for Neptune.]], - } + Identifier = "NeptuneLabel", + Parent = Neptune.Identifier, + Renderable = { + Enabled = false, + Type = "RenderableLabels", + LabelText = "Neptune", + FontSize = 100.0, + LabelSize = 8.8, + LabelMaxSize = 100.0, + LabelMinSize = 1.0, + LabelOrientationOption = "Camera View Direction", + BlendMode = "Additive" + }, + Tag = { "solarsystem_labels" }, + GUI = { + Name = "Neptune Label", + Path = "/Solar System/Planets/Neptune", + Description = [[ Main planet label for Neptune.]], + } } assetHelper.registerSceneGraphNodesAndExport(asset, { Neptune, NeptuneLabel }) asset.meta = { - Name = "Neptune", - Version = "1.0", - Description = [[ Neptune globe, and main planet label.]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"Neptune"} + Name = "Neptune", + Version = "1.0", + Description = [[ Neptune globe, and main planet label.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license", + Identifiers = {"Neptune"} } diff --git a/data/assets/scene/solarsystem/planets/neptune/neptune_textures.asset b/data/assets/scene/solarsystem/planets/neptune/neptune_textures.asset index 9674b1dde9..13adefb9a0 100644 --- a/data/assets/scene/solarsystem/planets/neptune/neptune_textures.asset +++ b/data/assets/scene/solarsystem/planets/neptune/neptune_textures.asset @@ -1,7 +1,7 @@ local TexturesPath = asset.syncedResource({ - Name = "Neptune textures", - Type = "HttpSynchronization", - Identifier = "neptune_textures", - Version = 1 + Name = "Neptune textures", + Type = "HttpSynchronization", + Identifier = "neptune_textures", + Version = 1 }) asset.export("TexturesPath", TexturesPath) diff --git a/data/assets/scene/solarsystem/planets/neptune/trail.asset b/data/assets/scene/solarsystem/planets/neptune/trail.asset index cc0a2d7eb4..86e554b33d 100644 --- a/data/assets/scene/solarsystem/planets/neptune/trail.asset +++ b/data/assets/scene/solarsystem/planets/neptune/trail.asset @@ -5,47 +5,47 @@ asset.require("spice/base") local NeptuneTrail = { - Identifier = "NeptuneTrail", - Parent = transforms.SolarSystemBarycenter.Identifier, - Renderable = { - Type = "RenderableTrailOrbit", - Translation = { - Type = "SpiceTranslation", - Target = "NEPTUNE BARYCENTER", - Observer = "SUN" - }, - Color = { 0.2, 0.5, 1.0 }, - -- Period = 60200, - -- Yes, this period is wrong, but the SPICE kernel we load by default only - -- goes back to 1850. Neptunes orbit is 164 years, which would mean that we - -- exceed the SPICE kernel if we go back before 2014, if we try to compute the - -- entire orbit. Cutting the orbit length to 100 years allows us to go back - -- to 1950 instead, which is good enough. - -- If the positions are needed before that, a different set of kernels are - -- needed, namely: - -- https://naif.jpl.nasa.gov/pub/naif/generic_kernels/spk/planets/de431_part-1.bsp - -- https://naif.jpl.nasa.gov/pub/naif/generic_kernels/spk/planets/de431_part-2.bsp - -- that cover a larger time span: -13201-MAY-06 00:00 to 17191-MAR-15 00:00 - Period = 36500, - Resolution = 1000 + Identifier = "NeptuneTrail", + Parent = transforms.SolarSystemBarycenter.Identifier, + Renderable = { + Type = "RenderableTrailOrbit", + Translation = { + Type = "SpiceTranslation", + Target = "NEPTUNE BARYCENTER", + Observer = "SUN" }, - Tag = { "planetTrail_solarSystem", "planetTrail_giants" }, - GUI = { - Name = "Neptune Trail", - Path = "/Solar System/Planets/Neptune", - Description = [[ Trail of Neptune as observed by the Sun.]] - } + Color = { 0.2, 0.5, 1.0 }, + -- Period = 60200, + -- Yes, this period is wrong, but the SPICE kernel we load by default only + -- goes back to 1850. Neptunes orbit is 164 years, which would mean that we + -- exceed the SPICE kernel if we go back before 2014, if we try to compute the + -- entire orbit. Cutting the orbit length to 100 years allows us to go back + -- to 1950 instead, which is good enough. + -- If the positions are needed before that, a different set of kernels are + -- needed, namely: + -- https://naif.jpl.nasa.gov/pub/naif/generic_kernels/spk/planets/de431_part-1.bsp + -- https://naif.jpl.nasa.gov/pub/naif/generic_kernels/spk/planets/de431_part-2.bsp + -- that cover a larger time span: -13201-MAY-06 00:00 to 17191-MAR-15 00:00 + Period = 36500, + Resolution = 1000 + }, + Tag = { "planetTrail_solarSystem", "planetTrail_giants" }, + GUI = { + Name = "Neptune Trail", + Path = "/Solar System/Planets/Neptune", + Description = [[ Trail of Neptune as observed by the Sun.]] + } } assetHelper.registerSceneGraphNodesAndExport(asset, { NeptuneTrail }) asset.meta = { - Name = "Neptune Trail", - Version = "1.0", - Description = [[ Main trail of Neptune. Data from NASA Spice (see base spice asset)]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"NeptuneTrail"} + Name = "Neptune Trail", + Version = "1.0", + Description = [[ Main trail of Neptune. Data from NASA Spice (see base spice asset)]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license", + Identifiers = {"NeptuneTrail"} } diff --git a/data/assets/scene/solarsystem/planets/neptune/trail_earth.asset b/data/assets/scene/solarsystem/planets/neptune/trail_earth.asset index 9757c78023..93b96735a5 100644 --- a/data/assets/scene/solarsystem/planets/neptune/trail_earth.asset +++ b/data/assets/scene/solarsystem/planets/neptune/trail_earth.asset @@ -6,39 +6,39 @@ asset.require("spice/base") local NeptuneTrailEarth = { - Identifier = "NeptuneTrailEarth", - Parent = earthTransforms.EarthBarycenter.Identifier, - Renderable = { - Type = "RenderableTrailOrbit", - Translation = { - Type = "SpiceTranslation", - Target = "NEPTUNE BARYCENTER", - Observer = "EARTH" - }, - Color = { 1.0, 0.5, 0.2 }, - Period = 224.695, - Resolution = 1000, - Enabled = false + Identifier = "NeptuneTrailEarth", + Parent = earthTransforms.EarthBarycenter.Identifier, + Renderable = { + Type = "RenderableTrailOrbit", + Translation = { + Type = "SpiceTranslation", + Target = "NEPTUNE BARYCENTER", + Observer = "EARTH" }, - Tag = { "planetTrail_solarSystem_alt", "planetTrail_terrestrial_alt" }, - GUI = { - Name = "Neptune trail from Earth", - Path = "/Solar System/Planets/Neptune", - Hidden = false, - Description = [[ Trail of Neptune as observed by the Earth.]], - } + Color = { 1.0, 0.5, 0.2 }, + Period = 224.695, + Resolution = 1000, + Enabled = false + }, + Tag = { "planetTrail_solarSystem_alt", "planetTrail_terrestrial_alt" }, + GUI = { + Name = "Neptune trail from Earth", + Path = "/Solar System/Planets/Neptune", + Hidden = false, + Description = [[ Trail of Neptune as observed by the Earth.]], + } } assetHelper.registerSceneGraphNodesAndExport(asset, { NeptuneTrailEarth }) asset.meta = { - Name = "Neptune Trail from Earth", - Version = "1.0", - Description = [[ Alternate trail of Neptune, as observed by the Earth rather then the - Sun.]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"VenusTrailEarth"} + Name = "Neptune Trail from Earth", + Version = "1.0", + Description = [[ Alternate trail of Neptune, as observed by the Earth rather then the + Sun.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license", + Identifiers = {"VenusTrailEarth"} } diff --git a/data/assets/scene/solarsystem/planets/neptune/transforms.asset b/data/assets/scene/solarsystem/planets/neptune/transforms.asset index be9a959e1a..ede2678dbd 100644 --- a/data/assets/scene/solarsystem/planets/neptune/transforms.asset +++ b/data/assets/scene/solarsystem/planets/neptune/transforms.asset @@ -3,32 +3,32 @@ local sun_transforms_asset = asset.require('scene/solarsystem/sun/transforms') asset.require("spice/base") local NeptuneBarycenter = { - Identifier = "NeptuneBarycenter", - Parent = sun_transforms_asset.SolarSystemBarycenter.Identifier, - Transform = { - Translation = { - Type = "SpiceTranslation", - Target = "NEPTUNE BARYCENTER", - Observer = "SUN" - } - }, - GUI = { - Name = "Neptune Barycenter", - Path = "/Solar System/Planets/Neptune", - Hidden = true, - Description = [[ Neptune Barycenter position]], + Identifier = "NeptuneBarycenter", + Parent = sun_transforms_asset.SolarSystemBarycenter.Identifier, + Transform = { + Translation = { + Type = "SpiceTranslation", + Target = "NEPTUNE BARYCENTER", + Observer = "SUN" } + }, + GUI = { + Name = "Neptune Barycenter", + Path = "/Solar System/Planets/Neptune", + Hidden = true, + Description = [[ Neptune Barycenter position]], + } } assetHelper.registerSceneGraphNodesAndExport(asset, { NeptuneBarycenter }) asset.meta = { - Name = "Neptune Transforms", - Version = "1.0", - Description = [[ Neptune Barycenter transform]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"NeptuneBarycenter"} + Name = "Neptune Transforms", + Version = "1.0", + Description = [[ Neptune Barycenter transform]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license", + Identifiers = {"NeptuneBarycenter"} } diff --git a/data/assets/scene/solarsystem/planets/neptune/triton.asset b/data/assets/scene/solarsystem/planets/neptune/triton.asset index 3b796b74ad..8dec8708d0 100644 --- a/data/assets/scene/solarsystem/planets/neptune/triton.asset +++ b/data/assets/scene/solarsystem/planets/neptune/triton.asset @@ -6,36 +6,36 @@ local kernel = asset.require('./kernels').nep081 local Triton = { - Identifier = "Triton", - Parent = { - Identifier = transforms.NeptuneBarycenter.Identifier, - Spice = "NEPTUNE BARYCENTER" - }, - Spice = "TRITON", - Radii = { 2709000, 2706000, 2705000 }, - Tags = { "moon_solarSystem", "moon_giants", "moon_neptune" }, - TrailTags = { "moonTrail_solarSystem", "moonTrail_giants", "moonTrail_neptune" }, - GUI = { - Path = "/Solar System/Planets/Neptune/Moons/Irregular Prograde Moons" - }, - TrailColor = { 0.2, 0.5, 0.75 }, - OrbitPeriod = 5.877, - Kernels = kernel + Identifier = "Triton", + Parent = { + Identifier = transforms.NeptuneBarycenter.Identifier, + Spice = "NEPTUNE BARYCENTER" + }, + Spice = "TRITON", + Radii = { 2709000, 2706000, 2705000 }, + Tags = { "moon_solarSystem", "moon_giants", "moon_neptune" }, + TrailTags = { "moonTrail_solarSystem", "moonTrail_giants", "moonTrail_neptune" }, + GUI = { + Path = "/Solar System/Planets/Neptune/Moons/Irregular Prograde Moons" + }, + TrailColor = { 0.2, 0.5, 0.75 }, + OrbitPeriod = 5.877, + Kernels = kernel } assetHelper.registerSceneGraphNodesAndExport( - asset, - proceduralGlobes.createGlobes({ Triton }) + asset, + proceduralGlobes.createGlobes({ Triton }) ) asset.meta = { - Name = "Triton", - Version = "1.0", - Description = [[ Procedural Globe asset containing Neptune's moon: Triton. - A blank globe and SPICE trail are generated for the moon.]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"Triton"} + Name = "Triton", + Version = "1.0", + Description = [[ Procedural Globe asset containing Neptune's moon: Triton. + A blank globe and SPICE trail are generated for the moon.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license", + Identifiers = {"Triton"} } diff --git a/data/assets/scene/solarsystem/planets/planets.asset b/data/assets/scene/solarsystem/planets/planets.asset index 2c80f258c5..1b6fac78fc 100644 --- a/data/assets/scene/solarsystem/planets/planets.asset +++ b/data/assets/scene/solarsystem/planets/planets.asset @@ -31,10 +31,10 @@ asset.require('./neptune/major_moons') asset.meta = { - Name = "Planets", - Version = "1.0", - Description = [[ Collection of planets in the solar system ]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license" + Name = "Planets", + Version = "1.0", + Description = [[ Collection of planets in the solar system ]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/saturn/default_layers.asset b/data/assets/scene/solarsystem/planets/saturn/default_layers.asset index c447b26495..897c4f114d 100644 --- a/data/assets/scene/solarsystem/planets/saturn/default_layers.asset +++ b/data/assets/scene/solarsystem/planets/saturn/default_layers.asset @@ -5,15 +5,15 @@ local colorLayer = asset.require(colorLayersPath .. "/saturn_texture") -- Set enabled layers (temporary solution) -- @TODO: do this using a boolean that's passed to the 'asset.require' instead asset.onInitialize(function () - openspace.setPropertyValueSingle("Scene.Saturn.Renderable.Layers.ColorLayers." .. colorLayer.layer.Identifier .. ".Enabled", true) + openspace.setPropertyValueSingle("Scene.Saturn.Renderable.Layers.ColorLayers." .. colorLayer.layer.Identifier .. ".Enabled", true) end) asset.meta = { - Name = "Default Saturn Layers", - Version = "1.0", - Description = [[ Default Saturn layers are: Saturn texture]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license" + Name = "Default Saturn Layers", + Version = "1.0", + Description = [[ Default Saturn layers are: Saturn texture]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/saturn/dione/default_layers.asset b/data/assets/scene/solarsystem/planets/saturn/dione/default_layers.asset index 32b2f9c147..d68bb5c002 100644 --- a/data/assets/scene/solarsystem/planets/saturn/dione/default_layers.asset +++ b/data/assets/scene/solarsystem/planets/saturn/dione/default_layers.asset @@ -5,16 +5,16 @@ local colorLayer = asset.require(colorLayersPath .. "/dione_texture") -- Set enabled layers (temporary solution) -- @TODO: do this using a boolean that's passed to the 'asset.require' instead asset.onInitialize(function () - openspace.setPropertyValueSingle("Scene.Dione.Renderable.Layers.ColorLayers." .. - colorLayer.layer.Identifier .. ".Enabled", true) + openspace.setPropertyValueSingle("Scene.Dione.Renderable.Layers.ColorLayers." .. + colorLayer.layer.Identifier .. ".Enabled", true) end) asset.meta = { - Name = "Default Dione Layers", - Version = "1.0", - Description = [[ Default Dione layers are: Dione Texture]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license" + Name = "Default Dione Layers", + Version = "1.0", + Description = [[ Default Dione layers are: Dione Texture]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/saturn/dione/dione.asset b/data/assets/scene/solarsystem/planets/saturn/dione/dione.asset index 34b711430c..1cce3d7e20 100644 --- a/data/assets/scene/solarsystem/planets/saturn/dione/dione.asset +++ b/data/assets/scene/solarsystem/planets/saturn/dione/dione.asset @@ -5,58 +5,58 @@ asset.require('./trail') local labelsPath = asset.require('../saturn_globelabels').LabelsPath local Dione = { - Identifier = "Dione", - Parent = transforms.SaturnBarycenter.Identifier, - Transform = { - Translation = { - Type = "SpiceTranslation", - Target = "DIONE", - Observer = "SATURN BARYCENTER", - Kernels = kernel - }, - Rotation = { - Type = "SpiceRotation", - SourceFrame = "IAU_ENCELADUS", - DestinationFrame = "GALACTIC" - } - }, - Renderable = { - Type = "RenderableGlobe", - Radii = 561400, - SegmentsPerPatch = 64, - Layers = {}, - Labels = { - Enable = false, - FileName = labelsPath .. "/dione.labels", - LabelAlignmentOption = "Horizontally", -- or Circularly - LabelsFontSize = 32.0, - LabelsSize = 8.0, - LabelsMinSize = 1.0, - LabelsMaxSize = 1500.0, - ProximityEnabled = false, - LabelsFadeInEnabled = true, - LabelsFadeOutEnabled = true, - FadeInStartingDistance = 3500000.0, - FadeOutStartingDistance = 1000000.0, - LabelsForceDomeRendering = true, - LabelsDistanceEPS = 200000.0, - LabelsColor = { 1.0, 1.0, 0.0 } - } + Identifier = "Dione", + Parent = transforms.SaturnBarycenter.Identifier, + Transform = { + Translation = { + Type = "SpiceTranslation", + Target = "DIONE", + Observer = "SATURN BARYCENTER", + Kernels = kernel }, - Tag = { "moon_solarSystem", "moon_giants", "moon_saturn" }, - GUI = { - Path = "/Solar System/Planets/Saturn/Moons" + Rotation = { + Type = "SpiceRotation", + SourceFrame = "IAU_ENCELADUS", + DestinationFrame = "GALACTIC" } + }, + Renderable = { + Type = "RenderableGlobe", + Radii = 561400, + SegmentsPerPatch = 64, + Layers = {}, + Labels = { + Enable = false, + FileName = labelsPath .. "/dione.labels", + LabelAlignmentOption = "Horizontally", -- or Circularly + LabelsFontSize = 32.0, + LabelsSize = 8.0, + LabelsMinSize = 1.0, + LabelsMaxSize = 1500.0, + ProximityEnabled = false, + LabelsFadeInEnabled = true, + LabelsFadeOutEnabled = true, + FadeInStartingDistance = 3500000.0, + FadeOutStartingDistance = 1000000.0, + LabelsForceDomeRendering = true, + LabelsDistanceEPS = 200000.0, + LabelsColor = { 1.0, 1.0, 0.0 } + } + }, + Tag = { "moon_solarSystem", "moon_giants", "moon_saturn" }, + GUI = { + Path = "/Solar System/Planets/Saturn/Moons" + } } assetHelper.registerSceneGraphNodesAndExport(asset, { Dione }) asset.meta = { - Name = "Dione", - Version = "1.0", - Description = [[ Dione globe with labels]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license" + Name = "Dione", + Version = "1.0", + Description = [[ Dione globe with labels]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/saturn/dione/layers/colorlayers/dione_texture.asset b/data/assets/scene/solarsystem/planets/saturn/dione/layers/colorlayers/dione_texture.asset index c1ba6585d7..8f58e9f7d2 100644 --- a/data/assets/scene/solarsystem/planets/saturn/dione/layers/colorlayers/dione_texture.asset +++ b/data/assets/scene/solarsystem/planets/saturn/dione/layers/colorlayers/dione_texture.asset @@ -2,22 +2,22 @@ local texturesPath = asset.require("./../../dione_textures").TexturesPath local globeIdentifier = asset.require("./../../dione").Dione.Identifier local layer = { - Identifier = "Texture", - FilePath = texturesPath .. "/dione.jpg", + Identifier = "Texture", + FilePath = texturesPath .. "/dione.jpg", } asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) asset.export("layer", layer) asset.meta = { - Name = "Dione Texutre", - Version = "1.0", - Description = [[ Default jpg texture for Dione]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license" + Name = "Dione Texutre", + Version = "1.0", + Description = [[ Default jpg texture for Dione]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/saturn/dione/trail.asset b/data/assets/scene/solarsystem/planets/saturn/dione/trail.asset index c94b6799ab..3b2f8a2d60 100644 --- a/data/assets/scene/solarsystem/planets/saturn/dione/trail.asset +++ b/data/assets/scene/solarsystem/planets/saturn/dione/trail.asset @@ -5,36 +5,36 @@ local kernel = asset.require('../kernels').sat375 local DioneTrail = { - Identifier = "DioneTrail", - Parent = transforms.SaturnBarycenter.Identifier, - Renderable = { - Type = "RenderableTrailOrbit", - Translation = { - Type = "SpiceTranslation", - Target = "DIONE", - Observer = "SATURN BARYCENTER", - Kernels = kernel - }, - Color = { 0.5, 0.3, 0.3 }, - Period = 66.0 / 24.0, - Resolution = 1000 + Identifier = "DioneTrail", + Parent = transforms.SaturnBarycenter.Identifier, + Renderable = { + Type = "RenderableTrailOrbit", + Translation = { + Type = "SpiceTranslation", + Target = "DIONE", + Observer = "SATURN BARYCENTER", + Kernels = kernel }, - Tag = { "moonTrail_solarSystem", "moonTrail_giants", "moonTrail_saturn" }, - GUI = { - Name = "Dione Trail", - Path = "/Solar System/Planets/Saturn/Moons", - Description = [[ Trail of Saturn's moon Dione as observed by Saturn]], - } + Color = { 0.5, 0.3, 0.3 }, + Period = 66.0 / 24.0, + Resolution = 1000 + }, + Tag = { "moonTrail_solarSystem", "moonTrail_giants", "moonTrail_saturn" }, + GUI = { + Name = "Dione Trail", + Path = "/Solar System/Planets/Saturn/Moons", + Description = [[ Trail of Saturn's moon Dione as observed by Saturn]], + } } assetHelper.registerSceneGraphNodesAndExport(asset, { DioneTrail }) asset.meta = { - Name = "Dione Trail", - Version = "1.0", - Description = [[ Trail for Dione. Data from NASA Spice (see base spice asset)]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license" + Name = "Dione Trail", + Version = "1.0", + Description = [[ Trail for Dione. Data from NASA Spice (see base spice asset)]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/saturn/enceladus/default_layers.asset b/data/assets/scene/solarsystem/planets/saturn/enceladus/default_layers.asset index 289882ed7f..f488cfd5b7 100644 --- a/data/assets/scene/solarsystem/planets/saturn/enceladus/default_layers.asset +++ b/data/assets/scene/solarsystem/planets/saturn/enceladus/default_layers.asset @@ -6,17 +6,17 @@ local colorLayer = asset.require(colorLayersPath .. "/global_mosaic_100m_hpf") -- Set enabled layers (temporary solution) -- @TODO: do this using a boolean that's passed to the 'asset.require' instead asset.onInitialize(function () - openspace.setPropertyValueSingle("Scene.Enceladus.Renderable.Layers.ColorLayers." .. - colorLayer.layer.Identifier .. ".Enabled", true) + openspace.setPropertyValueSingle("Scene.Enceladus.Renderable.Layers.ColorLayers." .. + colorLayer.layer.Identifier .. ".Enabled", true) end) asset.meta = { - Name = "Default Enceladus Layers", - Version = "1.0", - Description = [[ Default Enceladus layers are: Enceladus Texture and Cassini Global - Mosaic 100m HPF]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license" + Name = "Default Enceladus Layers", + Version = "1.0", + Description = [[ Default Enceladus layers are: Enceladus Texture and Cassini Global + Mosaic 100m HPF]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/saturn/enceladus/enceladus.asset b/data/assets/scene/solarsystem/planets/saturn/enceladus/enceladus.asset index 4dd5e1cff5..1f16f3f0bb 100644 --- a/data/assets/scene/solarsystem/planets/saturn/enceladus/enceladus.asset +++ b/data/assets/scene/solarsystem/planets/saturn/enceladus/enceladus.asset @@ -5,50 +5,50 @@ asset.require('./trail') local labelsPath = asset.require('../saturn_globelabels').LabelsPath local Enceladus = { - Identifier = "Enceladus", - Parent = transforms.SaturnBarycenter.Identifier, - Transform = { - Translation = { - Type = "SpiceTranslation", - Target = "ENCELADUS", - Observer = "SATURN BARYCENTER", - Kernels = kernel - }, - Rotation = { - Type = "SpiceRotation", - SourceFrame = "IAU_ENCELADUS", - DestinationFrame = "GALACTIC" - } - }, - Renderable = { - Type = "RenderableGlobe", - Radii = 252000, - SegmentsPerPatch = 64, - Layers = {}, - Labels = { - Enable = false, - FileName = labelsPath .. "/enceladus.labels", - LabelAlignmentOption = "Horizontally", -- or Circularly - LabelsFontSize = 22.0, - LabelsSize = 8.0, - LabelsMinSize = 1.0, - LabelsMaxSize = 1500.0, - ProximityEnabled = false, - LabelsFadeInEnabled = true, - LabelsFadeOutEnabled = true, - FadeInStartingDistance = 1000000.0, - FadeOutStartingDistance = 500000.0, - LabelsForceDomeRendering = true, - LabelsDistanceEPS = 100000.0, - LabelsColor = { 1.0, 1.0, 0.0 } - } + Identifier = "Enceladus", + Parent = transforms.SaturnBarycenter.Identifier, + Transform = { + Translation = { + Type = "SpiceTranslation", + Target = "ENCELADUS", + Observer = "SATURN BARYCENTER", + Kernels = kernel }, - Tag = { "moon_solarSystem", "moon_giants", "moon_saturn" }, - GUI = { - Name = "Enceladus", - Path = "/Solar System/Planets/Saturn/Moons", - Description = [[ Enceladus globe with labels]], + Rotation = { + Type = "SpiceRotation", + SourceFrame = "IAU_ENCELADUS", + DestinationFrame = "GALACTIC" } + }, + Renderable = { + Type = "RenderableGlobe", + Radii = 252000, + SegmentsPerPatch = 64, + Layers = {}, + Labels = { + Enable = false, + FileName = labelsPath .. "/enceladus.labels", + LabelAlignmentOption = "Horizontally", -- or Circularly + LabelsFontSize = 22.0, + LabelsSize = 8.0, + LabelsMinSize = 1.0, + LabelsMaxSize = 1500.0, + ProximityEnabled = false, + LabelsFadeInEnabled = true, + LabelsFadeOutEnabled = true, + FadeInStartingDistance = 1000000.0, + FadeOutStartingDistance = 500000.0, + LabelsForceDomeRendering = true, + LabelsDistanceEPS = 100000.0, + LabelsColor = { 1.0, 1.0, 0.0 } + } + }, + Tag = { "moon_solarSystem", "moon_giants", "moon_saturn" }, + GUI = { + Name = "Enceladus", + Path = "/Solar System/Planets/Saturn/Moons", + Description = [[ Enceladus globe with labels]] + } } assetHelper.registerSceneGraphNodesAndExport(asset, { Enceladus }) diff --git a/data/assets/scene/solarsystem/planets/saturn/enceladus/enceladus_textures.asset b/data/assets/scene/solarsystem/planets/saturn/enceladus/enceladus_textures.asset index bec59acc1e..39beb256b2 100644 --- a/data/assets/scene/solarsystem/planets/saturn/enceladus/enceladus_textures.asset +++ b/data/assets/scene/solarsystem/planets/saturn/enceladus/enceladus_textures.asset @@ -1,7 +1,7 @@ local TexturesPath = asset.syncedResource({ - Name = "Enceladus textures", - Type = "HttpSynchronization", - Identifier = "enceladus_textures", - Version = 1 + Name = "Enceladus textures", + Type = "HttpSynchronization", + Identifier = "enceladus_textures", + Version = 1 }) asset.export("TexturesPath", TexturesPath) diff --git a/data/assets/scene/solarsystem/planets/saturn/enceladus/layers/colorlayers/enceladus_texture.asset b/data/assets/scene/solarsystem/planets/saturn/enceladus/layers/colorlayers/enceladus_texture.asset index 41b14b81c5..cb60a5f6f4 100644 --- a/data/assets/scene/solarsystem/planets/saturn/enceladus/layers/colorlayers/enceladus_texture.asset +++ b/data/assets/scene/solarsystem/planets/saturn/enceladus/layers/colorlayers/enceladus_texture.asset @@ -2,22 +2,22 @@ local texturesPath = asset.require("./../../enceladus_textures").TexturesPath local globeIdentifier = asset.require("./../../enceladus").Enceladus.Identifier local layer = { - Identifier = "Texture", - FilePath = texturesPath .. "/enceladus.jpg", + Identifier = "Texture", + FilePath = texturesPath .. "/enceladus.jpg", } asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) asset.export("layer", layer) asset.meta = { - Name = "Enceladus Texutre", - Version = "1.0", - Description = [[ Default jpg texture for Enceladus]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license" + Name = "Enceladus Texutre", + Version = "1.0", + Description = [[ Default jpg texture for Enceladus]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/saturn/enceladus/layers/colorlayers/global_mosaic_100m_hpf.asset b/data/assets/scene/solarsystem/planets/saturn/enceladus/layers/colorlayers/global_mosaic_100m_hpf.asset index d8a3e6dc5d..861e113338 100644 --- a/data/assets/scene/solarsystem/planets/saturn/enceladus/layers/colorlayers/global_mosaic_100m_hpf.asset +++ b/data/assets/scene/solarsystem/planets/saturn/enceladus/layers/colorlayers/global_mosaic_100m_hpf.asset @@ -2,32 +2,32 @@ local mapServiceConfigs = asset.localResource("./../../map_service_configs") local globeIdentifier = asset.require("./../../enceladus").Enceladus.Identifier local layer = { - Identifier = "Global_Mosaic_100m_HPF", - Name = "Cassini Global Mosaic 100m HPF", - FilePath = mapServiceConfigs .. "/Cassini_ISS_Global_Mosaic_100m_HPF.wms", - Description = [[ This mosaic represents the completion of a global control network of - Enceladus containing Cassini Imaging Science Subsystem (ISS) images. A total of - 586 images in CLR, GRN, UV3, and IR3 filters were selected for the control - network. The image selection criteria were based on coverage, quality, and a - spatial resolution between 50 and 500 meters per pixel (m) with phase angles less - than 120 degrees. (Description from URL).]] + Identifier = "Global_Mosaic_100m_HPF", + Name = "Cassini Global Mosaic 100m HPF", + FilePath = mapServiceConfigs .. "/Cassini_ISS_Global_Mosaic_100m_HPF.wms", + Description = [[ This mosaic represents the completion of a global control network of + Enceladus containing Cassini Imaging Science Subsystem (ISS) images. A total of + 586 images in CLR, GRN, UV3, and IR3 filters were selected for the control + network. The image selection criteria were based on coverage, quality, and a + spatial resolution between 50 and 500 meters per pixel (m) with phase angles less + than 120 degrees. (Description from URL).]] } asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) asset.export("layer", layer) asset.meta = { - Name = "Cassini Global Mosaic 100m HPF", - Version = "1.0", - Description = [[ Cassini Global mosaic for Enceladus. This map is hosted on the - OpenSpace server Sweden.]], - Author = "USGS", - URL = "https://astrogeology.usgs.gov/search/map/Enceladus/Cassini/" .. - "Enceladus_Cassini_ISS_Global_Mosaic_100m_HPF", - License = "NASA/PDS", - Identifiers = {"Global_Mosaic_100m_HPF"} + Name = "Cassini Global Mosaic 100m HPF", + Version = "1.0", + Description = [[ Cassini Global mosaic for Enceladus. This map is hosted on the + OpenSpace server Sweden.]], + Author = "USGS", + URL = "https://astrogeology.usgs.gov/search/map/Enceladus/Cassini/" .. + "Enceladus_Cassini_ISS_Global_Mosaic_100m_HPF", + License = "NASA/PDS", + Identifiers = {"Global_Mosaic_100m_HPF"} } diff --git a/data/assets/scene/solarsystem/planets/saturn/enceladus/trail.asset b/data/assets/scene/solarsystem/planets/saturn/enceladus/trail.asset index df92c063be..df798fc9bb 100644 --- a/data/assets/scene/solarsystem/planets/saturn/enceladus/trail.asset +++ b/data/assets/scene/solarsystem/planets/saturn/enceladus/trail.asset @@ -5,37 +5,37 @@ local kernel = asset.require('../kernels').sat375 local EnceladusTrail = { - Identifier = "EnceladusTrail", - Parent = transforms.SaturnBarycenter.Identifier, - Renderable = { - Type = "RenderableTrailOrbit", - Translation = { - Type = "SpiceTranslation", - Target = "ENCELADUS", - Observer = "SATURN BARYCENTER", - Kernels = kernel - }, - Color = { 0.5, 0.3, 0.3 }, - Period = 33.0 / 24.0, - Resolution = 1000 + Identifier = "EnceladusTrail", + Parent = transforms.SaturnBarycenter.Identifier, + Renderable = { + Type = "RenderableTrailOrbit", + Translation = { + Type = "SpiceTranslation", + Target = "ENCELADUS", + Observer = "SATURN BARYCENTER", + Kernels = kernel }, - Tag = { "moonTrail_solarSystem", "moonTrail_giants", "moonTrail_saturn" }, - GUI = { - Name = "Enceladus Trail", - Path = "/Solar System/Planets/Saturn/Moons", - Description = [[ Trail of Saturn's moon Enceladus as observed by Saturn.]], - } + Color = { 0.5, 0.3, 0.3 }, + Period = 33.0 / 24.0, + Resolution = 1000 + }, + Tag = { "moonTrail_solarSystem", "moonTrail_giants", "moonTrail_saturn" }, + GUI = { + Name = "Enceladus Trail", + Path = "/Solar System/Planets/Saturn/Moons", + Description = [[ Trail of Saturn's moon Enceladus as observed by Saturn.]], + } } assetHelper.registerSceneGraphNodesAndExport(asset, { EnceladusTrail }) asset.meta = { - Name = "Enceladus Trail", - Version = "1.0", - Description = [[ Trail for Enceladus. Data from NASA Spice (see base spice asset)]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"EnceladusTrail"} + Name = "Enceladus Trail", + Version = "1.0", + Description = [[ Trail for Enceladus. Data from NASA Spice (see base spice asset)]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license", + Identifiers = {"EnceladusTrail"} } diff --git a/data/assets/scene/solarsystem/planets/saturn/hyperion/hyperion.asset b/data/assets/scene/solarsystem/planets/saturn/hyperion/hyperion.asset index 14dcdd94e2..77fe207be1 100644 --- a/data/assets/scene/solarsystem/planets/saturn/hyperion/hyperion.asset +++ b/data/assets/scene/solarsystem/planets/saturn/hyperion/hyperion.asset @@ -5,59 +5,59 @@ asset.require('./trail') local labelsPath = asset.require('../saturn_globelabels').LabelsPath local Hyperion = { - Identifier = "Hyperion", - Parent = transforms.SaturnBarycenter.Identifier, - Transform = { - Translation = { - Type = "SpiceTranslation", - Target = "HYPERION", - Observer = "SATURN BARYCENTER", - Kernels = kernel - } - --[[ - The IAU report does not give an orientation model for Hyperion. - Hyperion's rotation is in chaotic and is not predictable for - long periods. - ]]-- - }, - Renderable = { - Type = "RenderableGlobe", - Radii = { 360200, 266000, 205400}, - SegmentsPerPatch = 64, - Layers = {}, - Labels = { - Enable = false, - FileName = labelsPath .. "/hyperion.labels", - LabelAlignmentOption = "Horizontally", -- or Circularly - LabelsFontSize = 14.0, - LabelsSize = 8.0, - LabelsMinSize = 1.0, - LabelsMaxSize = 1500.0, - ProximityEnabled = false, - LabelsFadeInEnabled = true, - FadeInStartingDistance = 500000.0, - FadeOutStartingDistance = 1000000.0, - LabelsForceDomeRendering = true, - LabelsDistanceEPS = 1350000.0, - LabelsColor = { 1.0, 1.0, 0.0 } - } - }, - Tag = { "moon_solarSystem", "moon_giants", "moon_saturn" }, - GUI = { - Name = "Hyperion", - Path = "/Solar System/Planets/Saturn/Moons" + Identifier = "Hyperion", + Parent = transforms.SaturnBarycenter.Identifier, + Transform = { + Translation = { + Type = "SpiceTranslation", + Target = "HYPERION", + Observer = "SATURN BARYCENTER", + Kernels = kernel } + --[[ + The IAU report does not give an orientation model for Hyperion. + Hyperion's rotation is in chaotic and is not predictable for + long periods. + ]]-- + }, + Renderable = { + Type = "RenderableGlobe", + Radii = { 360200, 266000, 205400}, + SegmentsPerPatch = 64, + Layers = {}, + Labels = { + Enable = false, + FileName = labelsPath .. "/hyperion.labels", + LabelAlignmentOption = "Horizontally", -- or Circularly + LabelsFontSize = 14.0, + LabelsSize = 8.0, + LabelsMinSize = 1.0, + LabelsMaxSize = 1500.0, + ProximityEnabled = false, + LabelsFadeInEnabled = true, + FadeInStartingDistance = 500000.0, + FadeOutStartingDistance = 1000000.0, + LabelsForceDomeRendering = true, + LabelsDistanceEPS = 1350000.0, + LabelsColor = { 1.0, 1.0, 0.0 } + } + }, + Tag = { "moon_solarSystem", "moon_giants", "moon_saturn" }, + GUI = { + Name = "Hyperion", + Path = "/Solar System/Planets/Saturn/Moons" + } } assetHelper.registerSceneGraphNodesAndExport(asset, { Hyperion }) asset.meta = { - Name = "Hyperion", - Version = "1.0", - Description = [[ Hyperion globe with labels]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"Hyperion"} + Name = "Hyperion", + Version = "1.0", + Description = [[ Hyperion globe with labels]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license", + Identifiers = {"Hyperion"} } diff --git a/data/assets/scene/solarsystem/planets/saturn/hyperion/trail.asset b/data/assets/scene/solarsystem/planets/saturn/hyperion/trail.asset index 42ef03180e..a250809874 100644 --- a/data/assets/scene/solarsystem/planets/saturn/hyperion/trail.asset +++ b/data/assets/scene/solarsystem/planets/saturn/hyperion/trail.asset @@ -5,37 +5,37 @@ local kernel = asset.require('../kernels').sat375 local HyperionTrail = { - Identifier = "HyperionTrail", - Parent = transforms.SaturnBarycenter.Identifier, - Renderable = { - Type = "RenderableTrailOrbit", - Translation = { - Type = "SpiceTranslation", - Target = "HYPERION", - Observer = "SATURN BARYCENTER", - Kernels = kernel - }, - Color = { 0.5, 0.3, 0.3 }, - Period = 21.276, - Resolution = 1000 + Identifier = "HyperionTrail", + Parent = transforms.SaturnBarycenter.Identifier, + Renderable = { + Type = "RenderableTrailOrbit", + Translation = { + Type = "SpiceTranslation", + Target = "HYPERION", + Observer = "SATURN BARYCENTER", + Kernels = kernel }, - Tag = { "moonTrail_solarSystem", "moonTrail_giants", "moonTrail_saturn" }, - GUI = { - Name = "Hyperion Trail", - Path = "/Solar System/Planets/Saturn/Moons" - } + Color = { 0.5, 0.3, 0.3 }, + Period = 21.276, + Resolution = 1000 + }, + Tag = { "moonTrail_solarSystem", "moonTrail_giants", "moonTrail_saturn" }, + GUI = { + Name = "Hyperion Trail", + Path = "/Solar System/Planets/Saturn/Moons" + } } assetHelper.registerSceneGraphNodesAndExport(asset, { HyperionTrail }) asset.meta = { - Name = "Hyperion Trail", - Version = "1.0", - Description = [[ Trail of Saturn's moon Hyperion as observed by Saturn. Data from NASA - Spice (see base spice asset)]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"HyperionTrail"} + Name = "Hyperion Trail", + Version = "1.0", + Description = [[ Trail of Saturn's moon Hyperion as observed by Saturn. Data from NASA + Spice (see base spice asset)]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license", + Identifiers = {"HyperionTrail"} } diff --git a/data/assets/scene/solarsystem/planets/saturn/iapetus/default_layers.asset b/data/assets/scene/solarsystem/planets/saturn/iapetus/default_layers.asset index 22bd2e4002..9371e07f55 100644 --- a/data/assets/scene/solarsystem/planets/saturn/iapetus/default_layers.asset +++ b/data/assets/scene/solarsystem/planets/saturn/iapetus/default_layers.asset @@ -5,16 +5,16 @@ local colorLayer = asset.require(colorLayersPath .. "/iapetus_texture") -- Set enabled layers (temporary solution) -- @TODO: do this using a boolean that's passed to the 'asset.require' instead asset.onInitialize(function () - openspace.setPropertyValueSingle("Scene.Iapetus.Renderable.Layers.ColorLayers." .. - colorLayer.layer.Identifier .. ".Enabled", true) + openspace.setPropertyValueSingle("Scene.Iapetus.Renderable.Layers.ColorLayers." .. + colorLayer.layer.Identifier .. ".Enabled", true) end) asset.meta = { - Name = "Default Iapetus Layers", - Version = "1.0", - Description = [[ Default Iapetus layers are: Iapetus Texture]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license" + Name = "Default Iapetus Layers", + Version = "1.0", + Description = [[ Default Iapetus layers are: Iapetus Texture]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/saturn/iapetus/iapetus.asset b/data/assets/scene/solarsystem/planets/saturn/iapetus/iapetus.asset index fbe22a9aec..5a33262237 100644 --- a/data/assets/scene/solarsystem/planets/saturn/iapetus/iapetus.asset +++ b/data/assets/scene/solarsystem/planets/saturn/iapetus/iapetus.asset @@ -5,50 +5,50 @@ asset.require('./trail') local labelsPath = asset.require('../saturn_globelabels').LabelsPath local Iapetus = { - Identifier = "Iapetus", - Parent = transforms.SaturnBarycenter.Identifier, - Transform = { - Translation = { - Type = "SpiceTranslation", - Target = "IAPETUS", - Observer = "SATURN BARYCENTER", - Kernels = kernel - }, - Rotation = { - Type = "SpiceRotation", - SourceFrame = "IAU_IAPETUS", - DestinationFrame = "GALACTIC" - } + Identifier = "Iapetus", + Parent = transforms.SaturnBarycenter.Identifier, + Transform = { + Translation = { + Type = "SpiceTranslation", + Target = "IAPETUS", + Observer = "SATURN BARYCENTER", + Kernels = kernel }, - Renderable = { - Type = "RenderableGlobe", - Radii = 734000, - SegmentsPerPatch = 64, - Layers = {}, - Labels = { - Enable = false, - FileName = labelsPath .. "/iapetus.labels", - LabelAlignmentOption = "Horizontally", -- or Circularly - LabelsFontSize = 30.0, - LabelsSize = 8.0, - LabelsMinSize = 1.0, - LabelsMaxSize = 1500.0, - ProximityEnabled = false, - LabelsFadeInEnabled = true, - LabelsFadeOutEnabled = true, - FadeInStartingDistance = 3500000.0, - FadeOutStartingDistance = 600000.0, - LabelsForceDomeRendering = true, - LabelsDistanceEPS = 250000.0, - LabelsColor = { 1.0, 1.0, 0.0 } - } - }, - Tag = { "moon_solarSystem", "moon_giants", "moon_saturn" }, - GUI = { - Name = "Iapetus", - Path = "/Solar System/Planets/Saturn/Moons", - Description = [[Third largest moon of Saturn. ]] + Rotation = { + Type = "SpiceRotation", + SourceFrame = "IAU_IAPETUS", + DestinationFrame = "GALACTIC" } + }, + Renderable = { + Type = "RenderableGlobe", + Radii = 734000, + SegmentsPerPatch = 64, + Layers = {}, + Labels = { + Enable = false, + FileName = labelsPath .. "/iapetus.labels", + LabelAlignmentOption = "Horizontally", -- or Circularly + LabelsFontSize = 30.0, + LabelsSize = 8.0, + LabelsMinSize = 1.0, + LabelsMaxSize = 1500.0, + ProximityEnabled = false, + LabelsFadeInEnabled = true, + LabelsFadeOutEnabled = true, + FadeInStartingDistance = 3500000.0, + FadeOutStartingDistance = 600000.0, + LabelsForceDomeRendering = true, + LabelsDistanceEPS = 250000.0, + LabelsColor = { 1.0, 1.0, 0.0 } + } + }, + Tag = { "moon_solarSystem", "moon_giants", "moon_saturn" }, + GUI = { + Name = "Iapetus", + Path = "/Solar System/Planets/Saturn/Moons", + Description = [[Third largest moon of Saturn.]] + } } assetHelper.registerSceneGraphNodesAndExport(asset, { Iapetus }) diff --git a/data/assets/scene/solarsystem/planets/saturn/iapetus/iapetus_textures.asset b/data/assets/scene/solarsystem/planets/saturn/iapetus/iapetus_textures.asset index da00c7b4c7..f1446cdb56 100644 --- a/data/assets/scene/solarsystem/planets/saturn/iapetus/iapetus_textures.asset +++ b/data/assets/scene/solarsystem/planets/saturn/iapetus/iapetus_textures.asset @@ -1,7 +1,7 @@ local TexturesPath = asset.syncedResource({ - Name = "Iapetus textures", - Type = "HttpSynchronization", - Identifier = "iapetus_textures", - Version = 1 + Name = "Iapetus textures", + Type = "HttpSynchronization", + Identifier = "iapetus_textures", + Version = 1 }) asset.export("TexturesPath", TexturesPath) diff --git a/data/assets/scene/solarsystem/planets/saturn/iapetus/layers/colorlayers/iapetus_texture.asset b/data/assets/scene/solarsystem/planets/saturn/iapetus/layers/colorlayers/iapetus_texture.asset index 18015a6441..d90c500f5f 100644 --- a/data/assets/scene/solarsystem/planets/saturn/iapetus/layers/colorlayers/iapetus_texture.asset +++ b/data/assets/scene/solarsystem/planets/saturn/iapetus/layers/colorlayers/iapetus_texture.asset @@ -2,22 +2,22 @@ local texturesPath = asset.require("./../../iapetus_textures").TexturesPath local globeIdentifier = asset.require("./../../iapetus").Iapetus.Identifier local layer = { - Identifier = "Texture", - FilePath = texturesPath .. "/iapetus.jpg", + Identifier = "Texture", + FilePath = texturesPath .. "/iapetus.jpg", } asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) asset.export("layer", layer) asset.meta = { - Name = "Iapetus Texutre", - Version = "1.0", - Description = [[ Default jpg texture for Iapetus]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license" + Name = "Iapetus Texutre", + Version = "1.0", + Description = [[ Default jpg texture for Iapetus]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/saturn/iapetus/trail.asset b/data/assets/scene/solarsystem/planets/saturn/iapetus/trail.asset index 21e5681294..d1c2c2218c 100644 --- a/data/assets/scene/solarsystem/planets/saturn/iapetus/trail.asset +++ b/data/assets/scene/solarsystem/planets/saturn/iapetus/trail.asset @@ -5,37 +5,37 @@ local kernel = asset.require('../kernels').sat375 local IapetusTrail = { - Identifier = "IapetusTrail", - Parent = transforms.SaturnBarycenter.Identifier, - Renderable = { - Type = "RenderableTrailOrbit", - Translation = { - Type = "SpiceTranslation", - Target = "IAPETUS", - Observer = "SATURN BARYCENTER", - Kernels = kernel - }, - Color = { 0.5, 0.3, 0.3 }, - Period = 79.0, - Resolution = 1000 + Identifier = "IapetusTrail", + Parent = transforms.SaturnBarycenter.Identifier, + Renderable = { + Type = "RenderableTrailOrbit", + Translation = { + Type = "SpiceTranslation", + Target = "IAPETUS", + Observer = "SATURN BARYCENTER", + Kernels = kernel }, - Tag = { "moonTrail_solarSystem", "moonTrail_giants", "moonTrail_saturn" }, - GUI = { - Name = "Iapetus Trail", - Path = "/Solar System/Planets/Saturn/Moons", - Description = [[ Trail of Saturn's moon Iapetus as observed by Saturn.]], - } + Color = { 0.5, 0.3, 0.3 }, + Period = 79.0, + Resolution = 1000 + }, + Tag = { "moonTrail_solarSystem", "moonTrail_giants", "moonTrail_saturn" }, + GUI = { + Name = "Iapetus Trail", + Path = "/Solar System/Planets/Saturn/Moons", + Description = [[ Trail of Saturn's moon Iapetus as observed by Saturn.]], + } } assetHelper.registerSceneGraphNodesAndExport(asset, { IapetusTrail }) asset.meta = { - Name = "Iapetus Trail", - Version = "1.0", - Description = [[Main trail for Iapetus. Data from NASA Spice (see base spice asset)]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"IapetusTrail"} + Name = "Iapetus Trail", + Version = "1.0", + Description = [[Main trail for Iapetus. Data from NASA Spice (see base spice asset)]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license", + Identifiers = {"IapetusTrail"} } diff --git a/data/assets/scene/solarsystem/planets/saturn/kernels.asset b/data/assets/scene/solarsystem/planets/saturn/kernels.asset index 04bb883e80..3c4c25eca2 100644 --- a/data/assets/scene/solarsystem/planets/saturn/kernels.asset +++ b/data/assets/scene/solarsystem/planets/saturn/kernels.asset @@ -1,8 +1,8 @@ local Kernels = asset.syncedResource({ - Name = "Saturn Spice Kernels", - Type = "HttpSynchronization", - Identifier = "saturn_kernels", - Version = 1 + Name = "Saturn Spice Kernels", + Type = "HttpSynchronization", + Identifier = "saturn_kernels", + Version = 1 }) asset.export("sat319", Kernels .. '/sat319.bsp') @@ -12,10 +12,10 @@ asset.export("sat393", Kernels .. '/sat393.bsp') asset.meta = { - Name = "Saturn Spice Kernels", - Version = "1.0", - Description = [[ Generic SPICE kernels for Saturn.]], - Author = "OpenSpace Team", - URL = "https://naif.jpl.nasa.gov/pub/naif/pds/wgc/kernels/spk/", - License = "NASA" + Name = "Saturn Spice Kernels", + Version = "1.0", + Description = [[ Generic SPICE kernels for Saturn.]], + Author = "OpenSpace Team", + URL = "https://naif.jpl.nasa.gov/pub/naif/pds/wgc/kernels/spk/", + License = "NASA" } diff --git a/data/assets/scene/solarsystem/planets/saturn/layers/colorlayers/saturn_texture.asset b/data/assets/scene/solarsystem/planets/saturn/layers/colorlayers/saturn_texture.asset index 04ae53450c..8f69e96224 100644 --- a/data/assets/scene/solarsystem/planets/saturn/layers/colorlayers/saturn_texture.asset +++ b/data/assets/scene/solarsystem/planets/saturn/layers/colorlayers/saturn_texture.asset @@ -2,22 +2,22 @@ local texturesPath = asset.require("./../../saturn_textures").TexturesPath local globeIdentifier = asset.require("./../../saturn").Saturn.Identifier local layer = { - Identifier = "Texture", - FilePath = texturesPath .. "/saturn.jpg", + Identifier = "Texture", + FilePath = texturesPath .. "/saturn.jpg", } asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) asset.export("layer", layer) asset.meta = { - Name = "Saturn Texutre", - Version = "1.0", - Description = [[ Default jpg texture for Saturn]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license" + Name = "Saturn Texutre", + Version = "1.0", + Description = [[ Default jpg texture for Saturn]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/saturn/major_moons.asset b/data/assets/scene/solarsystem/planets/saturn/major_moons.asset index b6ed6156d6..b658909653 100644 --- a/data/assets/scene/solarsystem/planets/saturn/major_moons.asset +++ b/data/assets/scene/solarsystem/planets/saturn/major_moons.asset @@ -9,11 +9,11 @@ asset.require('./titan/titan') asset.meta = { - Name = "Saturn Major Moons", - Version = "1.0", - Description = [[ Meta asset containing Saturn's major moons: Dione, Enceladus, - Hyperion, Iapetus, Mimas, Rhea, Tethys, and Titan]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license" + Name = "Saturn Major Moons", + Version = "1.0", + Description = [[ Meta asset containing Saturn's major moons: Dione, Enceladus, + Hyperion, Iapetus, Mimas, Rhea, Tethys, and Titan]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/saturn/mimas/default_layers.asset b/data/assets/scene/solarsystem/planets/saturn/mimas/default_layers.asset index 3521c2beb4..8e4aca890e 100644 --- a/data/assets/scene/solarsystem/planets/saturn/mimas/default_layers.asset +++ b/data/assets/scene/solarsystem/planets/saturn/mimas/default_layers.asset @@ -5,16 +5,16 @@ local colorLayer = asset.require(colorLayersPath .. "/mimas_texture") -- Set enabled layers (temporary solution) -- @TODO: do this using a boolean that's passed to the 'asset.require' instead asset.onInitialize(function () - openspace.setPropertyValueSingle("Scene.Mimas.Renderable.Layers.ColorLayers." .. - colorLayer.layer.Identifier .. ".Enabled", true) + openspace.setPropertyValueSingle("Scene.Mimas.Renderable.Layers.ColorLayers." .. + colorLayer.layer.Identifier .. ".Enabled", true) end) asset.meta = { - Name = "Default Mimas Layers", - Version = "1.0", - Description = [[ Default Mimas layers are: Mimas Texture]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license" + Name = "Default Mimas Layers", + Version = "1.0", + Description = [[ Default Mimas layers are: Mimas Texture]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/saturn/mimas/layers/colorlayers/mimas_texture.asset b/data/assets/scene/solarsystem/planets/saturn/mimas/layers/colorlayers/mimas_texture.asset index b2a293f92c..d16f67c799 100644 --- a/data/assets/scene/solarsystem/planets/saturn/mimas/layers/colorlayers/mimas_texture.asset +++ b/data/assets/scene/solarsystem/planets/saturn/mimas/layers/colorlayers/mimas_texture.asset @@ -2,22 +2,22 @@ local texturesPath = asset.require("./../../mimas_textures").TexturesPath local globeIdentifier = asset.require("./../../mimas").Mimas.Identifier local layer = { - Identifier = "Texture", - FilePath = texturesPath .. "/mimas.jpg", + Identifier = "Texture", + FilePath = texturesPath .. "/mimas.jpg", } asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) asset.export("layer", layer) asset.meta = { - Name = "Mimas Texutre", - Version = "1.0", - Description = [[ Default jpg texture for Mimas]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license" + Name = "Mimas Texutre", + Version = "1.0", + Description = [[ Default jpg texture for Mimas]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/saturn/mimas/mimas.asset b/data/assets/scene/solarsystem/planets/saturn/mimas/mimas.asset index 7f1b4efab1..0b9e83521a 100644 --- a/data/assets/scene/solarsystem/planets/saturn/mimas/mimas.asset +++ b/data/assets/scene/solarsystem/planets/saturn/mimas/mimas.asset @@ -5,61 +5,61 @@ asset.require('./trail') local labelsPath = asset.require('../saturn_globelabels').LabelsPath local Mimas = { - Identifier = "Mimas", - Parent = transforms.SaturnBarycenter.Identifier, - Transform = { - Translation = { - Type = "SpiceTranslation", - Target = "MIMAS", - Observer = "SATURN BARYCENTER", - Kernels = kernel - }, - Rotation = { - Type = "SpiceRotation", - SourceFrame = "IAU_MIMAS", - DestinationFrame = "GALACTIC" - } + Identifier = "Mimas", + Parent = transforms.SaturnBarycenter.Identifier, + Transform = { + Translation = { + Type = "SpiceTranslation", + Target = "MIMAS", + Observer = "SATURN BARYCENTER", + Kernels = kernel }, - Renderable = { - Type = "RenderableGlobe", - Radii = 198000, - SegmentsPerPatch = 64, - Layers = { }, - Labels = { - Enable = false, - FileName = labelsPath .. "/mimas.labels", - LabelAlignmentOption = "Horizontally", -- or Circularly - LabelsFontSize = 14.0, - LabelsSize = 8.0, - LabelsMinSize = 1.0, - LabelsMaxSize = 1500.0, - ProximityEnabled = false, - LabelsFadeInEnabled = true, - LabelsFadeOutEnabled = true, - FadeInStartingDistance = 1000000.0, - FadeOutStartingDistance = 400000.0, - LabelsForceDomeRendering = true, - LabelsDistanceEPS = 25000.0, - LabelsColor = { 1.0, 1.0, 0.0 } - } - }, - Tag = { "moon_solarSystem", "moon_giants", "moon_saturn" }, - GUI = { - Name = "Mimas", - Path = "/Solar System/Planets/Saturn/Moons", - Description = [[That's no moon...]] + Rotation = { + Type = "SpiceRotation", + SourceFrame = "IAU_MIMAS", + DestinationFrame = "GALACTIC" } + }, + Renderable = { + Type = "RenderableGlobe", + Radii = 198000, + SegmentsPerPatch = 64, + Layers = { }, + Labels = { + Enable = false, + FileName = labelsPath .. "/mimas.labels", + LabelAlignmentOption = "Horizontally", -- or Circularly + LabelsFontSize = 14.0, + LabelsSize = 8.0, + LabelsMinSize = 1.0, + LabelsMaxSize = 1500.0, + ProximityEnabled = false, + LabelsFadeInEnabled = true, + LabelsFadeOutEnabled = true, + FadeInStartingDistance = 1000000.0, + FadeOutStartingDistance = 400000.0, + LabelsForceDomeRendering = true, + LabelsDistanceEPS = 25000.0, + LabelsColor = { 1.0, 1.0, 0.0 } + } + }, + Tag = { "moon_solarSystem", "moon_giants", "moon_saturn" }, + GUI = { + Name = "Mimas", + Path = "/Solar System/Planets/Saturn/Moons", + Description = [[That's no moon...]] + } } assetHelper.registerSceneGraphNodesAndExport(asset, { Mimas }) asset.meta = { - Name = "Mimas", - Version = "1.0", - Description = [[ Mimas globe with labels.]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"Mimas"} + Name = "Mimas", + Version = "1.0", + Description = [[ Mimas globe with labels.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license", + Identifiers = {"Mimas"} } diff --git a/data/assets/scene/solarsystem/planets/saturn/mimas/mimas_textures.asset b/data/assets/scene/solarsystem/planets/saturn/mimas/mimas_textures.asset index d77e912051..9f38f20984 100644 --- a/data/assets/scene/solarsystem/planets/saturn/mimas/mimas_textures.asset +++ b/data/assets/scene/solarsystem/planets/saturn/mimas/mimas_textures.asset @@ -1,7 +1,7 @@ local TexturesPath = asset.syncedResource({ - Name = "Mimas textures", - Type = "HttpSynchronization", - Identifier = "mimas_textures", - Version = 1 + Name = "Mimas textures", + Type = "HttpSynchronization", + Identifier = "mimas_textures", + Version = 1 }) asset.export("TexturesPath", TexturesPath) diff --git a/data/assets/scene/solarsystem/planets/saturn/mimas/trail.asset b/data/assets/scene/solarsystem/planets/saturn/mimas/trail.asset index 9777b2c2f6..0322f99b11 100644 --- a/data/assets/scene/solarsystem/planets/saturn/mimas/trail.asset +++ b/data/assets/scene/solarsystem/planets/saturn/mimas/trail.asset @@ -5,37 +5,37 @@ local kernel = asset.require('../kernels').sat375 local MimasTrail = { - Identifier = "MimasTrail", - Parent = transforms.SaturnBarycenter.Identifier, - Renderable = { - Type = "RenderableTrailOrbit", - Translation = { - Type = "SpiceTranslation", - Target = "MIMAS", - Observer = "SATURN BARYCENTER", - Kernels = kernel - }, - Color = { 0.5, 0.3, 0.3 }, - Period = 23.0 / 24.0, - Resolution = 1000 + Identifier = "MimasTrail", + Parent = transforms.SaturnBarycenter.Identifier, + Renderable = { + Type = "RenderableTrailOrbit", + Translation = { + Type = "SpiceTranslation", + Target = "MIMAS", + Observer = "SATURN BARYCENTER", + Kernels = kernel }, - Tag = { "moonTrail_solarSystem", "moonTrail_giants", "moonTrail_saturn" }, - GUI = { - Name = "Mimas Trail", - Path = "/Solar System/Planets/Saturn/Moons", - Description = [[ Trail of Saturn's moon Mimas as observed by Saturn.]], - } + Color = { 0.5, 0.3, 0.3 }, + Period = 23.0 / 24.0, + Resolution = 1000 + }, + Tag = { "moonTrail_solarSystem", "moonTrail_giants", "moonTrail_saturn" }, + GUI = { + Name = "Mimas Trail", + Path = "/Solar System/Planets/Saturn/Moons", + Description = [[ Trail of Saturn's moon Mimas as observed by Saturn.]], + } } assetHelper.registerSceneGraphNodesAndExport(asset, { MimasTrail }) asset.meta = { - Name = "Mimas Trail", - Version = "1.0", - Description = [[ Main trail for Mimas. Data from NASA Spice (see base spice asset)]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"MimasTrail"} + Name = "Mimas Trail", + Version = "1.0", + Description = [[ Main trail for Mimas. Data from NASA Spice (see base spice asset)]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license", + Identifiers = {"MimasTrail"} } diff --git a/data/assets/scene/solarsystem/planets/saturn/minor/gallic_group.asset b/data/assets/scene/solarsystem/planets/saturn/minor/gallic_group.asset index d1595eb574..a08b0fc03e 100644 --- a/data/assets/scene/solarsystem/planets/saturn/minor/gallic_group.asset +++ b/data/assets/scene/solarsystem/planets/saturn/minor/gallic_group.asset @@ -10,81 +10,81 @@ local parentSpice = "SATURN BARYCENTER" local tags = { "moon_solarSystem", "moon_giants", "moon_saturn", "moon_gallic" } local trailColor = { 0.5, 0.3, 0.3 } local trailTags = { - "moonTrail_solarSystem", - "moonTrail_giants", - "moonTrail_saturn", - "moonTrail_minor" + "moonTrail_solarSystem", + "moonTrail_giants", + "moonTrail_saturn", + "moonTrail_minor" } local gallicGroup = { - { - Identifier = "Albiorix", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "ALBIORIX", - Radii = { 32000, 32000, 32000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Path = "/Solar System/Planets/Saturn/Moons/Gallic Group" - }, - TrailColor = trailColor, - OrbitPeriod = 774.58, - Kernels = kernel + { + Identifier = "Albiorix", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice }, - { - Identifier = "Bebhionn", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "BEBHIONN", - Radii = { 6000, 6000, 6000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Path = "/Solar System/Planets/Saturn/Moons/Gallic Group" - }, - TrailColor = trailColor, - OrbitPeriod = 838.77, - Kernels = kernel + Spice = "ALBIORIX", + Radii = { 32000, 32000, 32000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Path = "/Solar System/Planets/Saturn/Moons/Gallic Group" }, - { - Identifier = "Erriapus", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "ERRIAPUS", - Radii = { 10000, 10000, 10000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Path = "/Solar System/Planets/Saturn/Moons/Gallic Group" - }, - TrailColor = trailColor, - OrbitPeriod = 844.89, - Kernels = kernel + TrailColor = trailColor, + OrbitPeriod = 774.58, + Kernels = kernel + }, + { + Identifier = "Bebhionn", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice }, - { - Identifier = "Tarvos", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "TARVOS", - Radii = { 15000, 15000, 15000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Path = "/Solar System/Planets/Saturn/Moons/Gallic Group" - }, - TrailColor = trailColor, - OrbitPeriod = 944.23, - Kernels = kernel + Spice = "BEBHIONN", + Radii = { 6000, 6000, 6000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Path = "/Solar System/Planets/Saturn/Moons/Gallic Group" }, + TrailColor = trailColor, + OrbitPeriod = 838.77, + Kernels = kernel + }, + { + Identifier = "Erriapus", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice + }, + Spice = "ERRIAPUS", + Radii = { 10000, 10000, 10000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Path = "/Solar System/Planets/Saturn/Moons/Gallic Group" + }, + TrailColor = trailColor, + OrbitPeriod = 844.89, + Kernels = kernel + }, + { + Identifier = "Tarvos", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice + }, + Spice = "TARVOS", + Radii = { 15000, 15000, 15000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Path = "/Solar System/Planets/Saturn/Moons/Gallic Group" + }, + TrailColor = trailColor, + OrbitPeriod = 944.23, + Kernels = kernel + } } assetHelper.registerSceneGraphNodesAndExport( @@ -94,12 +94,12 @@ assetHelper.registerSceneGraphNodesAndExport( asset.meta = { - Name = "Saturn Gallic Group Moons", - Version = "1.0", - Description = [[ Procedural Globe asset containing Saturn's Gallic Group - moons: Albiorix, Bebhionn, Erriapus, and Tarvos. Blank globes and SPICE trails are - generated for each moon.]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license" + Name = "Saturn Gallic Group Moons", + Version = "1.0", + Description = [[ Procedural Globe asset containing Saturn's Gallic Group + moons: Albiorix, Bebhionn, Erriapus, and Tarvos. Blank globes and SPICE trails are + generated for each moon.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/saturn/minor/inuit_group.asset b/data/assets/scene/solarsystem/planets/saturn/minor/inuit_group.asset index c94c9c1e83..9fd0637b38 100644 --- a/data/assets/scene/solarsystem/planets/saturn/minor/inuit_group.asset +++ b/data/assets/scene/solarsystem/planets/saturn/minor/inuit_group.asset @@ -10,113 +10,113 @@ local parentSpice = "SATURN BARYCENTER" local tags = { "moon_solarSystem", "moon_giants", "moon_saturn", "moon_inuit" } local trailColor = { 0.5, 0.3, 0.3 } local trailTags = { - "moonTrail_solarSystem", - "moonTrail_giants", - "moonTrail_saturn", - "moonTrail_minor" + "moonTrail_solarSystem", + "moonTrail_giants", + "moonTrail_saturn", + "moonTrail_minor" } local inuitGroup = { - { - Identifier = "Kiviuq", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "KIVIUQ", - Radii = { 16000, 16000, 16000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Path = "/Solar System/Planets/Saturn/Moons/Inuit Group" - }, - TrailColor = trailColor, - OrbitPeriod = 448.16, - Kernels = kernel + { + Identifier = "Kiviuq", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice }, - { - Identifier = "Ijiraq", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "IJIRAQ", - Radii = { 12000, 12000, 12000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Path = "/Solar System/Planets/Saturn/Moons/Inuit Group" - }, - TrailColor = trailColor, - OrbitPeriod = 451.77, - Kernels = kernel + Spice = "KIVIUQ", + Radii = { 16000, 16000, 16000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Path = "/Solar System/Planets/Saturn/Moons/Inuit Group" }, - { - Identifier = "Paaliaq", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "PAALIAQ", - Radii = { 22000, 22000, 22000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Path = "/Solar System/Planets/Saturn/Moons/Inuit Group" - }, - TrailColor = trailColor, - OrbitPeriod = 692.98, - Kernels = kernel + TrailColor = trailColor, + OrbitPeriod = 448.16, + Kernels = kernel + }, + { + Identifier = "Ijiraq", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice }, - { - Identifier = "Siarnaq", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "SIARNAQ", - Radii = { 40000, 40000, 40000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Path = "/Solar System/Planets/Saturn/Moons/Inuit Group" - }, - TrailColor = trailColor, - OrbitPeriod = 884.88, - Kernels = kernel + Spice = "IJIRAQ", + Radii = { 12000, 12000, 12000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Path = "/Solar System/Planets/Saturn/Moons/Inuit Group" }, - { - Identifier = "Tarqeq", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "TARQEQ", - Radii = { 7000, 7000, 7000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Path = "/Solar System/Planets/Saturn/Moons/Inuit Group" - }, - TrailColor = trailColor, - OrbitPeriod = 894.86, - Kernels = kernel + TrailColor = trailColor, + OrbitPeriod = 451.77, + Kernels = kernel + }, + { + Identifier = "Paaliaq", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice }, + Spice = "PAALIAQ", + Radii = { 22000, 22000, 22000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Path = "/Solar System/Planets/Saturn/Moons/Inuit Group" + }, + TrailColor = trailColor, + OrbitPeriod = 692.98, + Kernels = kernel + }, + { + Identifier = "Siarnaq", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice + }, + Spice = "SIARNAQ", + Radii = { 40000, 40000, 40000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Path = "/Solar System/Planets/Saturn/Moons/Inuit Group" + }, + TrailColor = trailColor, + OrbitPeriod = 884.88, + Kernels = kernel + }, + { + Identifier = "Tarqeq", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice + }, + Spice = "TARQEQ", + Radii = { 7000, 7000, 7000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Path = "/Solar System/Planets/Saturn/Moons/Inuit Group" + }, + TrailColor = trailColor, + OrbitPeriod = 894.86, + Kernels = kernel + } } assetHelper.registerSceneGraphNodesAndExport( - asset, - proceduralGlobes.createGlobes(inuitGroup) + asset, + proceduralGlobes.createGlobes(inuitGroup) ) asset.meta = { - Name = "Saturn Inuit Group Moons", - Version = "1.0", - Description = [[ Procedural Globe asset containing Saturn's Inuit Group - moons: Kiviuq, Ijiraq, Paaliaq, Siarnaq and Tarqeq. Blank globes and SPICE trails - are generated for each moon.]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license" + Name = "Saturn Inuit Group Moons", + Version = "1.0", + Description = [[ Procedural Globe asset containing Saturn's Inuit Group + moons: Kiviuq, Ijiraq, Paaliaq, Siarnaq and Tarqeq. Blank globes and SPICE trails + are generated for each moon.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/saturn/minor/norse_group.asset b/data/assets/scene/solarsystem/planets/saturn/minor/norse_group.asset index 84537fc15f..4cad89e12f 100644 --- a/data/assets/scene/solarsystem/planets/saturn/minor/norse_group.asset +++ b/data/assets/scene/solarsystem/planets/saturn/minor/norse_group.asset @@ -12,531 +12,531 @@ local parentSpice = "SATURN BARYCENTER" local tags = { "moon_solarSystem", "moon_giants", "moon_saturn", "moon_norse" } local trailColor = { 0.5, 0.3, 0.3 } local trailTags = { - "moonTrail_solarSystem", - "moonTrail_giants", - "moonTrail_saturn", - "moonTrail_minor" + "moonTrail_solarSystem", + "moonTrail_giants", + "moonTrail_saturn", + "moonTrail_minor" } local norseGroup = { - { - Identifier = "Phoebe", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "PHOEBE", - Radii = { 218800, 217000, 203600 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Path = "/Solar System/Planets/Saturn/Moons/Norse Group" - }, - TrailColor = trailColor, - OrbitPeriod = 545.09, - Kernels = kernel375 + { + Identifier = "Phoebe", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice }, - { - Identifier = "Skathi", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "SKATHI", - Radii = { 8000, 8000, 8000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Path = "/Solar System/Planets/Saturn/Moons/Norse Group" - }, - TrailColor = trailColor, - OrbitPeriod = 732.52, - Kernels = kernel368 + Spice = "PHOEBE", + Radii = { 218800, 217000, 203600 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Path = "/Solar System/Planets/Saturn/Moons/Norse Group" }, - { - Identifier = "S2007S2", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "65055", - Radii = { 6000, 6000, 6000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Name = "S/2007 S 2", - Path = "/Solar System/Planets/Saturn/Moons/Norse Group" - }, - TrailColor = trailColor, - OrbitPeriod = 792.96, - Kernels = kernel368 + TrailColor = trailColor, + OrbitPeriod = 545.09, + Kernels = kernel375 + }, + { + Identifier = "Skathi", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice }, - { - Identifier = "Skoll", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "SKOLL", - Radii = { 6000, 6000, 6000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Path = "/Solar System/Planets/Saturn/Moons/Norse Group" - }, - TrailColor = trailColor, - OrbitPeriod = 862.37, - Kernels = kernel368 + Spice = "SKATHI", + Radii = { 8000, 8000, 8000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Path = "/Solar System/Planets/Saturn/Moons/Norse Group" }, - { - Identifier = "S2004S13", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "65041", - Radii = { 6000, 6000, 6000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Name = "S/2004 S 13", - Path = "/Solar System/Planets/Saturn/Moons/Norse Group" - }, - TrailColor = trailColor, - OrbitPeriod = 905.85, - Kernels = kernel368 + TrailColor = trailColor, + OrbitPeriod = 732.52, + Kernels = kernel368 + }, + { + Identifier = "S2007S2", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice }, - { - Identifier = "Greip", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "GREIP", - Radii = { 6000, 6000, 6000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Path = "/Solar System/Planets/Saturn/Moons/Norse Group" - }, - TrailColor = trailColor, - OrbitPeriod = 906.56, - Kernels = kernel368 + Spice = "65055", + Radii = { 6000, 6000, 6000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Name = "S/2007 S 2", + Path = "/Solar System/Planets/Saturn/Moons/Norse Group" }, - { - Identifier = "Hyrrokkin", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "HYRROKKIN", - Radii = { 8000, 8000, 8000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Path = "/Solar System/Planets/Saturn/Moons/Norse Group" - }, - TrailColor = trailColor, - OrbitPeriod = 914.29, - Kernels = kernel368 + TrailColor = trailColor, + OrbitPeriod = 792.96, + Kernels = kernel368 + }, + { + Identifier = "Skoll", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice }, - { - Identifier = "Jarnsaxa", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "JARNSAXA", - Radii = { 6000, 6000, 6000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Path = "/Solar System/Planets/Saturn/Moons/Norse Group" - }, - TrailColor = trailColor, - OrbitPeriod = 943.78, - Kernels = kernel368 + Spice = "SKOLL", + Radii = { 6000, 6000, 6000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Path = "/Solar System/Planets/Saturn/Moons/Norse Group" }, - { - Identifier = "Mundilfari", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "MUNDILFARI", - Radii = { 7000, 7000, 7000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Path = "/Solar System/Planets/Saturn/Moons/Norse Group" - }, - TrailColor = trailColor, - OrbitPeriod = 956.70, - Kernels = kernel368 + TrailColor = trailColor, + OrbitPeriod = 862.37, + Kernels = kernel368 + }, + { + Identifier = "S2004S13", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice }, - { - Identifier = "S2006S1", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "65048", - Radii = { 6000, 6000, 6000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Name = "S/2006 S 1", - Path = "/Solar System/Planets/Saturn/Moons/Norse Group" - }, - TrailColor = trailColor, - OrbitPeriod = 972.41, - Kernels = kernel368 + Spice = "65041", + Radii = { 6000, 6000, 6000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Name = "S/2004 S 13", + Path = "/Solar System/Planets/Saturn/Moons/Norse Group" }, - { - Identifier = "S2004S17", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "65045", - Radii = { 4000, 4000, 4000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Name = "S/2004 S 17", - Path = "/Solar System/Planets/Saturn/Moons/Norse Group" - }, - TrailColor = trailColor, - OrbitPeriod = 985.45, - Kernels = kernel368 + TrailColor = trailColor, + OrbitPeriod = 905.85, + Kernels = kernel368 + }, + { + Identifier = "Greip", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice }, - { - Identifier = "Bergelmir", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "BERGELMIR", - Radii = { 6000, 6000, 6000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Path = "/Solar System/Planets/Saturn/Moons/Norse Group" - }, - TrailColor = trailColor, - OrbitPeriod = 985.83, - Kernels = kernel368 + Spice = "GREIP", + Radii = { 6000, 6000, 6000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Path = "/Solar System/Planets/Saturn/Moons/Norse Group" }, - { - Identifier = "Narvi", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "NARVI", - Radii = { 7000, 7000, 7000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Path = "/Solar System/Planets/Saturn/Moons/Norse Group" - }, - TrailColor = trailColor, - OrbitPeriod = 1008.45, - Kernels = kernel368 + TrailColor = trailColor, + OrbitPeriod = 906.56, + Kernels = kernel368 + }, + { + Identifier = "Hyrrokkin", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice }, - { - Identifier = "Suttungr", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "SUTTUNGR", - Radii = { 7000, 7000, 7000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Path = "/Solar System/Planets/Saturn/Moons/Norse Group" - }, - TrailColor = trailColor, - OrbitPeriod = 1022.82, - Kernels = kernel368 + Spice = "HYRROKKIN", + Radii = { 8000, 8000, 8000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Path = "/Solar System/Planets/Saturn/Moons/Norse Group" }, - { - Identifier = "Hati", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "HATI", - Radii = { 6000, 6000, 6000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Path = "/Solar System/Planets/Saturn/Moons/Norse Group" - }, - TrailColor = trailColor, - OrbitPeriod = 1033.05, - Kernels = kernel368 + TrailColor = trailColor, + OrbitPeriod = 914.29, + Kernels = kernel368 + }, + { + Identifier = "Jarnsaxa", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice }, - { - Identifier = "S2004S12", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "65040", - Radii = { 5000, 5000, 5000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Name = "S/2004 S 12", - Path = "/Solar System/Planets/Saturn/Moons/Norse Group" - }, - TrailColor = trailColor, - OrbitPeriod = 1048.54, - Kernels = kernel368 + Spice = "JARNSAXA", + Radii = { 6000, 6000, 6000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Path = "/Solar System/Planets/Saturn/Moons/Norse Group" }, - { - Identifier = "Farbauti", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "FARBAUTI", - Radii = { 5000, 5000, 5000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Path = "/Solar System/Planets/Saturn/Moons/Norse Group" - }, - TrailColor = trailColor, - OrbitPeriod = 1054.78, - Kernels = kernel368 + TrailColor = trailColor, + OrbitPeriod = 943.78, + Kernels = kernel368 + }, + { + Identifier = "Mundilfari", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice }, - { - Identifier = "Thrymr", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "THRYMR", - Radii = { 7000, 7000, 7000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Path = "/Solar System/Planets/Saturn/Moons/Norse Group" - }, - TrailColor = trailColor, - OrbitPeriod = 1078.09, - Kernels = kernel368 + Spice = "MUNDILFARI", + Radii = { 7000, 7000, 7000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Path = "/Solar System/Planets/Saturn/Moons/Norse Group" }, - { - Identifier = "Aegir", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "AEGIR", - Radii = { 6000, 6000, 6000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Path = "/Solar System/Planets/Saturn/Moons/Norse Group" - }, - TrailColor = trailColor, - OrbitPeriod = 1094.46, - Kernels = kernel368 + TrailColor = trailColor, + OrbitPeriod = 956.70, + Kernels = kernel368 + }, + { + Identifier = "S2006S1", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice }, - { - Identifier = "S2007S3", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "65056", - Radii = { 5000, 5000, 5000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Name = "S/2007 S 3", - Path = "/Solar System/Planets/Saturn/Moons/Norse Group" - }, - TrailColor = trailColor, - OrbitPeriod = 1100, - Kernels = kernel368 + Spice = "65048", + Radii = { 6000, 6000, 6000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Name = "S/2006 S 1", + Path = "/Solar System/Planets/Saturn/Moons/Norse Group" }, - { - Identifier = "Bestla", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "BESTLA", - Radii = { 7000, 7000, 7000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Path = "/Solar System/Planets/Saturn/Moons/Norse Group" - }, - TrailColor = trailColor, - OrbitPeriod = 1101.45, - Kernels = kernel368 + TrailColor = trailColor, + OrbitPeriod = 972.41, + Kernels = kernel368 + }, + { + Identifier = "S2004S17", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice }, - { - Identifier = "S2004S7", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "65035", - Radii = { 6000, 6000, 6000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Name = "S/2004 S 7", - Path = "/Solar System/Planets/Saturn/Moons/Norse Group" - }, - TrailColor = trailColor, - OrbitPeriod = 1101.99, - Kernels = kernel368 + Spice = "65045", + Radii = { 4000, 4000, 4000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Name = "S/2004 S 17", + Path = "/Solar System/Planets/Saturn/Moons/Norse Group" }, - { - Identifier = "S2006S3", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "65050", - Radii = { 6000, 6000, 6000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Name = "S/2006 S 3", - Path = "/Solar System/Planets/Saturn/Moons/Norse Group" - }, - TrailColor = trailColor, - OrbitPeriod = 1142.37, - Kernels = kernel368 + TrailColor = trailColor, + OrbitPeriod = 985.45, + Kernels = kernel368 + }, + { + Identifier = "Bergelmir", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice }, - { - Identifier = "FENRIR", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "FENRIR", - Radii = { 4000, 4000, 4000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Path = "/Solar System/Planets/Saturn/Moons/Norse Group" - }, - TrailColor = trailColor, - OrbitPeriod = 1212.53, - Kernels = kernel368 + Spice = "BERGELMIR", + Radii = { 6000, 6000, 6000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Path = "/Solar System/Planets/Saturn/Moons/Norse Group" }, - -- Not yet in the Spice kernels - -- { - -- Identifier = "Sutur", -- Rising - -- Parent = { - -- Identifier = parentIdentifier, - -- Spice = parentSpice - -- }, - -- Spice = "SUTUR", - -- Radii = { 6000, 6000, 6000 }, - -- Tags = tags, - -- GUI = { - -- Path = "/Solar System/Planets/Saturn/Moons/Norse Group" - -- }, - -- TrailColor = trailColor, - -- OrbitPeriod = 1242.36, - -- Kernels = kernels368 - -- }, - { - Identifier = "Kari", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "KARI", - Radii = { 7000, 7000, 7000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Path = "/Solar System/Planets/Saturn/Moons/Norse Group" - }, - TrailColor = trailColor, - OrbitPeriod = 1245.06, - Kernels = kernel368 + TrailColor = trailColor, + OrbitPeriod = 985.83, + Kernels = kernel368 + }, + { + Identifier = "Narvi", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice }, - { - Identifier = "Ymir", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "YMIR", - Radii = { 18000, 18000, 18000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Path = "/Solar System/Planets/Saturn/Moons/Norse Group" - }, - TrailColor = trailColor, - OrbitPeriod = 1254.15, - Kernels = kernel368 + Spice = "NARVI", + Radii = { 7000, 7000, 7000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Path = "/Solar System/Planets/Saturn/Moons/Norse Group" }, - { - Identifier = "Loge", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "LOGE", - Radii = { 6000, 6000, 6000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Path = "/Solar System/Planets/Saturn/Moons/Norse Group" - }, - TrailColor = trailColor, - OrbitPeriod = 1300.95, - Kernels = kernel368 + TrailColor = trailColor, + OrbitPeriod = 1008.45, + Kernels = kernel368 + }, + { + Identifier = "Suttungr", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice }, - { - Identifier = "Fornjot", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "FORNJOT", - Radii = { 6000, 6000, 6000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Path = "/Solar System/Planets/Saturn/Moons/Norse Group" - }, - TrailColor = trailColor, - OrbitPeriod = 1432.16, - Kernels = kernel368 + Spice = "SUTTUNGR", + Radii = { 7000, 7000, 7000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Path = "/Solar System/Planets/Saturn/Moons/Norse Group" }, + TrailColor = trailColor, + OrbitPeriod = 1022.82, + Kernels = kernel368 + }, + { + Identifier = "Hati", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice + }, + Spice = "HATI", + Radii = { 6000, 6000, 6000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Path = "/Solar System/Planets/Saturn/Moons/Norse Group" + }, + TrailColor = trailColor, + OrbitPeriod = 1033.05, + Kernels = kernel368 + }, + { + Identifier = "S2004S12", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice + }, + Spice = "65040", + Radii = { 5000, 5000, 5000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Name = "S/2004 S 12", + Path = "/Solar System/Planets/Saturn/Moons/Norse Group" + }, + TrailColor = trailColor, + OrbitPeriod = 1048.54, + Kernels = kernel368 + }, + { + Identifier = "Farbauti", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice + }, + Spice = "FARBAUTI", + Radii = { 5000, 5000, 5000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Path = "/Solar System/Planets/Saturn/Moons/Norse Group" + }, + TrailColor = trailColor, + OrbitPeriod = 1054.78, + Kernels = kernel368 + }, + { + Identifier = "Thrymr", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice + }, + Spice = "THRYMR", + Radii = { 7000, 7000, 7000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Path = "/Solar System/Planets/Saturn/Moons/Norse Group" + }, + TrailColor = trailColor, + OrbitPeriod = 1078.09, + Kernels = kernel368 + }, + { + Identifier = "Aegir", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice + }, + Spice = "AEGIR", + Radii = { 6000, 6000, 6000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Path = "/Solar System/Planets/Saturn/Moons/Norse Group" + }, + TrailColor = trailColor, + OrbitPeriod = 1094.46, + Kernels = kernel368 + }, + { + Identifier = "S2007S3", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice + }, + Spice = "65056", + Radii = { 5000, 5000, 5000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Name = "S/2007 S 3", + Path = "/Solar System/Planets/Saturn/Moons/Norse Group" + }, + TrailColor = trailColor, + OrbitPeriod = 1100, + Kernels = kernel368 + }, + { + Identifier = "Bestla", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice + }, + Spice = "BESTLA", + Radii = { 7000, 7000, 7000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Path = "/Solar System/Planets/Saturn/Moons/Norse Group" + }, + TrailColor = trailColor, + OrbitPeriod = 1101.45, + Kernels = kernel368 + }, + { + Identifier = "S2004S7", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice + }, + Spice = "65035", + Radii = { 6000, 6000, 6000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Name = "S/2004 S 7", + Path = "/Solar System/Planets/Saturn/Moons/Norse Group" + }, + TrailColor = trailColor, + OrbitPeriod = 1101.99, + Kernels = kernel368 + }, + { + Identifier = "S2006S3", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice + }, + Spice = "65050", + Radii = { 6000, 6000, 6000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Name = "S/2006 S 3", + Path = "/Solar System/Planets/Saturn/Moons/Norse Group" + }, + TrailColor = trailColor, + OrbitPeriod = 1142.37, + Kernels = kernel368 + }, + { + Identifier = "FENRIR", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice + }, + Spice = "FENRIR", + Radii = { 4000, 4000, 4000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Path = "/Solar System/Planets/Saturn/Moons/Norse Group" + }, + TrailColor = trailColor, + OrbitPeriod = 1212.53, + Kernels = kernel368 + }, + -- Not yet in the Spice kernels + -- { + -- Identifier = "Sutur", -- Rising + -- Parent = { + -- Identifier = parentIdentifier, + -- Spice = parentSpice + -- }, + -- Spice = "SUTUR", + -- Radii = { 6000, 6000, 6000 }, + -- Tags = tags, + -- GUI = { + -- Path = "/Solar System/Planets/Saturn/Moons/Norse Group" + -- }, + -- TrailColor = trailColor, + -- OrbitPeriod = 1242.36, + -- Kernels = kernels368 + -- }, + { + Identifier = "Kari", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice + }, + Spice = "KARI", + Radii = { 7000, 7000, 7000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Path = "/Solar System/Planets/Saturn/Moons/Norse Group" + }, + TrailColor = trailColor, + OrbitPeriod = 1245.06, + Kernels = kernel368 + }, + { + Identifier = "Ymir", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice + }, + Spice = "YMIR", + Radii = { 18000, 18000, 18000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Path = "/Solar System/Planets/Saturn/Moons/Norse Group" + }, + TrailColor = trailColor, + OrbitPeriod = 1254.15, + Kernels = kernel368 + }, + { + Identifier = "Loge", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice + }, + Spice = "LOGE", + Radii = { 6000, 6000, 6000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Path = "/Solar System/Planets/Saturn/Moons/Norse Group" + }, + TrailColor = trailColor, + OrbitPeriod = 1300.95, + Kernels = kernel368 + }, + { + Identifier = "Fornjot", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice + }, + Spice = "FORNJOT", + Radii = { 6000, 6000, 6000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Path = "/Solar System/Planets/Saturn/Moons/Norse Group" + }, + TrailColor = trailColor, + OrbitPeriod = 1432.16, + Kernels = kernel368 + } } assetHelper.registerSceneGraphNodesAndExport( - asset, - proceduralGlobes.createGlobes(norseGroup) + asset, + proceduralGlobes.createGlobes(norseGroup) ) asset.meta = { - Name = "Saturn Norse Group Moons", - Version = "1.0", - Description = [[ Procedural Globe asset containing Saturn's Norse Group - moons: Phoebe, Skathi, S2007S2, Skoll, S2004S13, Greip, Hyrrokkin, Jarnsaxa, - Mundilfari, S2006S1, S2004S17, Bergelmir, Narvi, Suttungr, Hati, S2004S12, - Farbauti, Thrymr, Aegir, S2007S3, Bestla, S2004S7, S2006S3, Fenrir, Kari, Ymir, - Loge, Fornjot. Blank globes and SPICE trails are generated for each moon.]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license" + Name = "Saturn Norse Group Moons", + Version = "1.0", + Description = [[ Procedural Globe asset containing Saturn's Norse Group + moons: Phoebe, Skathi, S2007S2, Skoll, S2004S13, Greip, Hyrrokkin, Jarnsaxa, + Mundilfari, S2006S1, S2004S17, Bergelmir, Narvi, Suttungr, Hati, S2004S12, + Farbauti, Thrymr, Aegir, S2007S3, Bestla, S2004S7, S2006S3, Fenrir, Kari, Ymir, + Loge, Fornjot. Blank globes and SPICE trails are generated for each moon.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/saturn/minor/other_group.asset b/data/assets/scene/solarsystem/planets/saturn/minor/other_group.asset index bfc6cf5c78..6ceaa4a9d1 100644 --- a/data/assets/scene/solarsystem/planets/saturn/minor/other_group.asset +++ b/data/assets/scene/solarsystem/planets/saturn/minor/other_group.asset @@ -12,251 +12,251 @@ local parentSpice = "SATURN BARYCENTER" local tags = { "moon_solarSystem", "moon_giants", "moon_saturn", "moon_other" } local trailColor = { 0.5, 0.3, 0.3 } local trailTags = { - "moonTrail_solarSystem", - "moonTrail_giants", - "moonTrail_saturn", - "moonTrail_minor" + "moonTrail_solarSystem", + "moonTrail_giants", + "moonTrail_saturn", + "moonTrail_minor" } local otherGroup = { - { - Identifier = "Atlas", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "ATLAS", - Radii = { 41000, 35000, 19000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Path = "/Solar System/Planets/Saturn/Moons/Other Group" - }, - TrailColor = trailColor, - OrbitPeriod = 0.60169, - Kernels = kernel393 + { + Identifier = "Atlas", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice }, - { - Identifier = "Prometheus", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "PROMETHEUS", - Radii = { 136000, 79000, 59000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Path = "/Solar System/Planets/Saturn/Moons/Other Group" - }, - TrailColor = trailColor, - OrbitPeriod = 0.61299, - Kernels = kernel393 + Spice = "ATLAS", + Radii = { 41000, 35000, 19000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Path = "/Solar System/Planets/Saturn/Moons/Other Group" }, - { - Identifier = "Pandora", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "PANDORA", - Radii = { 104000, 81000, 64000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Path = "/Solar System/Planets/Saturn/Moons/Other Group" - }, - TrailColor = trailColor, - OrbitPeriod = 0.62850, - Kernels = kernel393 + TrailColor = trailColor, + OrbitPeriod = 0.60169, + Kernels = kernel393 + }, + { + Identifier = "Prometheus", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice }, - { - Identifier = "Epimetheus", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "EPIMETHEUS", - Radii = { 130000, 114000, 106000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Path = "/Solar System/Planets/Saturn/Moons/Other Group" - }, - TrailColor = trailColor, - OrbitPeriod = 0.69433, - Kernels = kernel393 + Spice = "PROMETHEUS", + Radii = { 136000, 79000, 59000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Path = "/Solar System/Planets/Saturn/Moons/Other Group" }, - { - Identifier = "Janus", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "JANUS", - Radii = { 203000, 185000, 153000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Path = "/Solar System/Planets/Saturn/Moons/Other Group" - }, - TrailColor = trailColor, - OrbitPeriod = 0.69466, - Kernels = kernel393 + TrailColor = trailColor, + OrbitPeriod = 0.61299, + Kernels = kernel393 + }, + { + Identifier = "Pandora", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice }, - { - Identifier = "Aegaeon", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "AEGAEON", - Radii = { 500, 500, 500 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Path = "/Solar System/Planets/Saturn/Moons/Other Group" - }, - TrailColor = trailColor, - OrbitPeriod = 0.80812, - Kernels = kernel393 + Spice = "PANDORA", + Radii = { 104000, 81000, 64000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Path = "/Solar System/Planets/Saturn/Moons/Other Group" }, - { - Identifier = "Methone", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "METHONE", - Radii = { 3200, 3200, 3200 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Path = "/Solar System/Planets/Saturn/Moons/Other Group" - }, - TrailColor = trailColor, - OrbitPeriod = 1.00957, - Kernels = kernel393 + TrailColor = trailColor, + OrbitPeriod = 0.62850, + Kernels = kernel393 + }, + { + Identifier = "Epimetheus", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice }, - { - Identifier = "Anthe", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "ANTHE", - Radii = { 1800, 1800, 1800 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Path = "/Solar System/Planets/Saturn/Moons/Other Group" - }, - TrailColor = trailColor, - OrbitPeriod = 1.05089, - Kernels = kernel393 + Spice = "EPIMETHEUS", + Radii = { 130000, 114000, 106000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Path = "/Solar System/Planets/Saturn/Moons/Other Group" }, - { - Identifier = "Pallene", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "PALLENE", - Radii = { 6000, 6000, 4000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Path = "/Solar System/Planets/Saturn/Moons/Other Group" - }, - TrailColor = trailColor, - OrbitPeriod = 1.370218, - Kernels = kernel393 + TrailColor = trailColor, + OrbitPeriod = 0.69433, + Kernels = kernel393 + }, + { + Identifier = "Janus", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice }, - { - Identifier = "Telesto", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "TELESTO", - Radii = { 33000, 24000, 20000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Path = "/Solar System/Planets/Saturn/Moons/Other Group" - }, - TrailColor = trailColor, - OrbitPeriod = 1.887802, - Kernels = kernel375 + Spice = "JANUS", + Radii = { 203000, 185000, 153000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Path = "/Solar System/Planets/Saturn/Moons/Other Group" }, - { - Identifier = "Calypso", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "CALYPSO", - Radii = { 30000, 23000, 14000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Path = "/Solar System/Planets/Saturn/Moons/Other Group" - }, - TrailColor = trailColor, - OrbitPeriod = 1.887802, - Kernels = kernel375 + TrailColor = trailColor, + OrbitPeriod = 0.69466, + Kernels = kernel393 + }, + { + Identifier = "Aegaeon", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice }, - { - Identifier = "Helene", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "HELENE", - Radii = { 43000, 38000, 26000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Path = "/Solar System/Planets/Saturn/Moons/Other Group" - }, - TrailColor = trailColor, - OrbitPeriod = 2.736915, - Kernels = kernel375 + Spice = "AEGAEON", + Radii = { 500, 500, 500 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Path = "/Solar System/Planets/Saturn/Moons/Other Group" }, - { - Identifier = "Polydeuces", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "POLYDEUCES", - Radii = { 3000, 2000, 1000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Path = "/Solar System/Planets/Saturn/Moons/Other Group" - }, - TrailColor = trailColor, - OrbitPeriod = 2.736915, - Kernels = kernel393 - } + TrailColor = trailColor, + OrbitPeriod = 0.80812, + Kernels = kernel393 + }, + { + Identifier = "Methone", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice + }, + Spice = "METHONE", + Radii = { 3200, 3200, 3200 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Path = "/Solar System/Planets/Saturn/Moons/Other Group" + }, + TrailColor = trailColor, + OrbitPeriod = 1.00957, + Kernels = kernel393 + }, + { + Identifier = "Anthe", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice + }, + Spice = "ANTHE", + Radii = { 1800, 1800, 1800 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Path = "/Solar System/Planets/Saturn/Moons/Other Group" + }, + TrailColor = trailColor, + OrbitPeriod = 1.05089, + Kernels = kernel393 + }, + { + Identifier = "Pallene", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice + }, + Spice = "PALLENE", + Radii = { 6000, 6000, 4000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Path = "/Solar System/Planets/Saturn/Moons/Other Group" + }, + TrailColor = trailColor, + OrbitPeriod = 1.370218, + Kernels = kernel393 + }, + { + Identifier = "Telesto", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice + }, + Spice = "TELESTO", + Radii = { 33000, 24000, 20000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Path = "/Solar System/Planets/Saturn/Moons/Other Group" + }, + TrailColor = trailColor, + OrbitPeriod = 1.887802, + Kernels = kernel375 + }, + { + Identifier = "Calypso", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice + }, + Spice = "CALYPSO", + Radii = { 30000, 23000, 14000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Path = "/Solar System/Planets/Saturn/Moons/Other Group" + }, + TrailColor = trailColor, + OrbitPeriod = 1.887802, + Kernels = kernel375 + }, + { + Identifier = "Helene", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice + }, + Spice = "HELENE", + Radii = { 43000, 38000, 26000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Path = "/Solar System/Planets/Saturn/Moons/Other Group" + }, + TrailColor = trailColor, + OrbitPeriod = 2.736915, + Kernels = kernel375 + }, + { + Identifier = "Polydeuces", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice + }, + Spice = "POLYDEUCES", + Radii = { 3000, 2000, 1000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Path = "/Solar System/Planets/Saturn/Moons/Other Group" + }, + TrailColor = trailColor, + OrbitPeriod = 2.736915, + Kernels = kernel393 + } } assetHelper.registerSceneGraphNodesAndExport( - asset, - proceduralGlobes.createGlobes(otherGroup) + asset, + proceduralGlobes.createGlobes(otherGroup) ) asset.meta = { - Name = "Saturn Other Group Moons", - Version = "1.0", - Description = [[ Procedural Globe asset containing Saturn's Other Group - moons: Phoebe, Skathi, S2007S2, Skoll, S2004S13, Greip, Hyrrokkin, Jarnsaxa, - Mundilfari, S2006S1, S2004S17, Bergelmir, Narvi, Suttungr, Hati, S2004S12, - Farbauti, Thrymr, Aegir, S2007S3, Bestla, S2004S7, S2006S3, Fenrir, Kari, Ymir, - Loge, Fornjot. Blank globes and SPICE trails are generated for each moon.]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license" + Name = "Saturn Other Group Moons", + Version = "1.0", + Description = [[ Procedural Globe asset containing Saturn's Other Group + moons: Phoebe, Skathi, S2007S2, Skoll, S2004S13, Greip, Hyrrokkin, Jarnsaxa, + Mundilfari, S2006S1, S2004S17, Bergelmir, Narvi, Suttungr, Hati, S2004S12, + Farbauti, Thrymr, Aegir, S2007S3, Bestla, S2004S7, S2006S3, Fenrir, Kari, Ymir, + Loge, Fornjot. Blank globes and SPICE trails are generated for each moon.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/saturn/minor_moons.asset b/data/assets/scene/solarsystem/planets/saturn/minor_moons.asset index 15cce78ea9..d3a7048f7f 100644 --- a/data/assets/scene/solarsystem/planets/saturn/minor_moons.asset +++ b/data/assets/scene/solarsystem/planets/saturn/minor_moons.asset @@ -5,11 +5,11 @@ asset.require('./minor/other_group') asset.meta = { - Name = "Saturn Minor Moons", - Version = "1.0", - Description = [[ Meta asset containing four moon groups: Gallic, Inuit, Norse and - Other]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license" + Name = "Saturn Minor Moons", + Version = "1.0", + Description = [[ Meta asset containing four moon groups: Gallic, Inuit, Norse and + Other]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/saturn/rhea/default_layers.asset b/data/assets/scene/solarsystem/planets/saturn/rhea/default_layers.asset index 41d72450ae..3c169d1383 100644 --- a/data/assets/scene/solarsystem/planets/saturn/rhea/default_layers.asset +++ b/data/assets/scene/solarsystem/planets/saturn/rhea/default_layers.asset @@ -5,16 +5,16 @@ local colorLayer = asset.require(colorLayersPath .. "/rhea_texture") -- Set enabled layers (temporary solution) -- @TODO: do this using a boolean that's passed to the 'asset.require' instead asset.onInitialize(function () - openspace.setPropertyValueSingle("Scene.Rhea.Renderable.Layers.ColorLayers." .. - colorLayer.layer.Identifier .. ".Enabled", true) + openspace.setPropertyValueSingle("Scene.Rhea.Renderable.Layers.ColorLayers." .. + colorLayer.layer.Identifier .. ".Enabled", true) end) asset.meta = { - Name = "Default Rhea Layers", - Version = "1.0", - Description = [[ Default Rhea layers are: Rhea Texture]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license" + Name = "Default Rhea Layers", + Version = "1.0", + Description = [[ Default Rhea layers are: Rhea Texture]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/saturn/rhea/layers/colorlayers/rhea_texture.asset b/data/assets/scene/solarsystem/planets/saturn/rhea/layers/colorlayers/rhea_texture.asset index 36decdf745..dd36ba9160 100644 --- a/data/assets/scene/solarsystem/planets/saturn/rhea/layers/colorlayers/rhea_texture.asset +++ b/data/assets/scene/solarsystem/planets/saturn/rhea/layers/colorlayers/rhea_texture.asset @@ -2,22 +2,22 @@ local texturesPath = asset.require("./../../rhea_textures").TexturesPath local globeIdentifier = asset.require("./../../rhea").Rhea.Identifier local layer = { - Identifier = "Texture", - FilePath = texturesPath .. "/rhea.jpg", + Identifier = "Texture", + FilePath = texturesPath .. "/rhea.jpg", } asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) asset.export("layer", layer) asset.meta = { - Name = "Rhea Texutre", - Version = "1.0", - Description = [[ Default jpg texture for Rhea]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license" + Name = "Rhea Texutre", + Version = "1.0", + Description = [[ Default jpg texture for Rhea]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/saturn/rhea/rhea.asset b/data/assets/scene/solarsystem/planets/saturn/rhea/rhea.asset index 83792b1a33..0c2d323efe 100644 --- a/data/assets/scene/solarsystem/planets/saturn/rhea/rhea.asset +++ b/data/assets/scene/solarsystem/planets/saturn/rhea/rhea.asset @@ -5,60 +5,60 @@ asset.require('./trail') local labelsPath = asset.require('../saturn_globelabels').LabelsPath local Rhea = { - Identifier = "Rhea", - Parent = transforms.SaturnBarycenter.Identifier, - Transform = { - Translation = { - Type = "SpiceTranslation", - Target = "RHEA", - Observer = "SATURN BARYCENTER", - Kernels = kernel - }, - Rotation = { - Type = "SpiceRotation", - SourceFrame = "IAU_RHEA", - DestinationFrame = "GALACTIC" - } + Identifier = "Rhea", + Parent = transforms.SaturnBarycenter.Identifier, + Transform = { + Translation = { + Type = "SpiceTranslation", + Target = "RHEA", + Observer = "SATURN BARYCENTER", + Kernels = kernel }, - Renderable = { - Type = "RenderableGlobe", - Radii = 765000, - SegmentsPerPatch = 64, - Layers = {}, - Labels = { - Enable = false, - FileName = labelsPath .. "/rhea.labels", - LabelAlignmentOption = "Horizontally", -- or Circularly - LabelsFontSize = 40.0, - LabelsSize = 8.0, - LabelsMinSize = 1.0, - LabelsMaxSize = 1500.0, - ProximityEnabled = false, - LabelsFadeInEnabled = true, - LabelsFadeOutEnabled = true, - FadeInStartingDistance = 2500000.0, - FadeOutStartingDistance = 1000000.0, - LabelsForceDomeRendering = true, - LabelsDistanceEPS = 250000.0, - LabelsColor = { 1.0, 1.0, 0.0 } - } - }, - Tag = { "moon_solarSystem", "moon_giants", "moon_saturn" }, - GUI = { - Name = "Rhea", - Path = "/Solar System/Planets/Saturn/Moons", - Description = [[Second largest moon of Saturn.]] + Rotation = { + Type = "SpiceRotation", + SourceFrame = "IAU_RHEA", + DestinationFrame = "GALACTIC" } + }, + Renderable = { + Type = "RenderableGlobe", + Radii = 765000, + SegmentsPerPatch = 64, + Layers = {}, + Labels = { + Enable = false, + FileName = labelsPath .. "/rhea.labels", + LabelAlignmentOption = "Horizontally", -- or Circularly + LabelsFontSize = 40.0, + LabelsSize = 8.0, + LabelsMinSize = 1.0, + LabelsMaxSize = 1500.0, + ProximityEnabled = false, + LabelsFadeInEnabled = true, + LabelsFadeOutEnabled = true, + FadeInStartingDistance = 2500000.0, + FadeOutStartingDistance = 1000000.0, + LabelsForceDomeRendering = true, + LabelsDistanceEPS = 250000.0, + LabelsColor = { 1.0, 1.0, 0.0 } + } + }, + Tag = { "moon_solarSystem", "moon_giants", "moon_saturn" }, + GUI = { + Name = "Rhea", + Path = "/Solar System/Planets/Saturn/Moons", + Description = [[Second largest moon of Saturn.]] + } } assetHelper.registerSceneGraphNodesAndExport(asset, { Rhea }) asset.meta = { - Name = "Rhea", - Version = "1.0", - Description = [[ Rhea globe with labels.]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license" + Name = "Rhea", + Version = "1.0", + Description = [[ Rhea globe with labels.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/saturn/rhea/rhea_textures.asset b/data/assets/scene/solarsystem/planets/saturn/rhea/rhea_textures.asset index e6b1e10677..659a127fdc 100644 --- a/data/assets/scene/solarsystem/planets/saturn/rhea/rhea_textures.asset +++ b/data/assets/scene/solarsystem/planets/saturn/rhea/rhea_textures.asset @@ -1,7 +1,7 @@ local TexturesPath = asset.syncedResource({ - Name = "Rhea textures", - Type = "HttpSynchronization", - Identifier = "rhea_textures", - Version = 1 + Name = "Rhea textures", + Type = "HttpSynchronization", + Identifier = "rhea_textures", + Version = 1 }) asset.export("TexturesPath", TexturesPath) diff --git a/data/assets/scene/solarsystem/planets/saturn/rhea/trail.asset b/data/assets/scene/solarsystem/planets/saturn/rhea/trail.asset index 7e8a76469b..e26cc0d02b 100644 --- a/data/assets/scene/solarsystem/planets/saturn/rhea/trail.asset +++ b/data/assets/scene/solarsystem/planets/saturn/rhea/trail.asset @@ -5,36 +5,36 @@ local kernel = asset.require('../kernels').sat375 local RheaTrail = { - Identifier = "RheaTrail", - Parent = transforms.SaturnBarycenter.Identifier, - Renderable = { - Type = "RenderableTrailOrbit", - Translation = { - Type = "SpiceTranslation", - Target = "RHEA", - Observer = "SATURN BARYCENTER", - Kernels = kernel - }, - Color = { 0.5, 0.3, 0.3 }, - Period = 108.0 / 24.0, - Resolution = 1000 + Identifier = "RheaTrail", + Parent = transforms.SaturnBarycenter.Identifier, + Renderable = { + Type = "RenderableTrailOrbit", + Translation = { + Type = "SpiceTranslation", + Target = "RHEA", + Observer = "SATURN BARYCENTER", + Kernels = kernel }, - Tag = { "moonTrail_solarSystem", "moonTrail_giants", "moonTrail_saturn" }, - GUI = { - Name = "Rhea Trail", - Path = "/Solar System/Planets/Saturn/Moons", - Description = [[ Trail of Saturn's moon Rhea as observed by Saturn.]], - } + Color = { 0.5, 0.3, 0.3 }, + Period = 108.0 / 24.0, + Resolution = 1000 + }, + Tag = { "moonTrail_solarSystem", "moonTrail_giants", "moonTrail_saturn" }, + GUI = { + Name = "Rhea Trail", + Path = "/Solar System/Planets/Saturn/Moons", + Description = [[ Trail of Saturn's moon Rhea as observed by Saturn.]], + } } assetHelper.registerSceneGraphNodesAndExport(asset, { RheaTrail }) asset.meta = { - Name = "Rhea Trail", - Version = "1.0", - Description = [[ Main trail for Rhea. Data from NASA Spice (see base spice asset)]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license" + Name = "Rhea Trail", + Version = "1.0", + Description = [[ Main trail for Rhea. Data from NASA Spice (see base spice asset)]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/saturn/saturn.asset b/data/assets/scene/solarsystem/planets/saturn/saturn.asset index 09b3a33e2d..555ac5fc63 100644 --- a/data/assets/scene/solarsystem/planets/saturn/saturn.asset +++ b/data/assets/scene/solarsystem/planets/saturn/saturn.asset @@ -6,81 +6,81 @@ asset.require('./trail') local texturesPath = asset.require("./saturn_textures").TexturesPath local Saturn = { - Identifier = "Saturn", - Parent = transforms.SaturnBarycenter.Identifier, - Transform = { - Rotation = { - Type = "SpiceRotation", - SourceFrame = "IAU_SATURN", - DestinationFrame = "GALACTIC" - } - }, - Renderable = { - Type = "RenderableGlobe", - Radii = { 60268000, 60268000, 54364000 }, - SegmentsPerPatch = 64, - Layers = {}, - Rings = { - -- Single Texture Values: - --Texture = texturesPath .. "/saturn_rings.png", - --ColorFilter = 0.15, - - -- MultiTexture Valeus: - TextureFwrd = texturesPath .. "/forward_original_single.png", - TextureBckwrd = texturesPath .. "/back_original_single.png", - TextureUnlit = texturesPath .. "/unlit_original_single.png", - TextureColor = texturesPath .. "/color_original_single.png", - TextureTransparency = texturesPath .. "/trans_original_single.png", - ColorFilter = 0.8, - - NightFactor = 1.0, - Size = 140445000, - Offset = { 74500 / 140445.100671159, 1.0 }, -- min / max extend - }, - Shadows = { - Enabled = true, - DistanceFraction = 40.0 - } - }, - Tag = { "planet_solarSystem", "planet_giants" }, - GUI = { - Name = "Saturn", - Path = "/Solar System/Planets/Saturn", - Description = [[Saturn globe.]] + Identifier = "Saturn", + Parent = transforms.SaturnBarycenter.Identifier, + Transform = { + Rotation = { + Type = "SpiceRotation", + SourceFrame = "IAU_SATURN", + DestinationFrame = "GALACTIC" } + }, + Renderable = { + Type = "RenderableGlobe", + Radii = { 60268000, 60268000, 54364000 }, + SegmentsPerPatch = 64, + Layers = {}, + Rings = { + -- Single Texture Values: + --Texture = texturesPath .. "/saturn_rings.png", + --ColorFilter = 0.15, + + -- MultiTexture Valeus: + TextureFwrd = texturesPath .. "/forward_original_single.png", + TextureBckwrd = texturesPath .. "/back_original_single.png", + TextureUnlit = texturesPath .. "/unlit_original_single.png", + TextureColor = texturesPath .. "/color_original_single.png", + TextureTransparency = texturesPath .. "/trans_original_single.png", + ColorFilter = 0.8, + + NightFactor = 1.0, + Size = 140445000, + Offset = { 74500 / 140445.100671159, 1.0 }, -- min / max extend + }, + Shadows = { + Enabled = true, + DistanceFraction = 40.0 + } + }, + Tag = { "planet_solarSystem", "planet_giants" }, + GUI = { + Name = "Saturn", + Path = "/Solar System/Planets/Saturn", + Description = [[Saturn globe.]] + } } local SaturnLabel = { - Identifier = "SaturnLabel", - Parent = Saturn.Identifier, - Renderable = { - Enabled = false, - Type = "RenderableLabels", - LabelText = "Saturn", - FontSize = 100.0, - LabelSize = 8.7, - LabelMaxSize = 100.0, - LabelMinSize = 1.0, - BlendMode = "Additive", - LabelOrientationOption = "Camera View Direction" - }, - Tag = { "solarsystem_labels" }, - GUI = { - Name = "Saturn Label", - Path = "/Solar System/Planets/Saturn", - Description = [[ Main planet label for Saturn.]], - } + Identifier = "SaturnLabel", + Parent = Saturn.Identifier, + Renderable = { + Enabled = false, + Type = "RenderableLabels", + LabelText = "Saturn", + FontSize = 100.0, + LabelSize = 8.7, + LabelMaxSize = 100.0, + LabelMinSize = 1.0, + BlendMode = "Additive", + LabelOrientationOption = "Camera View Direction" + }, + Tag = { "solarsystem_labels" }, + GUI = { + Name = "Saturn Label", + Path = "/Solar System/Planets/Saturn", + Description = [[ Main planet label for Saturn.]], + } } assetHelper.registerSceneGraphNodesAndExport(asset, { Saturn, SaturnLabel }) asset.meta = { - Name = "Saturn", - Version = "1.0", - Description = [[ Saturn globe, and main planet label.]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"Saturn", "SaturnLabel"} + Name = "Saturn", + Version = "1.0", + Description = [[ Saturn globe, and main planet label.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license", + Identifiers = {"Saturn", "SaturnLabel"} } diff --git a/data/assets/scene/solarsystem/planets/saturn/saturn_globelabels.asset b/data/assets/scene/solarsystem/planets/saturn/saturn_globelabels.asset index 1fb85efda5..cca9ae611b 100644 --- a/data/assets/scene/solarsystem/planets/saturn/saturn_globelabels.asset +++ b/data/assets/scene/solarsystem/planets/saturn/saturn_globelabels.asset @@ -1,7 +1,7 @@ local LabelsPath = asset.syncedResource({ - Name = "Dione Labels", - Type = "HttpSynchronization", - Identifier = "saturn_labels", - Version = 1 + Name = "Dione Labels", + Type = "HttpSynchronization", + Identifier = "saturn_labels", + Version = 1 }) asset.export("LabelsPath", LabelsPath) diff --git a/data/assets/scene/solarsystem/planets/saturn/saturn_textures.asset b/data/assets/scene/solarsystem/planets/saturn/saturn_textures.asset index 092d099f87..3f29c75b07 100644 --- a/data/assets/scene/solarsystem/planets/saturn/saturn_textures.asset +++ b/data/assets/scene/solarsystem/planets/saturn/saturn_textures.asset @@ -1,7 +1,7 @@ local TexturesPath = asset.syncedResource({ - Type = "HttpSynchronization", - Name = "Saturn textures", - Identifier = "saturn_textures", - Version = 4 + Type = "HttpSynchronization", + Name = "Saturn textures", + Identifier = "saturn_textures", + Version = 4 }) asset.export("TexturesPath", TexturesPath) diff --git a/data/assets/scene/solarsystem/planets/saturn/tethys/default_layers.asset b/data/assets/scene/solarsystem/planets/saturn/tethys/default_layers.asset index cdb813d935..18d406031c 100644 --- a/data/assets/scene/solarsystem/planets/saturn/tethys/default_layers.asset +++ b/data/assets/scene/solarsystem/planets/saturn/tethys/default_layers.asset @@ -5,15 +5,15 @@ local colorLayer = asset.require(colorLayersPath .. "/tethys_texture") -- Set enabled layers (temporary solution) -- @TODO: do this using a boolean that's passed to the 'asset.require' instead asset.onInitialize(function () - openspace.setPropertyValueSingle("Scene.Tethys.Renderable.Layers.ColorLayers." .. colorLayer.layer.Identifier .. ".Enabled", true) + openspace.setPropertyValueSingle("Scene.Tethys.Renderable.Layers.ColorLayers." .. colorLayer.layer.Identifier .. ".Enabled", true) end) asset.meta = { - Name = "Default Tethys Layers", - Version = "1.0", - Description = [[ Default Tethys layers are: Tethys Texture]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license" + Name = "Default Tethys Layers", + Version = "1.0", + Description = [[ Default Tethys layers are: Tethys Texture]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/saturn/tethys/layers/colorlayers/tethys_texture.asset b/data/assets/scene/solarsystem/planets/saturn/tethys/layers/colorlayers/tethys_texture.asset index f8b9293d98..c8a546bc6c 100644 --- a/data/assets/scene/solarsystem/planets/saturn/tethys/layers/colorlayers/tethys_texture.asset +++ b/data/assets/scene/solarsystem/planets/saturn/tethys/layers/colorlayers/tethys_texture.asset @@ -2,22 +2,22 @@ local texturesPath = asset.require("./../../tethys_textures").TexturesPath local globeIdentifier = asset.require("./../../tethys").Tethys.Identifier local layer = { - Identifier = "Texture", - FilePath = texturesPath .. "/tethys.jpg", + Identifier = "Texture", + FilePath = texturesPath .. "/tethys.jpg", } asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) asset.export("layer", layer) asset.meta = { - Name = "Tethys Texutre", - Version = "1.0", - Description = [[ Default jpg texture for Tethys]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license" + Name = "Tethys Texutre", + Version = "1.0", + Description = [[ Default jpg texture for Tethys]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/saturn/tethys/tethys.asset b/data/assets/scene/solarsystem/planets/saturn/tethys/tethys.asset index 18a97e75c3..636081f8af 100644 --- a/data/assets/scene/solarsystem/planets/saturn/tethys/tethys.asset +++ b/data/assets/scene/solarsystem/planets/saturn/tethys/tethys.asset @@ -5,58 +5,58 @@ asset.require('./trail') local labelsPath = asset.require('../saturn_globelabels').LabelsPath local Tethys = { - Identifier = "Tethys", - Parent = transforms.SaturnBarycenter.Identifier, - Transform = { - Translation = { - Type = "SpiceTranslation", - Target = "TETHYS", - Observer = "SATURN BARYCENTER", - Kernels = kernel - }, - Rotation = { - Type = "SpiceRotation", - SourceFrame = "IAU_TETHYS", - DestinationFrame = "GALACTIC" - } + Identifier = "Tethys", + Parent = transforms.SaturnBarycenter.Identifier, + Transform = { + Translation = { + Type = "SpiceTranslation", + Target = "TETHYS", + Observer = "SATURN BARYCENTER", + Kernels = kernel }, - Renderable = { - Type = "RenderableGlobe", - Radii = 531100, - SegmentsPerPatch = 64, - Layers = {}, - Labels = { - Enable = false, - FileName = labelsPath .. "/tethys.labels", - LabelAlignmentOption = "Horizontally", -- or Circularly - LabelsFontSize = 24.0, - LabelsSize = 8.0, - LabelsMinSize = 1.0, - LabelsMaxSize = 1500.0, - ProximityEnabled = false, - LabelsFadeInEnabled = true, - LabelsFadeOutEnabled = true, - FadeInStartingDistance = 1500000.0, - FadeOutStartingDistance = 500000.0, - LabelsForceDomeRendering = true, - LabelsDistanceEPS = 200000.0, - LabelsColor = { 1.0, 1.0, 0.0 } - } - }, - Tag = { "moon_solarSystem", "moon_giants", "moon_saturn" }, - GUI = { - Path = "/Solar System/Planets/Saturn/Moons" + Rotation = { + Type = "SpiceRotation", + SourceFrame = "IAU_TETHYS", + DestinationFrame = "GALACTIC" } + }, + Renderable = { + Type = "RenderableGlobe", + Radii = 531100, + SegmentsPerPatch = 64, + Layers = {}, + Labels = { + Enable = false, + FileName = labelsPath .. "/tethys.labels", + LabelAlignmentOption = "Horizontally", -- or Circularly + LabelsFontSize = 24.0, + LabelsSize = 8.0, + LabelsMinSize = 1.0, + LabelsMaxSize = 1500.0, + ProximityEnabled = false, + LabelsFadeInEnabled = true, + LabelsFadeOutEnabled = true, + FadeInStartingDistance = 1500000.0, + FadeOutStartingDistance = 500000.0, + LabelsForceDomeRendering = true, + LabelsDistanceEPS = 200000.0, + LabelsColor = { 1.0, 1.0, 0.0 } + } + }, + Tag = { "moon_solarSystem", "moon_giants", "moon_saturn" }, + GUI = { + Path = "/Solar System/Planets/Saturn/Moons" + } } assetHelper.registerSceneGraphNodesAndExport(asset, { Tethys }) asset.meta = { - Name = "Tethys", - Version = "1.0", - Description = [[ Tethys globe with labels.]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license" + Name = "Tethys", + Version = "1.0", + Description = [[ Tethys globe with labels.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/saturn/tethys/tethys_textures.asset b/data/assets/scene/solarsystem/planets/saturn/tethys/tethys_textures.asset index ac80cf268d..804f577921 100644 --- a/data/assets/scene/solarsystem/planets/saturn/tethys/tethys_textures.asset +++ b/data/assets/scene/solarsystem/planets/saturn/tethys/tethys_textures.asset @@ -1,7 +1,7 @@ local TexturesPath = asset.syncedResource({ - Name = "Tethys textures", - Type = "HttpSynchronization", - Identifier = "tethys_textures", - Version = 1 + Name = "Tethys textures", + Type = "HttpSynchronization", + Identifier = "tethys_textures", + Version = 1 }) asset.export("TexturesPath", TexturesPath) diff --git a/data/assets/scene/solarsystem/planets/saturn/tethys/trail.asset b/data/assets/scene/solarsystem/planets/saturn/tethys/trail.asset index d7ce108cc4..6a82617fae 100644 --- a/data/assets/scene/solarsystem/planets/saturn/tethys/trail.asset +++ b/data/assets/scene/solarsystem/planets/saturn/tethys/trail.asset @@ -5,36 +5,36 @@ local kernel = asset.require('../kernels').sat375 local TethysTrail = { - Identifier = "TethysTrail", - Parent = transforms.SaturnBarycenter.Identifier, - Renderable = { - Type = "RenderableTrailOrbit", - Translation = { - Type = "SpiceTranslation", - Target = "TETHYS", - Observer = "SATURN BARYCENTER", - Kernels = kernel - }, - Color = { 0.5, 0.3, 0.3 }, - Period = 45.0 / 24.0, - Resolution = 1000 + Identifier = "TethysTrail", + Parent = transforms.SaturnBarycenter.Identifier, + Renderable = { + Type = "RenderableTrailOrbit", + Translation = { + Type = "SpiceTranslation", + Target = "TETHYS", + Observer = "SATURN BARYCENTER", + Kernels = kernel }, - Tag = { "moonTrail_solarSystem", "moonTrail_giants", "moonTrail_saturn" }, - GUI = { - Name = "Tethys Trail", - Path = "/Solar System/Planets/Saturn/Moons", - Description = [[ Trail of Saturn's moon Tethys as observed by Saturn.]], - } + Color = { 0.5, 0.3, 0.3 }, + Period = 45.0 / 24.0, + Resolution = 1000 + }, + Tag = { "moonTrail_solarSystem", "moonTrail_giants", "moonTrail_saturn" }, + GUI = { + Name = "Tethys Trail", + Path = "/Solar System/Planets/Saturn/Moons", + Description = [[ Trail of Saturn's moon Tethys as observed by Saturn.]], + } } assetHelper.registerSceneGraphNodesAndExport(asset, { TethysTrail }) asset.meta = { - Name = "Tethys Trail", - Version = "1.0", - Description = [[ Main trail for Tethys. Data from NASA Spice (see base spice asset)]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license" + Name = "Tethys Trail", + Version = "1.0", + Description = [[ Main trail for Tethys. Data from NASA Spice (see base spice asset)]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/saturn/titan/default_layers.asset b/data/assets/scene/solarsystem/planets/saturn/titan/default_layers.asset index 972c2d6787..9159115f6a 100644 --- a/data/assets/scene/solarsystem/planets/saturn/titan/default_layers.asset +++ b/data/assets/scene/solarsystem/planets/saturn/titan/default_layers.asset @@ -6,17 +6,17 @@ local colorLayer = asset.require(colorLayersPath .. "/cassini_iss_global_mosaic_ -- Set enabled layers (temporary solution) -- @TODO: do this using a boolean that's passed to the 'asset.require' instead asset.onInitialize(function () - openspace.setPropertyValueSingle("Scene.Titan.Renderable.Layers.ColorLayers." .. - colorLayer.layer.Identifier .. ".Enabled", true) + openspace.setPropertyValueSingle("Scene.Titan.Renderable.Layers.ColorLayers." .. + colorLayer.layer.Identifier .. ".Enabled", true) end) asset.meta = { - Name = "Default Titan Layers", - Version = "1.0", - Description = [[ Default Titan layers are: Titan Texture and Cassini ISS Global - Mosaic]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license" + Name = "Default Titan Layers", + Version = "1.0", + Description = [[ Default Titan layers are: Titan Texture and Cassini ISS Global + Mosaic]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/saturn/titan/layers/colorlayers/cassini_iss_global_mosaic_4km_liu.asset b/data/assets/scene/solarsystem/planets/saturn/titan/layers/colorlayers/cassini_iss_global_mosaic_4km_liu.asset index e59abc51d2..759b74073f 100644 --- a/data/assets/scene/solarsystem/planets/saturn/titan/layers/colorlayers/cassini_iss_global_mosaic_4km_liu.asset +++ b/data/assets/scene/solarsystem/planets/saturn/titan/layers/colorlayers/cassini_iss_global_mosaic_4km_liu.asset @@ -2,34 +2,34 @@ local mapServiceConfigs = asset.localResource("./../../map_service_configs") local globeIdentifier = asset.require("./../../titan").Titan.Identifier local layer = { - Identifier = "Cassini_ISS_Global_Mosaic_4km_LiU", - Name = "Cassini ISS Global Mosaic [Sweden]", - FilePath = mapServiceConfigs .. "/LiU/ISS_P19658_Mosaic_Global_4km.wms", - Description = [[ This global digital map of Saturn's moon Titan was created using - images taken by the Cassini spacecraft's Imaging Science Subsystem (ISS). The map - was produced in June 2015 using data collected through Cassini's flyby on April 7, - 2014, known as "T100". The mean radius of Titan used for projection of this map is - 1,600 miles (2,575 kilometers). Pixel resolution is 4005 meters per pixel (m). - Titan is assumed to be spherical until a control network -- a model of the moon's - shape based on multiple images tied together at defined points on the surface -- - is created at some point in the future. (Description from URL)]], + Identifier = "Cassini_ISS_Global_Mosaic_4km_LiU", + Name = "Cassini ISS Global Mosaic [Sweden]", + FilePath = mapServiceConfigs .. "/LiU/ISS_P19658_Mosaic_Global_4km.wms", + Description = [[ This global digital map of Saturn's moon Titan was created using + images taken by the Cassini spacecraft's Imaging Science Subsystem (ISS). The map + was produced in June 2015 using data collected through Cassini's flyby on April 7, + 2014, known as "T100". The mean radius of Titan used for projection of this map is + 1,600 miles (2,575 kilometers). Pixel resolution is 4005 meters per pixel (m). + Titan is assumed to be spherical until a control network -- a model of the moon's + shape based on multiple images tied together at defined points on the surface -- + is created at some point in the future. (Description from URL)]], } asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) asset.export("layer", layer) asset.meta = { - Name = "Cassini ISS Global Mosaic", - Version = "1.0", - Description = [[ Cassini global image layer for Titan. This layer is hosted on the - OpenSpace server in Sweden]], - Author = "USGS", - URL = "https://astrogeology.usgs.gov/search/map/Titan/Cassini/Global-Mosaic/" .. - "Titan_ISS_P19658_Mosaic_Global_4km", - License = "NASA/PDS", - Identifiers = {"Cassini_ISS_Global_Mosaic_4km_LiU"} + Name = "Cassini ISS Global Mosaic", + Version = "1.0", + Description = [[ Cassini global image layer for Titan. This layer is hosted on the + OpenSpace server in Sweden]], + Author = "USGS", + URL = "https://astrogeology.usgs.gov/search/map/Titan/Cassini/Global-Mosaic/" .. + "Titan_ISS_P19658_Mosaic_Global_4km", + License = "NASA/PDS", + Identifiers = {"Cassini_ISS_Global_Mosaic_4km_LiU"} } diff --git a/data/assets/scene/solarsystem/planets/saturn/titan/layers/colorlayers/titan_texture.asset b/data/assets/scene/solarsystem/planets/saturn/titan/layers/colorlayers/titan_texture.asset index 62a397db97..b9730b43eb 100644 --- a/data/assets/scene/solarsystem/planets/saturn/titan/layers/colorlayers/titan_texture.asset +++ b/data/assets/scene/solarsystem/planets/saturn/titan/layers/colorlayers/titan_texture.asset @@ -2,22 +2,22 @@ local texturesPath = asset.require("./../../titan_textures").TexturesPath local globeIdentifier = asset.require("./../../titan").Titan.Identifier local layer = { - Identifier = "Texture", - FilePath = texturesPath .. "/titan.jpg", + Identifier = "Texture", + FilePath = texturesPath .. "/titan.jpg", } asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) asset.export("layer", layer) asset.meta = { - Name = "Titan Texutre", - Version = "1.0", - Description = [[ Default jpg texture for Titan]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license" + Name = "Titan Texutre", + Version = "1.0", + Description = [[ Default jpg texture for Titan]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/saturn/titan/titan.asset b/data/assets/scene/solarsystem/planets/saturn/titan/titan.asset index eaa851c833..fb52863ec2 100644 --- a/data/assets/scene/solarsystem/planets/saturn/titan/titan.asset +++ b/data/assets/scene/solarsystem/planets/saturn/titan/titan.asset @@ -5,61 +5,61 @@ asset.require('./trail') local labelsPath = asset.require('../saturn_globelabels').LabelsPath local Titan = { - Identifier = "Titan", - Parent = transforms.SaturnBarycenter.Identifier, - Transform = { - Translation = { - Type = "SpiceTranslation", - Target = "TITAN", - Observer = "SATURN BARYCENTER", - Kernels = kernel - }, - Rotation = { - Type = "SpiceRotation", - SourceFrame = "IAU_TITAN", - DestinationFrame = "GALACTIC" - } + Identifier = "Titan", + Parent = transforms.SaturnBarycenter.Identifier, + Transform = { + Translation = { + Type = "SpiceTranslation", + Target = "TITAN", + Observer = "SATURN BARYCENTER", + Kernels = kernel }, - Renderable = { - Type = "RenderableGlobe", - Radii = 2576000, - SegmentsPerPatch = 64, - Layers = {}, - Labels = { - Enable = false, - FileName = labelsPath .. "/titan.labels", - LabelAlignmentOption = "Horizontally", -- or Circularly - LabelsFontSize = 14.0, - LabelsSize = 10.0, - LabelsMinSize = 1.0, - LabelsMaxSize = 1500.0, - ProximityEnabled = false, - LabelsFadeInEnabled = true, - LabelsFadeOutEnabled = true, - FadeInStartingDistance = 7500000.0, - FadeOutStartingDistance = 6000000.0, - LabelsForceDomeRendering = true, - LabelsDistanceEPS = 1350000.0, - LabelsColor = { 1.0, 1.0, 0.0 } - } - }, - Tag = { "moon_solarSystem", "moon_giants", "moon_saturn" }, - GUI = { - Name = "Titan", - Path = "/Solar System/Planets/Saturn/Moons", - Description = [[Largest moon of Saturn.]] + Rotation = { + Type = "SpiceRotation", + SourceFrame = "IAU_TITAN", + DestinationFrame = "GALACTIC" } + }, + Renderable = { + Type = "RenderableGlobe", + Radii = 2576000, + SegmentsPerPatch = 64, + Layers = {}, + Labels = { + Enable = false, + FileName = labelsPath .. "/titan.labels", + LabelAlignmentOption = "Horizontally", -- or Circularly + LabelsFontSize = 14.0, + LabelsSize = 10.0, + LabelsMinSize = 1.0, + LabelsMaxSize = 1500.0, + ProximityEnabled = false, + LabelsFadeInEnabled = true, + LabelsFadeOutEnabled = true, + FadeInStartingDistance = 7500000.0, + FadeOutStartingDistance = 6000000.0, + LabelsForceDomeRendering = true, + LabelsDistanceEPS = 1350000.0, + LabelsColor = { 1.0, 1.0, 0.0 } + } + }, + Tag = { "moon_solarSystem", "moon_giants", "moon_saturn" }, + GUI = { + Name = "Titan", + Path = "/Solar System/Planets/Saturn/Moons", + Description = [[Largest moon of Saturn.]] + } } assetHelper.registerSceneGraphNodesAndExport(asset, { Titan }) asset.meta = { - Name = "Titan", - Version = "1.0", - Description = [[ Titan globe with labels.]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"Titan"} + Name = "Titan", + Version = "1.0", + Description = [[ Titan globe with labels.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license", + Identifiers = {"Titan"} } diff --git a/data/assets/scene/solarsystem/planets/saturn/titan/titan_textures.asset b/data/assets/scene/solarsystem/planets/saturn/titan/titan_textures.asset index e4c0742701..6083943b65 100644 --- a/data/assets/scene/solarsystem/planets/saturn/titan/titan_textures.asset +++ b/data/assets/scene/solarsystem/planets/saturn/titan/titan_textures.asset @@ -1,7 +1,7 @@ local TexturesPath = asset.syncedResource({ - Type = "HttpSynchronization", - Name = "Titan textures", - Identifier = "titan_textures", - Version = 1 + Type = "HttpSynchronization", + Name = "Titan textures", + Identifier = "titan_textures", + Version = 1 }) asset.export("TexturesPath", TexturesPath) diff --git a/data/assets/scene/solarsystem/planets/saturn/titan/trail.asset b/data/assets/scene/solarsystem/planets/saturn/titan/trail.asset index 642a32b306..a05d56cd22 100644 --- a/data/assets/scene/solarsystem/planets/saturn/titan/trail.asset +++ b/data/assets/scene/solarsystem/planets/saturn/titan/trail.asset @@ -5,37 +5,37 @@ local kernel = asset.require('../kernels').sat375 local TitanTrail = { - Identifier = "TitanTrail", - Parent = transforms.SaturnBarycenter.Identifier, - Renderable = { - Type = "RenderableTrailOrbit", - Translation = { - Type = "SpiceTranslation", - Target = "TITAN", - Observer = "SATURN BARYCENTER", - Kernels = kernel - }, - Color = { 0.5, 0.3, 0.3 }, - Period = 16.0, - Resolution = 1000 + Identifier = "TitanTrail", + Parent = transforms.SaturnBarycenter.Identifier, + Renderable = { + Type = "RenderableTrailOrbit", + Translation = { + Type = "SpiceTranslation", + Target = "TITAN", + Observer = "SATURN BARYCENTER", + Kernels = kernel }, - Tag = { "moonTrail_solarSystem", "moonTrail_giants", "moonTrail_saturn" }, - GUI = { - Name = "Titan Trail", - Path = "/Solar System/Planets/Saturn/Moons", - Description = [[ Trail of Saturn's moon Titan as observed by Saturn.]], - } + Color = { 0.5, 0.3, 0.3 }, + Period = 16.0, + Resolution = 1000 + }, + Tag = { "moonTrail_solarSystem", "moonTrail_giants", "moonTrail_saturn" }, + GUI = { + Name = "Titan Trail", + Path = "/Solar System/Planets/Saturn/Moons", + Description = [[ Trail of Saturn's moon Titan as observed by Saturn.]], + } } assetHelper.registerSceneGraphNodesAndExport(asset, { TitanTrail }) asset.meta = { - Name = "Titan Trail", - Version = "1.0", - Description = [[ Main trail for Titan. Data from NASA Spice (see base spice asset)]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"TitanTrail"} + Name = "Titan Trail", + Version = "1.0", + Description = [[ Main trail for Titan. Data from NASA Spice (see base spice asset)]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license", + Identifiers = {"TitanTrail"} } diff --git a/data/assets/scene/solarsystem/planets/saturn/trail.asset b/data/assets/scene/solarsystem/planets/saturn/trail.asset index 5f11ff9c71..907eb7ae94 100644 --- a/data/assets/scene/solarsystem/planets/saturn/trail.asset +++ b/data/assets/scene/solarsystem/planets/saturn/trail.asset @@ -4,36 +4,36 @@ local transforms = asset.require('scene/solarsystem/sun/transforms') local SaturnTrail = { - Identifier = "SaturnTrail", - Parent = transforms.SolarSystemBarycenter.Identifier, - Renderable = { - Type = "RenderableTrailOrbit", - Translation = { - Type = "SpiceTranslation", - Target = "SATURN BARYCENTER", - Observer = "SUN" - }, - Color = { 0.85, 0.75, 0.51 }, - Period = 10746.94, - Resolution = 1000 + Identifier = "SaturnTrail", + Parent = transforms.SolarSystemBarycenter.Identifier, + Renderable = { + Type = "RenderableTrailOrbit", + Translation = { + Type = "SpiceTranslation", + Target = "SATURN BARYCENTER", + Observer = "SUN" }, - Tag = { "planetTrail_solarSystem", "planetTrail_giants" }, - GUI = { - Name = "Saturn Trail", - Path = "/Solar System/Planets/Saturn", - Description = [[ Trail of Saturn as observed by the Sun.]], - } + Color = { 0.85, 0.75, 0.51 }, + Period = 10746.94, + Resolution = 1000 + }, + Tag = { "planetTrail_solarSystem", "planetTrail_giants" }, + GUI = { + Name = "Saturn Trail", + Path = "/Solar System/Planets/Saturn", + Description = [[ Trail of Saturn as observed by the Sun.]] + } } assetHelper.registerSceneGraphNodesAndExport(asset, { SaturnTrail }) asset.meta = { - Name = "Saturn Trail", - Version = "1.0", - Description = [[ Main trail of Saturn. Data from NASA Spice (see base spice asset)]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"SaturnTrail"} + Name = "Saturn Trail", + Version = "1.0", + Description = [[ Main trail of Saturn. Data from NASA Spice (see base spice asset)]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license", + Identifiers = {"SaturnTrail"} } diff --git a/data/assets/scene/solarsystem/planets/saturn/trail_earth.asset b/data/assets/scene/solarsystem/planets/saturn/trail_earth.asset index d62a830e25..90a686abbb 100644 --- a/data/assets/scene/solarsystem/planets/saturn/trail_earth.asset +++ b/data/assets/scene/solarsystem/planets/saturn/trail_earth.asset @@ -6,38 +6,38 @@ asset.require("spice/base") local SaturnTrailEarth = { - Identifier = "SaturnTrailEarth", - Parent = earthTransforms.EarthBarycenter.Identifier, - Renderable = { - Type = "RenderableTrailOrbit", - Translation = { - Type = "SpiceTranslation", - Target = "SATURN BARYCENTER", - Observer = "EARTH" - }, - Color = { 1.0, 0.5, 0.2 }, - Period = 224.695, - Resolution = 1000, - Enabled = false + Identifier = "SaturnTrailEarth", + Parent = earthTransforms.EarthBarycenter.Identifier, + Renderable = { + Type = "RenderableTrailOrbit", + Translation = { + Type = "SpiceTranslation", + Target = "SATURN BARYCENTER", + Observer = "EARTH" }, - Tag = { "planetTrail_solarSystem_alt", "planetTrail_terrestrial_alt" }, - GUI = { - Name = "Saturn trail from Earth", - Path = "/Solar System/Planets/Saturn", - Hidden = false, - Description = [[ Trail of Saturn as observed by the Earth.]], - } + Color = { 1.0, 0.5, 0.2 }, + Period = 224.695, + Resolution = 1000, + Enabled = false + }, + Tag = { "planetTrail_solarSystem_alt", "planetTrail_terrestrial_alt" }, + GUI = { + Name = "Saturn trail from Earth", + Path = "/Solar System/Planets/Saturn", + Hidden = false, + Description = [[ Trail of Saturn as observed by the Earth.]], + } } asset.meta = { - Name = "Saturn Trail from Earth", - Version = "1.0", - Description = [[ Alternate trail of Saturn, as observed by the Earth rather then the - Sun. Data from NASA SPICE (see base spice asset)]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"VenusTrailEarth"} + Name = "Saturn Trail from Earth", + Version = "1.0", + Description = [[ Alternate trail of Saturn, as observed by the Earth rather then the + Sun. Data from NASA SPICE (see base spice asset)]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license", + Identifiers = {"VenusTrailEarth"} } diff --git a/data/assets/scene/solarsystem/planets/saturn/transforms.asset b/data/assets/scene/solarsystem/planets/saturn/transforms.asset index 486b23469b..cedfe258df 100644 --- a/data/assets/scene/solarsystem/planets/saturn/transforms.asset +++ b/data/assets/scene/solarsystem/planets/saturn/transforms.asset @@ -3,32 +3,32 @@ local transforms = asset.require('scene/solarsystem/sun/transforms') asset.require("spice/base") local SaturnBarycenter = { - Identifier = "SaturnBarycenter", - Parent = transforms.SolarSystemBarycenter.Identifier, - Transform = { - Translation = { - Type = "SpiceTranslation", - Target = "SATURN BARYCENTER", - Observer = "SUN" - } - }, - GUI = { - Name = "Saturn Barycenter", - Path = "/Solar System/Planets/Saturn", - Hidden = true, - Description = [[ Saturn Barycenter position]] + Identifier = "SaturnBarycenter", + Parent = transforms.SolarSystemBarycenter.Identifier, + Transform = { + Translation = { + Type = "SpiceTranslation", + Target = "SATURN BARYCENTER", + Observer = "SUN" } + }, + GUI = { + Name = "Saturn Barycenter", + Path = "/Solar System/Planets/Saturn", + Hidden = true, + Description = [[ Saturn Barycenter position]] + } } assetHelper.registerSceneGraphNodesAndExport(asset, { SaturnBarycenter }) asset.meta = { - Name = "Saturn Transforms", - Version = "1.0", - Description = [[ Saturn Barycenter transform]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"SaturnBarycenter"} + Name = "Saturn Transforms", + Version = "1.0", + Description = [[ Saturn Barycenter transform]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license", + Identifiers = {"SaturnBarycenter"} } diff --git a/data/assets/scene/solarsystem/planets/uranus/default_layers.asset b/data/assets/scene/solarsystem/planets/uranus/default_layers.asset index a724445e80..54ebcc8a44 100644 --- a/data/assets/scene/solarsystem/planets/uranus/default_layers.asset +++ b/data/assets/scene/solarsystem/planets/uranus/default_layers.asset @@ -5,15 +5,15 @@ local colorLayer = asset.require(colorLayersPath .. "/uranus_texture") -- Set enabled layers (temporary solution) -- @TODO: do this using a boolean that's passed to the 'asset.require' instead asset.onInitialize(function () - openspace.setPropertyValueSingle("Scene.Uranus.Renderable.Layers.ColorLayers." .. colorLayer.layer.Identifier .. ".Enabled", true) + openspace.setPropertyValueSingle("Scene.Uranus.Renderable.Layers.ColorLayers." .. colorLayer.layer.Identifier .. ".Enabled", true) end) asset.meta = { - Name = "Default Uranus Layers", - Version = "1.0", - Description = [[ Default Uranus layers are: Uranus texture]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license" + Name = "Default Uranus Layers", + Version = "1.0", + Description = [[ Default Uranus layers are: Uranus texture]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/uranus/inner_moons.asset b/data/assets/scene/solarsystem/planets/uranus/inner_moons.asset index d2d9b1c419..662fde8b7b 100644 --- a/data/assets/scene/solarsystem/planets/uranus/inner_moons.asset +++ b/data/assets/scene/solarsystem/planets/uranus/inner_moons.asset @@ -11,251 +11,251 @@ local tags = { "moon_solarSystem", "moon_giants", "moon_uranus", "moon_inner" } local trailColor = { 0.60, 0.65, 0.84 } local trailTags = { - "moonTrail_solarSystem", - "moonTrail_giants", - "moonTrail_uranus", - "moonTrail_minor" + "moonTrail_solarSystem", + "moonTrail_giants", + "moonTrail_uranus", + "moonTrail_minor" } local innerMoons = { - { - Identifier = "Cordelia", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "CORDELIA", - Radii = { 40000, 40000, 40000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Path = "/Solar System/Planets/Uranus/Moons/Inner Moons" - }, - TrailColor = trailColor, - OrbitPeriod = 0.335034, - Kernels = kernel + { + Identifier = "Cordelia", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice }, - { - Identifier = "Ophelia", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "OPHELIA", - Radii = { 43000, 43000, 43000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Path = "/Solar System/Planets/Uranus/Moons/Inner Moons" - }, - TrailColor = trailColor, - OrbitPeriod = 0.376400, - Kernels = kernel + Spice = "CORDELIA", + Radii = { 40000, 40000, 40000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Path = "/Solar System/Planets/Uranus/Moons/Inner Moons" }, - { - Identifier = "Bianca", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "BIANCA", - Radii = { 51000, 51000, 51000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Path = "/Solar System/Planets/Uranus/Moons/Inner Moons" - }, - TrailColor = trailColor, - OrbitPeriod = 0.434579, - Kernels = kernel + TrailColor = trailColor, + OrbitPeriod = 0.335034, + Kernels = kernel + }, + { + Identifier = "Ophelia", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice }, - { - Identifier = "Cressida", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "CRESSIDA", - Radii = { 80000, 80000, 80000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Path = "/Solar System/Planets/Uranus/Moons/Inner Moons" - }, - TrailColor = trailColor, - OrbitPeriod = 0.463570, - Kernels = kernel + Spice = "OPHELIA", + Radii = { 43000, 43000, 43000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Path = "/Solar System/Planets/Uranus/Moons/Inner Moons" }, - { - Identifier = "Desdemona", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "DESDEMONA", - Radii = { 64000, 64000, 64000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Path = "/Solar System/Planets/Uranus/Moons/Inner Moons" - }, - TrailColor = trailColor, - OrbitPeriod = 0.473650, - Kernels = kernel + TrailColor = trailColor, + OrbitPeriod = 0.376400, + Kernels = kernel + }, + { + Identifier = "Bianca", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice }, - { - Identifier = "Juliet", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "JULIET", - Radii = { 94000, 94000, 94000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Path = "/Solar System/Planets/Uranus/Moons/Inner Moons" - }, - TrailColor = trailColor, - OrbitPeriod = 0.493065, - Kernels = kernel + Spice = "BIANCA", + Radii = { 51000, 51000, 51000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Path = "/Solar System/Planets/Uranus/Moons/Inner Moons" }, - { - Identifier = "Portia", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "PORTIA", - Radii = { 135000, 135000, 135000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Path = "/Solar System/Planets/Uranus/Moons/Inner Moons" - }, - TrailColor = trailColor, - OrbitPeriod = 0.513196, - Kernels = kernel + TrailColor = trailColor, + OrbitPeriod = 0.434579, + Kernels = kernel + }, + { + Identifier = "Cressida", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice }, - { - Identifier = "Rosalind", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "ROSALIND", - Radii = { 72000, 72000, 72000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Path = "/Solar System/Planets/Uranus/Moons/Inner Moons" - }, - TrailColor = trailColor, - OrbitPeriod = 0.558460, - Kernels = kernel + Spice = "CRESSIDA", + Radii = { 80000, 80000, 80000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Path = "/Solar System/Planets/Uranus/Moons/Inner Moons" }, - { - Identifier = "Cupid", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "CUPID", - Radii = { 18000, 18000, 18000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Path = "/Solar System/Planets/Uranus/Moons/Inner Moons" - }, - TrailColor = trailColor, - OrbitPeriod = 0.618, - Kernels = kernel + TrailColor = trailColor, + OrbitPeriod = 0.463570, + Kernels = kernel + }, + { + Identifier = "Desdemona", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice }, - { - Identifier = "Belinda", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "BELINDA", - Radii = { 90000, 90000, 90000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Path = "/Solar System/Planets/Uranus/Moons/Inner Moons" - }, - TrailColor = trailColor, - OrbitPeriod = 0.623527, - Kernels = kernel + Spice = "DESDEMONA", + Radii = { 64000, 64000, 64000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Path = "/Solar System/Planets/Uranus/Moons/Inner Moons" }, - { - Identifier = "Perdita", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "PERDITA", - Radii = { 30000, 30000, 30000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Path = "/Solar System/Planets/Uranus/Moons/Inner Moons" - }, - TrailColor = trailColor, - OrbitPeriod = 0.638, - Kernels = kernel + TrailColor = trailColor, + OrbitPeriod = 0.473650, + Kernels = kernel + }, + { + Identifier = "Juliet", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice }, - { - Identifier = "Puck", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "PUCK", - Radii = { 162000, 162000, 162000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Path = "/Solar System/Planets/Uranus/Moons/Inner Moons" - }, - TrailColor = trailColor, - OrbitPeriod = 0.761833, - Kernels = kernel + Spice = "JULIET", + Radii = { 94000, 94000, 94000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Path = "/Solar System/Planets/Uranus/Moons/Inner Moons" }, - { - Identifier = "Mab", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "MAB", - Radii = { 25000, 25000, 25000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Path = "/Solar System/Planets/Uranus/Moons/Inner Moons" - }, - TrailColor = trailColor, - OrbitPeriod = 0.923, - Kernels = kernel - } + TrailColor = trailColor, + OrbitPeriod = 0.493065, + Kernels = kernel + }, + { + Identifier = "Portia", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice + }, + Spice = "PORTIA", + Radii = { 135000, 135000, 135000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Path = "/Solar System/Planets/Uranus/Moons/Inner Moons" + }, + TrailColor = trailColor, + OrbitPeriod = 0.513196, + Kernels = kernel + }, + { + Identifier = "Rosalind", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice + }, + Spice = "ROSALIND", + Radii = { 72000, 72000, 72000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Path = "/Solar System/Planets/Uranus/Moons/Inner Moons" + }, + TrailColor = trailColor, + OrbitPeriod = 0.558460, + Kernels = kernel + }, + { + Identifier = "Cupid", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice + }, + Spice = "CUPID", + Radii = { 18000, 18000, 18000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Path = "/Solar System/Planets/Uranus/Moons/Inner Moons" + }, + TrailColor = trailColor, + OrbitPeriod = 0.618, + Kernels = kernel + }, + { + Identifier = "Belinda", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice + }, + Spice = "BELINDA", + Radii = { 90000, 90000, 90000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Path = "/Solar System/Planets/Uranus/Moons/Inner Moons" + }, + TrailColor = trailColor, + OrbitPeriod = 0.623527, + Kernels = kernel + }, + { + Identifier = "Perdita", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice + }, + Spice = "PERDITA", + Radii = { 30000, 30000, 30000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Path = "/Solar System/Planets/Uranus/Moons/Inner Moons" + }, + TrailColor = trailColor, + OrbitPeriod = 0.638, + Kernels = kernel + }, + { + Identifier = "Puck", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice + }, + Spice = "PUCK", + Radii = { 162000, 162000, 162000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Path = "/Solar System/Planets/Uranus/Moons/Inner Moons" + }, + TrailColor = trailColor, + OrbitPeriod = 0.761833, + Kernels = kernel + }, + { + Identifier = "Mab", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice + }, + Spice = "MAB", + Radii = { 25000, 25000, 25000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Path = "/Solar System/Planets/Uranus/Moons/Inner Moons" + }, + TrailColor = trailColor, + OrbitPeriod = 0.923, + Kernels = kernel + } } assetHelper.registerSceneGraphNodesAndExport( - asset, - proceduralGlobes.createGlobes(innerMoons) + asset, + proceduralGlobes.createGlobes(innerMoons) ) asset.meta = { - Name = "Uranus Irregular Retrograde Moons", - Version = "1.0", - Description = [[ Procedural Globe asset containing Uranus' irregular retrograde - moons: Cordelia, Ophelia, Bianca, Cressida, Desdemona, Juliet, Portia, Rosalind, - Cupid, Belinda, Perdita, Puck and Mab. Blank globes and SPICE trails are - generated for each moon.]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license" + Name = "Uranus Irregular Retrograde Moons", + Version = "1.0", + Description = [[ Procedural Globe asset containing Uranus' irregular retrograde + moons: Cordelia, Ophelia, Bianca, Cressida, Desdemona, Juliet, Portia, Rosalind, + Cupid, Belinda, Perdita, Puck and Mab. Blank globes and SPICE trails are + generated for each moon.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/uranus/irregular_prograde_moons.asset b/data/assets/scene/solarsystem/planets/uranus/irregular_prograde_moons.asset index 7c010df1c2..a1d36a6a3f 100644 --- a/data/assets/scene/solarsystem/planets/uranus/irregular_prograde_moons.asset +++ b/data/assets/scene/solarsystem/planets/uranus/irregular_prograde_moons.asset @@ -10,44 +10,44 @@ local parentSpice = "URANUS BARYCENTER" local tags = { "moon_solarSystem", "moon_giants", "moon_uranus", "moon_irregular_prograde" } local trailColor = { 0.60, 0.65, 0.84 } local trailTags = { - "moonTrail_solarSystem", - "moonTrail_giants", - "moonTrail_uranus", - "moonTrail_minor" + "moonTrail_solarSystem", + "moonTrail_giants", + "moonTrail_uranus", + "moonTrail_minor" } local irregularMoons = { - { - Identifier = "Margaret", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "MARGARET", - Radii = { 20000, 20000, 20000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Path = "/Solar System/Planets/Uranus/Moons/Irregular Prograde Moons" - }, - TrailColor = trailColor, - OrbitPeriod = 1694.8, - Kernels = kernel - } + { + Identifier = "Margaret", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice + }, + Spice = "MARGARET", + Radii = { 20000, 20000, 20000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Path = "/Solar System/Planets/Uranus/Moons/Irregular Prograde Moons" + }, + TrailColor = trailColor, + OrbitPeriod = 1694.8, + Kernels = kernel + } } assetHelper.registerSceneGraphNodesAndExport( - asset, - proceduralGlobes.createGlobes(irregularMoons) + asset, + proceduralGlobes.createGlobes(irregularMoons) ) asset.meta = { - Name = "Uranus Irregular Prograde Moons", - Version = "1.0", - Description = [[ Procedural Globe asset containing Uranus' irregular prograde - moon: Margaret. A blank globe and SPICE trail are generated for the moon.]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license" + Name = "Uranus Irregular Prograde Moons", + Version = "1.0", + Description = [[ Procedural Globe asset containing Uranus' irregular prograde + moon: Margaret. A blank globe and SPICE trail are generated for the moon.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/uranus/irregular_retrograde_moons.asset b/data/assets/scene/solarsystem/planets/uranus/irregular_retrograde_moons.asset index 32567ea909..11545d7f2d 100644 --- a/data/assets/scene/solarsystem/planets/uranus/irregular_retrograde_moons.asset +++ b/data/assets/scene/solarsystem/planets/uranus/irregular_retrograde_moons.asset @@ -10,164 +10,164 @@ local parentSpice = "URANUS BARYCENTER" local tags = { "moon_solarSystem", "moon_giants", "moon_uranus", "moon_irregular_retrograde" } local trailColor = { 0.60, 0.65, 0.84 } local trailTags = { - "moonTrail_solarSystem", - "moonTrail_giants", - "moonTrail_uranus", - "moonTrail_minor" + "moonTrail_solarSystem", + "moonTrail_giants", + "moonTrail_uranus", + "moonTrail_minor" } local irregularMoons = { - { - Identifier = "Francisco", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "FRANCISCO", - Radii = { 22000, 22000, 22000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Path = "/Solar System/Planets/Uranus/Moons/Irregular Retrograde Moons" - }, - TrailColor = trailColor, - OrbitPeriod = 266.56, - Kernels = kernel + { + Identifier = "Francisco", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice }, - { - Identifier = "Caliban", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "CALIBAN", - Radii = { 72000, 72000, 72000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Path = "/Solar System/Planets/Uranus/Moons/Irregular Retrograde Moons" - }, - TrailColor = trailColor, - OrbitPeriod = 579.50, - Kernels = kernel + Spice = "FRANCISCO", + Radii = { 22000, 22000, 22000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Path = "/Solar System/Planets/Uranus/Moons/Irregular Retrograde Moons" }, - { - Identifier = "Stephano", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "STEPHANO", - Radii = { 32000, 32000, 32000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Path = "/Solar System/Planets/Uranus/Moons/Irregular Retrograde Moons" - }, - TrailColor = trailColor, - OrbitPeriod = 676.50, - Kernels = kernel + TrailColor = trailColor, + OrbitPeriod = 266.56, + Kernels = kernel + }, + { + Identifier = "Caliban", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice }, - { - Identifier = "Trinculo", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "TRINCULO", - Radii = { 18000, 18000, 18000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Path = "/Solar System/Planets/Uranus/Moons/Irregular Retrograde Moons" - }, - TrailColor = trailColor, - OrbitPeriod = 758.10, - Kernels = kernel + Spice = "CALIBAN", + Radii = { 72000, 72000, 72000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Path = "/Solar System/Planets/Uranus/Moons/Irregular Retrograde Moons" }, - { - Identifier = "Sycorax", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "SYCORAX", - Radii = { 165000, 165000, 165000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Path = "/Solar System/Planets/Uranus/Moons/Irregular Retrograde Moons" - }, - TrailColor = trailColor, - OrbitPeriod = 1283.4, - Kernels = kernel + TrailColor = trailColor, + OrbitPeriod = 579.50, + Kernels = kernel + }, + { + Identifier = "Stephano", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice }, - { - Identifier = "Prospero", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "PROSPERO", - Radii = { 50000, 50000, 50000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Path = "/Solar System/Planets/Uranus/Moons/Irregular Retrograde Moons" - }, - TrailColor = trailColor, - OrbitPeriod = 1992.8, - Kernels = kernel + Spice = "STEPHANO", + Radii = { 32000, 32000, 32000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Path = "/Solar System/Planets/Uranus/Moons/Irregular Retrograde Moons" }, - { - Identifier = "Setebos", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "SETEBOS", - Radii = { 48000, 48000, 48000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Path = "/Solar System/Planets/Uranus/Moons/Irregular Retrograde Moons" - }, - TrailColor = trailColor, - OrbitPeriod = 2202.3, - Kernels = kernel + TrailColor = trailColor, + OrbitPeriod = 676.50, + Kernels = kernel + }, + { + Identifier = "Trinculo", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice }, - { - Identifier = "Ferdinand", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "FERDINAND", - Radii = { 20000, 20000, 20000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Path = "/Solar System/Planets/Uranus/Moons/Irregular Retrograde Moons" - }, - TrailColor = trailColor, - OrbitPeriod = 2823.4, - Kernels = kernel - } + Spice = "TRINCULO", + Radii = { 18000, 18000, 18000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Path = "/Solar System/Planets/Uranus/Moons/Irregular Retrograde Moons" + }, + TrailColor = trailColor, + OrbitPeriod = 758.10, + Kernels = kernel + }, + { + Identifier = "Sycorax", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice + }, + Spice = "SYCORAX", + Radii = { 165000, 165000, 165000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Path = "/Solar System/Planets/Uranus/Moons/Irregular Retrograde Moons" + }, + TrailColor = trailColor, + OrbitPeriod = 1283.4, + Kernels = kernel + }, + { + Identifier = "Prospero", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice + }, + Spice = "PROSPERO", + Radii = { 50000, 50000, 50000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Path = "/Solar System/Planets/Uranus/Moons/Irregular Retrograde Moons" + }, + TrailColor = trailColor, + OrbitPeriod = 1992.8, + Kernels = kernel + }, + { + Identifier = "Setebos", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice + }, + Spice = "SETEBOS", + Radii = { 48000, 48000, 48000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Path = "/Solar System/Planets/Uranus/Moons/Irregular Retrograde Moons" + }, + TrailColor = trailColor, + OrbitPeriod = 2202.3, + Kernels = kernel + }, + { + Identifier = "Ferdinand", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice + }, + Spice = "FERDINAND", + Radii = { 20000, 20000, 20000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Path = "/Solar System/Planets/Uranus/Moons/Irregular Retrograde Moons" + }, + TrailColor = trailColor, + OrbitPeriod = 2823.4, + Kernels = kernel + } } assetHelper.registerSceneGraphNodesAndExport( - asset, - proceduralGlobes.createGlobes(irregularMoons) + asset, + proceduralGlobes.createGlobes(irregularMoons) ) asset.meta = { - Name = "Uranus Irregular Retrograde Moons", - Version = "1.0", - Description = [[ Procedural Globe asset containing Uranus' irregular retrograde - moons: Francisco, Caliban, Stephano, Trinculo, Sycorax, Prospero, Setebos and - Ferdinand. Blank globes and SPICE trails are generated for each moon.]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license" + Name = "Uranus Irregular Retrograde Moons", + Version = "1.0", + Description = [[ Procedural Globe asset containing Uranus' irregular retrograde + moons: Francisco, Caliban, Stephano, Trinculo, Sycorax, Prospero, Setebos and + Ferdinand. Blank globes and SPICE trails are generated for each moon.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/uranus/kernels.asset b/data/assets/scene/solarsystem/planets/uranus/kernels.asset index efcf3617b2..3e8ba66685 100644 --- a/data/assets/scene/solarsystem/planets/uranus/kernels.asset +++ b/data/assets/scene/solarsystem/planets/uranus/kernels.asset @@ -1,8 +1,8 @@ local Kernels = asset.syncedResource({ - Name = "Uranus Spice Kernels", - Type = "HttpSynchronization", - Identifier = "uranus_kernels", - Version = 1 + Name = "Uranus Spice Kernels", + Type = "HttpSynchronization", + Identifier = "uranus_kernels", + Version = 1 }) asset.export("ura091", Kernels .. "/ura091-rocks-merge.bsp") @@ -11,10 +11,10 @@ asset.export("ura112", Kernels .. "/ura112.bsp") asset.meta = { - Name = "Uranus Spice Kernels", - Version = "1.0", - Description = [[ Generic SPICE kernels for Uranus.]], - Author = "OpenSpace Team", - URL = "https://naif.jpl.nasa.gov/pub/naif/pds/wgc/kernels/spk/", - License = "NASA" + Name = "Uranus Spice Kernels", + Version = "1.0", + Description = [[ Generic SPICE kernels for Uranus.]], + Author = "OpenSpace Team", + URL = "https://naif.jpl.nasa.gov/pub/naif/pds/wgc/kernels/spk/", + License = "NASA" } diff --git a/data/assets/scene/solarsystem/planets/uranus/layers/colorlayers/uranus_texture.asset b/data/assets/scene/solarsystem/planets/uranus/layers/colorlayers/uranus_texture.asset index 62f8b14981..bafffffe9c 100644 --- a/data/assets/scene/solarsystem/planets/uranus/layers/colorlayers/uranus_texture.asset +++ b/data/assets/scene/solarsystem/planets/uranus/layers/colorlayers/uranus_texture.asset @@ -2,22 +2,22 @@ local texturesPath = asset.require("./../../uranus_textures").TexturesPath local globeIdentifier = asset.require("./../../uranus").Uranus.Identifier local layer = { - Identifier = "Texture", - FilePath = texturesPath .. "/uranus.jpg", + Identifier = "Texture", + FilePath = texturesPath .. "/uranus.jpg", } asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) asset.export("layer", layer) asset.meta = { - Name = "Uranus texture", - Version = "1.0", - Description = [[ Uranus image texture ]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license" + Name = "Uranus texture", + Version = "1.0", + Description = [[ Uranus image texture ]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/uranus/major_moons.asset b/data/assets/scene/solarsystem/planets/uranus/major_moons.asset index 6298874fa4..a854ebb27a 100644 --- a/data/assets/scene/solarsystem/planets/uranus/major_moons.asset +++ b/data/assets/scene/solarsystem/planets/uranus/major_moons.asset @@ -13,106 +13,106 @@ local trailTags = { "moonTrail_solarSystem", "moonTrail_giants", "moonTrail_uran local majorMoons = { - { - Identifier = "Miranda", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "MIRANDA", - Radii = { 471600, 468000, 466000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Path = "/Solar System/Planets/Uranus/Moons/Major Moons" - }, - TrailColor = trailColor, - OrbitPeriod = 1.413479, - Kernels = kernel + { + Identifier = "Miranda", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice }, - { - Identifier = "Ariel", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "ARIEL", - Radii = { 1162000, 1156000, 1155000 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Path = "/Solar System/Planets/Uranus/Moons/Major Moons" - }, - TrailColor = trailColor, - OrbitPeriod = 2.520379, - Kernels = kernel + Spice = "MIRANDA", + Radii = { 471600, 468000, 466000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Path = "/Solar System/Planets/Uranus/Moons/Major Moons" }, - { - Identifier = "Umbriel", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "UMBRIEL", - Radii = { 1169400, 1169400, 1169400 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Path = "/Solar System/Planets/Uranus/Moons/Major Moons" - }, - TrailColor = trailColor, - OrbitPeriod = 4.144177, - Kernels = kernel + TrailColor = trailColor, + OrbitPeriod = 1.413479, + Kernels = kernel + }, + { + Identifier = "Ariel", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice }, - { - Identifier = "Titania", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "TITANIA", - Radii = { 1576800, 1576800, 1576800 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Path = "/Solar System/Planets/Uranus/Moons/Major Moons" - }, - TrailColor = trailColor, - OrbitPeriod = 8.705872, - Kernels = kernel + Spice = "ARIEL", + Radii = { 1162000, 1156000, 1155000 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Path = "/Solar System/Planets/Uranus/Moons/Major Moons" }, - { - Identifier = "Oberon", - Parent = { - Identifier = parentIdentifier, - Spice = parentSpice - }, - Spice = "OBERON", - Radii = { 1522800, 1522800, 1522800 }, - Tags = tags, - TrailTags = trailTags, - GUI = { - Path = "/Solar System/Planets/Uranus/Moons/Major Moons" - }, - TrailColor = trailColor, - OrbitPeriod = 13.463239, - Kernels = kernel - } + TrailColor = trailColor, + OrbitPeriod = 2.520379, + Kernels = kernel + }, + { + Identifier = "Umbriel", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice + }, + Spice = "UMBRIEL", + Radii = { 1169400, 1169400, 1169400 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Path = "/Solar System/Planets/Uranus/Moons/Major Moons" + }, + TrailColor = trailColor, + OrbitPeriod = 4.144177, + Kernels = kernel + }, + { + Identifier = "Titania", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice + }, + Spice = "TITANIA", + Radii = { 1576800, 1576800, 1576800 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Path = "/Solar System/Planets/Uranus/Moons/Major Moons" + }, + TrailColor = trailColor, + OrbitPeriod = 8.705872, + Kernels = kernel + }, + { + Identifier = "Oberon", + Parent = { + Identifier = parentIdentifier, + Spice = parentSpice + }, + Spice = "OBERON", + Radii = { 1522800, 1522800, 1522800 }, + Tags = tags, + TrailTags = trailTags, + GUI = { + Path = "/Solar System/Planets/Uranus/Moons/Major Moons" + }, + TrailColor = trailColor, + OrbitPeriod = 13.463239, + Kernels = kernel + } } assetHelper.registerSceneGraphNodesAndExport( - asset, - proceduralGlobes.createGlobes(majorMoons) + asset, + proceduralGlobes.createGlobes(majorMoons) ) asset.meta = { - Name = "Uranus Marjor Moons", - Version = "1.0", - Description = [[ Procedural Globe asset containing Uranus' major moons: Miranda, - Ariel, Umbriel, Titania, and Oberon. Blank globes and SPICE trails are generated - for each moon.]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license" + Name = "Uranus Marjor Moons", + Version = "1.0", + Description = [[ Procedural Globe asset containing Uranus' major moons: Miranda, + Ariel, Umbriel, Titania, and Oberon. Blank globes and SPICE trails are generated + for each moon.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/uranus/minor_moons.asset b/data/assets/scene/solarsystem/planets/uranus/minor_moons.asset index 48ee0e01c7..cc69445a21 100644 --- a/data/assets/scene/solarsystem/planets/uranus/minor_moons.asset +++ b/data/assets/scene/solarsystem/planets/uranus/minor_moons.asset @@ -4,11 +4,11 @@ asset.require('./irregular_retrograde_moons') asset.meta = { - Name = "Uranus Minor Moons", - Version = "1.0", - Description = [[ Meta asset containing three moon groups: Inner Moons, Irregular - Prograde Moons and Irregular Retrograde Moons]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license" + Name = "Uranus Minor Moons", + Version = "1.0", + Description = [[ Meta asset containing three moon groups: Inner Moons, Irregular + Prograde Moons and Irregular Retrograde Moons]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/uranus/trail.asset b/data/assets/scene/solarsystem/planets/uranus/trail.asset index d853a80c7c..76d6996599 100644 --- a/data/assets/scene/solarsystem/planets/uranus/trail.asset +++ b/data/assets/scene/solarsystem/planets/uranus/trail.asset @@ -4,36 +4,36 @@ local transforms = asset.require('scene/solarsystem/sun/transforms') local UranusTrail = { - Identifier = "UranusTrail", - Parent = transforms.SolarSystemBarycenter.Identifier, - Renderable = { - Type = "RenderableTrailOrbit", - Translation = { - Type = "SpiceTranslation", - Target = "URANUS BARYCENTER", - Observer = "SUN" - }, - Color = { 0.60, 0.95, 1.00 }, - Period = 30588.740, - Resolution = 1000 + Identifier = "UranusTrail", + Parent = transforms.SolarSystemBarycenter.Identifier, + Renderable = { + Type = "RenderableTrailOrbit", + Translation = { + Type = "SpiceTranslation", + Target = "URANUS BARYCENTER", + Observer = "SUN" }, - Tag = { "planetTrail_solarSystem", "planetTrail_giants" }, - GUI = { - Name = "Uranus Trail", - Path = "/Solar System/Planets/Uranus", - Description = [[ Trail of Uranus as observed by the Sun.]], - } + Color = { 0.60, 0.95, 1.00 }, + Period = 30588.740, + Resolution = 1000 + }, + Tag = { "planetTrail_solarSystem", "planetTrail_giants" }, + GUI = { + Name = "Uranus Trail", + Path = "/Solar System/Planets/Uranus", + Description = [[ Trail of Uranus as observed by the Sun.]], + } } assetHelper.registerSceneGraphNodesAndExport(asset, { UranusTrail }) asset.meta = { - Name = "Uranus Trail", - Version = "1.0", - Description = [[ Main trail of Uranus. Data from NASA Spice (see base spice asset)]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"UranusTrail"} + Name = "Uranus Trail", + Version = "1.0", + Description = [[ Main trail of Uranus. Data from NASA Spice (see base spice asset)]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license", + Identifiers = {"UranusTrail"} } diff --git a/data/assets/scene/solarsystem/planets/uranus/trail_earth.asset b/data/assets/scene/solarsystem/planets/uranus/trail_earth.asset index 0b98567560..5c5d4d775d 100644 --- a/data/assets/scene/solarsystem/planets/uranus/trail_earth.asset +++ b/data/assets/scene/solarsystem/planets/uranus/trail_earth.asset @@ -6,39 +6,39 @@ asset.require("spice/base") local UranusTrailEarth = { - Identifier = "UranusTrailEarth", - Parent = earthTransforms.EarthBarycenter.Identifier, - Renderable = { - Type = "RenderableTrailOrbit", - Translation = { - Type = "SpiceTranslation", - Target = "URANUS BARYCENTER", - Observer = "EARTH" - }, - Color = { 1.0, 0.5, 0.2 }, - Period = 224.695, - Resolution = 1000, - Enabled = false + Identifier = "UranusTrailEarth", + Parent = earthTransforms.EarthBarycenter.Identifier, + Renderable = { + Type = "RenderableTrailOrbit", + Translation = { + Type = "SpiceTranslation", + Target = "URANUS BARYCENTER", + Observer = "EARTH" }, - Tag = { "planetTrail_solarSystem_alt", "planetTrail_terrestrial_alt" }, - GUI = { - Name = "Uranus trail from Earth", - Path = "/Solar System/Planets/Uranus", - Hidden = false, - Description = [[ Trail of Uranus as observed by the Earth.]], - } + Color = { 1.0, 0.5, 0.2 }, + Period = 224.695, + Resolution = 1000, + Enabled = false + }, + Tag = { "planetTrail_solarSystem_alt", "planetTrail_terrestrial_alt" }, + GUI = { + Name = "Uranus trail from Earth", + Path = "/Solar System/Planets/Uranus", + Hidden = false, + Description = [[ Trail of Uranus as observed by the Earth.]], + } } assetHelper.registerSceneGraphNodesAndExport(asset, { UranusTrailEarth }) asset.meta = { - Name = "Uranus Trail from Earth", - Version = "1.0", - Description = [[ Alternate trail of Uranus, as observed by the Earth rather then the - Sun. Data from NASA SPICE (see base spice asset)]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"VenusTrailEarth"} + Name = "Uranus Trail from Earth", + Version = "1.0", + Description = [[ Alternate trail of Uranus, as observed by the Earth rather then the + Sun. Data from NASA SPICE (see base spice asset)]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license", + Identifiers = {"VenusTrailEarth"} } diff --git a/data/assets/scene/solarsystem/planets/uranus/transforms.asset b/data/assets/scene/solarsystem/planets/uranus/transforms.asset index 93b67831fa..99a3274132 100644 --- a/data/assets/scene/solarsystem/planets/uranus/transforms.asset +++ b/data/assets/scene/solarsystem/planets/uranus/transforms.asset @@ -5,31 +5,31 @@ asset.require("spice/base") local UranusBarycenter = { - Identifier = "UranusBarycenter", - Parent = transforms.SolarSystemBarycenter.Identifier, - Transform = { - Translation = { - Type = "SpiceTranslation", - Target = "URANUS BARYCENTER", - Observer = "SUN" - } - }, - GUI = { - Name = "Uranus Barycenter", - Path = "/Solar System/Planets/Uranus", - Hidden = true, - Description = [[ Uranus Barycenter position]], + Identifier = "UranusBarycenter", + Parent = transforms.SolarSystemBarycenter.Identifier, + Transform = { + Translation = { + Type = "SpiceTranslation", + Target = "URANUS BARYCENTER", + Observer = "SUN" } + }, + GUI = { + Name = "Uranus Barycenter", + Path = "/Solar System/Planets/Uranus", + Hidden = true, + Description = [[ Uranus Barycenter position]], + } } assetHelper.registerSceneGraphNodesAndExport(asset, { UranusBarycenter }) asset.meta = { - Name = "Uranus Transforms", - Version = "1.0", - Description = [[ Uranus Barycenter transform]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license" + Name = "Uranus Transforms", + Version = "1.0", + Description = [[ Uranus Barycenter transform]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/uranus/uranus.asset b/data/assets/scene/solarsystem/planets/uranus/uranus.asset index be3566e994..c08924fd96 100644 --- a/data/assets/scene/solarsystem/planets/uranus/uranus.asset +++ b/data/assets/scene/solarsystem/planets/uranus/uranus.asset @@ -4,60 +4,60 @@ asset.require("spice/base") asset.require('./trail') local Uranus = { - Identifier = "Uranus", - Parent = transforms.UranusBarycenter.Identifier, - Transform = { - Rotation = { - Type = "SpiceRotation", - SourceFrame = "IAU_URANUS", - DestinationFrame = "GALACTIC" - } - }, - Renderable = { - Type = "RenderableGlobe", - Radii = { 25559000, 25559000, 24973000 }, - SegmentsPerPatch = 64, - Layers = {} - }, - Tag = { "planet_solarSystem", "planet_giants" }, - GUI = { - Name = "Uranus", - Path = "/Solar System/Planets/Uranus", - Description = [[Globe for Uranus.]] + Identifier = "Uranus", + Parent = transforms.UranusBarycenter.Identifier, + Transform = { + Rotation = { + Type = "SpiceRotation", + SourceFrame = "IAU_URANUS", + DestinationFrame = "GALACTIC" } + }, + Renderable = { + Type = "RenderableGlobe", + Radii = { 25559000, 25559000, 24973000 }, + SegmentsPerPatch = 64, + Layers = {} + }, + Tag = { "planet_solarSystem", "planet_giants" }, + GUI = { + Name = "Uranus", + Path = "/Solar System/Planets/Uranus", + Description = [[Globe for Uranus.]] + } } local UranusLabel = { - Identifier = "UranusLabel", - Parent = Uranus.Identifier, - Renderable = { - Enabled = false, - Type = "RenderableLabels", - LabelText = "Uranus", - FontSize = 100.0, - LabelSize = 8.7, - LabelMaxSize = 100.0, - LabelMinSize = 1.0, - LabelOrientationOption = "Camera View Direction", - BlendMode = "Additive" - }, - Tag = { "solarsystem_labels" }, - GUI = { - Name = "Uranus Label", - Path = "/Solar System/Planets/Uranus", - Description = [[ Main planet label for Uranus.]], - } + Identifier = "UranusLabel", + Parent = Uranus.Identifier, + Renderable = { + Enabled = false, + Type = "RenderableLabels", + LabelText = "Uranus", + FontSize = 100.0, + LabelSize = 8.7, + LabelMaxSize = 100.0, + LabelMinSize = 1.0, + LabelOrientationOption = "Camera View Direction", + BlendMode = "Additive" + }, + Tag = { "solarsystem_labels" }, + GUI = { + Name = "Uranus Label", + Path = "/Solar System/Planets/Uranus", + Description = [[ Main planet label for Uranus.]], + } } assetHelper.registerSceneGraphNodesAndExport(asset, { Uranus, UranusLabel }) asset.meta = { - Name = "Uranus", - Version = "1.0", - Description = [[ Uranus globe, and main planet label.]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"Uranus" , "UranusLabel"} + Name = "Uranus", + Version = "1.0", + Description = [[ Uranus globe, and main planet label.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license", + Identifiers = {"Uranus" , "UranusLabel"} } diff --git a/data/assets/scene/solarsystem/planets/uranus/uranus_textures.asset b/data/assets/scene/solarsystem/planets/uranus/uranus_textures.asset index ea47aa39a9..d7200697b6 100644 --- a/data/assets/scene/solarsystem/planets/uranus/uranus_textures.asset +++ b/data/assets/scene/solarsystem/planets/uranus/uranus_textures.asset @@ -1,7 +1,7 @@ local TexturesPath = asset.syncedResource({ - Name = "Uranus Textures", - Type = "HttpSynchronization", - Identifier = "uranus_textures", - Version = 1 + Name = "Uranus Textures", + Type = "HttpSynchronization", + Identifier = "uranus_textures", + Version = 1 }) asset.export("TexturesPath", TexturesPath) diff --git a/data/assets/scene/solarsystem/planets/venus/atmosphere.asset b/data/assets/scene/solarsystem/planets/venus/atmosphere.asset index 71a439877b..3ce91966ad 100644 --- a/data/assets/scene/solarsystem/planets/venus/atmosphere.asset +++ b/data/assets/scene/solarsystem/planets/venus/atmosphere.asset @@ -4,63 +4,63 @@ local assetHelper = asset.require('util/asset_helper') local Atmosphere = { - Identifier = "VenusAtmosphere", - Parent = transforms.Venus.Identifier, - Renderable = { - Type = "RenderableAtmosphere", - -- Atmosphere radius in Km - AtmosphereHeight = 6121.9 - 6051.9, - PlanetRadius = 6051.9, - PlanetAverageGroundReflectance = 0.018, - GroundRadianceEmission = 0.8, - SunIntensity = 11.47, - Rayleigh = { - Coefficients = { - -- Wavelengths are given in 10^-9m - Wavelengths = { 680, 550, 440 }, - -- Reflection coefficients are given in km^-1 - Scattering = { 19.518E-3, 13.83E-3, 3.65E-3 } - -- In Rayleigh scattering, the coefficients of - -- absorption and scattering are the same. - }, - -- Thichkness of atmosphere if its density were uniform, in Km - H_R = 3.53 - }, - -- Default - Mie = { - Coefficients = { - -- Reflection coefficients are given in km^-1 - Scattering = { 53.61771e-3, 53.61771e-3, 53.61771e-3 }, - -- Extinction coefficients are a fraction of the Scattering coefficients - Extinction = { 53.61771e-3/0.98979, 53.61771e-3/0.98979, 53.61771e-3/0.98979 } - }, - -- Mie Height scale (atmosphere thickness for constant density) in Km - H_M = 5.42, - -- Mie Phase Function Value (G e [-1.0, 1.0]. - -- If G = 1.0, Mie phase function = Rayleigh Phase Function) - G = 0.85 - }, - Debug = { - -- PreCalculatedTextureScale is a float from 1.0 to N, with N > 0.0 and N in Naturals (i.e., 1, 2, 3, 4, 5....) - PreCalculatedTextureScale = 1.0, - SaveCalculatedTextures = false - } + Identifier = "VenusAtmosphere", + Parent = transforms.Venus.Identifier, + Renderable = { + Type = "RenderableAtmosphere", + -- Atmosphere radius in Km + AtmosphereHeight = 6121.9 - 6051.9, + PlanetRadius = 6051.9, + PlanetAverageGroundReflectance = 0.018, + GroundRadianceEmission = 0.8, + SunIntensity = 11.47, + Rayleigh = { + Coefficients = { + -- Wavelengths are given in 10^-9m + Wavelengths = { 680, 550, 440 }, + -- Reflection coefficients are given in km^-1 + Scattering = { 19.518E-3, 13.83E-3, 3.65E-3 } + -- In Rayleigh scattering, the coefficients of + -- absorption and scattering are the same. + }, + -- Thichkness of atmosphere if its density were uniform, in Km + H_R = 3.53 }, - GUI = { - Name = "Venus Atmosphere", - Path = "/Solar System/Planets/Venus", - Description = "Simulation of Venus' Atmosphere" + -- Default + Mie = { + Coefficients = { + -- Reflection coefficients are given in km^-1 + Scattering = { 53.61771e-3, 53.61771e-3, 53.61771e-3 }, + -- Extinction coefficients are a fraction of the Scattering coefficients + Extinction = { 53.61771e-3/0.98979, 53.61771e-3/0.98979, 53.61771e-3/0.98979 } + }, + -- Mie Height scale (atmosphere thickness for constant density) in Km + H_M = 5.42, + -- Mie Phase Function Value (G e [-1.0, 1.0]. + -- If G = 1.0, Mie phase function = Rayleigh Phase Function) + G = 0.85 + }, + Debug = { + -- PreCalculatedTextureScale is a float from 1.0 to N, with N > 0.0 and N in Naturals (i.e., 1, 2, 3, 4, 5....) + PreCalculatedTextureScale = 1.0, + SaveCalculatedTextures = false } + }, + GUI = { + Name = "Venus Atmosphere", + Path = "/Solar System/Planets/Venus", + Description = "Simulation of Venus' Atmosphere" + } } assetHelper.registerSceneGraphNodesAndExport(asset, { Atmosphere }) asset.meta = { - Name = "Venus Atmosphere", - Version = "1.0", - Description = [[ Atmosphere of Venus.]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"VenusAtmosphere"} + Name = "Venus Atmosphere", + Version = "1.0", + Description = [[ Atmosphere of Venus.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license", + Identifiers = {"VenusAtmosphere"} } diff --git a/data/assets/scene/solarsystem/planets/venus/default_layers.asset b/data/assets/scene/solarsystem/planets/venus/default_layers.asset index 18fb90fcd3..ba24b5e01b 100644 --- a/data/assets/scene/solarsystem/planets/venus/default_layers.asset +++ b/data/assets/scene/solarsystem/planets/venus/default_layers.asset @@ -11,17 +11,17 @@ local heightLayer = asset.require(heightLayersPath .. "/magellan") -- Set enabled layers (temporary solution) -- @TODO: do this using a boolean that's passed to the 'asset.require' instead asset.onInitialize(function () - openspace.setPropertyValueSingle("Scene.Venus.Renderable.Layers.ColorLayers." .. colorLayer.layer.Identifier .. ".Enabled", true) - openspace.setPropertyValueSingle("Scene.Venus.Renderable.Layers.HeightLayers." .. heightLayer.layer.Identifier .. ".Enabled", true) + openspace.setPropertyValueSingle("Scene.Venus.Renderable.Layers.ColorLayers." .. colorLayer.layer.Identifier .. ".Enabled", true) + openspace.setPropertyValueSingle("Scene.Venus.Renderable.Layers.HeightLayers." .. heightLayer.layer.Identifier .. ".Enabled", true) end) asset.meta = { - Name = "Default Venus Layers", - Version = "1.0", - Description = [[ Default Venus layers are: Venus Magellan Mosaic and Venus Magellan - DEM]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license" + Name = "Default Venus Layers", + Version = "1.0", + Description = [[ Default Venus layers are: Venus Magellan Mosaic and Venus Magellan + DEM]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/venus/layers/colorlayers/magellan_mosaic_utah.asset b/data/assets/scene/solarsystem/planets/venus/layers/colorlayers/magellan_mosaic_utah.asset index 867ca8b10e..d600ff6ec3 100644 --- a/data/assets/scene/solarsystem/planets/venus/layers/colorlayers/magellan_mosaic_utah.asset +++ b/data/assets/scene/solarsystem/planets/venus/layers/colorlayers/magellan_mosaic_utah.asset @@ -2,46 +2,46 @@ local mapServiceConfigs = asset.localResource("./../../map_service_configs") local globeIdentifier = asset.require("./../../venus").Venus.Identifier local layer = { - Identifier = "Magellan_Mosaic_Utah", - Name = "Magellan Mosaic [Utah]", - Description = [[ Color layer for Venus. This mosaic was created from the Magellan - F-BIDRs, (Full resolution Basic Image Data Records), the highest resolution - radar images of the Venus surface (~75 m/pixel). Because Venus is shrouded by a - dense, opaque atmosphere, conventional optical cameras cannot be used to image - its surface. Instead, Magellan's imaging radar uses bursts of microwave energy - somewhat like a camera flash to illuminate the planet's surface. The radar pulses - are not sent directly downward but rather at a slight angle to the side of the - spacecraft--the radar is thus called "side-looking radar." In addition, special - processing techniques are used on the radar data to result in higher resolution - as if the radar had a larger antenna, or "aperture"; the technique is thus often - called "synthetic aperture radar," or SAR. The Magellan SAR is a side-looking - radar system. Radar pulses are not sent directly downward but rather at a slight - angle to the side of the spacecraft. In the case of Left-Look Magellan SAR data, - the radar system was sending signals to the left of the spacecraft. The SAR - operated in this left-looking mode during cycles 1 and 3 of the mission. - (Description from USGS)]], - FilePath = mapServiceConfigs .. "/Utah/MagellanMosaic.vrt", - BlendMode = "Color", - Settings = { - Gamma = 2.0 - } + Identifier = "Magellan_Mosaic_Utah", + Name = "Magellan Mosaic [Utah]", + Description = [[ Color layer for Venus. This mosaic was created from the Magellan + F-BIDRs, (Full resolution Basic Image Data Records), the highest resolution + radar images of the Venus surface (~75 m/pixel). Because Venus is shrouded by a + dense, opaque atmosphere, conventional optical cameras cannot be used to image + its surface. Instead, Magellan's imaging radar uses bursts of microwave energy + somewhat like a camera flash to illuminate the planet's surface. The radar pulses + are not sent directly downward but rather at a slight angle to the side of the + spacecraft--the radar is thus called "side-looking radar." In addition, special + processing techniques are used on the radar data to result in higher resolution + as if the radar had a larger antenna, or "aperture"; the technique is thus often + called "synthetic aperture radar," or SAR. The Magellan SAR is a side-looking + radar system. Radar pulses are not sent directly downward but rather at a slight + angle to the side of the spacecraft. In the case of Left-Look Magellan SAR data, + the radar system was sending signals to the left of the spacecraft. The SAR + operated in this left-looking mode during cycles 1 and 3 of the mission. + (Description from USGS)]], + FilePath = mapServiceConfigs .. "/Utah/MagellanMosaic.vrt", + BlendMode = "Color", + Settings = { + Gamma = 2.0 + } } asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) asset.export("layer", layer) asset.meta = { - Name = "Venus Magellan Mosaic", - Version = "1.0", - Description = [[Map layer for Venus containting Venus Magellan Mosaic from the USGS. - Hosted on the OpenSpace servers in Utah.]], - Author = "USGS", - URL = "https://astrogeology.usgs.gov/search/map/Venus/Magellan/" .. - "Venus_Magellan_LeftLook_mosaic_global_75m", - License = "NASA/PDS", - Identifiers = {"Magellan_Mosaic_Utah"} + Name = "Venus Magellan Mosaic", + Version = "1.0", + Description = [[Map layer for Venus containting Venus Magellan Mosaic from the USGS. + Hosted on the OpenSpace servers in Utah.]], + Author = "USGS", + URL = "https://astrogeology.usgs.gov/search/map/Venus/Magellan/" .. + "Venus_Magellan_LeftLook_mosaic_global_75m", + License = "NASA/PDS", + Identifiers = {"Magellan_Mosaic_Utah"} } diff --git a/data/assets/scene/solarsystem/planets/venus/layers/colorlayers/venus_texture.asset b/data/assets/scene/solarsystem/planets/venus/layers/colorlayers/venus_texture.asset index 3ef047c4fd..d9f40745c6 100644 --- a/data/assets/scene/solarsystem/planets/venus/layers/colorlayers/venus_texture.asset +++ b/data/assets/scene/solarsystem/planets/venus/layers/colorlayers/venus_texture.asset @@ -2,16 +2,16 @@ local texturesPath = asset.require("./../../venus_textures").TexturesPath local globeIdentifier = asset.require("./../../venus").Venus.Identifier local layer = { - Identifier = "Texture", - FilePath = texturesPath .. "/venus.jpg", - Settings = { - Opacity = 0.48, - Gamma = 0.48 - } + Identifier = "Texture", + FilePath = texturesPath .. "/venus.jpg", + Settings = { + Opacity = 0.48, + Gamma = 0.48 + } } asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/venus/layers/heightlayers/magellan.asset b/data/assets/scene/solarsystem/planets/venus/layers/heightlayers/magellan.asset index 95bf17d62a..f94cb916ab 100644 --- a/data/assets/scene/solarsystem/planets/venus/layers/heightlayers/magellan.asset +++ b/data/assets/scene/solarsystem/planets/venus/layers/heightlayers/magellan.asset @@ -2,41 +2,41 @@ local mapServiceConfigs = asset.localResource("./../../map_service_configs") local globeIdentifier = asset.require("./../../venus").Venus.Identifier local layer = { - Identifier = "Magellan", - Name = "Magellan Elevation [Utah]", - Description = [[ Elevation layer for Venus. The represents the version 2 - (1997 release) of the Global Topographic Data Record (GTDR-SINUS.3;2). - The range to surface is derived by fitting altimeter echoes from the fan-beam - altimetry antenna as a function of time to Hagfors' radar backscatter model - templates. The ranges are subtracted from the spacecraft radial - coordinate (derived from Doppler tracking), yielding measurements of - planetary radius. The data are filtered to remove low-frequency errors in - the in-plane elements of each spacecraft orbit, and then originally re-sampled - into sinusoidal, Mercator, and north and south polar stereographic projections - at a resolution of 5 kilometers per pixel (4641 meters per pixel [m]).]], - FilePath = mapServiceConfigs .. "/Utah/MagellanDEM.wms", - TilePixelSize = 64, - Settings = { - Gamma = 1.72, - Multiplier = 1.1 - } + Identifier = "Magellan", + Name = "Magellan Elevation [Utah]", + Description = [[ Elevation layer for Venus. The represents the version 2 + (1997 release) of the Global Topographic Data Record (GTDR-SINUS.3;2). + The range to surface is derived by fitting altimeter echoes from the fan-beam + altimetry antenna as a function of time to Hagfors' radar backscatter model + templates. The ranges are subtracted from the spacecraft radial + coordinate (derived from Doppler tracking), yielding measurements of + planetary radius. The data are filtered to remove low-frequency errors in + the in-plane elements of each spacecraft orbit, and then originally re-sampled + into sinusoidal, Mercator, and north and south polar stereographic projections + at a resolution of 5 kilometers per pixel (4641 meters per pixel [m]).]], + FilePath = mapServiceConfigs .. "/Utah/MagellanDEM.wms", + TilePixelSize = 64, + Settings = { + Gamma = 1.72, + Multiplier = 1.1 + } } asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "HeightLayers", layer) + openspace.globebrowsing.addLayer(globeIdentifier, "HeightLayers", layer) end) asset.export("layer", layer) asset.meta = { - Name = "Venus Magellan DEM", - Version = "1.0", - Description = [[Map layer for Venus containting Venus Magellan DEM from the USGS. - Hosted on the OpenSpace servers in Utah.]], - Author = "USGS", - URL = "https://astrogeology.usgs.gov/search/map/Venus/Magellan/RadarProperties" .. - "/Venus_Magellan_Topography_Global_4641m_v02", - License = "NASA/PDS", - Identifiers = {"Magellan"} + Name = "Venus Magellan DEM", + Version = "1.0", + Description = [[Map layer for Venus containting Venus Magellan DEM from the USGS. + Hosted on the OpenSpace servers in Utah.]], + Author = "USGS", + URL = "https://astrogeology.usgs.gov/search/map/Venus/Magellan/RadarProperties" .. + "/Venus_Magellan_Topography_Global_4641m_v02", + License = "NASA/PDS", + Identifiers = {"Magellan"} } diff --git a/data/assets/scene/solarsystem/planets/venus/trail.asset b/data/assets/scene/solarsystem/planets/venus/trail.asset index 6172f6b66c..8abf07815f 100644 --- a/data/assets/scene/solarsystem/planets/venus/trail.asset +++ b/data/assets/scene/solarsystem/planets/venus/trail.asset @@ -5,38 +5,38 @@ asset.require("spice/base") local VenusTrail = { - Identifier = "VenusTrail", - Parent = transforms.SolarSystemBarycenter.Identifier, - Renderable = { - Type = "RenderableTrailOrbit", - Translation = { - Type = "SpiceTranslation", - Target = "VENUS BARYCENTER", - Observer = "SUN" - }, - Color = { 1.0, 0.5, 0.2 }, - Period = 224.695, - Resolution = 1000 + Identifier = "VenusTrail", + Parent = transforms.SolarSystemBarycenter.Identifier, + Renderable = { + Type = "RenderableTrailOrbit", + Translation = { + Type = "SpiceTranslation", + Target = "VENUS BARYCENTER", + Observer = "SUN" }, - Tag = { "planetTrail_solarSystem", "planetTrail_terrestrial" }, - GUI = { - Name = "Venus Trail", - Path = "/Solar System/Planets/Venus", - Description = "Main trail for Venus", - Hidden = false - } + Color = { 1.0, 0.5, 0.2 }, + Period = 224.695, + Resolution = 1000 + }, + Tag = { "planetTrail_solarSystem", "planetTrail_terrestrial" }, + GUI = { + Name = "Venus Trail", + Path = "/Solar System/Planets/Venus", + Description = "Main trail for Venus", + Hidden = false + } } assetHelper.registerSceneGraphNodesAndExport(asset, { VenusTrail }) asset.meta = { - Name = "Venus Trail", - Version = "1.0", - Description = [[ Trail of Venus as observed by the Sun. Data from NASA Spice (see - base spice asset)]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"VenusTrail"} + Name = "Venus Trail", + Version = "1.0", + Description = [[ Trail of Venus as observed by the Sun. Data from NASA Spice (see + base spice asset)]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license", + Identifiers = {"VenusTrail"} } diff --git a/data/assets/scene/solarsystem/planets/venus/trail_earth.asset b/data/assets/scene/solarsystem/planets/venus/trail_earth.asset index a96a8990db..3af7aecaaa 100644 --- a/data/assets/scene/solarsystem/planets/venus/trail_earth.asset +++ b/data/assets/scene/solarsystem/planets/venus/trail_earth.asset @@ -5,39 +5,39 @@ asset.require("spice/base") local VenusTrailEarth = { - Identifier = "VenusTrailEarth", - Parent = earthTransforms.EarthBarycenter.Identifier, - Renderable = { - Type = "RenderableTrailOrbit", - Translation = { - Type = "SpiceTranslation", - Target = "VENUS BARYCENTER", - Observer = "EARTH" - }, - Color = { 1.0, 0.5, 0.2 }, - Period = 224.695, - Resolution = 1000, - Enabled = false + Identifier = "VenusTrailEarth", + Parent = earthTransforms.EarthBarycenter.Identifier, + Renderable = { + Type = "RenderableTrailOrbit", + Translation = { + Type = "SpiceTranslation", + Target = "VENUS BARYCENTER", + Observer = "EARTH" }, - Tag = { "planetTrail_solarSystem_alt", "planetTrail_terrestrial_alt" }, - GUI = { - Name = "Venus trail from Earth", - Path = "/Solar System/Planets/Venus", - Description = "Alternate trail for Venus, showing Venus as observed from Earth.", - Hidden = false - } + Color = { 1.0, 0.5, 0.2 }, + Period = 224.695, + Resolution = 1000, + Enabled = false + }, + Tag = { "planetTrail_solarSystem_alt", "planetTrail_terrestrial_alt" }, + GUI = { + Name = "Venus trail from Earth", + Path = "/Solar System/Planets/Venus", + Description = "Alternate trail for Venus, showing Venus as observed from Earth.", + Hidden = false + } } assetHelper.registerSceneGraphNodesAndExport(asset, { VenusTrailEarth }) asset.meta = { - Name = "Venus Trail from Earth", - Version = "1.0", - Description = [[ Trail of Venus as observed by the Earth. Data from NASA - SPICE (see base spice asset)]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"VenusTrailEarth"} + Name = "Venus Trail from Earth", + Version = "1.0", + Description = [[ Trail of Venus as observed by the Earth. Data from NASA + SPICE (see base spice asset)]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license", + Identifiers = {"VenusTrailEarth"} } diff --git a/data/assets/scene/solarsystem/planets/venus/transforms.asset b/data/assets/scene/solarsystem/planets/venus/transforms.asset index 83349ef680..2db6ea4117 100644 --- a/data/assets/scene/solarsystem/planets/venus/transforms.asset +++ b/data/assets/scene/solarsystem/planets/venus/transforms.asset @@ -3,32 +3,32 @@ local transforms = asset.require('scene/solarsystem/sun/transforms') asset.require("spice/base") local VenusBarycenter = { - Identifier = "VenusBarycenter", - Parent = transforms.SolarSystemBarycenter.Identifier, - Transform = { - Translation = { - Type = "SpiceTranslation", - Target = "VENUS BARYCENTER", - Observer = "SUN" - } - }, - GUI = { - Name = "Venus Barycenter", - Path = "/Solar System/Planets/Venus", - Hidden = true, - Description = "Position for Venus Barycenter" + Identifier = "VenusBarycenter", + Parent = transforms.SolarSystemBarycenter.Identifier, + Transform = { + Translation = { + Type = "SpiceTranslation", + Target = "VENUS BARYCENTER", + Observer = "SUN" } + }, + GUI = { + Name = "Venus Barycenter", + Path = "/Solar System/Planets/Venus", + Hidden = true, + Description = "Position for Venus Barycenter" + } } assetHelper.registerSceneGraphNodesAndExport(asset, { VenusBarycenter }) asset.meta = { - Name = "Venus Transforms", - Version = "1.0", - Description = [[ Spice translation for Venus Barycenter]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"VenusBarycenter"} + Name = "Venus Transforms", + Version = "1.0", + Description = [[ Spice translation for Venus Barycenter]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license", + Identifiers = {"VenusBarycenter"} } diff --git a/data/assets/scene/solarsystem/planets/venus/venus.asset b/data/assets/scene/solarsystem/planets/venus/venus.asset index b1bb529e58..b07ce04f0c 100644 --- a/data/assets/scene/solarsystem/planets/venus/venus.asset +++ b/data/assets/scene/solarsystem/planets/venus/venus.asset @@ -5,51 +5,51 @@ asset.require('./trail') local labelsPath = asset.require('./venus_globelabels').LabelsPath local Venus = { - Identifier = "Venus", - Parent = transforms.VenusBarycenter.Identifier, - Transform = { - Rotation = { - Type = "SpiceRotation", - SourceFrame = "IAU_VENUS", - DestinationFrame = "GALACTIC" - }, - Translation = { - Type = "SpiceTranslation", - Target = "VENUS", - Observer = "VENUS BARYCENTER" - } + Identifier = "Venus", + Parent = transforms.VenusBarycenter.Identifier, + Transform = { + Rotation = { + Type = "SpiceRotation", + SourceFrame = "IAU_VENUS", + DestinationFrame = "GALACTIC" }, - Renderable = { - Type = "RenderableGlobe", - --Radii = { 6051900.0, 6051900.0, 6051800.0 }, - Radii = { 6051900.0, 6051900.0, 6051900.0 }, - SegmentsPerPatch = 64, - Layers = {}, - Labels = { - Enable = false, - FileName = labelsPath .. "/venus.labels", - LabelAlignmentOption = "Horizontally", -- or Circularly - LabelsFontSize = 40.0, - LabelsSize = 10.0, - LabelsMinSize = 1.0, - LabelsMaxSize = 1500.0, - ProximityEnabled = false, - LabelsFadeInEnabled = true, - LabelsFadeInEnabled = true, - LabelsFadeOutEnabled = true, - FadeInStartingDistance = 7000000.0, - FadeOutStartingDistance = 2000000.0, - LabelsForceDomeRendering = true, - LabelsDistanceEPS = 4000000.0, - LabelsColor = { 1.0, 1.0, 0.0 } - } - }, - Tag = { "planet_solarSystem", "planet_terrestrial" }, - GUI = { - Name = "Venus", - Path = "/Solar System/Planets/Venus", - Description = "Venus globe with labels and map layers." + Translation = { + Type = "SpiceTranslation", + Target = "VENUS", + Observer = "VENUS BARYCENTER" } + }, + Renderable = { + Type = "RenderableGlobe", + --Radii = { 6051900.0, 6051900.0, 6051800.0 }, + Radii = { 6051900.0, 6051900.0, 6051900.0 }, + SegmentsPerPatch = 64, + Layers = {}, + Labels = { + Enable = false, + FileName = labelsPath .. "/venus.labels", + LabelAlignmentOption = "Horizontally", -- or Circularly + LabelsFontSize = 40.0, + LabelsSize = 10.0, + LabelsMinSize = 1.0, + LabelsMaxSize = 1500.0, + ProximityEnabled = false, + LabelsFadeInEnabled = true, + LabelsFadeInEnabled = true, + LabelsFadeOutEnabled = true, + FadeInStartingDistance = 7000000.0, + FadeOutStartingDistance = 2000000.0, + LabelsForceDomeRendering = true, + LabelsDistanceEPS = 4000000.0, + LabelsColor = { 1.0, 1.0, 0.0 } + } + }, + Tag = { "planet_solarSystem", "planet_terrestrial" }, + GUI = { + Name = "Venus", + Path = "/Solar System/Planets/Venus", + Description = "Venus globe with labels and map layers." + } } local VenusLabel = { diff --git a/data/assets/scene/solarsystem/planets/venus/venus_globelabels.asset b/data/assets/scene/solarsystem/planets/venus/venus_globelabels.asset index 5902e84d19..e38e2ea3f8 100644 --- a/data/assets/scene/solarsystem/planets/venus/venus_globelabels.asset +++ b/data/assets/scene/solarsystem/planets/venus/venus_globelabels.asset @@ -1,7 +1,7 @@ local LabelsPath = asset.syncedResource({ - Name = "Venus Labels", - Type = "HttpSynchronization", - Identifier = "venus_labels", - Version = 1 + Name = "Venus Labels", + Type = "HttpSynchronization", + Identifier = "venus_labels", + Version = 1 }) asset.export("LabelsPath", LabelsPath) diff --git a/data/assets/scene/solarsystem/planets/venus/venus_textures.asset b/data/assets/scene/solarsystem/planets/venus/venus_textures.asset index a9e47905d1..38442cb484 100644 --- a/data/assets/scene/solarsystem/planets/venus/venus_textures.asset +++ b/data/assets/scene/solarsystem/planets/venus/venus_textures.asset @@ -1,7 +1,7 @@ local TexturesPath = asset.syncedResource({ - Name = "Venus Textures", - Type = "HttpSynchronization", - Identifier = "venus_textures", - Version = 1 + Name = "Venus Textures", + Type = "HttpSynchronization", + Identifier = "venus_textures", + Version = 1 }) asset.export("TexturesPath", TexturesPath) diff --git a/data/assets/scene/solarsystem/sssb/amor_asteroid.asset b/data/assets/scene/solarsystem/sssb/amor_asteroid.asset index de5fa442e5..1829752752 100644 --- a/data/assets/scene/solarsystem/sssb/amor_asteroid.asset +++ b/data/assets/scene/solarsystem/sssb/amor_asteroid.asset @@ -2,28 +2,28 @@ local assetHelper = asset.require('util/asset_helper') local sharedSssb = asset.require('./sssb_shared') local filepath = sharedSssb.downloadSssbDatabaseFile(asset, 'amor_asteroid', - 'sssb_data_amor_asteroid') + 'sssb_data_amor_asteroid') local object = sharedSssb.createSssbGroupObject('sssb_data_amor_asteroid.csv', - "Amor Asteroids", filepath, { 1.0, 1.0, 1.0 }) + "Amor Asteroids", filepath, { 1.0, 1.0, 1.0 }) object.Renderable.Enabled = false object.Renderable.SegmentQuality = 4 object.Renderable.TrailFade = 11 object.GUI.Description = [[ Earth-approaching Near-Earth-Asteroids with orbits exterior to - Earth's but interior to Mars'. ]] + Earth's but interior to Mars'. ]] assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { - Name = "Amor Asteroids", - Version = "1.0", - Description = [[ RenderableSmallBody asset with data from from JPL Horizons - contiaining the Amor group.]], - Author = "JPL Small-Body Database hosted by California Institute of Technology", - URL = "https://ssd.jpl.nasa.gov/sbdb_query.cgi", - License = [[JPL-authored documents are sponsored by NASA under Contract NAS7-030010. - All documents available from this server may be protected under the U.S. and - Foreign Copyright Laws."]], - Identifiers = {"sssb_sssb_data_amor_asteroid"} + Name = "Amor Asteroids", + Version = "1.0", + Description = [[ RenderableSmallBody asset with data from from JPL Horizons + contiaining the Amor group.]], + Author = "JPL Small-Body Database hosted by California Institute of Technology", + URL = "https://ssd.jpl.nasa.gov/sbdb_query.cgi", + License = [[JPL-authored documents are sponsored by NASA under Contract NAS7-030010. + All documents available from this server may be protected under the U.S. and + Foreign Copyright Laws."]], + Identifiers = {"sssb_sssb_data_amor_asteroid"} } diff --git a/data/assets/scene/solarsystem/sssb/apollo_asteroid.asset b/data/assets/scene/solarsystem/sssb/apollo_asteroid.asset index 67c043019a..65507b67da 100644 --- a/data/assets/scene/solarsystem/sssb/apollo_asteroid.asset +++ b/data/assets/scene/solarsystem/sssb/apollo_asteroid.asset @@ -2,28 +2,28 @@ local assetHelper = asset.require('util/asset_helper') local sharedSssb = asset.require('./sssb_shared') local filepath = sharedSssb.downloadSssbDatabaseFile(asset, 'apollo_asteroid', - 'sssb_data_apollo_asteroid') + 'sssb_data_apollo_asteroid') local object = sharedSssb.createSssbGroupObject('sssb_data_apollo_asteroid.csv', - "Apollo Asteroids", filepath, { 0.7, 0.7, 1.0 }) + "Apollo Asteroids", filepath, { 0.7, 0.7, 1.0 }) object.Renderable.Enabled = false object.Renderable.SegmentQuality = 6 object.Renderable.TrailFade = 10 object.GUI.Description = [[ Earth-crossing Near-Earth-Asteroids with semi-major axes - larger than Earth's. ]] + larger than Earth's. ]] assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { - Name = "Apollo Asteroids", - Version = "1.0", - Description = [[ RenderableSmallBody asset with data from from JPL Horizons - contiaining the Apollo group.]], - Author = "JPL Small-Body Database hosted by California Institute of Technology", - URL = "https://ssd.jpl.nasa.gov/sbdb_query.cgi", - License = [[JPL-authored documents are sponsored by NASA under Contract NAS7-030010. - All documents available from this server may be protected under the U.S. and - Foreign Copyright Laws.]], - Identifiers = {"sssb_sssb_data_apollo_asteroid"} + Name = "Apollo Asteroids", + Version = "1.0", + Description = [[ RenderableSmallBody asset with data from from JPL Horizons + contiaining the Apollo group.]], + Author = "JPL Small-Body Database hosted by California Institute of Technology", + URL = "https://ssd.jpl.nasa.gov/sbdb_query.cgi", + License = [[JPL-authored documents are sponsored by NASA under Contract NAS7-030010. + All documents available from this server may be protected under the U.S. and + Foreign Copyright Laws.]], + Identifiers = {"sssb_sssb_data_apollo_asteroid"} } diff --git a/data/assets/scene/solarsystem/sssb/astraea.asset b/data/assets/scene/solarsystem/sssb/astraea.asset index 17ce92dcef..fc0895743b 100644 --- a/data/assets/scene/solarsystem/sssb/astraea.asset +++ b/data/assets/scene/solarsystem/sssb/astraea.asset @@ -2,60 +2,60 @@ local assetHelper = asset.require('util/asset_helper') local sunTransforms = asset.require('scene/solarsystem/sun/transforms') local trajectory = asset.syncedResource({ - Name = "5 Astraea Trajectory", - Type = "HttpSynchronization", - Identifier = "astraea_horizons", - Version = 1 + Name = "5 Astraea Trajectory", + Type = "HttpSynchronization", + Identifier = "astraea_horizons", + Version = 1 }) local AstraeaTrail = { - Identifier = "AstraeaTrail", - Parent = sunTransforms.SolarSystemBarycenter.Identifier, - Renderable = { - Type = "RenderableTrailTrajectory", - Translation = { - Type = "HorizonsTranslation", - HorizonsTextFile = trajectory .. "/horizons_astraea.dat" - }, - Color = { 0.9, 0.9, 0.0 }, - StartTime = "2014 JAN 01 00:00:00", - EndTime = "2023 JAN 01 00:00:00", - SampleInterval = 7000, - TimeStampSubsampleFactor = 1 + Identifier = "AstraeaTrail", + Parent = sunTransforms.SolarSystemBarycenter.Identifier, + Renderable = { + Type = "RenderableTrailTrajectory", + Translation = { + Type = "HorizonsTranslation", + HorizonsTextFile = trajectory .. "/horizons_astraea.dat" }, - GUI = { - Name = "5 Astraea Trail", - Path = "/Solar System/Interstellar" - } + Color = { 0.9, 0.9, 0.0 }, + StartTime = "2014 JAN 01 00:00:00", + EndTime = "2023 JAN 01 00:00:00", + SampleInterval = 7000, + TimeStampSubsampleFactor = 1 + }, + GUI = { + Name = "5 Astraea Trail", + Path = "/Solar System/Interstellar" + } } local AstraeaPosition = { - Identifier = "AstraeaPosition", - Parent = sunTransforms.SolarSystemBarycenter.Identifier, - Transform = { - Translation = { - Type = "HorizonsTranslation", - HorizonsTextFile = trajectory .. "/horizons_astraea.dat" - }, - }, - GUI = { - Name = "5 Astraea", - Path = "/Solar System/Interstellar" + Identifier = "AstraeaPosition", + Parent = sunTransforms.SolarSystemBarycenter.Identifier, + Transform = { + Translation = { + Type = "HorizonsTranslation", + HorizonsTextFile = trajectory .. "/horizons_astraea.dat" } + }, + GUI = { + Name = "5 Astraea", + Path = "/Solar System/Interstellar" + } } assetHelper.registerSceneGraphNodesAndExport(asset, { AstraeaPosition, AstraeaTrail }) asset.meta = { - Name = "5 Astraea", - Version = "1.0", - Description = [[ This asset contains the trail - and position of 5 Astraea from 2014 JAN 01 00:00:00 - to 2023 JAN 01 00:00:00. Data from JPL Horizons']], - Author = "Zach Shaffer", - URL = "https://ssd.jpl.nasa.gov/horizons.cgi", - License = [[ JPL-authored documents are sponsored by NASA under Contract - NAS7-030010. All documents available from this server may be protected - under the U.S. and Foreign Copyright Laws."]] + Name = "5 Astraea", + Version = "1.0", + Description = [[ This asset contains the trail + and position of 5 Astraea from 2014 JAN 01 00:00:00 + to 2023 JAN 01 00:00:00. Data from JPL Horizons']], + Author = "Zach Shaffer", + URL = "https://ssd.jpl.nasa.gov/horizons.cgi", + License = [[ JPL-authored documents are sponsored by NASA under Contract + NAS7-030010. All documents available from this server may be protected + under the U.S. and Foreign Copyright Laws."]] } diff --git a/data/assets/scene/solarsystem/sssb/aten_asteroid.asset b/data/assets/scene/solarsystem/sssb/aten_asteroid.asset index c522abe149..9f86dffb54 100644 --- a/data/assets/scene/solarsystem/sssb/aten_asteroid.asset +++ b/data/assets/scene/solarsystem/sssb/aten_asteroid.asset @@ -2,29 +2,29 @@ local assetHelper = asset.require('util/asset_helper') local sharedSssb = asset.require('./sssb_shared') local filepath = sharedSssb.downloadSssbDatabaseFile(asset, 'aten_asteroid', - 'sssb_data_aten_asteroid') + 'sssb_data_aten_asteroid') local object = sharedSssb.createSssbGroupObject('sssb_data_aten_asteroid.csv', - "Aten Asteroids", filepath, { 0.15, 0.15, 1.0 }) + "Aten Asteroids", filepath, { 0.15, 0.15, 1.0 }) object.Renderable.Enabled = false object.Renderable.SegmentQuality = 2 object.Renderable.TrailFade = 18 object.GUI.Description = [[ Earth-crossing Near-Earth-Asteroids with semi-major axes - smaller than Earth's. ]] + smaller than Earth's. ]] assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { - Name = "Aten Asteroids", - Version = "1.0", - Description = [[ RenderableSmallBody asset with data from from JPL Horizons - contiaining the Aten group.]], - Author = "JPL Small-Body Database hosted by California Institute of Technology", - URL = "https://ssd.jpl.nasa.gov/sbdb_query.cgi", - License = [[JPL-authored documents are sponsored by NASA under Contract NAS7-030010. - All documents available from this server may be protected under the U.S. and - Foreign Copyright Laws.]], - Identifiers = {"sssb_sssb_data_aten_asteroid"} + Name = "Aten Asteroids", + Version = "1.0", + Description = [[ RenderableSmallBody asset with data from from JPL Horizons + contiaining the Aten group.]], + Author = "JPL Small-Body Database hosted by California Institute of Technology", + URL = "https://ssd.jpl.nasa.gov/sbdb_query.cgi", + License = [[JPL-authored documents are sponsored by NASA under Contract NAS7-030010. + All documents available from this server may be protected under the U.S. and + Foreign Copyright Laws.]], + Identifiers = {"sssb_sssb_data_aten_asteroid"} } diff --git a/data/assets/scene/solarsystem/sssb/atira_asteroid.asset b/data/assets/scene/solarsystem/sssb/atira_asteroid.asset index b06b0850de..b89f2a2658 100644 --- a/data/assets/scene/solarsystem/sssb/atira_asteroid.asset +++ b/data/assets/scene/solarsystem/sssb/atira_asteroid.asset @@ -2,29 +2,29 @@ local assetHelper = asset.require('util/asset_helper') local sharedSssb = asset.require('./sssb_shared') local filepath = sharedSssb.downloadSssbDatabaseFile(asset, 'atira_asteroid', - 'sssb_data_atira_asteroid') + 'sssb_data_atira_asteroid') local object = sharedSssb.createSssbGroupObject('sssb_data_atira_asteroid.csv', - "Atira Asteroids", filepath, { 0.5, 0.8, 1.0 }) + "Atira Asteroids", filepath, { 0.5, 0.8, 1.0 }) object.Renderable.Enabled = false object.Renderable.SegmentQuality = 2 object.Renderable.TrailFade = 25 object.GUI.Description = [[ Near-Earth-Asteroids whose orbits are contained entirely - within the orbit of the Earth. ]] + within the orbit of the Earth. ]] assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { - Name = "Atira Asteroids", - Version = "1.0", - Description = [[ RenderableSmallBody asset with data from from JPL Horizons - contiaining the Atira group.]], - Author = "JPL Small-Body Database hosted by California Institute of Technology", - URL = "https://ssd.jpl.nasa.gov/sbdb_query.cgi", - License = [[JPL-authored documents are sponsored by NASA under Contract NAS7-030010. + Name = "Atira Asteroids", + Version = "1.0", + Description = [[ RenderableSmallBody asset with data from from JPL Horizons + contiaining the Atira group.]], + Author = "JPL Small-Body Database hosted by California Institute of Technology", + URL = "https://ssd.jpl.nasa.gov/sbdb_query.cgi", + License = [[JPL-authored documents are sponsored by NASA under Contract NAS7-030010. All documents available from this server may be protected under the U.S. and Foreign Copyright Laws."]], - Identifiers = {"sssb_sssb_data_atira_asteroid"} + Identifiers = {"sssb_sssb_data_atira_asteroid"} } diff --git a/data/assets/scene/solarsystem/sssb/c2019y4atlas.asset b/data/assets/scene/solarsystem/sssb/c2019y4atlas.asset index 912db8d30b..e3525ae6d8 100644 --- a/data/assets/scene/solarsystem/sssb/c2019y4atlas.asset +++ b/data/assets/scene/solarsystem/sssb/c2019y4atlas.asset @@ -2,62 +2,62 @@ local assetHelper = asset.require('util/asset_helper') local sunTransforms = asset.require('scene/solarsystem/sun/transforms') local orbit = asset.syncedResource({ - Name = "Comet C/2019 Y4 ATLAS", - Type = "HttpSynchronization", - Identifier = "horizons_c2019y4atlas", - Version = 1 + Name = "Comet C/2019 Y4 ATLAS", + Type = "HttpSynchronization", + Identifier = "horizons_c2019y4atlas", + Version = 1 }) .. "/c2019y4atlas.txt" local C2019Y4AtlasTrail = { - Identifier = "C2019Y4AtlasTrail", - Parent = sunTransforms.SolarSystemBarycenter.Identifier, - Renderable = { - Type = "RenderableTrailTrajectory", - Translation = { - Type = "HorizonsTranslation", - HorizonsTextFile = orbit - }, - Color = { 0.533333, 0.850980, 0.996078 }, - EnableFade = false, - StartTime = "1950 JAN 1 0:00:00", - EndTime = "2100 JAN 1 00:00:00", - SampleInterval = 35000, - TimeStampSubsampleFactor = 1 + Identifier = "C2019Y4AtlasTrail", + Parent = sunTransforms.SolarSystemBarycenter.Identifier, + Renderable = { + Type = "RenderableTrailTrajectory", + Translation = { + Type = "HorizonsTranslation", + HorizonsTextFile = orbit }, - GUI = { - Name = "C2019 Y4 Atlas Trail", - Path = "/Solar System/Comets" - } + Color = { 0.533333, 0.850980, 0.996078 }, + EnableFade = false, + StartTime = "1950 JAN 1 0:00:00", + EndTime = "2100 JAN 1 00:00:00", + SampleInterval = 35000, + TimeStampSubsampleFactor = 1 + }, + GUI = { + Name = "C2019 Y4 Atlas Trail", + Path = "/Solar System/Comets" + } } local C2019Y4AtlasPosition = { - Identifier = "C2019Y4AtlasPosition", - Parent = sunTransforms.SolarSystemBarycenter.Identifier, - Transform = { - Translation = { - Type = "HorizonsTranslation", - HorizonsTextFile = orbit - }, + Identifier = "C2019Y4AtlasPosition", + Parent = sunTransforms.SolarSystemBarycenter.Identifier, + Transform = { + Translation = { + Type = "HorizonsTranslation", + HorizonsTextFile = orbit }, - GUI = { - Name = "C/2019 Y4 Atlas", - Path = "/Solar System/Comets", - Description = 'This is the position for C/2019 Y4 Atlas' - } + }, + GUI = { + Name = "C/2019 Y4 Atlas", + Path = "/Solar System/Comets", + Description = 'This is the position for C/2019 Y4 Atlas' + } } assetHelper.registerSceneGraphNodesAndExport(asset, { - C2019Y4AtlasPosition, C2019Y4AtlasTrail + C2019Y4AtlasPosition, C2019Y4AtlasTrail }) asset.meta = { - Name = "C/2019 Y4 Atlas", - Version = "1.0", - Description = [[ This asset contains the trail and position of C/2019 Y4 Atlas from - 1950 JAN 01 00:00:00 to 2100 JAN 01 00:00:00. Data from JPL Horizons']], - Author = "OpenSpace Team", - URL = "https://ssd.jpl.nasa.gov/horizons.cgi", - License = "NASA", - Identifiers = {"C2019Y4AtlasPosition", "C2019Y4AtlasTrail"} + Name = "C/2019 Y4 Atlas", + Version = "1.0", + Description = [[ This asset contains the trail and position of C/2019 Y4 Atlas from + 1950 JAN 01 00:00:00 to 2100 JAN 01 00:00:00. Data from JPL Horizons']], + Author = "OpenSpace Team", + URL = "https://ssd.jpl.nasa.gov/horizons.cgi", + License = "NASA", + Identifiers = {"C2019Y4AtlasPosition", "C2019Y4AtlasTrail"} } diff --git a/data/assets/scene/solarsystem/sssb/centaur_asteroid.asset b/data/assets/scene/solarsystem/sssb/centaur_asteroid.asset index baa3d5469f..6d0e5a39b2 100644 --- a/data/assets/scene/solarsystem/sssb/centaur_asteroid.asset +++ b/data/assets/scene/solarsystem/sssb/centaur_asteroid.asset @@ -2,29 +2,29 @@ local assetHelper = asset.require('util/asset_helper') local sharedSssb = asset.require('./sssb_shared') local filepath = sharedSssb.downloadSssbDatabaseFile(asset, 'centaur_asteroid', - 'sssb_data_centaur_asteroid') + 'sssb_data_centaur_asteroid') local object = sharedSssb.createSssbGroupObject('sssb_data_centaur_asteroid.csv', - "Centaur Asteroids", filepath, { 0.94, 0.96, 0.94 }) + "Centaur Asteroids", filepath, { 0.94, 0.96, 0.94 }) object.Renderable.Enabled = false object.Renderable.SegmentQuality = 6 object.Renderable.TrailFade = 18 object.GUI.Description = [[ Asteroids with either a perihelion or a semi-major axis - between those of the four outer planets. ]] + between those of the four outer planets. ]] assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { - Name = "Centaur Asteroids", - Version = "1.0", - Description = [[ RenderableSmallBody asset with data from from JPL Horizons - contiaining the Centaur group.]], - Author = "JPL Small-Body Database hosted by California Institute of Technology", - URL = "https://ssd.jpl.nasa.gov/sbdb_query.cgi", - License = [[JPL-authored documents are sponsored by NASA under Contract NAS7-030010. + Name = "Centaur Asteroids", + Version = "1.0", + Description = [[ RenderableSmallBody asset with data from from JPL Horizons + contiaining the Centaur group.]], + Author = "JPL Small-Body Database hosted by California Institute of Technology", + URL = "https://ssd.jpl.nasa.gov/sbdb_query.cgi", + License = [[JPL-authored documents are sponsored by NASA under Contract NAS7-030010. All documents available from this server may be protected under the U.S. and Foreign Copyright Laws.]], - Identifiers = {"sssb_sssb_data_centaur_asteroid"} + Identifiers = {"sssb_sssb_data_centaur_asteroid"} } diff --git a/data/assets/scene/solarsystem/sssb/chiron-type_comet.asset b/data/assets/scene/solarsystem/sssb/chiron-type_comet.asset index 81f1523ac6..315abef89b 100644 --- a/data/assets/scene/solarsystem/sssb/chiron-type_comet.asset +++ b/data/assets/scene/solarsystem/sssb/chiron-type_comet.asset @@ -2,29 +2,29 @@ local assetHelper = asset.require('util/asset_helper') local sharedSssb = asset.require('./sssb_shared') local filepath = sharedSssb.downloadSssbDatabaseFile(asset, 'chiron-type_comet', - 'sssb_data_chiron-type_comet') + 'sssb_data_chiron-type_comet') local object = sharedSssb.createSssbGroupObject('sssb_data_chiron-type_comet.csv', - "Chiron-type Comets", filepath, { 0.15 ,0.1 ,1.0 }) + "Chiron-type Comets", filepath, { 0.15 ,0.1 ,1.0 }) object.Renderable.Enabled = false object.Renderable.SegmentQuality = 10 object.Renderable.TrailFade = 25 object.GUI.Description = [[ Comets with a Tisserand's parameter with respect to Jupiter of - greater than 3 and a semi-major axis greater than that of Jupiter. ]] + greater than 3 and a semi-major axis greater than that of Jupiter. ]] assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { - Name = "Chiron-Type Comets", - Version = "1.0", - Description = [[ RenderableSmallBody asset with data from from JPL Horizons - contiaining the Chiron-Type group.]], - Author = "JPL Small-Body Database hosted by California Institute of Technology", - URL = "https://ssd.jpl.nasa.gov/sbdb_query.cgi", - License = [[JPL-authored documents are sponsored by NASA under Contract NAS7-030010. - All documents available from this server may be protected under the U.S. and - Foreign Copyright Laws.]], - Identifiers = {"sssb_sssb_data_chiron-type_comet"} + Name = "Chiron-Type Comets", + Version = "1.0", + Description = [[ RenderableSmallBody asset with data from from JPL Horizons + contiaining the Chiron-Type group.]], + Author = "JPL Small-Body Database hosted by California Institute of Technology", + URL = "https://ssd.jpl.nasa.gov/sbdb_query.cgi", + License = [[JPL-authored documents are sponsored by NASA under Contract NAS7-030010. + All documents available from this server may be protected under the U.S. and + Foreign Copyright Laws.]], + Identifiers = {"sssb_sssb_data_chiron-type_comet"} } diff --git a/data/assets/scene/solarsystem/sssb/encke-type_comet.asset b/data/assets/scene/solarsystem/sssb/encke-type_comet.asset index c3af524bb2..f07d3a39ab 100644 --- a/data/assets/scene/solarsystem/sssb/encke-type_comet.asset +++ b/data/assets/scene/solarsystem/sssb/encke-type_comet.asset @@ -2,29 +2,29 @@ local assetHelper = asset.require('util/asset_helper') local sharedSssb = asset.require('./sssb_shared') local filepath = sharedSssb.downloadSssbDatabaseFile(asset, 'encke-type_comet', - 'sssb_data_encke-type_comet') + 'sssb_data_encke-type_comet') local object = sharedSssb.createSssbGroupObject('sssb_data_encke-type_comet.csv', - "Encke-type Comets", filepath, { 0.8, 0.34, 1.0 }) + "Encke-type Comets", filepath, { 0.8, 0.34, 1.0 }) object.Renderable.Enabled = false object.Renderable.SegmentQuality = 2 object.Renderable.TrailFade = 23 object.GUI.Description = [[ Comets with a Tisserand's parameter with respect to Jupiter of - greater than 3 and a semi-major axis less than that of Jupiter. ]] + greater than 3 and a semi-major axis less than that of Jupiter. ]] assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { - Name = "Encke-Type Comets", - Version = "1.0", - Description = [[ RenderableSmallBody asset with data from from JPL Horizons - contiaining the Encke-Type group.]], - Author = "JPL Small-Body Database hosted by California Institute of Technology", - URL = "https://ssd.jpl.nasa.gov/sbdb_query.cgi", - License = [[JPL-authored documents are sponsored by NASA under Contract NAS7-030010. + Name = "Encke-Type Comets", + Version = "1.0", + Description = [[ RenderableSmallBody asset with data from from JPL Horizons + contiaining the Encke-Type group.]], + Author = "JPL Small-Body Database hosted by California Institute of Technology", + URL = "https://ssd.jpl.nasa.gov/sbdb_query.cgi", + License = [[JPL-authored documents are sponsored by NASA under Contract NAS7-030010. All documents available from this server may be protected under the U.S. and Foreign Copyright Laws.]], - Identifiers = {"sssb_sssb_data_encke-type_comet"} + Identifiers = {"sssb_sssb_data_encke-type_comet"} } diff --git a/data/assets/scene/solarsystem/sssb/halley-type_comet.asset b/data/assets/scene/solarsystem/sssb/halley-type_comet.asset index ebc84f9e0d..b0d0131d77 100644 --- a/data/assets/scene/solarsystem/sssb/halley-type_comet.asset +++ b/data/assets/scene/solarsystem/sssb/halley-type_comet.asset @@ -2,28 +2,28 @@ local assetHelper = asset.require('util/asset_helper') local sharedSssb = asset.require('./sssb_shared') local filepath = sharedSssb.downloadSssbDatabaseFile(asset, 'halley-type_comet', - 'sssb_data_halley-type_comet') + 'sssb_data_halley-type_comet') local object = sharedSssb.createSssbGroupObject('sssb_data_halley-type_comet.csv', - "Halley-type Comets", filepath, { 0.66, 0.66, 0.66 }) + "Halley-type Comets", filepath, { 0.66, 0.66, 0.66 }) object.Renderable.Enabled = false object.Renderable.SegmentQuality = 9 object.Renderable.TrailFade = 18 object.GUI.Description = [[ Periodic comets with an orbital period between 20 and 200 - years. ]] + years. ]] assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { - Name = "Halley-Type Comets", - Version = "1.0", - Description = [[ RenderableSmallBody asset with data from from JPL Horizons - contiaining the Halley-Type group.]], - Author = "JPL Small-Body Database hosted by California Institute of Technology", - URL = "https://ssd.jpl.nasa.gov/sbdb_query.cgi", - License = [[JPL-authored documents are sponsored by NASA under Contract NAS7-030010. - All documents available from this server may be protected under the U.S. and - Foreign Copyright Laws.]], - Identifiers = {"sssb_sssb_data_halley-type_comet"} + Name = "Halley-Type Comets", + Version = "1.0", + Description = [[ RenderableSmallBody asset with data from from JPL Horizons + contiaining the Halley-Type group.]], + Author = "JPL Small-Body Database hosted by California Institute of Technology", + URL = "https://ssd.jpl.nasa.gov/sbdb_query.cgi", + License = [[JPL-authored documents are sponsored by NASA under Contract NAS7-030010. + All documents available from this server may be protected under the U.S. and + Foreign Copyright Laws.]], + Identifiers = {"sssb_sssb_data_halley-type_comet"} } diff --git a/data/assets/scene/solarsystem/sssb/inner_main_belt_asteroid.asset b/data/assets/scene/solarsystem/sssb/inner_main_belt_asteroid.asset index bd63087c9b..1c43e1f631 100644 --- a/data/assets/scene/solarsystem/sssb/inner_main_belt_asteroid.asset +++ b/data/assets/scene/solarsystem/sssb/inner_main_belt_asteroid.asset @@ -2,29 +2,29 @@ local assetHelper = asset.require('util/asset_helper') local sharedSssb = asset.require('./sssb_shared') local filepath = sharedSssb.downloadSssbDatabaseFile(asset, 'inner_main_belt_asteroid', - 'sssb_data_inner_main_belt_asteroid') + 'sssb_data_inner_main_belt_asteroid') local object = sharedSssb.createSssbGroupObject('sssb_data_inner_main_belt_asteroid.csv', - "Inner Main Asteroid Belt", filepath, { 1.0, 1.0, 0.0 }) + "Inner Main Asteroid Belt", filepath, { 1.0, 1.0, 0.0 }) object.Renderable.Enabled = false object.Renderable.SegmentQuality = 1 object.Renderable.TrailFade = 0.5 object.GUI.Description = [[ Asteroids with a semi-major axis less than 2.0 au and a - perihelion distance greater than 1.666 au. ]] + perihelion distance greater than 1.666 au. ]] assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { - Name = "Inner Main Asteroid Belt", - Version = "1.0", - Description = [[ RenderableSmallBody asset with data from from JPL Horizons - contiaining the Inner Main Asteroid Belt group.]], - Author = "JPL Small-Body Database hosted by California Institute of Technology", - URL = "https://ssd.jpl.nasa.gov/sbdb_query.cgi", - License = [[JPL-authored documents are sponsored by NASA under Contract NAS7-030010. - All documents available from this server may be protected under the U.S. and - Foreign Copyright Laws.]], - Identifiers = {"sssb_sssb_data_inner_main_belt_asteroid"} + Name = "Inner Main Asteroid Belt", + Version = "1.0", + Description = [[ RenderableSmallBody asset with data from from JPL Horizons + contiaining the Inner Main Asteroid Belt group.]], + Author = "JPL Small-Body Database hosted by California Institute of Technology", + URL = "https://ssd.jpl.nasa.gov/sbdb_query.cgi", + License = [[JPL-authored documents are sponsored by NASA under Contract NAS7-030010. + All documents available from this server may be protected under the U.S. and + Foreign Copyright Laws.]], + Identifiers = {"sssb_sssb_data_inner_main_belt_asteroid"} } diff --git a/data/assets/scene/solarsystem/sssb/jupiter-family_comet.asset b/data/assets/scene/solarsystem/sssb/jupiter-family_comet.asset index ecbf215d8e..91f4226222 100644 --- a/data/assets/scene/solarsystem/sssb/jupiter-family_comet.asset +++ b/data/assets/scene/solarsystem/sssb/jupiter-family_comet.asset @@ -2,29 +2,29 @@ local assetHelper = asset.require('util/asset_helper') local sharedSssb = asset.require('./sssb_shared') local filepath = sharedSssb.downloadSssbDatabaseFile(asset, 'jupiter-family_comet', - 'sssb_data_jupiter-family_comet') + 'sssb_data_jupiter-family_comet') local object = sharedSssb.createSssbGroupObject('sssb_data_jupiter-family_comet.csv', - "Jupiter-family Comets", filepath, { 0.2, 0.8, 0.2 }) + "Jupiter-family Comets", filepath, { 0.2, 0.8, 0.2 }) object.Renderable.Enabled = false object.Renderable.SegmentQuality = 10 object.Renderable.TrailFade = 28 object.GUI.Description = [[ Comets with a Tisserand's parameter with respect to Jupiter of - between 2 and 3. ]] + between 2 and 3. ]] assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { - Name = "Jupiter Family Comets", - Version = "1.0", - Description = [[ RenderableSmallBody asset with data from from JPL Horizons - contiaining Jupiter-family group.]], - Author = "JPL Small-Body Database hosted by California Institute of Technology", - URL = "https://ssd.jpl.nasa.gov/sbdb_query.cgi", - License = [[JPL-authored documents are sponsored by NASA under Contract NAS7-030010. - All documents available from this server may be protected under the U.S. and - Foreign Copyright Laws.]], - Identifiers = {"sssb_sssb_data_jupiter-family_comet"} + Name = "Jupiter Family Comets", + Version = "1.0", + Description = [[ RenderableSmallBody asset with data from from JPL Horizons + contiaining Jupiter-family group.]], + Author = "JPL Small-Body Database hosted by California Institute of Technology", + URL = "https://ssd.jpl.nasa.gov/sbdb_query.cgi", + License = [[JPL-authored documents are sponsored by NASA under Contract NAS7-030010. + All documents available from this server may be protected under the U.S. and + Foreign Copyright Laws.]], + Identifiers = {"sssb_sssb_data_jupiter-family_comet"} } diff --git a/data/assets/scene/solarsystem/sssb/jupiter_trojan_asteroid.asset b/data/assets/scene/solarsystem/sssb/jupiter_trojan_asteroid.asset index 6663cd38a2..0389c0338d 100644 --- a/data/assets/scene/solarsystem/sssb/jupiter_trojan_asteroid.asset +++ b/data/assets/scene/solarsystem/sssb/jupiter_trojan_asteroid.asset @@ -2,29 +2,29 @@ local assetHelper = asset.require('util/asset_helper') local sharedSssb = asset.require('./sssb_shared') local filepath = sharedSssb.downloadSssbDatabaseFile(asset, 'jupiter_trojan_asteroid', - 'sssb_data_jupiter_trojan_asteroid') + 'sssb_data_jupiter_trojan_asteroid') local object = sharedSssb.createSssbGroupObject('sssb_data_jupiter_trojan_asteroid.csv', - "Jupiter Trojan Asteroids", filepath, { 0.5, 0.8, 0.5 }) + "Jupiter Trojan Asteroids", filepath, { 0.5, 0.8, 0.5 }) object.Renderable.Enabled = false object.Renderable.SegmentQuality = 1 object.Renderable.TrailFade = 5 object.GUI.Description = [[ Asteroids trapped in Jupiter's L4/L5 Lagrange points - (semimajor axis of between 4.6 and 5.5 au), with an eccentricity of less than 0.3. ]] + (semimajor axis of between 4.6 and 5.5 au), with an eccentricity of less than 0.3. ]] assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { - Name = "Jupiter Trojan Asteroids", - Version = "1.0", - Description = [[ RenderableSmallBody asset with data from from JPL Horizons - contiaining Jupiter Trojan group.]], - Author = "JPL Small-Body Database hosted by California Institute of Technology", - URL = "https://ssd.jpl.nasa.gov/sbdb_query.cgi", - License = [[JPL-authored documents are sponsored by NASA under Contract NAS7-030010. - All documents available from this server may be protected under the U.S. and - Foreign Copyright Laws.]], - Identifiers = {"sssb_sssb_data_jupiter_trojan_asteroid"} + Name = "Jupiter Trojan Asteroids", + Version = "1.0", + Description = [[ RenderableSmallBody asset with data from from JPL Horizons + contiaining Jupiter Trojan group.]], + Author = "JPL Small-Body Database hosted by California Institute of Technology", + URL = "https://ssd.jpl.nasa.gov/sbdb_query.cgi", + License = [[JPL-authored documents are sponsored by NASA under Contract NAS7-030010. + All documents available from this server may be protected under the U.S. and + Foreign Copyright Laws.]], + Identifiers = {"sssb_sssb_data_jupiter_trojan_asteroid"} } diff --git a/data/assets/scene/solarsystem/sssb/main_belt_asteroid.asset b/data/assets/scene/solarsystem/sssb/main_belt_asteroid.asset index 580b7b5fbb..7634f0ca92 100644 --- a/data/assets/scene/solarsystem/sssb/main_belt_asteroid.asset +++ b/data/assets/scene/solarsystem/sssb/main_belt_asteroid.asset @@ -2,30 +2,30 @@ local assetHelper = asset.require('util/asset_helper') local sharedSssb = asset.require('./sssb_shared') local filepath = sharedSssb.downloadSssbDatabaseFile(asset, 'main_belt_asteroid', - 'sssb_data_main_belt_asteroid') + 'sssb_data_main_belt_asteroid') local object = sharedSssb.createSssbGroupObject('sssb_data_main_belt_asteroid.csv', - "Main Asteroid Belt", filepath, { 0.0, 0.5, 0.0 }) + "Main Asteroid Belt", filepath, { 0.0, 0.5, 0.0 }) object.Renderable.Enabled = false object.Renderable.SegmentQuality = 1 object.Renderable.TrailFade = 0.1 object.Renderable.UpperLimit = 50000 object.GUI.Description = [[ Asteroids with a semi-major axis of between 2.0 and 3.2 au, - and a perihelion distance greater than 1.666 au. ]] + and a perihelion distance greater than 1.666 au. ]] assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { - Name = "Main Asteroid Belt", - Version = "1.0", - Description = [[ RenderableSmallBody asset with data from from JPL Horizons - contiaining Main Asteroid Belt group.]], - Author = "JPL Small-Body Database hosted by California Institute of Technology", - URL = "https://ssd.jpl.nasa.gov/sbdb_query.cgi", - License = [[JPL-authored documents are sponsored by NASA under Contract NAS7-030010. - All documents available from this server may be protected under the U.S. and - Foreign Copyright Laws.]], - Identifiers = {"sssb_sssb_data_main_belt_asteroid"} + Name = "Main Asteroid Belt", + Version = "1.0", + Description = [[ RenderableSmallBody asset with data from from JPL Horizons + contiaining Main Asteroid Belt group.]], + Author = "JPL Small-Body Database hosted by California Institute of Technology", + URL = "https://ssd.jpl.nasa.gov/sbdb_query.cgi", + License = [[JPL-authored documents are sponsored by NASA under Contract NAS7-030010. + All documents available from this server may be protected under the U.S. and + Foreign Copyright Laws.]], + Identifiers = {"sssb_sssb_data_main_belt_asteroid"} } diff --git a/data/assets/scene/solarsystem/sssb/mars-crossing_asteroid.asset b/data/assets/scene/solarsystem/sssb/mars-crossing_asteroid.asset index dd3252f7c2..f731c32ab2 100644 --- a/data/assets/scene/solarsystem/sssb/mars-crossing_asteroid.asset +++ b/data/assets/scene/solarsystem/sssb/mars-crossing_asteroid.asset @@ -2,29 +2,29 @@ local assetHelper = asset.require('util/asset_helper') local sharedSssb = asset.require('./sssb_shared') local filepath = sharedSssb.downloadSssbDatabaseFile(asset, 'mars-crossing_asteroid', - 'sssb_data_mars-crossing_asteroid') + 'sssb_data_mars-crossing_asteroid') local object = sharedSssb.createSssbGroupObject('sssb_data_mars-crossing_asteroid.csv', - "Mars-crossing Asteroids", filepath, { 0.814, 0.305, 0.220 }) + "Mars-crossing Asteroids", filepath, { 0.814, 0.305, 0.220 }) object.Renderable.Enabled = false object.Renderable.SegmentQuality = 1 object.Renderable.TrailFade = 13 object.GUI.Description = [[ Asteroids that cross the orbit of Mars, with a semi-major axis - of less than 3.2 au, and a perihelion distance of between 1.3 and 1.666 au. ]] + of less than 3.2 au, and a perihelion distance of between 1.3 and 1.666 au. ]] assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { - Name = "Mars-Crossing Asteroids", - Version = "1.0", - Description = [[ RenderableSmallBody asset with data from from JPL Horizons - contiaining Mars-Crossing group.]], - Author = "JPL Small-Body Database hosted by California Institute of Technology", - URL = "https://ssd.jpl.nasa.gov/sbdb_query.cgi", - License = [[JPL-authored documents are sponsored by NASA under Contract NAS7-030010. - All documents available from this server may be protected under the U.S. and - Foreign Copyright Laws.]], - Identifiers = {"sssb_sssb_data_mars-crossing_asteroid"} + Name = "Mars-Crossing Asteroids", + Version = "1.0", + Description = [[ RenderableSmallBody asset with data from from JPL Horizons + containing Mars-Crossing group.]], + Author = "JPL Small-Body Database hosted by California Institute of Technology", + URL = "https://ssd.jpl.nasa.gov/sbdb_query.cgi", + License = [[JPL-authored documents are sponsored by NASA under Contract NAS7-030010. + All documents available from this server may be protected under the U.S. and + Foreign Copyright Laws.]], + Identifiers = {"sssb_sssb_data_mars-crossing_asteroid"} } diff --git a/data/assets/scene/solarsystem/sssb/outer_main_belt_asteroid.asset b/data/assets/scene/solarsystem/sssb/outer_main_belt_asteroid.asset index e792b3d556..6c01440fd6 100644 --- a/data/assets/scene/solarsystem/sssb/outer_main_belt_asteroid.asset +++ b/data/assets/scene/solarsystem/sssb/outer_main_belt_asteroid.asset @@ -2,15 +2,15 @@ local assetHelper = asset.require('util/asset_helper') local sharedSssb = asset.require('./sssb_shared') local filepath = sharedSssb.downloadSssbDatabaseFile( - asset, - 'outer_main_belt_asteroid', - 'sssb_data_outer_main_belt_asteroid' + asset, + 'outer_main_belt_asteroid', + 'sssb_data_outer_main_belt_asteroid' ) local object = sharedSssb.createSssbGroupObject( - 'sssb_data_outer_main_belt_asteroid.csv', - "Outer Main Asteroid Belt", - filepath, - { 0.4, 0.4, 1.0 } + 'sssb_data_outer_main_belt_asteroid.csv', + "Outer Main Asteroid Belt", + filepath, + { 0.4, 0.4, 1.0 } ) object.Renderable.Enabled = false object.Renderable.SegmentQuality = 1 @@ -22,14 +22,14 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { - Name = "Outer Main Asteroid Belt", - Version = "1.0", - Description = [[ RenderableSmallBody asset with data from from JPL Horizons - contiaining Outer Main Asteroid Belt group.]], - Author = "JPL Small-Body Database hosted by California Institute of Technology", - URL = "https://ssd.jpl.nasa.gov/sbdb_query.cgi", - License = [[JPL-authored documents are sponsored by NASA under Contract NAS7-030010. - All documents available from this server may be protected under the U.S. - and Foreign Copyright Laws.]], - Identifiers = {"sssb_sssb_data_outer_main_belt_asteroid"} + Name = "Outer Main Asteroid Belt", + Version = "1.0", + Description = [[ RenderableSmallBody asset with data from from JPL Horizons + contiaining Outer Main Asteroid Belt group.]], + Author = "JPL Small-Body Database hosted by California Institute of Technology", + URL = "https://ssd.jpl.nasa.gov/sbdb_query.cgi", + License = [[JPL-authored documents are sponsored by NASA under Contract NAS7-030010. + All documents available from this server may be protected under the U.S. + and Foreign Copyright Laws.]], + Identifiers = {"sssb_sssb_data_outer_main_belt_asteroid"} } diff --git a/data/assets/scene/solarsystem/sssb/pha.asset b/data/assets/scene/solarsystem/sssb/pha.asset index 514396b4b2..04ce9a44e2 100644 --- a/data/assets/scene/solarsystem/sssb/pha.asset +++ b/data/assets/scene/solarsystem/sssb/pha.asset @@ -3,33 +3,33 @@ local sharedSssb = asset.require('./sssb_shared') local filepath = sharedSssb.downloadSssbDatabaseFile(asset, 'pha', 'sssb_data_pha') local object = sharedSssb.createSssbGroupObject('sssb_data_pha.csv', - "Potentially Hazardous Asteroids", - filepath, - { 0.98, 0.09, 0.06} + "Potentially Hazardous Asteroids", + filepath, + { 0.98, 0.09, 0.06} ) object.Renderable.Enabled = false object.Renderable.SegmentQuality = 3 object.Renderable.TrailFade = 17 object.GUI.Description = [[ Asteroids that are deemed potentially hazardous to Earth - based on their close approaches. All asteroids with an Earth Minimum Orbit - Intersection Distance (MOID) of 0.05 au or less, and with an absolute magnitude (H) - of 22.0 or less. ]] + based on their close approaches. All asteroids with an Earth Minimum Orbit + Intersection Distance (MOID) of 0.05 au or less, and with an absolute magnitude (H) + of 22.0 or less. ]] assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { - Name = "Potentially-Hazardous Asteroids", - Version = "1.0", - Description = [[ RenderableSmallBody asset with data from from JPL Horizons - contiaining Potentially Hazardous group. ]], - Author = [[JPL Small-Body Database hosted by California Institute of - Technology]], - URL = "https://ssd.jpl.nasa.gov/sbdb_query.cgi", - License = [[JPL-authored documents are sponsored by NASA under Contract - NAS7-030010. All documents available from this server may be protected - under the U.S. and Foreign Copyright Laws.]], - Identifiers = {"sssb_sssb_data_pha"} + Name = "Potentially-Hazardous Asteroids", + Version = "1.0", + Description = [[ RenderableSmallBody asset with data from from JPL Horizons + contiaining Potentially Hazardous group. ]], + Author = [[JPL Small-Body Database hosted by California Institute of + Technology]], + URL = "https://ssd.jpl.nasa.gov/sbdb_query.cgi", + License = [[JPL-authored documents are sponsored by NASA under Contract + NAS7-030010. All documents available from this server may be protected + under the U.S. and Foreign Copyright Laws.]], + Identifiers = {"sssb_sssb_data_pha"} } diff --git a/data/assets/scene/solarsystem/sssb/sssb_shared.asset b/data/assets/scene/solarsystem/sssb/sssb_shared.asset index ea494d0fff..9ba25174e9 100644 --- a/data/assets/scene/solarsystem/sssb/sssb_shared.asset +++ b/data/assets/scene/solarsystem/sssb/sssb_shared.asset @@ -1,39 +1,39 @@ local transforms = asset.require('scene/solarsystem/sun/transforms') function downloadSssbDatabaseFile(sceneAsset, name, identifier) - assert(sceneAsset, "'asset' needs to be provided") - assert(name, "'name' needs to be provided") - assert(identifier, "'identifier'needs to be provided") + assert(sceneAsset, "'asset' needs to be provided") + assert(name, "'name' needs to be provided") + assert(identifier, "'identifier'needs to be provided") - return sceneAsset.syncedResource({ - Name = "Small SolarSystem Body Data (" .. name .. ")", - Type = "HttpSynchronization", - Identifier = identifier, - Version = 1 - }) + return sceneAsset.syncedResource({ + Name = "Small SolarSystem Body Data (" .. name .. ")", + Type = "HttpSynchronization", + Identifier = identifier, + Version = 1 + }) end local createSssbGroupObject = function(filename, guiName, sssbFolder, trailColor) - assert(filename, "'filename' needs to be provided") - assert(sssbFolder, "'sssbFolder' needs to be provided") - trailColor = trailColor or { 0.75, 0.1, 0.1 } + assert(filename, "'filename' needs to be provided") + assert(sssbFolder, "'sssbFolder' needs to be provided") + trailColor = trailColor or { 0.75, 0.1, 0.1 } - local filenameSansExt = filename:gsub(filename:match("(%.%w+)$"), "") - return { - Identifier = 'sssb_'..filenameSansExt, - Parent = transforms.SunECLIPJ2000.Identifier, - Renderable = { - Type = "RenderableSmallBody", - Path = sssbFolder.."/"..filename, - Segments = 200, - Color = trailColor, - TrailFade = 0.5, - }, - GUI = { - Path = "/Solar System/Small Bodies", - Name = guiName - } + local filenameSansExt = filename:gsub(filename:match("(%.%w+)$"), "") + return { + Identifier = 'sssb_'..filenameSansExt, + Parent = transforms.SunECLIPJ2000.Identifier, + Renderable = { + Type = "RenderableSmallBody", + Path = sssbFolder.."/"..filename, + Segments = 200, + Color = trailColor, + TrailFade = 0.5, + }, + GUI = { + Path = "/Solar System/Small Bodies", + Name = guiName } + } end asset.export("downloadSssbDatabaseFile", downloadSssbDatabaseFile) diff --git a/data/assets/scene/solarsystem/sssb/swifttuttle.asset b/data/assets/scene/solarsystem/sssb/swifttuttle.asset index 971c822bb2..f0d97c6fdc 100644 --- a/data/assets/scene/solarsystem/sssb/swifttuttle.asset +++ b/data/assets/scene/solarsystem/sssb/swifttuttle.asset @@ -2,61 +2,61 @@ local assetHelper = asset.require('util/asset_helper') local sunTransforms = asset.require('scene/solarsystem/sun/transforms') local sync = asset.syncedResource({ - Name = "Swift Tuttle Orbit", - Type = "HttpSynchronization", - Identifier = "swift_tuttle_horizons", - Version = 1 + Name = "Swift Tuttle Orbit", + Type = "HttpSynchronization", + Identifier = "swift_tuttle_horizons", + Version = 1 }) local SwiftTuttleTrail = { - Identifier = "SwiftTuttleTrail", - Parent = sunTransforms.SolarSystemBarycenter.Identifier, - Renderable = { - Type = "RenderableTrailTrajectory", - Translation = { - Type = "HorizonsTranslation", - HorizonsTextFile = sync .. "/horizons_swifttuttle.dat" - }, - Color = { 0.9, 0.9, 0.0 }, - StartTime = "1879 JUN 27 00:00:00", - EndTime = "1879 JUN 27 00:00:00", - SampleInterval = 60 + Identifier = "SwiftTuttleTrail", + Parent = sunTransforms.SolarSystemBarycenter.Identifier, + Renderable = { + Type = "RenderableTrailTrajectory", + Translation = { + Type = "HorizonsTranslation", + HorizonsTextFile = sync .. "/horizons_swifttuttle.dat" }, - GUI = { - Name = "Swift Tuttle Trail", - Path = "/Solar System/SSSB" - } + Color = { 0.9, 0.9, 0.0 }, + StartTime = "1879 JUN 27 00:00:00", + EndTime = "1879 JUN 27 00:00:00", + SampleInterval = 60 + }, + GUI = { + Name = "Swift Tuttle Trail", + Path = "/Solar System/SSSB" + } } local SwiftTuttlePosition = { - Identifier = "SwiftTuttlePosition", - Parent = sunTransforms.SolarSystemBarycenter.Identifier, - Transform = { - Translation = { - Type = "HorizonsTranslation", - HorizonsTextFile = sync .. "/horizons_swifttuttle.dat" - }, - }, - GUI = { - Name = "Swift Tuttle Position", - Path = "/Solar System/SSSB" + Identifier = "SwiftTuttlePosition", + Parent = sunTransforms.SolarSystemBarycenter.Identifier, + Transform = { + Translation = { + Type = "HorizonsTranslation", + HorizonsTextFile = sync .. "/horizons_swifttuttle.dat" } + }, + GUI = { + Name = "Swift Tuttle Position", + Path = "/Solar System/SSSB" + } } assetHelper.registerSceneGraphNodesAndExport(asset, { - SwiftTuttlePosition, SwiftTuttleTrail + SwiftTuttlePosition, SwiftTuttleTrail }) asset.meta = { - Name = "Swift Tuttle", - Version = "1.0", - Description = [[ Position and Trail of Swift Tuttle from 1879 JUN 27 - to 1879 JUN 27. Data from JPL Horizons]], - Author = "OpenSpace Team", - URL = "https://ssd.jpl.nasa.gov/horizons.cgi", - License = [[ JPL-authored documents are sponsored by NASA under Contract + Name = "Swift Tuttle", + Version = "1.0", + Description = [[ Position and Trail of Swift Tuttle from 1879 JUN 27 + to 1879 JUN 27. Data from JPL Horizons]], + Author = "OpenSpace Team", + URL = "https://ssd.jpl.nasa.gov/horizons.cgi", + License = [[ JPL-authored documents are sponsored by NASA under Contract NAS7-030010. All documents available from this server may be protected under the U.S. and Foreign Copyright Laws."]], - Identifiers = {"SwiftTuttlePosition", "SwiftTuttleTrail"} + Identifiers = {"SwiftTuttlePosition", "SwiftTuttleTrail"} } diff --git a/data/assets/scene/solarsystem/sssb/tesla_roadster.asset b/data/assets/scene/solarsystem/sssb/tesla_roadster.asset index 105a489659..19b8ac2c44 100644 --- a/data/assets/scene/solarsystem/sssb/tesla_roadster.asset +++ b/data/assets/scene/solarsystem/sssb/tesla_roadster.asset @@ -2,62 +2,62 @@ local assetHelper = asset.require('util/asset_helper') local sunTransforms = asset.require('scene/solarsystem/sun/transforms') local orbit = asset.syncedResource({ - Name = "Tesla Roadster Orbit", - Type = "HttpSynchronization", - Identifier = "tesla_horizons", - Version = 1 + Name = "Tesla Roadster Orbit", + Type = "HttpSynchronization", + Identifier = "tesla_horizons", + Version = 1 }) local TeslaRoadsterTrail = { - Identifier = "TeslaRoadsterTrail", - Parent = sunTransforms.SolarSystemBarycenter.Identifier, - Renderable = { - Type = "RenderableTrailTrajectory", - Translation = { - Type = "HorizonsTranslation", - HorizonsTextFile = orbit .. "/horizons_tesla.dat" - }, - Color = { 0.9, 0.9, 0.0 }, - StartTime = "2018 FEB 8 00:00:00", - EndTime = "2022 FEB 7 00:00:00", - SampleInterval = 3000, - TimeStampSubsampleFactor = 1 + Identifier = "TeslaRoadsterTrail", + Parent = sunTransforms.SolarSystemBarycenter.Identifier, + Renderable = { + Type = "RenderableTrailTrajectory", + Translation = { + Type = "HorizonsTranslation", + HorizonsTextFile = orbit .. "/horizons_tesla.dat" }, - GUI = { - Name = "Tesla Roadster Trail", - Path = "/Solar System/SSSB" - } + Color = { 0.9, 0.9, 0.0 }, + StartTime = "2018 FEB 8 00:00:00", + EndTime = "2022 FEB 7 00:00:00", + SampleInterval = 3000, + TimeStampSubsampleFactor = 1 + }, + GUI = { + Name = "Tesla Roadster Trail", + Path = "/Solar System/SSSB" + } } local TeslaPosition = { - Identifier = "TeslaPosition", - Parent = sunTransforms.SolarSystemBarycenter.Identifier, - Transform = { - Translation = { - Type = "HorizonsTranslation", - HorizonsTextFile = orbit .. "/horizons_tesla.dat" - }, - }, - GUI = { - Name = "Tesla Roadster", - Path = "/Solar System/SSSB", - Description = [[Position and Trail of Tesla Roadster from 2018 FEB 8 - to 2022 FEB 7 00:00:00. Data from JPL Horizons.]] + Identifier = "TeslaPosition", + Parent = sunTransforms.SolarSystemBarycenter.Identifier, + Transform = { + Translation = { + Type = "HorizonsTranslation", + HorizonsTextFile = orbit .. "/horizons_tesla.dat" } + }, + GUI = { + Name = "Tesla Roadster", + Path = "/Solar System/SSSB", + Description = [[Position and Trail of Tesla Roadster from 2018 FEB 8 + to 2022 FEB 7 00:00:00. Data from JPL Horizons.]] + } } assetHelper.registerSceneGraphNodesAndExport(asset, { TeslaPosition, TeslaRoadsterTrail }) asset.meta = { - Name = "Tesla Roadster", - Version = "1.0", - Description = [[ Position and Trail of Tesla Roadster from 2018 FEB 8 - to 2022 FEB 7 00:00:00. Data from JPL Horizons.]], - Author = "OpenSpace Team", - URL = "https://ssd.jpl.nasa.gov/horizons.cgi", - License = [[ JPL-authored documents are sponsored by NASA under Contract + Name = "Tesla Roadster", + Version = "1.0", + Description = [[ Position and Trail of Tesla Roadster from 2018 FEB 8 + to 2022 FEB 7 00:00:00. Data from JPL Horizons.]], + Author = "OpenSpace Team", + URL = "https://ssd.jpl.nasa.gov/horizons.cgi", + License = [[ JPL-authored documents are sponsored by NASA under Contract NAS7-030010. All documents available from this server may be protected under the U.S. and Foreign Copyright Laws.]], - Identifiers = {"TeslaPosition", "TeslaRoadsterTrail"} + Identifiers = {"TeslaPosition", "TeslaRoadsterTrail"} } diff --git a/data/assets/scene/solarsystem/sssb/transneptunian_object_asteroid.asset b/data/assets/scene/solarsystem/sssb/transneptunian_object_asteroid.asset index 50a9dc8959..dd8252f2d4 100644 --- a/data/assets/scene/solarsystem/sssb/transneptunian_object_asteroid.asset +++ b/data/assets/scene/solarsystem/sssb/transneptunian_object_asteroid.asset @@ -2,37 +2,36 @@ local assetHelper = asset.require('util/asset_helper') local sharedSssb = asset.require('./sssb_shared') local filepath = sharedSssb.downloadSssbDatabaseFile(asset, - 'transneptunian_object_asteroid', - 'sssb_data_transneptunian_object_asteroid' + 'transneptunian_object_asteroid', + 'sssb_data_transneptunian_object_asteroid' ) local object = sharedSssb.createSssbGroupObject( - 'sssb_data_transneptunian_object_asteroid.csv', - "Transneptunian Object Asteroids", - filepath, - {0.56, 0.64, 0.95 } + 'sssb_data_transneptunian_object_asteroid.csv', + "Transneptunian Object Asteroids", + filepath, + { 0.56, 0.64, 0.95 } ) object.Renderable.Enabled = false object.Renderable.SegmentQuality = 8 object.Renderable.TrailFade = 10 object.GUI.Description = [[ Any minor or dwarf planets in the solar system that orbit - the Sun at a greater average distance than Neptune (semi-major axis - of 30.1 AU). ]] + the Sun at a greater average distance than Neptune (semi-major axis of 30.1 AU). ]] assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { - Name = "Trans-Neptunian Asteroids", - Version = "1.0", - Description = [[ RenderableSmallBody asset with data from from JPL Horizons - contiaining Trans-Neptunian group. ]], - Author = [[JPL Small-Body Database hosted by California Institute of - Technology]], - URL = "https://ssd.jpl.nasa.gov/sbdb_query.cgi", - License = [[ JPL-authored documents are sponsored by NASA under Contract - NAS7-030010. All documents available from this server may be protected - under the U.S. and Foreign Copyright Laws."]], - Identifiers = {"sssb_sssb_data_transneptunian_object_asteroid"} + Name = "Trans-Neptunian Asteroids", + Version = "1.0", + Description = [[ RenderableSmallBody asset with data from from JPL Horizons + contiaining Trans-Neptunian group. ]], + Author = [[JPL Small-Body Database hosted by California Institute of + Technology]], + URL = "https://ssd.jpl.nasa.gov/sbdb_query.cgi", + License = [[ JPL-authored documents are sponsored by NASA under Contract + NAS7-030010. All documents available from this server may be protected + under the U.S. and Foreign Copyright Laws."]], + Identifiers = {"sssb_sssb_data_transneptunian_object_asteroid"} } diff --git a/data/assets/scene/solarsystem/sun/default_layers.asset b/data/assets/scene/solarsystem/sun/default_layers.asset index c28573d81c..0b9ded96b0 100644 --- a/data/assets/scene/solarsystem/sun/default_layers.asset +++ b/data/assets/scene/solarsystem/sun/default_layers.asset @@ -5,15 +5,15 @@ local colorLayer = asset.require(colorLayersPath .. "/sun_texture") -- Set enabled layers (temporary solution) -- @TODO: do this using a boolean that's passed to the 'asset.require' instead asset.onInitialize(function () - openspace.setPropertyValueSingle("Scene.Sun.Renderable.Layers.ColorLayers." .. colorLayer.layer.Identifier .. ".Enabled", true) + openspace.setPropertyValueSingle("Scene.Sun.Renderable.Layers.ColorLayers." .. colorLayer.layer.Identifier .. ".Enabled", true) end) asset.meta = { - Name = "Default Sun layers", - Version = "1.0", - Description = [[ Default Sun layers renderable globe.]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license" + Name = "Default Sun layers", + Version = "1.0", + Description = [[ Default Sun layers renderable globe.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/sun/glare.asset b/data/assets/scene/solarsystem/sun/glare.asset index 3d817fe120..827ab90509 100644 --- a/data/assets/scene/solarsystem/sun/glare.asset +++ b/data/assets/scene/solarsystem/sun/glare.asset @@ -6,41 +6,41 @@ asset.require("spice/base") local SunGlare = { - Identifier = "SunGlare", - Parent = transforms.SolarSystemBarycenter.Identifier, - Renderable = { - Type = "RenderablePlaneImageLocal", - Size = 1.3*10^10.5, - Origin = "Center", - Billboard = true, - Texture = textures .. "/halo.png", - BlendMode = "Additive", - Opacity = 0.65, - RenderableType = "PreDeferredTransparency" - }, - Transform = { - Translation = { - Type = "SpiceTranslation", - Target = "SUN", - Observer = "SSB" - } - }, - GUI = { - Name = "Sun Glare", - Path = "/Solar System/Sun", - Description = [[ Sun glare effect. Enabled by default instead of sun orb.]] + Identifier = "SunGlare", + Parent = transforms.SolarSystemBarycenter.Identifier, + Renderable = { + Type = "RenderablePlaneImageLocal", + Size = 1.3*10^10.5, + Origin = "Center", + Billboard = true, + Texture = textures .. "/halo.png", + BlendMode = "Additive", + Opacity = 0.65, + RenderableType = "PreDeferredTransparency" + }, + Transform = { + Translation = { + Type = "SpiceTranslation", + Target = "SUN", + Observer = "SSB" } + }, + GUI = { + Name = "Sun Glare", + Path = "/Solar System/Sun", + Description = [[ Sun glare effect. Enabled by default instead of sun orb.]] + } } assetHelper.registerSceneGraphNodesAndExport(asset, { SunGlare }) asset.meta = { - Name = "Sun Glare", - Version = "1.0", - Description = [[ Image plane with sun glare effect.]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"SunGlare"} + Name = "Sun Glare", + Version = "1.0", + Description = [[ Image plane with sun glare effect.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license", + Identifiers = {"SunGlare"} } diff --git a/data/assets/scene/solarsystem/sun/habitablezone.asset b/data/assets/scene/solarsystem/sun/habitablezone.asset index 1816f4500b..7c64aa0241 100644 --- a/data/assets/scene/solarsystem/sun/habitablezone.asset +++ b/data/assets/scene/solarsystem/sun/habitablezone.asset @@ -3,33 +3,33 @@ local transforms = asset.require("./transforms") local textures = asset.require('scene/milkyway/habitable_zones/habitable_zone_textures').TexturesPath local HabitableZone = { - Identifier = "SunHabitableZone", - Parent = transforms.SunECLIPJ2000.Identifier, - Renderable = { - Type = "RenderableHabitableZone", - Enabled = false, - Texture = textures .. "/hot_to_cold_faded.png", - EffectiveTemperature = 5780, -- Kelvin - Luminosity = 1, -- solar - Opacity = 0.1, - Optimistic = true - }, - GUI = { - Name = "Sun Habitable Zone", - Path = "/Solar System/Sun", - Description = "Habitable zone for the sun in our solar system." - } + Identifier = "SunHabitableZone", + Parent = transforms.SunECLIPJ2000.Identifier, + Renderable = { + Type = "RenderableHabitableZone", + Enabled = false, + Texture = textures .. "/hot_to_cold_faded.png", + EffectiveTemperature = 5780, -- Kelvin + Luminosity = 1, -- solar + Opacity = 0.1, + Optimistic = true + }, + GUI = { + Name = "Sun Habitable Zone", + Path = "/Solar System/Sun", + Description = "Habitable zone for the sun in our solar system." + } } assetHelper.registerSceneGraphNodesAndExport(asset, { HabitableZone }) asset.meta = { - Name = "Sun Habitable Zone", - Version = "1.0", - Description = [[ The habitable zone around our sun, computed using formula and + Name = "Sun Habitable Zone", + Version = "1.0", + Description = [[ The habitable zone around our sun, computed using formula and coefficients by Kopparapu et al. (2015) https://arxiv.org/abs/1404.5292]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"SunHabitableZone"} + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license", + Identifiers = {"SunHabitableZone"} } diff --git a/data/assets/scene/solarsystem/sun/layers/colorlayers/sun_texture.asset b/data/assets/scene/solarsystem/sun/layers/colorlayers/sun_texture.asset index a9e550212b..3a37a2a610 100644 --- a/data/assets/scene/solarsystem/sun/layers/colorlayers/sun_texture.asset +++ b/data/assets/scene/solarsystem/sun/layers/colorlayers/sun_texture.asset @@ -2,22 +2,22 @@ local texturesPath = asset.require("./../../sun_textures").TexturesPath local globeIdentifier = asset.require("./../../sun").Sun.Identifier local layer = { - Identifier = "Texture", - FilePath = texturesPath .. "/sun.jpg", + Identifier = "Texture", + FilePath = texturesPath .. "/sun.jpg", } asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) asset.export("layer", layer) asset.meta = { - Name = "Sun Texture", - Version = "1.0", - Description = [[ Default Sun texture for renderable globe.]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license" + Name = "Sun Texture", + Version = "1.0", + Description = [[ Default Sun texture for renderable globe.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/sun/marker.asset b/data/assets/scene/solarsystem/sun/marker.asset index f392f82ad9..1c6648c2eb 100644 --- a/data/assets/scene/solarsystem/sun/marker.asset +++ b/data/assets/scene/solarsystem/sun/marker.asset @@ -6,33 +6,33 @@ asset.require("spice/base") local SunMarker = { - Identifier = "SunMarker", - Parent = transforms.SolarSystemBarycenter.Identifier, - Renderable = { - Enabled = false, - Type = "RenderablePlaneImageLocal", - Size = 3.0E11, - Origin = "Center", - Billboard = true, - Texture = textures .. "/marker.png", - BlendMode = "Additive" - }, - GUI = { - Name = "Sun Marker", - Path = "/Solar System/Sun", - Description = [[ Sun marker with name, sized for Solar System view]] - } + Identifier = "SunMarker", + Parent = transforms.SolarSystemBarycenter.Identifier, + Renderable = { + Enabled = false, + Type = "RenderablePlaneImageLocal", + Size = 3.0E11, + Origin = "Center", + Billboard = true, + Texture = textures .. "/marker.png", + BlendMode = "Additive" + }, + GUI = { + Name = "Sun Marker", + Path = "/Solar System/Sun", + Description = [[ Sun marker with name, sized for Solar System view]] + } } assetHelper.registerSceneGraphNodesAndExport(asset, { SunMarker }) asset.meta = { - Name = "Sun marker", - Version = "1.0", - Description = [[ Marker for the sun, with a stick and label.]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"SunMarker"} + Name = "Sun marker", + Version = "1.0", + Description = [[ Marker for the sun, with a stick and label.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license", + Identifiers = {"SunMarker"} } diff --git a/data/assets/scene/solarsystem/sun/sun.asset b/data/assets/scene/solarsystem/sun/sun.asset index 36569f6092..7eae833e2d 100644 --- a/data/assets/scene/solarsystem/sun/sun.asset +++ b/data/assets/scene/solarsystem/sun/sun.asset @@ -3,61 +3,61 @@ local transforms = asset.require("./transforms") asset.require("spice/base") local Sun = { - Identifier = "Sun", - Parent = transforms.SunIAU.Identifier, - Renderable = { - Type = "RenderableGlobe", - Enabled = false, - Radii = { 6.957E8, 6.957E8, 6.957E8 }, - SegmentsPerPatch = 64, - Layers = {}, - PerformShading = false - }, - GUI = { - Name = "Sun", - Path = "/Solar System/Sun", - Description = "Globe for the sun in our solar system." - } + Identifier = "Sun", + Parent = transforms.SunIAU.Identifier, + Renderable = { + Type = "RenderableGlobe", + Enabled = false, + Radii = { 6.957E8, 6.957E8, 6.957E8 }, + SegmentsPerPatch = 64, + Layers = {}, + PerformShading = false + }, + GUI = { + Name = "Sun", + Path = "/Solar System/Sun", + Description = "Globe for the sun in our solar system." + } } local SunLabel = { - Identifier = "SunLabel", - Parent = Sun.Identifier, - Renderable = { - Enabled = false, - Type = "RenderableLabels", - LabelText = "Sun", - FontSize = 100.0, - LabelSize = 13.127, - LabelMaxSize = 100.0, - LabelMinSize = 1.0, - LabelOrientationOption = "Camera View Direction", - BlendMode = "Additive", - EnableFading = true, - FadeStartUnit = "Pm", - FadeStartDistance = 2.841, - FadeStartSpeed = 1.375, - FadeEndUnit = "pc", - FadeEndDistance = 1.326, - FadeEndSpeed = 1.0 - }, - Tag = { "solarsystem_labels" }, - GUI = { - Name = "Sun Label", - Path = "/Solar System/Sun", - Description = "Label for the sun in our solar system." - } + Identifier = "SunLabel", + Parent = Sun.Identifier, + Renderable = { + Enabled = false, + Type = "RenderableLabels", + LabelText = "Sun", + FontSize = 100.0, + LabelSize = 13.127, + LabelMaxSize = 100.0, + LabelMinSize = 1.0, + LabelOrientationOption = "Camera View Direction", + BlendMode = "Additive", + EnableFading = true, + FadeStartUnit = "Pm", + FadeStartDistance = 2.841, + FadeStartSpeed = 1.375, + FadeEndUnit = "pc", + FadeEndDistance = 1.326, + FadeEndSpeed = 1.0 + }, + Tag = { "solarsystem_labels" }, + GUI = { + Name = "Sun Label", + Path = "/Solar System/Sun", + Description = "Label for the sun in our solar system." + } } assetHelper.registerSceneGraphNodesAndExport(asset, { Sun, SunLabel }) asset.meta = { - Name = "Sun", - Version = "1.0", - Description = [[ The Sun and label]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"Sun" , "SunLabel"} + Name = "Sun", + Version = "1.0", + Description = [[ The Sun and label]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license", + Identifiers = {"Sun" , "SunLabel"} } diff --git a/data/assets/scene/solarsystem/sun/sun_textures.asset b/data/assets/scene/solarsystem/sun/sun_textures.asset index b38fdab4b0..fd698e1aea 100644 --- a/data/assets/scene/solarsystem/sun/sun_textures.asset +++ b/data/assets/scene/solarsystem/sun/sun_textures.asset @@ -1,18 +1,18 @@ local TexturesPath = asset.syncedResource({ - Type = "HttpSynchronization", - Name = "Sun textures", - Identifier = "sun_textures", - Version = 4 + Type = "HttpSynchronization", + Name = "Sun textures", + Identifier = "sun_textures", + Version = 4 }) asset.export("TexturesPath", TexturesPath) asset.meta = { - Name = "Sun Textures", - Version = "4.0", - Description = [[ Default Sun textures]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license" + Name = "Sun Textures", + Version = "4.0", + Description = [[ Default Sun textures]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/sun/transforms.asset b/data/assets/scene/solarsystem/sun/transforms.asset index fe661015d9..29ab4120b8 100644 --- a/data/assets/scene/solarsystem/sun/transforms.asset +++ b/data/assets/scene/solarsystem/sun/transforms.asset @@ -5,78 +5,78 @@ asset.require("spice/base") -- Barycenter of the solar system, expressed in the Galactic frame local SolarSystemBarycenter = { - Identifier = "SolarSystemBarycenter", - -- No parent; this node is attached to the scene graph root - TimeFrame = { -- Using Spice kernels for 1850-2150 - Type = "TimeFrameInterval", - Start = "1850-JAN-01", - End = "2150-JAN-01" - }, - GUI = { - Name = "Solar System Barycenter", - Path = "/Solar System", - Description = [[Barycenter of the solar system, expressed in the Galactic frame]], - Hidden = true - } + Identifier = "SolarSystemBarycenter", + -- No parent; this node is attached to the scene graph root + TimeFrame = { -- Using Spice kernels for 1850-2150 + Type = "TimeFrameInterval", + Start = "1850-JAN-01", + End = "2150-JAN-01" + }, + GUI = { + Name = "Solar System Barycenter", + Path = "/Solar System", + Description = [[Barycenter of the solar system, expressed in the Galactic frame]], + Hidden = true + } } -- Spice frame for the Sun local SunIAU = { - Identifier = "SunIAU", - Parent = SolarSystemBarycenter.Identifier, - Transform = { - Translation = { - Type = "SpiceTranslation", - Target = "SUN", - Observer = "SSB" - }, - Rotation = { - Type = "SpiceRotation", - SourceFrame = "IAU_SUN", - DestinationFrame = "GALACTIC" - } + Identifier = "SunIAU", + Parent = SolarSystemBarycenter.Identifier, + Transform = { + Translation = { + Type = "SpiceTranslation", + Target = "SUN", + Observer = "SSB" }, - GUI = { - Name = "SUN IAU", - Path = "/Solar System/Sun", - Description = [[Spice frame for the Sun]], - Hidden = true + Rotation = { + Type = "SpiceRotation", + SourceFrame = "IAU_SUN", + DestinationFrame = "GALACTIC" } + }, + GUI = { + Name = "SUN IAU", + Path = "/Solar System/Sun", + Description = [[Spice frame for the Sun]], + Hidden = true + } } local SunECLIPJ2000 = { - Identifier = "SunECLIPJ2000", - Parent = SolarSystemBarycenter.Identifier, - Transform = { - Translation = { - Type = "SpiceTranslation", - Target = "SUN", - Observer = "SSB" - }, - Rotation = { - Type = "SpiceRotation", - SourceFrame = "ECLIPJ2000", - DestinationFrame = "GALACTIC" - } + Identifier = "SunECLIPJ2000", + Parent = SolarSystemBarycenter.Identifier, + Transform = { + Translation = { + Type = "SpiceTranslation", + Target = "SUN", + Observer = "SSB" }, - GUI = { - Name = "SUN J2000", - Path = "/Solar System/Sun", - Description = [[Spice rotation for Mean ecliptic and equinox of J2000]], - Hidden = true + Rotation = { + Type = "SpiceRotation", + SourceFrame = "ECLIPJ2000", + DestinationFrame = "GALACTIC" } + }, + GUI = { + Name = "SUN J2000", + Path = "/Solar System/Sun", + Description = [[Spice rotation for Mean ecliptic and equinox of J2000]], + Hidden = true + } } assetHelper.registerSceneGraphNodesAndExport(asset, { SolarSystemBarycenter, SunIAU, SunECLIPJ2000 }) asset.meta = { - Name = "Sun Transforms", - Version = "1.0", - Description = [[ Sun transforms: Solar System Barycenter, SUN IAU and + Name = "Sun Transforms", + Version = "1.0", + Description = [[ Sun transforms: Solar System Barycenter, SUN IAU and SUN J2000]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"SolarSystemBarycenter", "SunIAU", "SunECLIPJ2000"} + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license", + Identifiers = {"SolarSystemBarycenter", "SunIAU", "SunECLIPJ2000"} } diff --git a/data/assets/spice/base.asset b/data/assets/spice/base.asset index 2f4199a0d7..9a9f9a31e1 100644 --- a/data/assets/spice/base.asset +++ b/data/assets/spice/base.asset @@ -3,28 +3,28 @@ local assetHelper = asset.require("util/asset_helper") local syncedDirectory = asset.syncedResource({ - Name = "General SPK Kernels", - Type = "HttpSynchronization", - Identifier = "general_spk", - Version = 1 + Name = "General SPK Kernels", + Type = "HttpSynchronization", + Identifier = "general_spk", + Version = 1 }) local kernels = { - asset.localResource("naif0012.tls"), - -- Leapseconds: - asset.localResource("pck00010.tpc"), - syncedDirectory .. "/de430_1850-2150.bsp" + asset.localResource("naif0012.tls"), + -- Leapseconds: + asset.localResource("pck00010.tpc"), + syncedDirectory .. "/de430_1850-2150.bsp" } assetHelper.registerSpiceKernels(asset, kernels) asset.meta = { - Name = "SPICE Base", - Version = "1.0", - Description = [[ This asset contains the spice base kernels. With positions + Name = "SPICE Base", + Version = "1.0", + Description = [[ This asset contains the spice base kernels. With positions for Solar System bodies from 1850 to 2150]], - Author = "OpenSpace Team", - URL = "https://naif.jpl.nasa.gov/naif/data_generic.html", - License = "NASA" + Author = "OpenSpace Team", + URL = "https://naif.jpl.nasa.gov/naif/data_generic.html", + License = "NASA" } diff --git a/data/assets/util/asset_helper.asset b/data/assets/util/asset_helper.asset index e5cf1582e6..840f845b13 100644 --- a/data/assets/util/asset_helper.asset +++ b/data/assets/util/asset_helper.asset @@ -1,179 +1,179 @@ local tableLength = function(table) - local count = 0 - for _ in pairs(table) do count = count + 1 end - return count + local count = 0 + for _ in pairs(table) do count = count + 1 end + return count end local registerSpiceKernels = function (spiceAsset, kernels) - spiceAsset.onInitialize(function () - for i, kernel in ipairs(kernels) do - openspace.spice.loadKernel(kernel) - end - end) - spiceAsset.onDeinitialize(function () - for i = #kernels, 1, -1 do - local kernel = kernels[i] - openspace.spice.unloadKernel(kernel) - end - end) + spiceAsset.onInitialize(function () + for i, kernel in ipairs(kernels) do + openspace.spice.loadKernel(kernel) + end + end) + spiceAsset.onDeinitialize(function () + for i = #kernels, 1, -1 do + local kernel = kernels[i] + openspace.spice.unloadKernel(kernel) + end + end) end local registerSceneGraphNodes = function (sceneAsset, nodes, override) - override = override or false - if not override then - if tableLength(nodes) == 0 then - openspace.printWarning(sceneAsset.filePath .. ": Register function was called with an empty node list. Pass 'true' as third argument to silence this warning.") - return - end + override = override or false + if not override then + if tableLength(nodes) == 0 then + openspace.printWarning(sceneAsset.filePath .. ": Register function was called with an empty node list. Pass 'true' as third argument to silence this warning.") + return end + end - sceneAsset.onInitialize(function () - for i, node in ipairs(nodes) do - openspace.addSceneGraphNode(node) - end - end) - sceneAsset.onDeinitialize(function () - for i = #nodes, 1, -1 do - node = nodes[i] - openspace.removeSceneGraphNode(node.Identifier) - end - end) + sceneAsset.onInitialize(function () + for i, node in ipairs(nodes) do + openspace.addSceneGraphNode(node) + end + end) + sceneAsset.onDeinitialize(function () + for i = #nodes, 1, -1 do + node = nodes[i] + openspace.removeSceneGraphNode(node.Identifier) + end + end) end local registerScreenSpaceRenderables = function (sceneAsset, renderables, override) - override = override or false - if not override then - if tableLength(renderables) == 0 then - openspace.printWarning(sceneAsset.filePath .. ": Register function was called with an empty node list. Pass 'true' as third argument to silence this warning.") - return - end + override = override or false + if not override then + if tableLength(renderables) == 0 then + openspace.printWarning(sceneAsset.filePath .. ": Register function was called with an empty node list. Pass 'true' as third argument to silence this warning.") + return end + end - sceneAsset.onInitialize(function () - for i, node in ipairs(renderables) do - openspace.addScreenSpaceRenderable(node) - end - end) - sceneAsset.onDeinitialize(function () - for i = #renderables, 1, -1 do - renderable = renderables[i] - openspace.removeScreenSpaceRenderable(renderable.Identifier) - end - end) + sceneAsset.onInitialize(function () + for i, node in ipairs(renderables) do + openspace.addScreenSpaceRenderable(node) + end + end) + sceneAsset.onDeinitialize(function () + for i = #renderables, 1, -1 do + renderable = renderables[i] + openspace.removeScreenSpaceRenderable(renderable.Identifier) + end + end) end local registerDashboardItems = function (dashboardAsset, items) - dashboardAsset.onInitialize( - function () - for i, item in ipairs(items) do - openspace.dashboard.addDashboardItem(item) - end - end - ) - dashboardAsset.onDeinitialize(function () - for i = #items, 1, -1 do - local item = items[i] - openspace.dashboard.removeDashboardItem(item.Identifier) - end - end) + dashboardAsset.onInitialize( + function () + for i, item in ipairs(items) do + openspace.dashboard.addDashboardItem(item) + end + end + ) + dashboardAsset.onDeinitialize(function () + for i = #items, 1, -1 do + local item = items[i] + openspace.dashboard.removeDashboardItem(item.Identifier) + end + end) end local registerSceneGraphNodesAndExport = function (sceneAsset, nodes, override) - override = override or false - if not override then - if tableLength(nodes) == 0 then - openspace.printWarning(sceneAsset.filePath .. ": Register function was called with an empty node list. Pass 'true' as third argument to silence this warning.") - return - end + override = override or false + if not override then + if tableLength(nodes) == 0 then + openspace.printWarning(sceneAsset.filePath .. ": Register function was called with an empty node list. Pass 'true' as third argument to silence this warning.") + return end + end + for i, node in ipairs(nodes) do + if not node.Identifier then + openspace.printError("Could not load asset as Identifier was missing") + end + end + + sceneAsset.onInitialize(function () for i, node in ipairs(nodes) do - if not node.Identifier then - openspace.printError("Could not load asset as Identifier was missing") - end + openspace.addSceneGraphNode(node) end - - sceneAsset.onInitialize(function () - for i, node in ipairs(nodes) do - openspace.addSceneGraphNode(node) - end - end) - sceneAsset.onDeinitialize(function () - for i = #nodes, 1, -1 do - local node = nodes[i] - openspace.removeSceneGraphNode(node.Identifier) - end - end) - - for i, node in ipairs(nodes) do - sceneAsset.export(node.Identifier, node) + end) + sceneAsset.onDeinitialize(function () + for i = #nodes, 1, -1 do + local node = nodes[i] + openspace.removeSceneGraphNode(node.Identifier) end + end) + + for i, node in ipairs(nodes) do + sceneAsset.export(node.Identifier, node) + end end local requireAll = function (sceneAsset, directory) - function string.ends(String,End) - return End=='' or string.sub(String,-string.len(End))==End + function string.ends(String,End) + return End=='' or string.sub(String,-string.len(End))==End + end + + local result = {} + + local files = openspace.walkDirectoryFiles(sceneAsset.localResource('') .. directory, true) + for _, file in pairs(files) do + if file:ends('.asset') then + openspace.printDebug("Requiring: " .. file:sub(file:find(directory), -7)) + local exports = sceneAsset.require(file:sub(1, -7)) + table.insert(result, exports) end + end - local result = {} - - local files = openspace.walkDirectoryFiles(sceneAsset.localResource('') .. directory, true) - for _, file in pairs(files) do - if file:ends('.asset') then - openspace.printDebug("Requiring: " .. file:sub(file:find(directory), -7)) - local exports = sceneAsset.require(file:sub(1, -7)) - table.insert(result, exports) - end - end - - return result + return result end local getDefaultLightSources = function (solarSystemBarycenterIdentifier) - local sourceList = { - { - Type = "SceneGraphLightSource", - Identifier = "Sun", - Node = solarSystemBarycenterIdentifier, - Intensity = 1.0 - }, - { - Identifier = "Camera", - Type = "CameraLightSource", - Intensity = 0.5 - } + local sourceList = { + { + Type = "SceneGraphLightSource", + Identifier = "Sun", + Node = solarSystemBarycenterIdentifier, + Intensity = 1.0 + }, + { + Identifier = "Camera", + Type = "CameraLightSource", + Intensity = 0.5 } - return sourceList + } + return sourceList end local createModelPart = function (parent, sunLightSourceNode, models, geometry, texture, performShading) - local lightSources = {} - if performShading then - lightSources[1] = { - Type = "SceneGraphLightSource", - Identifier = "Sun", - Node = sunLightSourceNode, - Intensity = 1.0 - } - end - return { - Identifier = parent .. "-" .. geometry, - Parent = parent, - Renderable = { - Type = "RenderableModel", - GeometryFile = models .. "/" .. geometry .. ".obj", - LightSources = lightSources, - PerformShading = performShading, - DisableFaceCulling = true - }, - GUI = { - Hidden = true - } + local lightSources = {} + if performShading then + lightSources[1] = { + Type = "SceneGraphLightSource", + Identifier = "Sun", + Node = sunLightSourceNode, + Intensity = 1.0 } + end + return { + Identifier = parent .. "-" .. geometry, + Parent = parent, + Renderable = { + Type = "RenderableModel", + GeometryFile = models .. "/" .. geometry .. ".obj", + LightSources = lightSources, + PerformShading = performShading, + DisableFaceCulling = true + }, + GUI = { + Hidden = true + } + } end asset.export("registerSceneGraphNodes", registerSceneGraphNodes) diff --git a/data/assets/util/debug_helper.asset b/data/assets/util/debug_helper.asset index 68b04f3197..6c75714d06 100644 --- a/data/assets/util/debug_helper.asset +++ b/data/assets/util/debug_helper.asset @@ -1,128 +1,120 @@ local identifierGeneratorFunction = function (suffix) - local nextIndex = 0 - return function (specification) - nextIndex = nextIndex + 1 - return specification.Identifier or - (specification.Parent .. suffix .. nextIndex) - end + local nextIndex = 0 + return function (specification) + nextIndex = nextIndex + 1 + return specification.Identifier or + (specification.Parent .. suffix .. nextIndex) + end end local generateGridIdentifier = identifierGeneratorFunction("Grid") local addGrid = function (specification) - local identifier = specification.Identifier or - generateGridIdentifier(specification) + local identifier = specification.Identifier or generateGridIdentifier(specification) - local name = specification.Name - local color = specification.Color - local parent = specification.Parent - local scale = specification.Scale - local position = specification.Position - local rotation = specification.Rotation + local name = specification.Name + local color = specification.Color + local parent = specification.Parent + local scale = specification.Scale + local position = specification.Position + local rotation = specification.Rotation - local grid = { - Identifier = identifier, - Parent = parent, - Transform = { - Scale = { - Type = "StaticScale", - Scale = scale; - }, - Translation = { - Type = "StaticTranslation", - Position = position - }, - Rotation = { - Type = "StaticRotation", - Rotation = rotation - } - }, - Renderable = { - Type = "RenderableSphericalGrid", - Enabled = true, - LineWidth = 2.0, - Color = color - }, - GUI = { - Name = name, - Path = "/Other/Grids" - } + local grid = { + Identifier = identifier, + Parent = parent, + Transform = { + Scale = { + Type = "StaticScale", + Scale = scale + }, + Translation = { + Type = "StaticTranslation", + Position = position + }, + Rotation = { + Type = "StaticRotation", + Rotation = rotation + } + }, + Renderable = { + Type = "RenderableSphericalGrid", + Enabled = true, + LineWidth = 2.0, + Color = color + }, + GUI = { + Name = name, + Path = "/Other/Grids" } - openspace.addSceneGraphNode(grid) - return identifier; + } + openspace.addSceneGraphNode(grid) + return identifier; end local generateAxesIdentifier = identifierGeneratorFunction("Axes") local addCartesianAxes = function (specification) - local identifier = specification.Identifier or - generateAxesIdentifier(specification) + local identifier = specification.Identifier or generateAxesIdentifier(specification) - local name = specification.Name or specification.Identifier - local parent = specification.Parent or "Root" - local scale = specification.Scale or 1.0 - local position = specification.Position or { 0.0, 0.0, 0.0 } - local rotation = specification.Rotation or { 0.0, 0.0, 0.0 } + local name = specification.Name or specification.Identifier + local parent = specification.Parent or "Root" + local scale = specification.Scale or 1.0 + local position = specification.Position or { 0.0, 0.0, 0.0 } + local rotation = specification.Rotation or { 0.0, 0.0, 0.0 } - local axes = { - Identifier = identifier, - Parent = parent, - Transform = { - Scale = { - Type = "StaticScale", - Scale = scale; - }, - Translation = { - Type = "StaticTranslation", - Position = position - }, - Rotation = { - Type = "StaticRotation", - Rotation = rotation - } - }, - Renderable = { - Type = "RenderableCartesianAxes", - Enabled = true, - XColor = { 1.0, 0.0, 0.0 }, - YColor = { 0.0, 1.0, 0.0 }, - ZColor = { 0.0, 0.0, 1.0 } - }, - GUI = { - Name = name, - Path = "/Other/Coordinate Systems" - } + local axes = { + Identifier = identifier, + Parent = parent, + Transform = { + Scale = { + Type = "StaticScale", + Scale = scale + }, + Translation = { + Type = "StaticTranslation", + Position = position + }, + Rotation = { + Type = "StaticRotation", + Rotation = rotation + } + }, + Renderable = { + Type = "RenderableCartesianAxes", + Enabled = true, + XColor = { 1.0, 0.0, 0.0 }, + YColor = { 0.0, 1.0, 0.0 }, + ZColor = { 0.0, 0.0, 1.0 } + }, + GUI = { + Name = name, + Path = "/Other/Coordinate Systems" } - openspace.addSceneGraphNode(axes) - return identifier; + } + openspace.addSceneGraphNode(axes) + return identifier; end -local registerNode = function( - containerAsset, - nodeCreationFunction, - identifierGeneratorFunction, - specification -) - local identifier = specification.Identifier or - identifierGeneratorFunction(specification) +local registerNode = function(containerAsset, nodeCreationFunction, identifierGeneratorFunction, specification) + local identifier = specification.Identifier or identifierGeneratorFunction(specification) - specification.Identifier = identifier + specification.Identifier = identifier - containerAsset.onInitialize(function () - nodeCreationFunction(specification) - end) - containerAsset.onDeinitialize(function () - openspace.removeSceneGraphNode(identifier) - end) + containerAsset.onInitialize(function () + nodeCreationFunction(specification) + end) + containerAsset.onDeinitialize(function () + openspace.removeSceneGraphNode(identifier) + end) end local registerGrid = function(gridAsset, specification) - registerNode(gridAsset, addGrid, generateGridIdentifier, specification) + registerNode(gridAsset, addGrid, generateGridIdentifier, specification) end local registerCartesianAxes = function(axesAsset, specification) - registerNode(axesAsset, addCartesianAxes, generateAxesIdentifier, specification) + registerNode(axesAsset, addCartesianAxes, generateAxesIdentifier, specification) end asset.export("addGrid", addGrid) @@ -130,4 +122,3 @@ asset.export("registerGrid", registerGrid) asset.export("addCartesianAxes", addCartesianAxes) asset.export("registerCartesianAxes", registerCartesianAxes) - diff --git a/data/assets/util/default_joystick.asset b/data/assets/util/default_joystick.asset index 2c55c2dc42..e511364fff 100644 --- a/data/assets/util/default_joystick.asset +++ b/data/assets/util/default_joystick.asset @@ -17,49 +17,49 @@ local propertyHelper = asset.require('./property_helper') local XBoxController = { - LeftThumbStick = { 0 , 1 }, - RightThumbStick = { 2, 3 }, - LeftTrigger = 4, - RightTrigger = 5, - A = 0, - B = 1, - X = 2, - Y = 3, - LB = 4, - RB = 5, - Select = 6, - Start = 7, - LeftStick = 8, - RightStick = 9, - DPad = { - Up = 10, - Right = 11, - Down = 12, - Left = 13 - } + LeftThumbStick = { 0 , 1 }, + RightThumbStick = { 2, 3 }, + LeftTrigger = 4, + RightTrigger = 5, + A = 0, + B = 1, + X = 2, + Y = 3, + LB = 4, + RB = 5, + Select = 6, + Start = 7, + LeftStick = 8, + RightStick = 9, + DPad = { + Up = 10, + Right = 11, + Down = 12, + Left = 13 + } } local PS4Controller = { - LeftThumbStick = { 0 , 1 }, - RightThumbStick = { 2, 5 }, - LeftTrigger = 3, - RightTrigger = 4, - A = 3, -- Triangle - B = 0, -- Square - X = 2, -- Circle - Y = 1, -- Cross - LB = 4, - RB = 5, - Select = 9, -- options - Start = 12, -- PS button - LeftStick = 10, - RightStick = 11, - DPad = { - Up = 14, - Right = 15, - Down = 16, - Left = 17 - } + LeftThumbStick = { 0 , 1 }, + RightThumbStick = { 2, 5 }, + LeftTrigger = 3, + RightTrigger = 4, + A = 3, -- Triangle + B = 0, -- Square + X = 2, -- Circle + Y = 1, -- Cross + LB = 4, + RB = 5, + Select = 9, -- options + Start = 12, -- PS button + LeftStick = 10, + RightStick = 11, + DPad = { + Up = 14, + Right = 15, + Down = 16, + Left = 17 + } } -- Variables to store the state of the joystick between frames @@ -69,106 +69,106 @@ Joystick.State.IsInRollMode = false Joystick.State.Axis = {} local bindLocalRoll = function(axis) -return [[ - -- We only want to store the current state in the first mode that is enabled, otherwise we will overwrite the backup - if not Joystick.State.IsInRollMode then - -- Save current axis state - Joystick.State.Axis.Type, Joystick.State.Axis.Inverted, Joystick.State.Axis.Normalized = openspace.navigation.joystickAxis(]] .. axis .. [[) - end + return [[ + -- We only want to store the current state in the first mode that is enabled, otherwise we will overwrite the backup + if not Joystick.State.IsInRollMode then + -- Save current axis state + Joystick.State.Axis.Type, Joystick.State.Axis.Inverted, Joystick.State.Axis.Normalized = openspace.navigation.joystickAxis(]] .. axis .. [[) + end - -- Set new axis state - openspace.navigation.bindJoystickAxis(]] .. axis .. [[, "LocalRoll X", true); - Joystick.State.IsInRollMode = true - ]] + -- Set new axis state + openspace.navigation.bindJoystickAxis(]] .. axis .. [[, "LocalRoll X", true); + Joystick.State.IsInRollMode = true + ]] end local bindGlobalRoll = function(axis) - return [[ - -- We only want to store the current state in the first mode that is enabled, otherwise we will overwrite the backup - if not Joystick.State.IsInRollMode then - -- Save current axis state - Joystick.State.Axis.Type, Joystick.State.Axis.Inverted, Joystick.State.Axis.Normalized = openspace.navigation.joystickAxis(]] .. axis .. [[) - end + return [[ + -- We only want to store the current state in the first mode that is enabled, otherwise we will overwrite the backup + if not Joystick.State.IsInRollMode then + -- Save current axis state + Joystick.State.Axis.Type, Joystick.State.Axis.Inverted, Joystick.State.Axis.Normalized = openspace.navigation.joystickAxis(]] .. axis .. [[) + end - -- Set new axis state - openspace.navigation.bindJoystickAxis(]] .. axis .. [[, "GlobalRoll X", true); - Joystick.State.IsInRollMode = true - ]] + -- Set new axis state + openspace.navigation.bindJoystickAxis(]] .. axis .. [[, "GlobalRoll X", true); + Joystick.State.IsInRollMode = true + ]] end local unbindRoll = function(axis) - return [[ - -- Reset previous state - openspace.navigation.bindJoystickAxis(]] .. axis .. [[, Joystick.State.Axis.Type, Joystick.State.Axis.Inverted, Joystick.State.Axis.Normalized); -]] + return [[ + -- Reset previous state + openspace.navigation.bindJoystickAxis(]] .. axis .. [[, Joystick.State.Axis.Type, Joystick.State.Axis.Inverted, Joystick.State.Axis.Normalized); + ]] end asset.onInitialize(function() - -- Set the controller to the connected controller - -- Currently: XBoxController or PS4Controller - local controller = XBoxController; + -- Set the controller to the connected controller + -- Currently: XBoxController or PS4Controller + local controller = XBoxController; - openspace.navigation.setAxisDeadZone(controller.LeftThumbStick[1], 0.15) - openspace.navigation.setAxisDeadZone(controller.LeftThumbStick[2], 0.15) - openspace.navigation.setAxisDeadZone(controller.RightThumbStick[1], 0.15) - openspace.navigation.setAxisDeadZone(controller.RightThumbStick[2], 0.15) - openspace.navigation.setAxisDeadZone(controller.LeftTrigger, 0.15) - openspace.navigation.setAxisDeadZone(controller.RightTrigger, 0.15) + openspace.navigation.setAxisDeadZone(controller.LeftThumbStick[1], 0.15) + openspace.navigation.setAxisDeadZone(controller.LeftThumbStick[2], 0.15) + openspace.navigation.setAxisDeadZone(controller.RightThumbStick[1], 0.15) + openspace.navigation.setAxisDeadZone(controller.RightThumbStick[2], 0.15) + openspace.navigation.setAxisDeadZone(controller.LeftTrigger, 0.15) + openspace.navigation.setAxisDeadZone(controller.RightTrigger, 0.15) - openspace.navigation.bindJoystickAxis(controller.LeftThumbStick[1], "Orbit X"); - openspace.navigation.bindJoystickAxis(controller.LeftThumbStick[2], "Orbit Y", true); - openspace.navigation.bindJoystickAxis(controller.RightThumbStick[1], "Pan X", true); - openspace.navigation.bindJoystickAxis(controller.RightThumbStick[2], "Pan Y", true); - openspace.navigation.bindJoystickAxis(controller.LeftTrigger, "Zoom Out", false, true); - openspace.navigation.bindJoystickAxis(controller.RightTrigger, "Zoom In", false, true); + openspace.navigation.bindJoystickAxis(controller.LeftThumbStick[1], "Orbit X"); + openspace.navigation.bindJoystickAxis(controller.LeftThumbStick[2], "Orbit Y", true); + openspace.navigation.bindJoystickAxis(controller.RightThumbStick[1], "Pan X", true); + openspace.navigation.bindJoystickAxis(controller.RightThumbStick[2], "Pan Y", true); + openspace.navigation.bindJoystickAxis(controller.LeftTrigger, "Zoom Out", false, true); + openspace.navigation.bindJoystickAxis(controller.RightTrigger, "Zoom In", false, true); - openspace.navigation.bindJoystickButton( - controller.LB, - bindLocalRoll(controller.RightThumbStick[1]), - "Switch to local roll mode" - ) - openspace.navigation.bindJoystickButton( - controller.LB, - unbindRoll(controller.RightThumbStick[1]), - "Switch back to normal mode", - "Release" - ) - openspace.navigation.bindJoystickButton( - controller.RB, - bindGlobalRoll(controller.RightThumbStick[1]), - "Switch to global roll mode" - ) - openspace.navigation.bindJoystickButton( - controller.RB, - unbindRoll(controller.RightThumbStick[1]), - "Switch back to normal mode", - "Release" - ) + openspace.navigation.bindJoystickButton( + controller.LB, + bindLocalRoll(controller.RightThumbStick[1]), + "Switch to local roll mode" + ) + openspace.navigation.bindJoystickButton( + controller.LB, + unbindRoll(controller.RightThumbStick[1]), + "Switch back to normal mode", + "Release" + ) + openspace.navigation.bindJoystickButton( + controller.RB, + bindGlobalRoll(controller.RightThumbStick[1]), + "Switch to global roll mode" + ) + openspace.navigation.bindJoystickButton( + controller.RB, + unbindRoll(controller.RightThumbStick[1]), + "Switch back to normal mode", + "Release" + ) - openspace.navigation.bindJoystickButton( - controller.A, - propertyHelper.invert('NavigationHandler.OrbitalNavigator.Friction.ZoomFriction'), - "Toggle zoom friction" - ) - openspace.navigation.bindJoystickButton( - controller.B, - propertyHelper.invert('NavigationHandler.OrbitalNavigator.Friction.RotationalFriction'), - "Toggle rotational friction" - ) - openspace.navigation.bindJoystickButton( - controller.DPad.Left, - propertyHelper.invert('NavigationHandler.OrbitalNavigator.Friction.RollFriction'), - "Toggle roll friction" - ) + openspace.navigation.bindJoystickButton( + controller.A, + propertyHelper.invert('NavigationHandler.OrbitalNavigator.Friction.ZoomFriction'), + "Toggle zoom friction" + ) + openspace.navigation.bindJoystickButton( + controller.B, + propertyHelper.invert('NavigationHandler.OrbitalNavigator.Friction.RotationalFriction'), + "Toggle rotational friction" + ) + openspace.navigation.bindJoystickButton( + controller.DPad.Left, + propertyHelper.invert('NavigationHandler.OrbitalNavigator.Friction.RollFriction'), + "Toggle roll friction" + ) - openspace.navigation.bindJoystickButton( - controller.X, - "openspace.setPropertyValue('NavigationHandler.Origin', 'Earth')", - "Switch target to Earth" - ) - openspace.navigation.bindJoystickButton( - controller.Y, - "openspace.setPropertyValue('NavigationHandler.Origin', 'Mars')", - "Switch target to Mars" - ) + openspace.navigation.bindJoystickButton( + controller.X, + "openspace.setPropertyValue('NavigationHandler.Origin', 'Earth')", + "Switch target to Earth" + ) + openspace.navigation.bindJoystickButton( + controller.Y, + "openspace.setPropertyValue('NavigationHandler.Origin', 'Mars')", + "Switch target to Mars" + ) end) diff --git a/data/assets/util/default_keybindings.asset b/data/assets/util/default_keybindings.asset index 57d90ddaa2..d178200ed0 100644 --- a/data/assets/util/default_keybindings.asset +++ b/data/assets/util/default_keybindings.asset @@ -2,154 +2,154 @@ local sceneHelper = asset.require('./scene_helper') local propertyHelper = asset.require('./property_helper') local Keybindings = { - { - Key = "F1", - Name = "Show Native GUI", - Command = propertyHelper.invert('Modules.ImGUI.Main.Enabled'), - Documentation = "Shows or hides the native UI", - GuiPath = "/Native GUI", - Local = true - }, - { - Key = "ESC", - Name = "Toggle Shutdown", - Command = "openspace.toggleShutdown()", - Documentation = "Toggles the shutdown that will stop OpenSpace after a grace period. Press again to cancel the shutdown during this period.", - Local = true - }, - { - Key = "PRINT_SCREEN", - Name = "Take Screenshot", - Command = "openspace.takeScreenshot()", - Documentation = "Saves the contents of the screen to a file in the ${SCREENSHOTS} directory.", - GuiPath = "/Rendering", - Local = true - }, - { - Key = "F12", - Name = "Take Screenshot", - Command = "openspace.takeScreenshot()", - Documentation = "Saves the contents of the screen to a file in the ${SCREENSHOTS} directory.", - GuiPath = "/Rendering", - Local = true - }, - { - Key = "SPACE", - Name = "Toggle Pause (Interpolated)", - Command = "openspace.time.interpolateTogglePause()", - Documentation = "Smoothly starts and stops the simulation time.", - GuiPath = "/Simulation Speed", - Local = true - }, - { - Key = "Shift+SPACE", - Name = "Toggle Pause (Immediate)", - Command = "openspace.time.togglePause()", - Documentation = "Immediately starts and stops the simulation time.", - GuiPath = "/Simulation Speed", - Local = true - }, - { - Key = "f", - Name = "Toggle Rotation friction", - Command = propertyHelper.invert('NavigationHandler.OrbitalNavigator.Friction.RotationalFriction'), - Documentation = "Toggles the rotational friction of the camera. If it is disabled, the camera rotates around the focus object indefinitely.", - GuiPath = "/Navigation", - Local = false - }, - { - Key = "Shift+f", - Name = "Toggle Zoom Friction", - Command = propertyHelper.invert('NavigationHandler.OrbitalNavigator.Friction.ZoomFriction'), - Documentation = "Toggles the zoom friction of the camera. If it is disabled, the camera rises up from or closes in towards the focus object indefinitely.", - GuiPath = "/Navigation", - Local = false - }, - { - Key = "Ctrl+f", - Name = "Toggle Roll Friction", - Command = propertyHelper.invert('NavigationHandler.OrbitalNavigator.Friction.RollFriction'), - Documentation = "Toggles the roll friction of the camera. If it is disabled, the camera rolls around its own axis indefinitely.", - GuiPath = "/Navigation", - Local = false - }, - { - Key = "w", - Name = "Fade to/from black", - Command = "if openspace.getPropertyValue('RenderEngine.BlackoutFactor') > 0.5 then openspace.setPropertyValueSingle('RenderEngine.BlackoutFactor', 0.0, 3) else openspace.setPropertyValueSingle('RenderEngine.BlackoutFactor', 1.0, 3) end", - Documentation = "Toggles the fade to black within 3 seconds or shows the rendering after 3 seconds.", - GuiPath = "/Rendering", - Local = false - }, - { - Key = "Tab", - Name = "Toggle main GUI", - Command = propertyHelper.invert('Modules.CefWebGui.Visible'), - Documentation = "Toggles the main GUI", - GuiPath = "/GUI", - Local = true - }, - { - Key = "Shift+Tab", - Name = "Toggle dashboard and overlays", - Command = + { + Key = "F1", + Name = "Show Native GUI", + Command = propertyHelper.invert('Modules.ImGUI.Main.Enabled'), + Documentation = "Shows or hides the native UI", + GuiPath = "/Native GUI", + Local = true + }, + { + Key = "ESC", + Name = "Toggle Shutdown", + Command = "openspace.toggleShutdown()", + Documentation = "Toggles the shutdown that will stop OpenSpace after a grace period. Press again to cancel the shutdown during this period.", + Local = true + }, + { + Key = "PRINT_SCREEN", + Name = "Take Screenshot", + Command = "openspace.takeScreenshot()", + Documentation = "Saves the contents of the screen to a file in the ${SCREENSHOTS} directory.", + GuiPath = "/Rendering", + Local = true + }, + { + Key = "F12", + Name = "Take Screenshot", + Command = "openspace.takeScreenshot()", + Documentation = "Saves the contents of the screen to a file in the ${SCREENSHOTS} directory.", + GuiPath = "/Rendering", + Local = true + }, + { + Key = "SPACE", + Name = "Toggle Pause (Interpolated)", + Command = "openspace.time.interpolateTogglePause()", + Documentation = "Smoothly starts and stops the simulation time.", + GuiPath = "/Simulation Speed", + Local = true + }, + { + Key = "Shift+SPACE", + Name = "Toggle Pause (Immediate)", + Command = "openspace.time.togglePause()", + Documentation = "Immediately starts and stops the simulation time.", + GuiPath = "/Simulation Speed", + Local = true + }, + { + Key = "f", + Name = "Toggle Rotation friction", + Command = propertyHelper.invert('NavigationHandler.OrbitalNavigator.Friction.RotationalFriction'), + Documentation = "Toggles the rotational friction of the camera. If it is disabled, the camera rotates around the focus object indefinitely.", + GuiPath = "/Navigation", + Local = false + }, + { + Key = "Shift+f", + Name = "Toggle Zoom Friction", + Command = propertyHelper.invert('NavigationHandler.OrbitalNavigator.Friction.ZoomFriction'), + Documentation = "Toggles the zoom friction of the camera. If it is disabled, the camera rises up from or closes in towards the focus object indefinitely.", + GuiPath = "/Navigation", + Local = false + }, + { + Key = "Ctrl+f", + Name = "Toggle Roll Friction", + Command = propertyHelper.invert('NavigationHandler.OrbitalNavigator.Friction.RollFriction'), + Documentation = "Toggles the roll friction of the camera. If it is disabled, the camera rolls around its own axis indefinitely.", + GuiPath = "/Navigation", + Local = false + }, + { + Key = "w", + Name = "Fade to/from black", + Command = "if openspace.getPropertyValue('RenderEngine.BlackoutFactor') > 0.5 then openspace.setPropertyValueSingle('RenderEngine.BlackoutFactor', 0.0, 3) else openspace.setPropertyValueSingle('RenderEngine.BlackoutFactor', 1.0, 3) end", + Documentation = "Toggles the fade to black within 3 seconds or shows the rendering after 3 seconds.", + GuiPath = "/Rendering", + Local = false + }, + { + Key = "Tab", + Name = "Toggle main GUI", + Command = propertyHelper.invert('Modules.CefWebGui.Visible'), + Documentation = "Toggles the main GUI", + GuiPath = "/GUI", + Local = true + }, + { + Key = "Shift+Tab", + Name = "Toggle dashboard and overlays", + Command = [[local isEnabled = openspace.getPropertyValue('Dashboard.IsEnabled'); openspace.setPropertyValueSingle('Dashboard.IsEnabled', not isEnabled); openspace.setPropertyValueSingle("RenderEngine.ShowLog", not isEnabled); openspace.setPropertyValueSingle("RenderEngine.ShowVersion", not isEnabled); openspace.setPropertyValueSingle("RenderEngine.ShowCamera", not isEnabled)]], - Documentation = "Toggles the dashboard and overlays", - GuiPath = "/GUI", - Local = true - }, - { - Key = "Alt+R", - Name = "Toggle rendering on master", - Command = propertyHelper.invert('RenderEngine.DisableMasterRendering'), - Documentation = "Toggles the rendering on master", - GuiPath = "/Rendering", - Local = true - }, - { - Key = "Right", - Name = "Next Delta Time Step (Interpolate)", - Command = "openspace.time.interpolateNextDeltaTimeStep()", - Documentation = "Smoothly interpolates the simulation speed to the next delta time step, if one exists.", - GuiPath = "/Simulation Speed", - Local = true - }, - { - Key = "Shift+Right", - Name = "Next Delta Time Step (Immediate)", - Command = "openspace.time.setNextDeltaTimeStep()", - Documentation = "Immediately set the simulation speed to the next delta time step, if one exists.", - GuiPath = "/Simulation Speed", - Local = true - }, - { - Key = "Left", - Name = "Previous Delta Time Step (Interpolate)", - Command = "openspace.time.interpolatePreviousDeltaTimeStep()", - Documentation = "Smoothly interpolates the simulation speed to the previous delta time step, if one exists.", - GuiPath = "/Simulation Speed", - Local = true - }, - { - Key = "Shift+Left", - Name = "Previous Delta Time Step (Immediate)", - Command = "openspace.time.setPreviousDeltaTimeStep()", - Documentation = "Immediately set the simulation speed to the previous delta time step, if one exists.", - GuiPath = "/Simulation Speed", - Local = true - } + Documentation = "Toggles the dashboard and overlays", + GuiPath = "/GUI", + Local = true + }, + { + Key = "Alt+R", + Name = "Toggle rendering on master", + Command = propertyHelper.invert('RenderEngine.DisableMasterRendering'), + Documentation = "Toggles the rendering on master", + GuiPath = "/Rendering", + Local = true + }, + { + Key = "Right", + Name = "Next Delta Time Step (Interpolate)", + Command = "openspace.time.interpolateNextDeltaTimeStep()", + Documentation = "Smoothly interpolates the simulation speed to the next delta time step, if one exists.", + GuiPath = "/Simulation Speed", + Local = true + }, + { + Key = "Shift+Right", + Name = "Next Delta Time Step (Immediate)", + Command = "openspace.time.setNextDeltaTimeStep()", + Documentation = "Immediately set the simulation speed to the next delta time step, if one exists.", + GuiPath = "/Simulation Speed", + Local = true + }, + { + Key = "Left", + Name = "Previous Delta Time Step (Interpolate)", + Command = "openspace.time.interpolatePreviousDeltaTimeStep()", + Documentation = "Smoothly interpolates the simulation speed to the previous delta time step, if one exists.", + GuiPath = "/Simulation Speed", + Local = true + }, + { + Key = "Shift+Left", + Name = "Previous Delta Time Step (Immediate)", + Command = "openspace.time.setPreviousDeltaTimeStep()", + Documentation = "Immediately set the simulation speed to the previous delta time step, if one exists.", + GuiPath = "/Simulation Speed", + Local = true + } } asset.onInitialize(function() - sceneHelper.bindKeys(Keybindings) + sceneHelper.bindKeys(Keybindings) end) asset.onDeinitialize(function () - sceneHelper.unbindKeys(Keybindings) + sceneHelper.unbindKeys(Keybindings) end) asset.export("DefaultKeybindings", Keybindings) diff --git a/data/assets/util/generate_bookmarks.asset b/data/assets/util/generate_bookmarks.asset index d17307d5a6..8736ef7d11 100644 --- a/data/assets/util/generate_bookmarks.asset +++ b/data/assets/util/generate_bookmarks.asset @@ -5,78 +5,78 @@ local getBookmarks = function (guiPath, bookmarkfile) local notFirstLine = false; local PARSEC_CONSTANT = 3.0856776E16; for line in io.lines(openspace.absPath(bookmarkfile)) do - if (notFirstLine) then - local matchstring = '(.-),(.-),(.-),(.-),(.-),(.-),(.-),(.-),(.-),(.-),(.-)$' - local group, name, globe, lat, lon, altitude, x, y, z, scale, linewidth = line:match(matchstring) + if (notFirstLine) then + local matchstring = '(.-),(.-),(.-),(.-),(.-),(.-),(.-),(.-),(.-),(.-),(.-)$' + local group, name, globe, lat, lon, altitude, x, y, z, scale, linewidth = line:match(matchstring) - scale = (scale == '' and 75000 or scale) - linewidth = (linewidth == '' and 2.0 or tonumber(linewidth)) - group = (group == '' and globe or group) + scale = (scale == '' and 75000 or scale) + linewidth = (linewidth == '' and 2.0 or tonumber(linewidth)) + group = (group == '' and globe or group) - local parent = (globe == '' and 'Root' or globe) + local parent = (globe == '' and 'Root' or globe) - local sgn = { - Identifier = guiPath .. '-' .. name, - Parent = parent, - Transform = { - Scale = { - Type = 'StaticScale', - Scale = tonumber(scale); - }, - Rotation = { - Type = "StaticRotation", - Rotation = { - -0.05487554, 0.4941095, -0.8676661, - -0.9938214 , -0.1109906, -0.0003515167, - -0.09647644, 0.8622859, 0.4971472 - } + local sgn = { + Identifier = guiPath .. '-' .. name, + Parent = parent, + Transform = { + Scale = { + Type = 'StaticScale', + Scale = tonumber(scale); + }, + Rotation = { + Type = "StaticRotation", + Rotation = { + -0.05487554, 0.4941095, -0.8676661, + -0.9938214 , -0.1109906, -0.0003515167, + -0.09647644, 0.8622859, 0.4971472 } - }, - Renderable = { - Type = 'RenderableSphericalGrid', - Enabled = false, - Opacity = 0.3, - Color = { 0.3, 0.84, 1.0}, - LineWidth = linewidth - }, - GUI = { - Name = name, - Path = '/' .. guiPath + } + }, + Renderable = { + Type = 'RenderableSphericalGrid', + Enabled = false, + Opacity = 0.3, + Color = { 0.3, 0.84, 1.0}, + LineWidth = linewidth + }, + GUI = { + Name = name, + Path = '/' .. guiPath + } + } + + if (group ~= '') then + sgn.GUI.Path = sgn.GUI.Path .. '/' .. group + end + + if (globe == '') then + sgn.Transform.Translation = { + Type = 'StaticTranslation', + Position = { + tonumber(x) * PARSEC_CONSTANT, + tonumber(y) * PARSEC_CONSTANT, + tonumber(z) * PARSEC_CONSTANT } } - - if (group ~= '') then - sgn.GUI.Path = sgn.GUI.Path .. '/' .. group - end - - if (globe == '') then - sgn.Transform.Translation = { - Type = 'StaticTranslation', - Position = { - tonumber(x) * PARSEC_CONSTANT, - tonumber(y) * PARSEC_CONSTANT, - tonumber(z) * PARSEC_CONSTANT - } - } - else - sgn.Transform.Translation = { - Type = 'GlobeTranslation', - Globe = globe, - Latitude = tonumber(lat), - Longitude = tonumber(lon) - } - if (altitude == nil) then - sgn.Transform.Translation.UseHeightMap = true; - else - sgn.Transform.Translation.UseHeightMap = false; - sgn.Transform.Translation.Altitude = tonumber(altitude); - end - end - - table.insert(genBookmarks, sgn); else - notFirstLine = true + sgn.Transform.Translation = { + Type = 'GlobeTranslation', + Globe = globe, + Latitude = tonumber(lat), + Longitude = tonumber(lon) + } + if (altitude == nil) then + sgn.Transform.Translation.UseHeightMap = true; + else + sgn.Transform.Translation.UseHeightMap = false; + sgn.Transform.Translation.Altitude = tonumber(altitude); + end end + + table.insert(genBookmarks, sgn); + else + notFirstLine = true + end end return genBookmarks end diff --git a/data/assets/util/ipac.asset b/data/assets/util/ipac.asset index 5d9140d4eb..223fbf47f9 100644 --- a/data/assets/util/ipac.asset +++ b/data/assets/util/ipac.asset @@ -1,18 +1,18 @@ asset.onInitialize(function() - openspace.clearKeys() - openspace.bindKey("RIGHT", "openspace.navigation.addGlobalRotation(-5.0, 0.0)"); - openspace.bindKey("LEFT", "openspace.navigation.addGlobalRotation(5.0, 0.0)"); - openspace.bindKey("UP", "openspace.navigation.addGlobalRotation(0.0, 5.0)"); - openspace.bindKey("DOWN", "openspace.navigation.addGlobalRotation(0.0, -5.0)"); + openspace.clearKeys() + openspace.bindKey("RIGHT", "openspace.navigation.addGlobalRotation(-5.0, 0.0)"); + openspace.bindKey("LEFT", "openspace.navigation.addGlobalRotation(5.0, 0.0)"); + openspace.bindKey("UP", "openspace.navigation.addGlobalRotation(0.0, 5.0)"); + openspace.bindKey("DOWN", "openspace.navigation.addGlobalRotation(0.0, -5.0)"); - openspace.bindKey("CTRL+RIGHT", "openspace.navigation.addLocalRotation(-5.0, 0.0)"); - openspace.bindKey("CTRL+LEFT", "openspace.navigation.addLocalRotation(5.0, 0.0)"); - openspace.bindKey("CTRL+UP", "openspace.navigation.addLocalRotation(0.0, 5.0)"); - openspace.bindKey("CTRL+DOWN", "openspace.navigation.addLocalRotation(0.0, -5.0)"); + openspace.bindKey("CTRL+RIGHT", "openspace.navigation.addLocalRotation(-5.0, 0.0)"); + openspace.bindKey("CTRL+LEFT", "openspace.navigation.addLocalRotation(5.0, 0.0)"); + openspace.bindKey("CTRL+UP", "openspace.navigation.addLocalRotation(0.0, 5.0)"); + openspace.bindKey("CTRL+DOWN", "openspace.navigation.addLocalRotation(0.0, -5.0)"); - openspace.bindKey("ALT+UP", "openspace.navigation.addTruckMovement(0.0, 5.0)"); - openspace.bindKey("ALT+DOWN", "openspace.navigation.addTruckMovement(0.0, -5.0)"); + openspace.bindKey("ALT+UP", "openspace.navigation.addTruckMovement(0.0, 5.0)"); + openspace.bindKey("ALT+DOWN", "openspace.navigation.addTruckMovement(0.0, -5.0)"); - openspace.bindKey("SPACE", "openspace.setPropertyValueSingle('NavigationHandler.OrbitalNavigator.Aim', '');openspace.setPropertyValueSingle('NavigationHandler.OrbitalNavigator.Anchor', 'Moon');openspace.setPropertyValueSingle('NavigationHandler.OrbitalNavigator.RetargetAnchor', nil);") - openspace.bindKey("Z", "openspace.setPropertyValueSingle('NavigationHandler.OrbitalNavigator.Aim', '');openspace.setPropertyValueSingle('NavigationHandler.OrbitalNavigator.Anchor', 'Earth');openspace.setPropertyValueSingle('NavigationHandler.OrbitalNavigator.RetargetAnchor', nil);") + openspace.bindKey("SPACE", "openspace.setPropertyValueSingle('NavigationHandler.OrbitalNavigator.Aim', '');openspace.setPropertyValueSingle('NavigationHandler.OrbitalNavigator.Anchor', 'Moon');openspace.setPropertyValueSingle('NavigationHandler.OrbitalNavigator.RetargetAnchor', nil);") + openspace.bindKey("Z", "openspace.setPropertyValueSingle('NavigationHandler.OrbitalNavigator.Aim', '');openspace.setPropertyValueSingle('NavigationHandler.OrbitalNavigator.Anchor', 'Earth');openspace.setPropertyValueSingle('NavigationHandler.OrbitalNavigator.RetargetAnchor', nil);") end) diff --git a/data/assets/util/launcher_images.asset b/data/assets/util/launcher_images.asset index 6db2ae994c..32098b0c64 100644 --- a/data/assets/util/launcher_images.asset +++ b/data/assets/util/launcher_images.asset @@ -1,7 +1,7 @@ local DataPath = asset.syncedResource({ - Name = "Launcher Images", - Type = "HttpSynchronization", - Identifier = "launcher_images", - Version = 1 + Name = "Launcher Images", + Type = "HttpSynchronization", + Identifier = "launcher_images", + Version = 1 }) asset.export("DataPath", DataPath) diff --git a/data/assets/util/procedural_globe.asset b/data/assets/util/procedural_globe.asset index 4c34de326a..282ffccf1f 100644 --- a/data/assets/util/procedural_globe.asset +++ b/data/assets/util/procedural_globe.asset @@ -2,119 +2,119 @@ asset.require('spice/base') local createGlobeWithoutName = function(identifier, parent, parentSpiceName, spiceName, radii, tags, trailTags, guiPath, trailColor, orbitPeriod, kernels) - return { - Identifier = identifier, - Parent = parent, - Transform = { - Translation = { - Type = "SpiceTranslation", - Target = spiceName, - Observer = parentSpiceName, - Kernels = kernels - } - }, - Renderable = { - Type = "RenderableGlobe", - Radii = radii, - SegmentsPerPatch = 64, - Layers = {}, - Tag = tags - }, - GUI = { - Path = guiPath + return { + Identifier = identifier, + Parent = parent, + Transform = { + Translation = { + Type = "SpiceTranslation", + Target = spiceName, + Observer = parentSpiceName, + Kernels = kernels } + }, + Renderable = { + Type = "RenderableGlobe", + Radii = radii, + SegmentsPerPatch = 64, + Layers = {}, + Tag = tags + }, + GUI = { + Path = guiPath + } + }, + { + Identifier = identifier .. "Trail", + Parent = parent, + Renderable = { + Type = "RenderableTrailOrbit", + Translation = { + Type = "SpiceTranslation", + Target = spiceName, + Observer = parentSpiceName + }, + Color = trailColor, + Period = orbitPeriod, + Resolution = 1000, + Tag = trailTags, }, - { - Identifier = identifier .. "Trail", - Parent = parent, - Renderable = { - Type = "RenderableTrailOrbit", - Translation = { - Type = "SpiceTranslation", - Target = spiceName, - Observer = parentSpiceName - }, - Color = trailColor, - Period = orbitPeriod, - Resolution = 1000, - Tag = trailTags, - }, - GUI = { - Path = guiPath - } + GUI = { + Path = guiPath } + } end local createGlobeWithName = function(identifier, name, parent, parentSpiceName, spiceName, radii, tags, trailTags, guiPath, trailColor, orbitPeriod, kernels, layers) - g, t = createGlobeWithoutName(identifier, parent, parentSpiceName, spiceName, radii, - tags, trailTags, guiPath, trailColor, orbitPeriod, kernels, layers) - g.GUI.Name = name - t.GUI.Name = name .. " Trail" + g, t = createGlobeWithoutName(identifier, parent, parentSpiceName, spiceName, radii, + tags, trailTags, guiPath, trailColor, orbitPeriod, kernels, layers) + g.GUI.Name = name + t.GUI.Name = name .. " Trail" - return g, t + return g, t end asset.export("createGlobeWithoutName", createGlobeWithoutName) asset.export("createGlobeWithName", createGlobeWithName) local createGlobes = function(t) - for _,v in pairs(t) do - if type(v) ~= "table" then - local warning = "The table passed to 'createGlobes' was not a table of tables" - openspace.printWarning(warning) - -- We return an empty table of tables to silence a potential future warning - return {{}} - end + for _,v in pairs(t) do + if type(v) ~= "table" then + local warning = "The table passed to 'createGlobes' was not a table of tables" + openspace.printWarning(warning) + -- We return an empty table of tables to silence a potential future warning + return {{}} + end + end + + local result = {} + + for i, v in ipairs(t) do + local globe = nil + local trail = nil + if not v.Layers then + v.Layers = {} + end + if not v.TrailTags then + v.TrailTags = {} + end + if v.Name then + globe, trail = createGlobeWithName( + v.Identifier, + v.GUI.Name, + v.Parent.Identifier, + v.Parent.Spice, + v.Spice, + v.Radii, + v.Tags, + v.TrailTags, + v.GUI.Path, + v.TrailColor, + v.OrbitPeriod, + v.Kernels, + v.Layers + ) + else + globe, trail = createGlobeWithoutName( + v.Identifier, + v.Parent.Identifier, + v.Parent.Spice, + v.Spice, + v.Radii, + v.Tags, + v.TrailTags, + v.GUI.Path, + v.TrailColor, + v.OrbitPeriod, + v.Kernels, + v.Layers + ) end - local result = {} - - for i, v in ipairs(t) do - local globe = nil - local trail = nil - if not v.Layers then - v.Layers = {} - end - if not v.TrailTags then - v.TrailTags = {} - end - if v.Name then - globe, trail = createGlobeWithName( - v.Identifier, - v.GUI.Name, - v.Parent.Identifier, - v.Parent.Spice, - v.Spice, - v.Radii, - v.Tags, - v.TrailTags, - v.GUI.Path, - v.TrailColor, - v.OrbitPeriod, - v.Kernels, - v.Layers - ) - else - globe, trail = createGlobeWithoutName( - v.Identifier, - v.Parent.Identifier, - v.Parent.Spice, - v.Spice, - v.Radii, - v.Tags, - v.TrailTags, - v.GUI.Path, - v.TrailColor, - v.OrbitPeriod, - v.Kernels, - v.Layers - ) - end - - table.insert(result, globe) - table.insert(result, trail) - end - return result + table.insert(result, globe) + table.insert(result, trail) + end + return result end asset.export("createGlobes", createGlobes) diff --git a/data/assets/util/property_helper.asset b/data/assets/util/property_helper.asset index 50feeeb5d3..0c13e098de 100644 --- a/data/assets/util/property_helper.asset +++ b/data/assets/util/property_helper.asset @@ -1,44 +1,44 @@ -- Function that returns the string that inverts the fully qualified boolean property 'property' local invert = function(prop) - local escaped_property = "'" .. prop .. "'" - return "openspace.setPropertyValueSingle(" .. escaped_property .. ", not openspace.getPropertyValue(" .. escaped_property .. "));" + local escaped_property = "'" .. prop .. "'" + return "openspace.setPropertyValueSingle(" .. escaped_property .. ", not openspace.getPropertyValue(" .. escaped_property .. "));" end -- Function that returns the string that increments the 'property' by the 'value' local increment = function(prop, value) - local v = value or 1 - local escaped_property = "'" .. prop .. "'" - return "openspace.setPropertyValueSingle(" .. escaped_property .. ", openspace.getPropertyValue(" .. escaped_property .. ") + " .. v .. ");" + local v = value or 1 + local escaped_property = "'" .. prop .. "'" + return "openspace.setPropertyValueSingle(" .. escaped_property .. ", openspace.getPropertyValue(" .. escaped_property .. ") + " .. v .. ");" end -- Function that returns the string that decrements the 'property' by the 'value' local decrement = function(prop, value) - return increment(prop, -value) + return increment(prop, -value) end local fade = function(prop, value, duration) - assert(type(prop) == "string", "prop must be a number") - assert(type(duration) == "number", "duration must be a number") + assert(type(prop) == "string", "prop must be a number") + assert(type(duration) == "number", "duration must be a number") - local escaped_property = "'" .. prop .. "'" - return "openspace.setPropertyValueSingle(" .. escaped_property ..", " .. tostring(value) .. ", " .. tostring(duration) .. ")" + local escaped_property = "'" .. prop .. "'" + return "openspace.setPropertyValueSingle(" .. escaped_property ..", " .. tostring(value) .. ", " .. tostring(duration) .. ")" end local fadeOut = function(prop, duration) - return fade(prop, 0.0, duration) + return fade(prop, 0.0, duration) end local fadeIn = function(prop, duration) - return fade(prop, 1.0, duration) + return fade(prop, 1.0, duration) end local fadeInOut = function(prop, duration) - assert(type(prop) == "string", "prop must be a number") - assert(type(duration) == "number", "duration must be a number") + assert(type(prop) == "string", "prop must be a number") + assert(type(duration) == "number", "duration must be a number") - local escaped_property = "'" .. prop .. "'" - -- If the value is > 0.5 fade out, otherwise fade in - return "local v = openspace.getPropertyValue(" .. escaped_property .. "); if v <= 0.5 then " .. fadeIn(prop, duration) .. " else " .. fadeOut(prop, duration) .. " end" + local escaped_property = "'" .. prop .. "'" + -- If the value is > 0.5 fade out, otherwise fade in + return "local v = openspace.getPropertyValue(" .. escaped_property .. "); if v <= 0.5 then " .. fadeIn(prop, duration) .. " else " .. fadeOut(prop, duration) .. " end" end asset.export('invert', invert) diff --git a/data/assets/util/renderable_helper.asset b/data/assets/util/renderable_helper.asset index 31ef99a3df..90e04e9c7f 100644 --- a/data/assets/util/renderable_helper.asset +++ b/data/assets/util/renderable_helper.asset @@ -2,12 +2,12 @@ local propertyHelper = asset.require('./property_helper') -- Function that returns the string that enables/disables the renderable 'renderable' local toggle = function(renderable) - return propertyHelper.invert(renderable .. ".Renderable.Enabled") + return propertyHelper.invert(renderable .. ".Renderable.Enabled") end -- Function that returns the string that sets the enabled property of to local setEnabled = function(renderable, enabled) - return "openspace.setPropertyValue('" .. renderable .. ".Renderable.Enabled', " .. (enabled and "true" or "false") .. ");"; + return "openspace.setPropertyValue('" .. renderable .. ".Renderable.Enabled', " .. (enabled and "true" or "false") .. ");"; end diff --git a/data/assets/util/scene_helper.asset b/data/assets/util/scene_helper.asset index 47540c3779..89f6c88a4c 100644 --- a/data/assets/util/scene_helper.asset +++ b/data/assets/util/scene_helper.asset @@ -1,108 +1,108 @@ local bindKeys = function(t, ignoreWarning) - ignoreWarning = ignoreWarning or false - for _, k in ipairs(t) do - assert(k.Key, 'No key provided') - assert(k.Command, 'No command provided for key ' .. k.Key) + ignoreWarning = ignoreWarning or false + for _, k in ipairs(t) do + assert(k.Key, 'No key provided') + assert(k.Command, 'No command provided for key ' .. k.Key) - k.Name = k.Name or k.Key - k.GuiPath = k.GuiPath or '' + k.Name = k.Name or k.Key + k.GuiPath = k.GuiPath or '' - local currentKey = openspace.getKeyBinding(k.Key) - if (next(currentKey) ~= nil) and (not ignoreWarning) then - openspace.printWarning('New keybind for "' .. k.Key .. '" is added, but a previous keybind already existed. If you want to silence this warning, pass "true", to this call to bindKeys') - end - - if k.Local then - openspace.bindKeyLocal(k.Key, k.Command, k.Documentation, k.Name, k.GuiPath) - else - openspace.bindKey(k.Key, k.Command, k.Documentation, k.Name, k.GuiPath) - end + local currentKey = openspace.getKeyBinding(k.Key) + if (next(currentKey) ~= nil) and (not ignoreWarning) then + openspace.printWarning('New keybind for "' .. k.Key .. '" is added, but a previous keybind already existed. If you want to silence this warning, pass "true", to this call to bindKeys') end + + if k.Local then + openspace.bindKeyLocal(k.Key, k.Command, k.Documentation, k.Name, k.GuiPath) + else + openspace.bindKey(k.Key, k.Command, k.Documentation, k.Name, k.GuiPath) + end + end end asset.export("bindKeys", bindKeys) local unbindKeys = function(keys) - -- We check against k and k.Key to provide compatability - -- for both calls with the same table that goes to bindKeys - -- as well as the return values from setDeltaTimeKeys - for _, k in ipairs(keys) do - openspace.clearKey(k.Key or k) - end + -- We check against k and k.Key to provide compatability + -- for both calls with the same table that goes to bindKeys + -- as well as the return values from setDeltaTimeKeys + for _, k in ipairs(keys) do + openspace.clearKey(k.Key or k) + end end asset.export("unbindKeys", unbindKeys) --shortcut function local function has_value (tab, val) - for index, value in ipairs(tab) do - -- We grab the first index of our sub-table instead - if value[1] == val then - return true - end + for index, value in ipairs(tab) do + -- We grab the first index of our sub-table instead + if value[1] == val then + return true end + end - return false + return false end local extractShortcuts = function(names, shortcuts) - local foundShortcuts = {}; + local foundShortcuts = {}; - if type(names) ~= "table" then - openspace.printWarning("scene_helper.extractShortcuts invalid paramater names (not Table)") + if type(names) ~= "table" then + openspace.printWarning("scene_helper.extractShortcuts invalid paramater names (not Table)") + end + + if type(shortcuts) ~= "table" then + openspace.printWarning("scene_helper.extractShortcuts invalid paramater shortcuts (not Table)") + end + + for _, shortcut in ipairs(shortcuts) do + for _, name in ipairs(names ) do + if (shortcut.Name == name) then + foundShortcuts[#foundShortcuts+1] = shortcut + end end + end - if type(shortcuts) ~= "table" then - openspace.printWarning("scene_helper.extractShortcuts invalid paramater shortcuts (not Table)") - end - - for _, shortcut in ipairs(shortcuts) do - for _, name in ipairs(names ) do - if (shortcut.Name == name) then - foundShortcuts[#foundShortcuts+1] = shortcut - end - end - end - - return foundShortcuts + return foundShortcuts end asset.export("extractShortcuts", extractShortcuts) local createKeyBindFromShortcuts = function(key, shortcuts, guipath, title, documentation) - if type(key) ~= "string" then - openspace.printWarning("scene_helper.createKeyBindFromShortcuts invalid paramater key (not String)") + if type(key) ~= "string" then + openspace.printWarning("scene_helper.createKeyBindFromShortcuts invalid paramater key (not String)") + end + + if type(shortcuts) ~= "table" or #shortcuts == 0 then + openspace.printWarning("scene_helper.createKeyBindFromShortcuts invalid paramater shortcuts (not Table or empty)") + end + + -- if type(guipath) ~= "string" then + -- guipath = shortcuts[0].GuiPath + -- end + + local concatTitle = type(title) ~= "string" + local concatDocumentation = type(documentation) ~= "string" + + local keybind = { + Key = key, + Command = "", + Name = name or "", + Documentation = documentation or "", + GuiPath = guipath or "", + Local = false + } + + for _, shortcut in ipairs(shortcuts) do + keybind.Command = keybind.Command .. shortcut.Command + if concatTitle then + keybind.Name = keybind.Name .. "/" .. shortcut.Name + end + if concatDocumentation then + keybind.Documentation = keybind.Documentation .. "," .. shortcut.Documentation end - if type(shortcuts) ~= "table" or #shortcuts == 0 then - openspace.printWarning("scene_helper.createKeyBindFromShortcuts invalid paramater shortcuts (not Table or empty)") - end + keybind.Local = keybind.Local and shortcut.Local + end - -- if type(guipath) ~= "string" then - -- guipath = shortcuts[0].GuiPath - -- end - - local concatTitle = type(title) ~= "string" - local concatDocumentation = type(documentation) ~= "string" - - local keybind = { - Key = key, - Command = "", - Name = name or "", - Documentation = documentation or "", - GuiPath = guipath or "", - Local = false - } - - for _, shortcut in ipairs(shortcuts) do - keybind.Command = keybind.Command .. shortcut.Command - if concatTitle then - keybind.Name = keybind.Name .. "/" .. shortcut.Name - end - if concatDocumentation then - keybind.Documentation = keybind.Documentation .. "," .. shortcut.Documentation - end - - keybind.Local = keybind.Local and shortcut.Local - end - - return keybind + return keybind end asset.export("createKeyBindFromShortcuts", createKeyBindFromShortcuts) diff --git a/data/assets/util/screenshots_endpoint.asset b/data/assets/util/screenshots_endpoint.asset index 40a58e0277..2381816e42 100644 --- a/data/assets/util/screenshots_endpoint.asset +++ b/data/assets/util/screenshots_endpoint.asset @@ -1,21 +1,21 @@ asset.onInitialize(function () - -- Disable the server, add production gui endpoint, and restart server. - -- The temporary disabling avoids restarting the server on each property change. - -- TODO: Add a trigger property to the module to restart the server "manually" - -- and remove automatic restart on each property change, - -- since frequent restarting seems to be unstable on mac. + -- Disable the server, add production gui endpoint, and restart server. + -- The temporary disabling avoids restarting the server on each property change. + -- TODO: Add a trigger property to the module to restart the server "manually" + -- and remove automatic restart on each property change, + -- since frequent restarting seems to be unstable on mac. - local enabled = openspace.getPropertyValue("Modules.WebGui.ServerProcessEnabled") - openspace.setPropertyValueSingle("Modules.WebGui.ServerProcessEnabled", false) + local enabled = openspace.getPropertyValue("Modules.WebGui.ServerProcessEnabled") + openspace.setPropertyValueSingle("Modules.WebGui.ServerProcessEnabled", false) - local directories = openspace.getPropertyValue("Modules.WebGui.Directories") - directories[#directories + 1] = "screenshots" - directories[#directories + 1] = "${SCREENSHOTS}" - openspace.setPropertyValueSingle("Modules.WebGui.Directories", directories) - openspace.setPropertyValueSingle("Modules.WebGui.ServerProcessEnabled", enabled) + local directories = openspace.getPropertyValue("Modules.WebGui.Directories") + directories[#directories + 1] = "screenshots" + directories[#directories + 1] = "${SCREENSHOTS}" + openspace.setPropertyValueSingle("Modules.WebGui.Directories", directories) + openspace.setPropertyValueSingle("Modules.WebGui.ServerProcessEnabled", enabled) end) asset.onDeinitialize(function () - -- TODO: Remove endpoints. As of 2019-10-29, OpenSpace sometimes - -- crashes when endpoints are removed while the application is closing. + -- TODO: Remove endpoints. As of 2019-10-29, OpenSpace sometimes + -- crashes when endpoints are removed while the application is closing. end) diff --git a/data/assets/util/script_scheduler_helper.asset b/data/assets/util/script_scheduler_helper.asset index 4a3727b9b3..e3740daac3 100644 --- a/data/assets/util/script_scheduler_helper.asset +++ b/data/assets/util/script_scheduler_helper.asset @@ -3,21 +3,21 @@ local renderableHelper = asset.require('./renderable_helper') -- Function that schedules scripts setting the enabled property -- of to at time