mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-01-06 03:29:44 -06:00
Merge branch 'feature/osirisrex' of github.com:OpenSpace/OpenSpace into feature/osirisrex
This commit is contained in:
Erik Broberg
@@ -174,8 +174,9 @@ function postInitialization()
|
||||
openspace.setPropertyValue("MilkyWay.renderable.transparency", 0.55)
|
||||
openspace.setPropertyValue("MilkyWay.renderable.segments", 50)
|
||||
|
||||
-- Rotate Osiris Rex model to match the specification in the spice data
|
||||
openspace.setPropertyValue("OsirisRex.renderable.modelrotation", {90.0, 0.0, 0.0})
|
||||
-- Activate night textures and water masks
|
||||
openspace.setPropertyValue("LodEarth.RenderableGlobe.WaterMasks", {0, 1});
|
||||
openspace.setPropertyValue("LodEarth.RenderableGlobe.NightTextures", {0, 1});
|
||||
|
||||
openspace.printInfo("Done setting default values")
|
||||
openspace.loadMission("${OPENSPACE_DATA}/scene/osirisrex/osirisrex/osirisrex.mission")
|
||||
|
||||
38
data/scene/rosetta/67P/rosettaimages.torrent
Normal file
38
data/scene/rosetta/67P/rosettaimages.torrent
Normal file
File diff suppressed because one or more lines are too long
@@ -1,7 +1,7 @@
|
||||
return {
|
||||
FileRequest = {
|
||||
{ Identifier = "rosetta_model", Destination = "obj", Version = 2 },
|
||||
{ Identifier = "rosetta_textures", Destination = "textures", Version = 1 }
|
||||
{ Identifier = "rosetta_model", Destination = "rosetta", Version = 3 },
|
||||
{ Identifier = "rosetta_textures", Destination = "textures", Version = 2 }
|
||||
},
|
||||
TorrentFiles = {
|
||||
{ File = "RosettaKernels.torrent", Destination = "${SPICE}" },
|
||||
|
||||
@@ -1,93 +1,290 @@
|
||||
RosettaKernels = {
|
||||
--needed
|
||||
"${OPENSPACE_DATA}/spice/de430_1850-2150.bsp",
|
||||
-- SPK
|
||||
--long term orbits loaded first
|
||||
-- '${OPENSPACE_DATA}/spice/RosettaKernels/SPK/LORL_DL_006_01____H__00156.BSP',
|
||||
-- '${OPENSPACE_DATA}/spice/RosettaKernels/SPK/RORL_DL_006_01____H__00156.BSP',
|
||||
-- '${OPENSPACE_DATA}/spice/RosettaKernels/SPK/CORL_DL_006_01____H__00156.BSP',
|
||||
|
||||
--Jan 2014 - May 2015 (version match with 00162 ck files)
|
||||
-- "${OPENSPACE_DATA}/spice/RosettaKernels/SPK/CORB_DV_097_01_______00162.BSP",
|
||||
-- "${OPENSPACE_DATA}/spice/RosettaKernels/SPK/RORB_DV_097_01_______00162.BSP",
|
||||
-- "${OPENSPACE_DATA}/spice/RosettaKernels/SPK/LORB_DV_097_01_______00162.BSP",
|
||||
|
||||
--IK
|
||||
"${OPENSPACE_DATA}/spice/RosettaKernels_New/IK/ROS_NAVCAM_V01.TI",
|
||||
"${OPENSPACE_DATA}/spice/RosettaKernels/IK/ROS_NAVCAM_V00-20130102.TI",
|
||||
|
||||
--SCLK
|
||||
-- "${OPENSPACE_DATA}/spice/RosettaKernels/SCLK/ROS_150227_STEP.TSC",
|
||||
|
||||
-- FK
|
||||
-- "${OPENSPACE_DATA}/spice/RosettaKernels/FK/ROS_CHURYUMOV_V01.TF",
|
||||
-- "${OPENSPACE_DATA}/spice/RosettaKernels/FK/ROS_V24.TF",
|
||||
|
||||
-- CK
|
||||
-- '${OPENSPACE_DATA}/spice/RosettaKernels/CK/RATT_DV_097_01_01____00162.BC',
|
||||
-- "${OPENSPACE_DATA}/spice/RosettaKernels/CK/CATT_DV_097_01_______00162.BC",
|
||||
|
||||
--SCLK
|
||||
-- "${OPENSPACE_DATA}/spice/RosettaKernels/SCLK/ROS_150227_STEP.TSC",
|
||||
"${OPENSPACE_DATA}/spice/RosettaKernels_New/SCLK/ROS_160425_STEP.TSC",
|
||||
|
||||
-- FK
|
||||
|
||||
"${OPENSPACE_DATA}/spice/RosettaKernels_New/FK/ROS_CHURYUMOV_V01.TF",
|
||||
"${OPENSPACE_DATA}/spice/RosettaKernels_New/FK/ROS_V26.TF",
|
||||
-- "${OPENSPACE_DATA}/spice/RosettaKernels/FK/ROS_V24.TF",
|
||||
-- CK
|
||||
"${OPENSPACE_DATA}/spice/RosettaKernels_New/CK/RATT_DV_211_01_01____00288.BC",
|
||||
"${OPENSPACE_DATA}/spice/RosettaKernels_New/CK/CATT_DV_211_01_______00288.BC",
|
||||
'${OPENSPACE_DATA}/spice/RosettaKernels/CK/RATT_DV_097_01_01____00162.BC',
|
||||
"${OPENSPACE_DATA}/spice/RosettaKernels/CK/CATT_DV_097_01_______00162.BC",
|
||||
|
||||
-- PCK
|
||||
"${OPENSPACE_DATA}/spice/RosettaKernels_New/PCK/ROS_CGS_RSOC_V03.TPC",
|
||||
-- "${OPENSPACE_DATA}/spice/RosettaKernels/PCK/ROS_CGS_RSOC_V03.TPC",
|
||||
|
||||
|
||||
|
||||
"${OPENSPACE_DATA}/spice/RosettaKernels_New/CK/ROS_SA_2014_V0047.BC",
|
||||
"${OPENSPACE_DATA}/spice/RosettaKernels_New/CK/ROS_SA_2015_V0042.BC",
|
||||
"${OPENSPACE_DATA}/spice/RosettaKernels_New/CK/ROS_SA_2016_V0019.BC",
|
||||
}
|
||||
|
||||
return {
|
||||
-- Rosetta Body module
|
||||
{
|
||||
Name = "Rosetta",
|
||||
Parent = "SolarSystemBarycenter",
|
||||
Renderable = {
|
||||
Type = "RenderableModel",
|
||||
Body = "ROSETTA",
|
||||
Geometry = {
|
||||
Type = "MultiModelGeometry",
|
||||
GeometryFile = "obj/Rosetta.obj",
|
||||
Magnification = 1,
|
||||
},
|
||||
Textures = {
|
||||
Type = "simple",
|
||||
Color = "textures/gray.png",
|
||||
},
|
||||
Rotation = {
|
||||
Source = "ROS_SPACECRAFT",
|
||||
Destination = "J2000"
|
||||
},
|
||||
},
|
||||
Parent = "SolarSystemBarycenter",
|
||||
Transform = {
|
||||
Translation = {
|
||||
Type = "SpiceEphemeris",
|
||||
Body = "ROSETTA",
|
||||
Reference = "GALACTIC",
|
||||
Observer = "SUN",
|
||||
Kernels = {
|
||||
--needed
|
||||
"${OPENSPACE_DATA}/spice/de430_1850-2150.bsp",
|
||||
-- SPK
|
||||
--long term orbits loaded first
|
||||
-- '${OPENSPACE_DATA}/spice/RosettaKernels/SPK/LORL_DL_006_01____H__00156.BSP',
|
||||
-- '${OPENSPACE_DATA}/spice/RosettaKernels/SPK/RORL_DL_006_01____H__00156.BSP',
|
||||
-- '${OPENSPACE_DATA}/spice/RosettaKernels/SPK/CORL_DL_006_01____H__00156.BSP',
|
||||
|
||||
--Jan 2014 - May 2015 (version match with 00162 ck files)
|
||||
-- "${OPENSPACE_DATA}/spice/RosettaKernels/SPK/CORB_DV_097_01_______00162.BSP",
|
||||
-- "${OPENSPACE_DATA}/spice/RosettaKernels/SPK/RORB_DV_097_01_______00162.BSP",
|
||||
-- "${OPENSPACE_DATA}/spice/RosettaKernels/SPK/LORB_DV_097_01_______00162.BSP",
|
||||
|
||||
--IK
|
||||
"${OPENSPACE_DATA}/spice/RosettaKernels_New/IK/ROS_NAVCAM_V01.TI",
|
||||
"${OPENSPACE_DATA}/spice/RosettaKernels/IK/ROS_NAVCAM_V00-20130102.TI",
|
||||
|
||||
--SCLK
|
||||
-- "${OPENSPACE_DATA}/spice/RosettaKernels/SCLK/ROS_150227_STEP.TSC",
|
||||
|
||||
-- FK
|
||||
-- "${OPENSPACE_DATA}/spice/RosettaKernels/FK/ROS_CHURYUMOV_V01.TF",
|
||||
-- "${OPENSPACE_DATA}/spice/RosettaKernels/FK/ROS_V24.TF",
|
||||
|
||||
-- CK
|
||||
-- '${OPENSPACE_DATA}/spice/RosettaKernels/CK/RATT_DV_097_01_01____00162.BC',
|
||||
-- "${OPENSPACE_DATA}/spice/RosettaKernels/CK/CATT_DV_097_01_______00162.BC",
|
||||
|
||||
--SCLK
|
||||
-- "${OPENSPACE_DATA}/spice/RosettaKernels/SCLK/ROS_150227_STEP.TSC",
|
||||
"${OPENSPACE_DATA}/spice/RosettaKernels_New/SCLK/ROS_160425_STEP.TSC",
|
||||
|
||||
-- FK
|
||||
|
||||
"${OPENSPACE_DATA}/spice/RosettaKernels_New/FK/ROS_CHURYUMOV_V01.TF",
|
||||
"${OPENSPACE_DATA}/spice/RosettaKernels_New/FK/ROS_V26.TF",
|
||||
-- "${OPENSPACE_DATA}/spice/RosettaKernels/FK/ROS_V24.TF",
|
||||
-- CK
|
||||
"${OPENSPACE_DATA}/spice/RosettaKernels_New/CK/RATT_DV_211_01_01____00288.BC",
|
||||
"${OPENSPACE_DATA}/spice/RosettaKernels_New/CK/CATT_DV_211_01_______00288.BC",
|
||||
'${OPENSPACE_DATA}/spice/RosettaKernels/CK/RATT_DV_097_01_01____00162.BC',
|
||||
"${OPENSPACE_DATA}/spice/RosettaKernels/CK/CATT_DV_097_01_______00162.BC",
|
||||
|
||||
-- PCK
|
||||
"${OPENSPACE_DATA}/spice/RosettaKernels_New/PCK/ROS_CGS_RSOC_V03.TPC",
|
||||
-- "${OPENSPACE_DATA}/spice/RosettaKernels/PCK/ROS_CGS_RSOC_V03.TPC",
|
||||
|
||||
|
||||
|
||||
"${OPENSPACE_DATA}/spice/RosettaKernels_New/CK/ROS_SA_2014_V0047.BC",
|
||||
"${OPENSPACE_DATA}/spice/RosettaKernels_New/CK/ROS_SA_2015_V0042.BC",
|
||||
"${OPENSPACE_DATA}/spice/RosettaKernels_New/CK/ROS_SA_2016_V0019.BC",
|
||||
}
|
||||
Kernels = RosettaKernels
|
||||
},
|
||||
Rotation = {
|
||||
Type = "SpiceRotation",
|
||||
SourceFrame = "ROS_SPACECRAFT",
|
||||
DestinationFrame = "GALACTIC",
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
Name = "Rosetta_black_foil",
|
||||
Parent = "Rosetta",
|
||||
Renderable = {
|
||||
Type = "RenderableModel",
|
||||
Body = "ROSETTA",
|
||||
Geometry = {
|
||||
Type = "MultiModelGeometry",
|
||||
GeometryFile = "rosetta/black_foil.obj"
|
||||
},
|
||||
},
|
||||
GuiName = "/Solar/Rosetta"
|
||||
Textures = {
|
||||
Type = "simple",
|
||||
Color = "textures/foil_silver_ramp.png"
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
Name = "Rosetta_black_parts",
|
||||
Parent = "Rosetta",
|
||||
Renderable = {
|
||||
Type = "RenderableModel",
|
||||
Body = "ROSETTA",
|
||||
Geometry = {
|
||||
Type = "MultiModelGeometry",
|
||||
GeometryFile = "rosetta/black_parts.obj"
|
||||
},
|
||||
Textures = {
|
||||
Type = "simple",
|
||||
Color = "textures/foil_silver_ramp.png"
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
Name = "Rosetta_dish",
|
||||
Parent = "Rosetta",
|
||||
Renderable = {
|
||||
Type = "RenderableModel",
|
||||
Body = "ROSETTA",
|
||||
Geometry = {
|
||||
Type = "MultiModelGeometry",
|
||||
GeometryFile = "rosetta/dish.obj"
|
||||
},
|
||||
Textures = {
|
||||
Type = "simple",
|
||||
Color = "textures/dish_AO.png"
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
Name = "Rosetta_parts",
|
||||
Parent = "Rosetta",
|
||||
Renderable = {
|
||||
Type = "RenderableModel",
|
||||
Body = "ROSETTA",
|
||||
Geometry = {
|
||||
Type = "MultiModelGeometry",
|
||||
GeometryFile = "rosetta/parts.obj"
|
||||
},
|
||||
Textures = {
|
||||
Type = "simple",
|
||||
Color = "textures/parts2_AO.png"
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
Name = "Rosetta_silver_foil",
|
||||
Parent = "Rosetta",
|
||||
Renderable = {
|
||||
Type = "RenderableModel",
|
||||
Body = "ROSETTA",
|
||||
Geometry = {
|
||||
Type = "MultiModelGeometry",
|
||||
GeometryFile = "rosetta/silver_foil.obj"
|
||||
},
|
||||
Textures = {
|
||||
Type = "simple",
|
||||
Color = "textures/foil_silver_ramp.png"
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
Name = "Rosetta_vents",
|
||||
Parent = "Rosetta",
|
||||
Renderable = {
|
||||
Type = "RenderableModel",
|
||||
Body = "ROSETTA",
|
||||
Geometry = {
|
||||
Type = "MultiModelGeometry",
|
||||
GeometryFile = "rosetta/vents.obj"
|
||||
},
|
||||
Textures = {
|
||||
Type = "simple",
|
||||
Color = "textures/tex_01.png"
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
Name = "Rosetta_wing_a",
|
||||
Parent = "Rosetta",
|
||||
Renderable = {
|
||||
Type = "RenderableModel",
|
||||
Body = "ROSETTA",
|
||||
Geometry = {
|
||||
Type = "MultiModelGeometry",
|
||||
GeometryFile = "rosetta/wingA.obj"
|
||||
},
|
||||
Textures = {
|
||||
Type = "simple",
|
||||
Color = "textures/tex_01.png"
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
Name = "Rosetta_wing_b",
|
||||
Parent = "Rosetta",
|
||||
Renderable = {
|
||||
Type = "RenderableModel",
|
||||
Body = "ROSETTA",
|
||||
Geometry = {
|
||||
Type = "MultiModelGeometry",
|
||||
GeometryFile = "rosetta/wingB.obj"
|
||||
},
|
||||
Textures = {
|
||||
Type = "simple",
|
||||
Color = "textures/tex_01.png"
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
Name = "Rosetta_yellow_foil",
|
||||
Parent = "Rosetta",
|
||||
Renderable = {
|
||||
Type = "RenderableModel",
|
||||
Body = "ROSETTA",
|
||||
Geometry = {
|
||||
Type = "MultiModelGeometry",
|
||||
GeometryFile = "rosetta/yellow_foil.obj"
|
||||
},
|
||||
Textures = {
|
||||
Type = "simple",
|
||||
Color = "textures/foil_gold_ramp.png"
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
Name = "Philae",
|
||||
Parent = "Rosetta"
|
||||
-- This should need a transform, but currently the model is intrinsically
|
||||
-- translated
|
||||
},
|
||||
{
|
||||
Name = "Philae_foil",
|
||||
Parent = "Philae",
|
||||
Renderable = {
|
||||
Type = "RenderableModel",
|
||||
Body = "ROSETTA",
|
||||
Geometry = {
|
||||
Type = "MultiModelGeometry",
|
||||
GeometryFile = "rosetta/lander_foil.obj"
|
||||
},
|
||||
Textures = {
|
||||
Type = "simple",
|
||||
Color = "textures/foil_silver_ramp.png"
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
Name = "Philae_lids",
|
||||
Parent = "Philae",
|
||||
Renderable = {
|
||||
Type = "RenderableModel",
|
||||
Body = "ROSETTA",
|
||||
Geometry = {
|
||||
Type = "MultiModelGeometry",
|
||||
GeometryFile = "rosetta/lander_lids.obj"
|
||||
},
|
||||
Textures = {
|
||||
Type = "simple",
|
||||
Color = "textures/parts2_AO.png"
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
Name = "Philae_parts",
|
||||
Parent = "Philae",
|
||||
Renderable = {
|
||||
Type = "RenderableModel",
|
||||
Body = "ROSETTA",
|
||||
Geometry = {
|
||||
Type = "MultiModelGeometry",
|
||||
GeometryFile = "rosetta/lander_parts.obj"
|
||||
},
|
||||
Textures = {
|
||||
Type = "simple",
|
||||
Color = "textures/foil_silver_ramp.png"
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
Name = "Philae_solarp",
|
||||
Parent = "Philae",
|
||||
Renderable = {
|
||||
Type = "RenderableModel",
|
||||
Body = "ROSETTA",
|
||||
Geometry = {
|
||||
Type = "MultiModelGeometry",
|
||||
GeometryFile = "rosetta/lander_solarp.obj"
|
||||
},
|
||||
Textures = {
|
||||
Type = "simple",
|
||||
Color = "textures/tex_01.png"
|
||||
}
|
||||
}
|
||||
},
|
||||
--[[ -- Rosetta Trail Module
|
||||
{
|
||||
@@ -164,13 +361,13 @@ return {
|
||||
{
|
||||
Name = "NAVCAM",
|
||||
Parent = "Rosetta",
|
||||
Transform = {
|
||||
Rotation = {
|
||||
Type = "SpiceRotation",
|
||||
SourceFrame = "NAVCAM",
|
||||
DestinationFrame = "ROS_SPACECRAFT",
|
||||
},
|
||||
},
|
||||
-- Transform = {
|
||||
-- Rotation = {
|
||||
-- Type = "SpiceRotation",
|
||||
-- SourceFrame = "NAVCAM",
|
||||
-- DestinationFrame = "ROS_SPACECRAFT",
|
||||
-- },
|
||||
-- },
|
||||
GuiName = "/Solar/Rosetta_navcam"
|
||||
},
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user