mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-28 06:59:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

Add renderable fov to OSIRIS-REx polycam and increse precision in rendering of view frustum (fov)

Browse Source
This commit is contained in:
Kalle Bladin
2016-08-15 20:20:36 -04:00
parent 9d04fd5593
commit fb7104fbed
5 changed files with 118 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
data/scene/osirisrex/bennu/bennu.mod
View File

@@ -60,26 +60,7 @@ return {
},
},
Target = {
Body = BENNU_BODY,
--[[
Read = {
"TARGET_NAME",
"INSTRUMENT_HOST_NAME",
"INSTRUMENT_ID",
"START_TIME",
"STOP_TIME",
},
Convert = {
CHURYUMOV = {"CHURYUMOV-GERASIMENKO"},
ROSETTA = {"ROSETTA" },
--NAVCAM = {"NAVCAM"},
["ROSETTA-ORBITER"] = {"ROSETTA" },
CHURYUMOVGERASIMENKO11969R1 = {"CHURYUMOV-GERASIMENKO"},
CHURYUMOVGERASIMENKO = {"CHURYUMOV-GERASIMENKO"},
["CHURYUMOV-GERASIMENKO1(1969R1)"] = {"CHURYUMOV-GERASIMENKO"},
--NAVIGATIONCAMERA = {"NAVCAM" },
},
]]
Body = BENNU_BODY, -- Do we need this?
},
},

78
data/scene/osirisrex/osirisrex/osirisrex.mod
View File

@@ -69,7 +69,7 @@ return {
Destination = "ORX_SPACECRAFT"
},
Transform = {
Translation = {0,0,0}, -- Translation relative to parent
Translation = {1,0,0}, -- Translation relative to parent
--Rotation = {0,0,0}, -- Euler angles relative to parent (not implemented)
--Scale = {1,1,1}, -- Scale relative to parent (not implemented)
},
@@ -77,6 +77,82 @@ return {
GuiName = "/Solar/ORX_OCAMS_POLYCAM"
},
--[[
{
Name = "ORX_OCAMS_POLYCAM FOV",
Parent = "ORX_OCAMS_POLYCAM",
Renderable = {
Type = "RenderableFov",
Body = "OSIRIS-REX",
Frame = "GALACTIC",
RGB = { 0.8, 0.7, 0.7 },
Textures = {
Type = "simple",
Color = "textures/glare_blue.png",
-- need to add different texture
},
Instrument = {
Name = "ORX_OCAMS_POLYCAM",
Method = "ELLIPSOID",
Aberration = "NONE",
},
PotentialTargets = {
"Bennu2",
}
},
GuiName = "/Solar/ORX_OCAMS_POLYCAM"
},
]]
{
Name = "POLYCAM",
Parent = "ORX_OCAMS_POLYCAM",
Renderable = {
Type = "RenderableFov",
Body = "OSIRIS-REX",
Frame = "ORX_OCAMS_POLYCAM",
RGB = { 0.8, 0.7, 0.7 },
Textures = {
Type = "simple",
Color = "textures/glare_blue.png",
-- need to add different texture
},
Instrument = {
Name = "ORX_OCAMS_POLYCAM",
Method = "ELLIPSOID",
Aberration = "NONE",
},
PotentialTargets = {
BENNU_BODY -- Bennu
}
},
GuiName = "/Solar/POLYCAM"
},
-- Latest image taken by POLYCAM
--[[
{
Name = "ImagePlaneOsirisRex",
Parent = "OsirisRex",
Renderable = {
Type = "RenderablePlaneProjection",
Frame = "IAU_BENNU",
DefaultTarget = BENNU_BODY,
Spacecraft = "OSIRIS-REX",
Instrument = "ORX_OCAMS_POLYCAM",
Moving = false,
Texture = "textures/defaultProj.png",
},
Ephemeris = {
Type = "Static",
Position = {0, 0, 0, 1}
},
},
]]
{
Name = "OsirisRexPathSolar",
Parent = "SolarSystemBarycenter",