diff --git a/data/assets/customization/globebrowsing.asset b/data/assets/customization/globebrowsing.asset index 726ac0bce9..ad68200b26 100644 --- a/data/assets/customization/globebrowsing.asset +++ b/data/assets/customization/globebrowsing.asset @@ -1,10 +1,9 @@ -- Add require statements for assets exporting the neccessary globes --- example: +-- here we add Mars, Moon and Mercury: asset.require('../scene/solarsystem/planets/mars/mars') asset.require('../scene/solarsystem/planets/earth/moon/moon') asset.require('../scene/solarsystem/planets/mercury/mercury') - local CreateFocusNodes = false -- Add folders to this list that contain .info files describing patches @@ -21,8 +20,17 @@ local vrt_folders = { -- 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 + '', + + -- Our provided HiRISE layer + openspace.absPath('${ASSETS}/scene/solarsystem/planets/mars/map_service_configs/ESRI/'), + -- 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 = { diff --git a/data/assets/insight.scene b/data/assets/insight.scene new file mode 100644 index 0000000000..ebe225b849 --- /dev/null +++ b/data/assets/insight.scene @@ -0,0 +1,82 @@ +asset.require('./base') + +local sceneHelper = asset.require('util/scene_helper') + +-- Keybindings that are specific for this scene +local Keybindings = { + { + Key = "i", + 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);" .. + "openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.ColorLayers.insight_ctx.Enabled', true);" .. + "openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.HeightLayers.OnMarsHiRISELS.Enabled', true);" .. + "openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.ColorLayers.insight_ctx.Settings.Gamma', 3.098590);" .. + "openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.ColorLayers.insight_ctx.Settings.Multiplier', 3.568080);" .. + "openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.ColorLayers.MOC_WA_Color_Utah.Settings.Multiplier', 2.816900);" .. + "openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.ColorLayers.OnMarsHiRISELS.Settings.Gamma', 0.938970);" .. + "openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.ColorLayers.MOC_WA_Color_Utah.Settings.Gamma', 2.394370);" .. + "openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.ColorLayers.OnMarsHiRISELS.Enabled', true);", + Documentation = "Setup Insight landing layers", + Local = false + }, + { + Key = "SHIFT+i", + Command = "openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.HeightLayers.Mola_Utah.Settings.Offset', 0);" .. + "openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.HeightLayers.OnMarsHiRISELS.Settings.Offset', 0);" .. + "openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.ColorLayers.insight_ctx.Enabled', false);" .. + "openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.HeightLayers.OnMarsHiRISELS.Enabled', false);" .. + "openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.ColorLayers.OnMarsHiRISELS.Enabled', false);", + "openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.ColorLayers.insight_ctx.Settings.Gamma', 1.0);" .. + "openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.ColorLayers.insight_ctx.Settings.Multiplier', 1.0);" .. + "openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.ColorLayers.MOC_WA_Color_Utah.Settings.Multiplier', 1.0);" .. + "openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.ColorLayers.OnMarsHiRISELS.Settings.Gamma', 1.0);" .. + "openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.ColorLayers.MOC_WA_Color_Utah.Settings.Gamma', 1.0);"; + Documentation = "Undo Insight landing layers setup", + Local = false + } +} + +local insightAsset = asset.require('scene/solarsystem/missions/insight/edl') + +asset.onInitialize(function () + openspace.time.setTime("2018 NOV 26 19:39:03.68") + + sceneHelper.bindKeys(Keybindings) + + 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); + openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.HeightLayers.OnMarsHiRISELS.Enabled', true); + -- openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.ColorLayers.insight_ctx.Enabled', true); + -- openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.ColorLayers.insight_ctx.Settings.Gamma', 3.098590); + -- openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.ColorLayers.insight_ctx.Settings.Multiplier', 3.568080); + openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.ColorLayers.MOC_WA_Color_Utah.Settings.Multiplier', 2.81690); + openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.ColorLayers.OnMarsHiRISELS.Settings.Gamma', 0.938970); + openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.ColorLayers.MOC_WA_Color_Utah.Settings.Gamma', 2.394370); + openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.ColorLayers.OnMarsHiRISELS.Enabled', true); + + openspace.markInterestingNodes({ "Insight" }) + + openspace.navigation.setCameraState({ + Anchor = insightAsset.Insight.Identifier, + Position = { 0, 0, 0 }, + Rotation = { 0.758797, 0.221490, -0.605693, -0.091135 }, + }) + +end) + +asset.onDeinitialize(function () + sceneHelper.unbindKeys(Keybindings) + + openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.HeightLayers.Mola_Utah.Settings.Offset', 0); + openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.HeightLayers.OnMarsHiRISELS.Settings.Offset', 0); + openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.HeightLayers.OnMarsHiRISELS.Enabled', false); + -- openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.ColorLayers.insight_ctx.Enabled', false); + -- openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.ColorLayers.insight_ctx.Settings.Gamma', 1.0); + -- openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.ColorLayers.insight_ctx.Settings.Multiplier', 1.0); + openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.ColorLayers.MOC_WA_Color_Utah.Settings.Multiplier', 1.0); + openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.ColorLayers.OnMarsHiRISELS.Settings.Gamma', 1.0); + openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.ColorLayers.MOC_WA_Color_Utah.Settings.Gamma', 1.0); + openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.ColorLayers.OnMarsHiRISELS.Enabled', false); + + openspace.removeInterestingNodes({ "Insight" }) +end) diff --git a/data/assets/scene/solarsystem/missions/insight/edl.asset b/data/assets/scene/solarsystem/missions/insight/edl.asset new file mode 100644 index 0000000000..5ede98786a --- /dev/null +++ b/data/assets/scene/solarsystem/missions/insight/edl.asset @@ -0,0 +1,981 @@ +asset.require('spice/base') +local sunTransforms = asset.require('scene/solarsystem/sun/transforms') +local assetHelper = asset.require('util/asset_helper') + +local models_chutes = asset.syncedResource({ + Name = "Insight Models Chutes", + Type = "HttpSynchronization", + Identifier = "insight_models_chutes", + Version = 1 +}) + +local models_cruise_arrays = asset.syncedResource({ + Name = "Insight Models Cruise Arrays", + Type = "HttpSynchronization", + Identifier = "insight_models_cruise_arrays", + Version = 1 +}) + +local models_cruise_cone = asset.syncedResource({ + Name = "Insight Models Cruise Cone", + Type = "HttpSynchronization", + Identifier = "insight_models_cruise_cone", + Version = 1 +}) + +local models_lander_lander_deck = asset.syncedResource({ + Name = "Insight Models Lander Deck", + Type = "HttpSynchronization", + Identifier = "insight_models_lander_lander_deck", + Version = 1 +}) + +local models_lander_legs_deploy = asset.syncedResource({ + Name = "Insight Models Lander Legs Deploy", + Type = "HttpSynchronization", + Identifier = "insight_models_lander_legs_deploy", + Version = 1 +}) + +local models_lander_legs_stow = asset.syncedResource({ + Name = "Insight Models Lander Legs Stow", + Type = "HttpSynchronization", + Identifier = "insight_models_lander_legs_stow", + Version = 1 +}) + +local models_lander_panels_deploy = asset.syncedResource({ + Name = "Insight Models Lander Panels Deploy", + Type = "HttpSynchronization", + Identifier = "insight_models_lander_panels_deploy", + Version = 1 +}) + +local models_lander_panels_stow = asset.syncedResource({ + Name = "Insight Models Lander Panels Stow", + Type = "HttpSynchronization", + Identifier = "insight_models_lander_panels_stow", + Version = 1 +}) + + + + +local ikernels = asset.syncedResource({ + 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', +} + +local RotationMatrix = { + -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 + } +} + +--expected timeline +local entryTimeStart = "2018 NOV 26 19:39:03.68"; --(-00:08:07.32 less then pdf) +local parachuteDeployTime1 = "2018 NOV 26 19:42:41.68" -- entry + 218s +local parachuteDeployTime20 = "2018 NOV 26 19:42:42.18" -- entry + 218.5s +local parachuteDeployTime40 = "2018 NOV 26 19:42:42.68" -- entry + 219s +local heatShieldSeperationTime = "2018 NOV 26 19:42:56.68" -- entry + 233s +local legDeployTime = "2018 NOV 26 19:43:06.68" -- entry + 243s +local landerSeperationTime = "2018 NOV 26 19:44:51.68" -- entry + 348s +local touchdownTime = "2018 NOV 26 19:45:32.68" -- entry + 389s +local panelDeployTime = "2018 NOV 26 19:45:33.68" -- entry + 390s +local foreverTime = "2018 NOV 26 20:17:50.68" -- entry + 2327s + +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" + }, + }, + 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" + } +} + +local Insight_Entry_CapsuleA = { + Identifier = "Insight_Entry_CapsuleA", + Parent = Insight.Identifier, + Renderable = { + Type = "RenderableModel", + Geometry = { + Type = "MultiModelGeometry", + GeometryFile = models_cruise_cone .. "/cruise_insight_doubleside2_newcapsule_diffuse.obj" + }, + ColorTexture = models_cruise_cone .. "/insight_newcapsule_diffuse.jpg", + 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", + Geometry = { + Type = "MultiModelGeometry", + GeometryFile = models_cruise_cone .. "/insight_cruise_cone_ring_foil_gold.obj" + }, + ColorTexture = models_cruise_cone .. "/foil_gold_ramp.png", + 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", + Geometry = { + Type = "MultiModelGeometry", + GeometryFile = models_cruise_cone .. "/insight_cruise_cone_capsule_diffuse.obj" + }, + ColorTexture = models_cruise_cone .. "/insight_capsule_diffuse.png", + 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", + Geometry = { + Type = "MultiModelGeometry", + GeometryFile = models_cruise_cone .. "/insight_cruise_heatshield_foil_gold.obj" + }, + ColorTexture = models_cruise_cone .. "/foil_gold_ramp.png", + 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", + Geometry = { + Type = "MultiModelGeometry", + GeometryFile = models_chutes .. "/insight_chute_frame01_diff1.obj" + }, + ColorTexture = models_chutes .. "/chute_diff.png", + 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", + Geometry = { + Type = "MultiModelGeometry", + GeometryFile = models_chutes .. "/insight_chute_frame01_cords1.obj" + }, + ColorTexture = models_chutes .. "/foil_gold_ramp.png", + 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", + Geometry = { + Type = "MultiModelGeometry", + GeometryFile = models_chutes .. "/insight_chute_frame20_diff1.obj" + }, + ColorTexture = models_chutes .. "/chute_diff.png", + 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", + Geometry = { + Type = "MultiModelGeometry", + GeometryFile = models_chutes .. "/insight_chute_frame20_cords1.obj" + }, + ColorTexture = models_chutes .. "/foil_gold_ramp.png", + 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", + Geometry = { + Type = "MultiModelGeometry", + GeometryFile = models_chutes .. "/chute_doubleside_frame40_diff.obj" + }, + ColorTexture = models_chutes .. "/chute_diff.png", + 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", + Geometry = { + Type = "MultiModelGeometry", + GeometryFile = models_chutes .. "/insight_chute_frame40_cords1.obj" + }, + ColorTexture = models_chutes .. "/foil_gold_ramp.png", + 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", + Geometry = { + Type = "MultiModelGeometry", + GeometryFile = models_lander_lander_deck .. "/insight_lander_deck_AO01.obj" + }, + ColorTexture = models_lander_lander_deck .. "/InSIGHT_AO_01.jpg", + 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", + Geometry = { + Type = "MultiModelGeometry", + GeometryFile = models_lander_lander_deck .. "/insight_lander_deck_AO02.obj" + }, + ColorTexture = models_lander_lander_deck .. "/InSIGHT_AO_02.jpg", + 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", + Geometry = { + Type = "MultiModelGeometry", + GeometryFile = models_lander_lander_deck .. "/insight_lander_deck_AO03.obj" + }, + ColorTexture = models_lander_lander_deck .. "/InSIGHT_AO_03.jpg", + 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", + Geometry = { + Type = "MultiModelGeometry", + GeometryFile = models_lander_lander_deck .. "/insight_lander_deck_AO04.obj" + }, + ColorTexture = models_lander_lander_deck .. "/InSIGHT_AO_04.jpg", + 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", + Geometry = { + Type = "MultiModelGeometry", + GeometryFile = models_lander_lander_deck .. "/insight_lander_deck_AO05.obj" + }, + ColorTexture = models_lander_lander_deck .. "/InSIGHT_AO_05.jpg", + 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", + Geometry = { + Type = "MultiModelGeometry", + GeometryFile = models_lander_lander_deck .. "/insight_lander_deck_AO06.obj" + }, + ColorTexture = models_lander_lander_deck .. "/InSIGHT_AO_06.jpg", + 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", + Geometry = { + Type = "MultiModelGeometry", + GeometryFile = models_lander_lander_deck .. "/insight_lander_deck_AO07.obj" + }, + ColorTexture = models_lander_lander_deck .. "/InSIGHT_AO_07.jpg", + 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", + Geometry = { + Type = "MultiModelGeometry", + GeometryFile = models_lander_lander_deck .. "/insight_lander_deck_AO08.obj" + }, + ColorTexture = models_lander_lander_deck .. "/InSIGHT_AO_08.jpg", + 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", + Geometry = { + Type = "MultiModelGeometry", + GeometryFile = models_lander_lander_deck .. "/insight_lander_deck_foil1.obj" + }, + ColorTexture = models_lander_lander_deck .. "/foil_silver_ramp.jpg", + 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", + Geometry = { + Type = "MultiModelGeometry", + GeometryFile = models_lander_lander_deck .. "/insight_lander_deck_tex01.obj" + }, + ColorTexture = models_lander_lander_deck .. "/InSIGHT_tex_01.jpg", + 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", + Geometry = { + Type = "MultiModelGeometry", + GeometryFile = models_lander_lander_deck .. "/insight_lander_deck_tex02.obj" + }, + ColorTexture = models_lander_lander_deck .. "/InSIGHT_tex_02.jpg", + 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", + Geometry = { + Type = "MultiModelGeometry", + GeometryFile = models_lander_legs_stow .. "/insight_lander_legs_stow_tex01.obj" + }, + ColorTexture = models_lander_legs_stow .. "/InSIGHT_tex_01.jpg", + 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", + Geometry = { + Type = "MultiModelGeometry", + GeometryFile = models_lander_legs_stow .. "/insight_lander_legs_stow_AO06.obj" + }, + ColorTexture = models_lander_legs_stow .. "/InSIGHT_AO_06.jpg", + 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", + Geometry = { + Type = "MultiModelGeometry", + GeometryFile = models_lander_legs_deploy .. "/insight_lander_legs_deploy_tex01.obj" + }, + ColorTexture = models_lander_legs_deploy .. "/InSIGHT_tex_01.jpg", + 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", + Geometry = { + Type = "MultiModelGeometry", + GeometryFile = models_lander_legs_deploy .. "/insight_lander_legs_deploy_AO06.obj" + }, + ColorTexture = models_lander_legs_deploy .. "/InSIGHT_AO_06.jpg", + 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", + Geometry = { + Type = "MultiModelGeometry", + GeometryFile = models_lander_panels_stow .. "/insight_lander_panels_stow_tex01.obj" + }, + ColorTexture = models_lander_panels_stow .. "/InSIGHT_tex_01.jpg", + 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", + Geometry = { + Type = "MultiModelGeometry", + GeometryFile = models_lander_panels_stow .. "/insight_lander_panels_stow_tex02.obj" + }, + ColorTexture = models_lander_panels_stow .. "/InSIGHT_tex_02.jpg", + 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", + Geometry = { + Type = "MultiModelGeometry", + GeometryFile = models_lander_panels_stow .. "/insight_lander_panels_stow_AO01.obj" + }, + ColorTexture = models_lander_panels_stow .. "/InSIGHT_AO_01.jpg", + 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", + Geometry = { + Type = "MultiModelGeometry", + GeometryFile = models_lander_panels_deploy .. "/insight_lander_panels_deploy_tex01.obj" + }, + ColorTexture = models_lander_panels_deploy .. "/InSIGHT_tex_01.jpg", + 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", + Geometry = { + Type = "MultiModelGeometry", + GeometryFile = models_lander_panels_deploy .. "/insight_lander_panels_deploy_tex02.obj" + }, + ColorTexture = models_lander_panels_deploy .. "/InSIGHT_tex_02.jpg", + 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", + Geometry = { + Type = "MultiModelGeometry", + GeometryFile = models_lander_panels_deploy .. "/insight_lander_panels_deploy_AO01.obj" + }, + ColorTexture = models_lander_panels_deploy .. "/InSIGHT_AO_01.jpg", + 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 + }, + 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 +}) diff --git a/data/assets/scene/solarsystem/planets/mars/map_service_configs/AWS/CTX.wms b/data/assets/scene/solarsystem/planets/mars/map_service_configs/AWS/CTX.wms deleted file mode 100644 index 148dc55d16..0000000000 --- a/data/assets/scene/solarsystem/planets/mars/map_service_configs/AWS/CTX.wms +++ /dev/null @@ -1,18 +0,0 @@ - - - http://planetarydev-1803629091.us-west-2.elb.amazonaws.com/Mars/CTX/tile/${z}/${y}/${x} - - - -180.0 90.0 - 180.0 -90.0 - 4194304 2097152 - 12 top - - GEOGCS["GCS_Mars_2000_Sphere",DATUM["D_Mars_2000_Sphere",SPHEROID["Mars_2000_Sphere_IAU_IAG",3396190.0,0.0]],PRIMEM["Reference_Meridian",0.0],UNIT["Degree",0.0174532925199433]] - 512 512 - 2 - 5 - 400,204,404 - true - 5 - diff --git a/data/assets/scene/solarsystem/planets/mars/map_service_configs/AWS/Mdim.wms b/data/assets/scene/solarsystem/planets/mars/map_service_configs/AWS/Mdim.wms deleted file mode 100644 index 350934bdc7..0000000000 --- a/data/assets/scene/solarsystem/planets/mars/map_service_configs/AWS/Mdim.wms +++ /dev/null @@ -1,23 +0,0 @@ - - - http://planetarydev-1803629091.us-west-2.elb.amazonaws.com/Mars/Mdim/tile/${z}/${y}/${x} - - - -180.0 - 90.0 - 180.0 - -90.0 - 92160 - 46080 - 7 - top - - GEOGCS["GCS_Mars_2000_Sphere",DATUM["D_Mars_2000_Sphere",SPHEROID["Mars_2000_Sphere_IAU_IAG",3396190.0,0.0]],PRIMEM["Reference_Meridian",0.0],UNIT["Degree",0.0174532925199433]] - 360 - 360 - 3 - 10 - 400,204,404 - true - 5 - diff --git a/data/assets/scene/solarsystem/planets/mars/map_service_configs/AWS/Mola_Elevation.wms b/data/assets/scene/solarsystem/planets/mars/map_service_configs/AWS/Mola_Elevation.wms deleted file mode 100644 index 75f50e4234..0000000000 --- a/data/assets/scene/solarsystem/planets/mars/map_service_configs/AWS/Mola_Elevation.wms +++ /dev/null @@ -1,24 +0,0 @@ - - - http://planetarydev-1803629091.us-west-2.elb.amazonaws.com/Mars/MolaElevation/tile/${z}/${y}/${x} - - - -180.0 - 90.0 - 180.0 - -90.0 - 46080 - 23040 - 6 - top - - GEOGCS["GCS_Mars_2000_Sphere",DATUM["D_Mars_2000_Sphere",SPHEROID["Mars_2000_Sphere_IAU_IAG",3396190.0,0.0]],PRIMEM["Reference_Meridian",0.0],UNIT["Degree",0.0174532925199433]] - 360 - 360 - 1 - Int16 - 10 - 400,204,404 - true - 5 - diff --git a/data/assets/scene/solarsystem/planets/mars/map_service_configs/AWS/Mola_PseudoColor.wms b/data/assets/scene/solarsystem/planets/mars/map_service_configs/AWS/Mola_PseudoColor.wms deleted file mode 100644 index a72a5b8fd3..0000000000 --- a/data/assets/scene/solarsystem/planets/mars/map_service_configs/AWS/Mola_PseudoColor.wms +++ /dev/null @@ -1,23 +0,0 @@ - - - http://planetarydev-1803629091.us-west-2.elb.amazonaws.com/Mars/MolaPseudoColor/tile/${z}/${y}/${x} - - - -180.0 - 90.0 - 180.0 - -90.0 - 46080 - 23040 - 6 - top - - GEOGCS["GCS_Mars_2000_Sphere",DATUM["D_Mars_2000_Sphere",SPHEROID["Mars_2000_Sphere_IAU_IAG",3396190.0,0.0]],PRIMEM["Reference_Meridian",0.0],UNIT["Degree",0.0174532925199433]] - 360 - 360 - 3 - 10 - 400,204,404 - true - 5 - diff --git a/data/assets/scene/solarsystem/planets/mars/map_service_configs/AWS/Themis_IR_Day.wms b/data/assets/scene/solarsystem/planets/mars/map_service_configs/AWS/Themis_IR_Day.wms deleted file mode 100644 index bb8c28f2ce..0000000000 --- a/data/assets/scene/solarsystem/planets/mars/map_service_configs/AWS/Themis_IR_Day.wms +++ /dev/null @@ -1,23 +0,0 @@ - - - http://planetarydev-1803629091.us-west-2.elb.amazonaws.com/Mars/ThemisIRDay/tile/${z}/${y}/${x} - - - -180.0 - 90.0 - 180.0 - -90.0 - 213390 - 106695 - 9 - top - - GEOGCS["GCS_Mars_2000_Sphere",DATUM["D_Mars_2000_Sphere",SPHEROID["Mars_2000_Sphere_IAU_IAG",3396190.0,0.0]],PRIMEM["Reference_Meridian",0.0],UNIT["Degree",0.0174532925199433]] - 256 - 256 - 1 - 10 - 400,204,404 - true - 5 - diff --git a/data/assets/scene/solarsystem/planets/mars/map_service_configs/AWS/Themis_IR_Night.wms b/data/assets/scene/solarsystem/planets/mars/map_service_configs/AWS/Themis_IR_Night.wms deleted file mode 100644 index e6e249f089..0000000000 --- a/data/assets/scene/solarsystem/planets/mars/map_service_configs/AWS/Themis_IR_Night.wms +++ /dev/null @@ -1,23 +0,0 @@ - - - http://planetarydev-1803629091.us-west-2.elb.amazonaws.com/Mars/ThemisIRNight/tile/${z}/${y}/${x} - - - -180.0 - 90.0 - 180.0 - -90.0 - 213388 - 71130 - 9 - top - - GEOGCS["GCS_Mars_2000_Sphere",DATUM["D_Mars_2000_Sphere",SPHEROID["Mars_2000_Sphere_IAU_IAG",3396190.0,0.0]],PRIMEM["Reference_Meridian",0.0],UNIT["Degree",0.0174532925199433]] - 256 - 256 - 1 - 10 - 400,204,404 - true - 5 - diff --git a/data/assets/scene/solarsystem/planets/mars/map_service_configs/ESRI/HiRISELS.tif b/data/assets/scene/solarsystem/planets/mars/map_service_configs/ESRI/HiRISELS.tif new file mode 100644 index 0000000000..3e8c92cd05 --- /dev/null +++ b/data/assets/scene/solarsystem/planets/mars/map_service_configs/ESRI/HiRISELS.tif @@ -0,0 +1,18 @@ + + + http://astro.arcgis.com/arcgis/rest/services/OnMars/HiRISELS/base/MapServer/tile/${z}/${y}/${x} + + + -180 90 + 180 -90 + 83886080 41943040 + 17 top + + GEOGCS["GCS_Mars_2000_Sphere",DATUM["D_Mars_2000_Sphere",SPHEROID["Mars_2000_Sphere_IAU_IAG",3396190.0,0.0]],PRIMEM["Reference_Meridian",0.0],UNIT["Degree",0.0174532925199433]] + 512 + 512 + 1 + 5 + + 404,400 + diff --git a/data/assets/scene/solarsystem/planets/mars/map_service_configs/ESRI/HiRISELS.vrt b/data/assets/scene/solarsystem/planets/mars/map_service_configs/ESRI/HiRISELS.vrt new file mode 100644 index 0000000000..40a9f2d8c6 --- /dev/null +++ b/data/assets/scene/solarsystem/planets/mars/map_service_configs/ESRI/HiRISELS.vrt @@ -0,0 +1,29 @@ + + GEOGCS["GCS_Mars_2000_Sphere",DATUM["D_Mars_2000_Sphere",SPHEROID["Mars_2000_Sphere_IAU_IAG",3396190.0,0.0]],PRIMEM["Reference_Meridian",0.0],UNIT["Degree",0.0174532925199433]] + -1.8000000000000000e+02, 4.2915344238281250e-06, 0.0000000000000000e+00, 9.0000000000000000e+01, 0.0000000000000000e+00, -4.2915344238281250e-06 + + 0 + Gray + + HiRISELS.tif + 1 + + + + 0 + + + + Alpha + 0 + + HiRISELS.tif + 1 + + + + 255 + 0 + + + diff --git a/data/assets/scene/solarsystem/planets/mars/map_service_configs/ESRI/HiRISE_DEM.tif b/data/assets/scene/solarsystem/planets/mars/map_service_configs/ESRI/HiRISE_DEM.tif new file mode 100644 index 0000000000..f557be2ac1 --- /dev/null +++ b/data/assets/scene/solarsystem/planets/mars/map_service_configs/ESRI/HiRISE_DEM.tif @@ -0,0 +1,17 @@ + + + http://astro.arcgis.com/arcgis/rest/services/OnMars/HiRISE_DEM/ImageServer/tile/${z}/${y}/${x} + + + -180 90 + 180 -90 + 20971520 10485760 + 15 top + + GEOGCS["GCS_Mars_2000_Sphere",DATUM["D_Mars_2000_Sphere",SPHEROID["Mars_2000_Sphere_IAU_IAG",3396190,0]],PRIMEM["Reference_Meridian",0],UNIT["Degree",0.0174532925199433]] + 512 512 + 1 Int16 + + 5 + 404,400 + diff --git a/data/assets/scene/solarsystem/planets/mars/map_service_configs/ESRI/HiRISE_DEM.wms b/data/assets/scene/solarsystem/planets/mars/map_service_configs/ESRI/HiRISE_DEM.wms new file mode 100644 index 0000000000..bedcb068e0 --- /dev/null +++ b/data/assets/scene/solarsystem/planets/mars/map_service_configs/ESRI/HiRISE_DEM.wms @@ -0,0 +1,17 @@ + + + http://astro.arcgis.com/arcgis/rest/services/OnMars/HiRISE_DEM/ImageServer/tile/${z}/${y}/${x} + + + -180 90 + 180 -90 + 20971520 10485760 + 15 top + + GEOGCS["GCS_Mars_2000_Sphere",DATUM["D_Mars_2000_Sphere",SPHEROID["Mars_2000_Sphere_IAU_IAG",3396190,0]],PRIMEM["Reference_Meridian",0],UNIT["Degree",0.0174532925199433]] + 512 512 + 1 Int16 + + 5 + 404,400 + diff --git a/data/assets/scene/solarsystem/planets/mars/map_service_configs/ESRI/OnMarsHiRISE.info b/data/assets/scene/solarsystem/planets/mars/map_service_configs/ESRI/OnMarsHiRISE.info new file mode 100644 index 0000000000..04aa1e0926 --- /dev/null +++ b/data/assets/scene/solarsystem/planets/mars/map_service_configs/ESRI/OnMarsHiRISE.info @@ -0,0 +1,5 @@ +Name="HiRISE Local Set" +Identifier="OnMarsHiRISELS" +Description="HiRISE Stereo Pairs" +ColorFile="HiRISELS.vrt" +HeightFile="HiRISE_DEM.wms" \ No newline at end of file diff --git a/data/assets/scene/solarsystem/planets/mars/mars.asset b/data/assets/scene/solarsystem/planets/mars/mars.asset index 0325b61df2..10eecc74f7 100644 --- a/data/assets/scene/solarsystem/planets/mars/mars.asset +++ b/data/assets/scene/solarsystem/planets/mars/mars.asset @@ -49,11 +49,6 @@ local color_layers = { Name = "Viking MDIM [Sweden]", FilePath = mapServiceConfigs .. "/LiU/MDIM.wms" }, - { - Identifier = "Viking_MDIM_AWS", - Name = "Viking MDIM [AWS]", - FilePath = mapServiceConfigs .. "/AWS/Mdim.wms" - }, { Identifier = "MOLA_Pseudo_Color_Utah", Name = "MOLA Pseudo Color [Utah]", @@ -64,11 +59,6 @@ local color_layers = { Name = "MOLA Pseudo Color [Sweden]", FilePath = mapServiceConfigs .. "/LiU/Mola_PseudoColor.wms" }, - { - Identifier = "MOLA_Pseudo_Color_AWS", - Name = "MOLA Pseudo Color [AWS]", - FilePath = mapServiceConfigs .. "/AWS/Mola_PseudoColor.wms" - }, { Identifier = "MOLA_HRSC_Utah", Name = "MOLA HRSC [Utah]", @@ -91,12 +81,6 @@ local color_layers = { FilePath = mapServiceConfigs .. "/LiU/Themis_IR_Day.wms", BlendMode = "Color" }, - { - Identifier = "Themis_IR_Day_AWS", - Name = "Themis IR Day [AWS]", - FilePath = mapServiceConfigs .. "/AWS/Themis_IR_Day.wms", - BlendMode = "Color" - }, { Identifier = "Themis_IR_Night_Utah", Name = "Themis IR Night [Utah]", @@ -109,12 +93,6 @@ local color_layers = { FilePath = mapServiceConfigs .. "/LiU/Themis_IR_Night.wms", BlendMode = "Color" }, - { - Identifier = "Themis_IR_Night_AWS", - Name = "Themis IR Night [AWS]", - FilePath = mapServiceConfigs .. "/AWS/Themis_IR_Night.wms", - BlendMode = "Color" - }, { Identifier = "CTX_Mosaic_Utah", Name = "CTX Mosaic [Utah]", @@ -126,12 +104,6 @@ local color_layers = { Name = "CTX Mosaic [Sweden]", FilePath = mapServiceConfigs .. "/LiU/CTX.wms", BlendMode = "Color" - }, - { - Identifier = "CTX_Mosaic_AWS", - Name = "CTX Mosaic [AWS]", - FilePath = mapServiceConfigs .. "/AWS/CTX.wms", - BlendMode = "Color" } } @@ -167,12 +139,6 @@ local height_layers = { FilePath = mapServiceConfigs .. "/Utah/Mola_Elevation.wms", Enabled = true, TilePixelSize = 90 - }, - { - Identifier = "Mola_AWS", - Name = "Mola Elevation [AWS]", - FilePath = mapServiceConfigs .. "/AWS/Mola_Elevation.wms", - TilePixelSize = 90 } } @@ -206,6 +172,4 @@ local Mars = { } } - - assetHelper.registerSceneGraphNodesAndExport(asset, { Mars }) diff --git a/data/assets/scene/solarsystem/planets/mercury/map_service_configs/AWS/MessengerMdis.wms b/data/assets/scene/solarsystem/planets/mercury/map_service_configs/AWS/MessengerMdis.wms deleted file mode 100644 index ff78793136..0000000000 --- a/data/assets/scene/solarsystem/planets/mercury/map_service_configs/AWS/MessengerMdis.wms +++ /dev/null @@ -1,21 +0,0 @@ - - - http://planetarydev-1803629091.us-west-2.elb.amazonaws.com/Mercury/MessengerMdis/tile/${z}/${y}/${x} - - - -180.0 - 90.0 - 180.0 - -90.0 - 61324 - 30662 - 7 - top - - GEOGCS["GCS_Mercury_2015",DATUM["D_Mercury_2015",SPHEROID["Mercury_2015",2439400.0,0.0]],PRIMEM["Reference_Meridian",0.0],UNIT["Degree",0.0174532925199433]] - 256 - 256 - 1 - 10 - 5 - diff --git a/data/assets/scene/solarsystem/planets/mercury/map_service_configs/AWS/MessengerMosaic.wms b/data/assets/scene/solarsystem/planets/mercury/map_service_configs/AWS/MessengerMosaic.wms deleted file mode 100644 index 15c7e11d5f..0000000000 --- a/data/assets/scene/solarsystem/planets/mercury/map_service_configs/AWS/MessengerMosaic.wms +++ /dev/null @@ -1,21 +0,0 @@ - - - http://planetarydev-1803629091.us-west-2.elb.amazonaws.com/Mercury/MessengerMosaic/tile/${z}/${y}/${x} - - - -180.0 - 90.0 - 180.0 - -90.0 - 23054 - 11527 - 6 - top - - GEOGCS["GCS_Mercury_2015",DATUM["D_Mercury_2015",SPHEROID["Mercury_2015",2439400.0,0.0]],PRIMEM["Reference_Meridian",0.0],UNIT["Degree",0.0174532925199433]] - 256 - 256 - 3 - 10 - 5 - diff --git a/data/assets/scene/solarsystem/planets/mercury/mercury.asset b/data/assets/scene/solarsystem/planets/mercury/mercury.asset index 35e332c368..b5f60b4e93 100644 --- a/data/assets/scene/solarsystem/planets/mercury/mercury.asset +++ b/data/assets/scene/solarsystem/planets/mercury/mercury.asset @@ -28,11 +28,6 @@ local color_layers = { Name = "Messenger MDIS [Sweden]", FilePath = mapServiceConfigs .. "/LiU/Messenger_MDIS.wms", }, - { - Identifier = "Messenger_MDIS_AWS", - Name = "Messenger MDIS [AWS]", - FilePath = mapServiceConfigs .. "/AWS/MessengerMdis.wms" - }, --mossaic { Identifier = "Messenger_Mosaic_Utah", @@ -44,11 +39,6 @@ local color_layers = { Name = "Messenger Mosaic [Sweden]", FilePath = mapServiceConfigs .. "/LiU/Messenger_Mosaic.wms" }, - { - Identifier = "Messenger_Mosaic_AWS", - Name = "Messenger Mosaic [AWS]", - FilePath = mapServiceConfigs .. "/AWS/MessengerMosaic.wms" - }, --bdr { Identifier = "Messenger_BDR_Utah", diff --git a/modules/sync/syncs/httpsynchronization.cpp b/modules/sync/syncs/httpsynchronization.cpp index 0149d5a280..a924f1e053 100644 --- a/modules/sync/syncs/httpsynchronization.cpp +++ b/modules/sync/syncs/httpsynchronization.cpp @@ -228,9 +228,7 @@ bool HttpSynchronization::trySyncFromUrl(std::string listUrl) { filename + TempSuffix; if (sizeData.find(line) != sizeData.end()) { - LWARNING(fmt::format( - "{}: Duplicate entries: {}", _identifier, line - )); + LWARNING(fmt::format("{}: Duplicate entries: {}", _identifier, line)); continue; } @@ -242,11 +240,7 @@ bool HttpSynchronization::trySyncFromUrl(std::string listUrl) { std::unique_ptr& fileDownload = downloads.back(); - sizeData[line] = { - false, - 0, - 0, - }; + sizeData[line] = { false, 0, 0 }; fileDownload->onProgress( [this, line, &sizeData, &sizeDataMutex, @@ -258,11 +252,7 @@ bool HttpSynchronization::trySyncFromUrl(std::string listUrl) { std::lock_guard guard(sizeDataMutex); - sizeData[line] = { - p.totalBytesKnown, - p.totalBytes, - p.downloadedBytes, - }; + sizeData[line] = { p.totalBytesKnown, p.totalBytes, p.downloadedBytes }; SizeData size = std::accumulate( sizeData.begin(), @@ -312,9 +302,7 @@ bool HttpSynchronization::trySyncFromUrl(std::string listUrl) { } } else { - LERROR(fmt::format( - "Error downloading file from URL {}", d->url() - )); + LERROR(fmt::format("Error downloading file from URL {}", d->url())); failed = true; } } diff --git a/openspace.cfg b/openspace.cfg index abdb43b9e8..7d8fb12c6d 100644 --- a/openspace.cfg +++ b/openspace.cfg @@ -46,6 +46,7 @@ Asset = "default" -- Asset = "gaia" -- Asset = "juno" -- Asset = "messenger" +-- Asset = "insight" -- These scripts are executed after the initialization of each scene, thus making -- it possible to have global overrides to default values or execute other scripts