From 4a45cbd66e26b6f2bc9588a0c932f07af67b65cd Mon Sep 17 00:00:00 2001 From: Gene Payne Date: Mon, 31 May 2021 19:44:12 -0600 Subject: [PATCH] Feature/orex2021 (#1623) * updating files for orex return * Changes to osirisrex assets to bring mission events up to date * Removed accidental duplicate line from merge * Enable low-res Bennu model by default * Modify osirisrex asset to only include the low-res BennuProjection asteroid model * Adapt version numbers, change to 2-space indentation Co-authored-by: Micah Co-authored-by: Alexander Bock --- .../missions/osirisrex/bennu.asset | 62 +----- .../missions/osirisrex/bennu_projection.asset | 104 ++++++++++ .../missions/osirisrex/imageplane.asset | 43 ++++ .../missions/osirisrex/kernels.asset | 91 ++++++++ .../missions/osirisrex/model.asset | 195 ++---------------- .../missions/osirisrex/models.asset | 8 + .../missions/osirisrex/osirisrex.asset | 2 +- data/profiles/osirisrex.profile | 3 +- 8 files changed, 276 insertions(+), 232 deletions(-) create mode 100644 data/assets/scene/solarsystem/missions/osirisrex/bennu_projection.asset create mode 100644 data/assets/scene/solarsystem/missions/osirisrex/imageplane.asset create mode 100644 data/assets/scene/solarsystem/missions/osirisrex/kernels.asset create mode 100644 data/assets/scene/solarsystem/missions/osirisrex/models.asset diff --git a/data/assets/scene/solarsystem/missions/osirisrex/bennu.asset b/data/assets/scene/solarsystem/missions/osirisrex/bennu.asset index ea0377a3a9..ba0442a4eb 100644 --- a/data/assets/scene/solarsystem/missions/osirisrex/bennu.asset +++ b/data/assets/scene/solarsystem/missions/osirisrex/bennu.asset @@ -1,17 +1,10 @@ local assetHelper = asset.require('util/asset_helper') 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 -}) +local models = asset.require('./models').models local BENNU_BODY = "2101955" - local Bennu = { Identifier = "Bennu", Parent = transforms.BennuBarycenter.Identifier, @@ -20,56 +13,17 @@ local Bennu = { Type = "SpiceRotation", SourceFrame = "IAU_BENNU", DestinationFrame = "GALACTIC" + }, + Scale = { + Type = "StaticScale", + Scale = 1000.0 } }, Renderable = { - Type = "RenderableModelProjection", + Enabled = false, + Type = "RenderableModel", 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 - } - } + GeometryFile = models .. "/Bennu_v20_200k.stl", }, GUI = { Path = "/Solar System/Asteroid" diff --git a/data/assets/scene/solarsystem/missions/osirisrex/bennu_projection.asset b/data/assets/scene/solarsystem/missions/osirisrex/bennu_projection.asset new file mode 100644 index 0000000000..ae2b0add47 --- /dev/null +++ b/data/assets/scene/solarsystem/missions/osirisrex/bennu_projection.asset @@ -0,0 +1,104 @@ +local assetHelper = asset.require('util/asset_helper') +local transforms = asset.require('./transforms') +local sunTransforms = asset.require('scene/solarsystem/sun/transforms') + +local models = asset.require('./models').models + +local BENNU_BODY = "2101955" + +local images = asset.syncedResource({ + Name = "Bennu Images Approach", + Type = "HttpSynchronization", + Identifier = "osirisrex_bennu_images_approach", + Version = 1 +}) + +local imagesA = asset.syncedResource({ + Name = "Bennu Images A", + Type = "HttpSynchronization", + Identifier = "osirisrex_bennu_images_orbit_a", + Version = 1 +}) + +local BennuProjection = { + Identifier = "BennuProjection", + Parent = transforms.BennuBarycenter.Identifier, + Transform = { + Rotation = { + Type = "SpiceRotation", + SourceFrame = "IAU_BENNU", + DestinationFrame = "GALACTIC" + }, + }, + Renderable = { + Enabled = true, + Type = "RenderableModelProjection", + Body = BENNU_BODY, + GeometryFile = models .. "/BennuTextured.obj", + Projection = { + Sequence = { images, imagesA }, + SequenceType = "image-sequence", + Observer = "OSIRIS-REX", + Target = BENNU_BODY, + Aberration = "NONE", + TextureMap = true, + DataInputTranslation = { + Instruments = { + ORX_OCAMS_POLYCAM = { + DetectorType = "Camera", + Spice = { "ORX_OCAMS_POLYCAM" }, + }, + }, + Target = { + Read = { + "TARGET_NAME", + "INSTRUMENT_HOST_NAME", + "INSTRUMENT_ID", + "START_TIME", + "STOP_TIME" + }, + Convert = { + ["2101955"] = { "2101955" }, + ["OSIRIS-REX"] = { "OSIRIS-REX" }, + ["ORX_OCAMS_POLYCAM"] = { "ORX_OCAMS_POLYCAM" }, + } + } + }, + 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 + }, + GUI = { + Name = "Bennu Trail", + Path = "/Solar System/Asteroid" + } +} + +assetHelper.registerSceneGraphNodesAndExport(asset, { BennuProjection, BennuTrail }) diff --git a/data/assets/scene/solarsystem/missions/osirisrex/imageplane.asset b/data/assets/scene/solarsystem/missions/osirisrex/imageplane.asset new file mode 100644 index 0000000000..bb4f1ffca2 --- /dev/null +++ b/data/assets/scene/solarsystem/missions/osirisrex/imageplane.asset @@ -0,0 +1,43 @@ +local assetHelper = asset.require('util/asset_helper') +local transforms = asset.require('./transforms') + +local textures = asset.syncedResource({ + Name = "Bennu Textures", + Type = "HttpSynchronization", + Identifier = "bennu_textures", + Version = 1 +}) + +local BENNU_BODY = "2101955" + +local ImagePlane = { + Identifier = "ImagePlaneBennu", + Parent = transforms.BennuBarycenter.Identifier, + Transform = { + -- Translation = { + -- Type = "StaticTranslation", + -- Position = { -0.2476, 0.2710, 0.3364 } + -- }, + -- Rotation = { + -- Type = "SpiceRotation", + -- SourceFrame = "ORX_OCAMS_POLYCAM", + -- DestinationFrame = "ORX_SPACECRAFT" + -- } + }, + Renderable = { + Type = "RenderablePlaneProjection", + Frame = "IAU_BENNU", + DefaultTarget = BENNU_BODY, + Spacecraft = "OSIRIS-REX", + Instrument = "ORX_OCAMS_POLYCAM", + Moving = false, + Texture = textures .. "/defaultProj.png" + }, + GUI = { + Name = "OsirisREx Image Plane", + Path = "/Solar System/Missions/OSIRIS REx" + } +} + + +assetHelper.registerSceneGraphNodesAndExport(asset, { ImagePlane }) diff --git a/data/assets/scene/solarsystem/missions/osirisrex/kernels.asset b/data/assets/scene/solarsystem/missions/osirisrex/kernels.asset new file mode 100644 index 0000000000..85e56d5fa1 --- /dev/null +++ b/data/assets/scene/solarsystem/missions/osirisrex/kernels.asset @@ -0,0 +1,91 @@ +local kernels = asset.syncedResource({ + Name = "Osiris Rex Kernels", + Type = "HttpSynchronization", + Identifier = "osirisrex_kernels", + Version = 2 +}) + +local OsirisRexKernels = { + kernels .. "/orx_v14.tf", + kernels .. "/orx_ocams_v07.ti", + kernels .. "/orx_rexis_v01.ti", + kernels .. "/ORX_SCLKSCET.00061.tsc", + kernels .. "/bennu_v17.tpc", + kernels .. "/orx_struct_v04.bsp", + kernels .. "/orx_sa_red_200106_v02.bc", + kernels .. "/orx_sa_red_200107_v02.bc", + kernels .. "/orx_sa_red_200108_v02.bc", + kernels .. "/orx_sa_red_200109_v02.bc", + kernels .. "/orx_sa_red_200110_v02.bc", + kernels .. "/orx_sa_rel_200106_200112_v01.bc", + kernels .. "/orx_sc_rel_160909_160911_v01.bc", + kernels .. "/orx_sc_rel_160912_160918_v01.bc", + kernels .. "/orx_sc_rel_160919_160925_v01.bc", + kernels .. "/orx_sc_rel_160926_161002_v01.bc", + kernels .. "/orx_sc_rel_181029_181104_v02.bc", + kernels .. "/orx_sc_rel_190218_190224_v02.bc", + kernels .. "/orx_sc_rel_200106_200112_v01.bc", + kernels .. "/orx_sc_rel_201019_201025_v01.bc", + kernels .. "/orx_sc_rel_201012_201018_v01.bc", + kernels .. "/orx_sc_red_200106_v02.bc", + kernels .. "/orx_sc_red_200107_v02.bc", + kernels .. "/orx_sc_red_200108_v02.bc", + kernels .. "/orx_sc_red_200109_v02.bc", + kernels .. "/orx_sc_red_201020_v02.bc", + kernels .. "/orx_sc_red_201017_v03.bc", + kernels .. "/orx_sc_red_201018_v02.bc", + kernels .. "/orx_sc_red_201019_v02.bc", + kernels .. "/orx_r_160909_160910_v01.bc", + kernels .. "/orx_r_160910_160913_v01.bc", + kernels .. "/orx_r_160913_160915_v01.bc", + kernels .. "/orx_r_160915_160919_v01.bc", + kernels .. "/orx_r_160918_160922_v01.bc", + kernels .. "/orx_r_160919_160922_v01.bc", + kernels .. "/orx_r_200105_200107_v02.bc", + kernels .. "/orx_r_200106_200108_v02.bc", + kernels .. "/orx_r_200107_200109_v02.bc", + kernels .. "/orx_r_200107_200112_v01.bc", + kernels .. "/orx_r_200108_200110_v02.bc", + kernels .. "/orx_r_200109_200111_v02.bc", + kernels .. "/orx_r_201019_201021_v06.bc", + kernels .. "/orx_r_201018_201021_v02.bc", + kernels .. "/orx_r_201018_201020_v03.bc", + kernels .. "/orx_r_201017_201019_v03.bc", + kernels .. "/orx_p_160910_161005_xc001b_v01.bc", + kernels .. "/orx_p_200106_200113_2002_od205_v01.bc", + kernels .. "/orx_p_200106_200113_2002_od209_v01.bc", + kernels .. "/orx_p_200106_200113_2002_od210_v01.bc", + kernels .. "/orx_p_201019_201026_2043tag_od293_v03.bc", + kernels .. "/orx_p_201012_201019_2042_od291_v04.bc", + kernels .. "/orx_p_210411_210510_xq006_od297_v05.bc", + kernels .. "/orx_p_210509_210513_xr001_adm_final_mod_od311_v01.bc", + kernels .. "/orx_p_210509_210607_xr001_od298_v00.bc", + kernels .. "/orx_p_230824_231008_src_release_od298_v00.bc", + kernels .. "/OREX_20160904_M45_complete.bsp", + kernels .. "/OREX_20160908_M60_complete.bsp", + kernels .. "/orx_struct_polycam_v01.bc", + kernels .. "/de424.bsp", + kernels .. "/bennu_refdrmc_v1.bsp", + kernels .. "/orx_160908_231024_pgaa2_day06m60.bsp", + kernels .. "/orx_160908_231024_pgaa3_day06m60_v1.bsp", + kernels .. "/orx_160909_161228_160919_od005_tcm1_v2.bsp", + kernels .. "/orx_160909_161228_160930_od006_tcm1_v1.bsp", + kernels .. "/orx_160909_170101_160912_od004_v1.bsp", + kernels .. "/orx_160909_170101_161010_od008_v1.bsp", + kernels .. "/spk_orx_160908_231024_pgaa2_day06m60_v3.bsp", + kernels .. "/orx_160909_231024_refod009_v2.bsp", + kernels .. "/orx_171006_231024_171005_refod027_v1.bsp", + kernels .. "/orx_180301_200101_180711_od037-R-AM1-P-M17B_v2.bsp", + kernels .. "/orx_180801_181219_181128_od066-N-M0P-L-VC1_v1.bsp", + kernels .. "/orx_191101_200407_191202_od204-R-R1P1-P-R3R_v1.bsp", + kernels .. "/orx_201020_210524_210103_od297-N-PTO1-F_v1.bsp", + kernels .. "/orx_201020_210601_201109_od295-R_v1.bsp", + kernels .. "/orx_201020_201110_201021_od293-N_v1.bsp", + kernels .. "/orx_201005_201201_200615_od258-R-T1P1-P-T1R1_v1.bsp", + kernels .. "/orx_201005_201201_200615_od258-C-T1P1-P-T1R5_v2.bsp", + kernels .. "/orx_210115_210701_210426_od310-N-ADM-P_v1.bsp", + kernels .. "/orx_210408_210701_210503_od311-N-ADM-F_v1.bsp", + kernels .. "/orx_210509_231025_210119_od298-R-ADM1-P-DB1_v1.bsp" +} + +asset.export('kernels', OsirisRexKernels) diff --git a/data/assets/scene/solarsystem/missions/osirisrex/model.asset b/data/assets/scene/solarsystem/missions/osirisrex/model.asset index 454d4462e3..0af62025e7 100644 --- a/data/assets/scene/solarsystem/missions/osirisrex/model.asset +++ b/data/assets/scene/solarsystem/missions/osirisrex/model.asset @@ -3,173 +3,17 @@ local transforms = asset.require('./transforms') local sunTransforms = asset.require('scene/solarsystem/sun/transforms') local earthTransforms = asset.require('scene/solarsystem/planets/earth/transforms') - - -local kernels = asset.syncedResource({ - Name = "Osiris Rex Kernels", - Type = "HttpSynchronization", - Identifier = "osirisrex_kernels", - Version = 1 -}) +local OsirisRexKernels = asset.require('./kernels').kernels local models = asset.syncedResource({ Name = "Osiris Rex Models", Type = "HttpSynchronization", Identifier = "osirisrex_models", - Version = 2 + Version = 3 }) local BENNU_BODY = "2101955" -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", - - 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", - - 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" - } -elseif KernelCase == 11 then - 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", - - -- 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", - - kernels .. "/OREX_20160908_M60_complete.bsp", - kernels .. "/OREX_20160904_M45_complete.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", - - --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", - - --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 = { { @@ -185,11 +29,6 @@ local LightSources = { } } --- Append the CaseDependentKernels at the end of the OsirisRexKernels set -for i = 0, #CaseDependentKernels do - OsirisRexKernels[#OsirisRexKernels + 1] = CaseDependentKernels[i] -end - local OsirisRex = { Identifier = "OsirisRex", Parent = sunTransforms.SolarSystemBarycenter.Identifier, @@ -204,7 +43,7 @@ local OsirisRex = { Type = "SpiceRotation", SourceFrame = "ORX_SPACECRAFT", DestinationFrame = "GALACTIC" - } + }, }, Renderable = { Type = "RenderableModel", @@ -262,7 +101,7 @@ local Rexis = { Type = "SpiceRotation", SourceFrame = "ORX_REXIS", DestinationFrame = "ORX_SPACECRAFT" - } + }, }, GUI = { Name = "REXIS", @@ -274,13 +113,13 @@ local PolyCamFov = { Identifier = "POLYCAM FOV", Parent = PolyCam.Identifier, Renderable = { - Type = "RenderableFov", - Body = "OSIRIS-REX", + Type = "RenderableFov", + Body = "OSIRIS-REX", Frame = "ORX_OCAMS_POLYCAM", - RGB = { 0.8, 0.7, 0.7 }, + RGB = { 0.8, 0.7, 0.7 }, Instrument = { - Name = "ORX_OCAMS_POLYCAM", - Method = "ELLIPSOID", + Name = "ORX_OCAMS_POLYCAM", + Method = "ELLIPSOID", Aberration = "NONE" }, PotentialTargets = { BENNU_BODY } @@ -295,13 +134,13 @@ local RexisFov = { Identifier = "REXIS FOV", Parent = Rexis.Identifier, Renderable = { - Type = "RenderableFov", - Body = "OSIRIS-REX", + Type = "RenderableFov", + Body = "OSIRIS-REX", Frame = "ORX_REXIS", - RGB = { 0.8, 0.7, 0.7 }, + RGB = { 0.8, 0.7, 0.7 }, Instrument = { - Name = "ORX_REXIS", - Method = "ELLIPSOID", + Name = "ORX_REXIS", + Method = "ELLIPSOID", Aberration = "NONE" }, PotentialTargets = { BENNU_BODY }, @@ -316,5 +155,9 @@ local RexisFov = { } assetHelper.registerSceneGraphNodesAndExport(asset, { - OsirisRex, PolyCam, Rexis, PolyCamFov, RexisFov + OsirisRex, + PolyCam, + Rexis, + PolyCamFov, + RexisFov }) diff --git a/data/assets/scene/solarsystem/missions/osirisrex/models.asset b/data/assets/scene/solarsystem/missions/osirisrex/models.asset new file mode 100644 index 0000000000..cdd95678ff --- /dev/null +++ b/data/assets/scene/solarsystem/missions/osirisrex/models.asset @@ -0,0 +1,8 @@ +local models = asset.syncedResource({ + Name = "Bennu Models", + Type = "HttpSynchronization", + Identifier = "bennu_models", + Version = 2 +}) + +asset.export('models', models) diff --git a/data/assets/scene/solarsystem/missions/osirisrex/osirisrex.asset b/data/assets/scene/solarsystem/missions/osirisrex/osirisrex.asset index ff5d7658b6..8428875ce3 100644 --- a/data/assets/scene/solarsystem/missions/osirisrex/osirisrex.asset +++ b/data/assets/scene/solarsystem/missions/osirisrex/osirisrex.asset @@ -1,4 +1,4 @@ -asset.require('./bennu') +asset.require('./bennu_projection') asset.require('./model') asset.require('./trail') asset.require('scene/solarsystem/sun/marker') diff --git a/data/profiles/osirisrex.profile b/data/profiles/osirisrex.profile index 94aebc6939..a6b9399bcb 100644 --- a/data/profiles/osirisrex.profile +++ b/data/profiles/osirisrex.profile @@ -3,7 +3,8 @@ "base", "scene/solarsystem/missions/osirisrex/dashboard", "scene/solarsystem/missions/osirisrex/model", - "scene/solarsystem/missions/osirisrex/osirisrex" + "scene/solarsystem/missions/osirisrex/osirisrex", + "scene/solarsystem/missions/osirisrex/imageplane" ], "camera": { "aim": "",