diff --git a/data/scene/missions/newhorizons/jupiter/callisto/callisto.mod b/data/scene/missions/newhorizons/jupiter/callisto/callisto.mod index c99c354d59..3a51e4c5bb 100644 --- a/data/scene/missions/newhorizons/jupiter/callisto/callisto.mod +++ b/data/scene/missions/newhorizons/jupiter/callisto/callisto.mod @@ -1,3 +1,5 @@ +local callisto_radius = 1.8213E6 + return { -- Callisto module { @@ -7,9 +9,10 @@ return { Type = "RenderablePlanetProjection", Frame = "IAU_CALLISTO", Body = "CALLISTO", + Radius = callisto_radius, Geometry = { Type = "SimpleSphere", - Radius = 1.8213E6, + Radius = callisto_radius, Segments = 100 }, Textures = { diff --git a/data/scene/missions/newhorizons/jupiter/europa/europa.mod b/data/scene/missions/newhorizons/jupiter/europa/europa.mod index 21e07a2703..37a137fdb0 100644 --- a/data/scene/missions/newhorizons/jupiter/europa/europa.mod +++ b/data/scene/missions/newhorizons/jupiter/europa/europa.mod @@ -1,3 +1,5 @@ +local europa_radius = 1.8213E6 + return { -- Europa module { @@ -7,9 +9,10 @@ return { Type = "RenderablePlanetProjection", Frame = "IAU_EUROPA", Body = "EUROPA", + Radius = europa_radius, Geometry = { Type = "SimpleSphere", - Radius = 1.8213E6, + Radius = europa_radius, Segments = 100 }, Textures = { diff --git a/data/scene/missions/newhorizons/jupiter/ganymede/ganymede.mod b/data/scene/missions/newhorizons/jupiter/ganymede/ganymede.mod index 5fa473d332..9d16289f9b 100644 --- a/data/scene/missions/newhorizons/jupiter/ganymede/ganymede.mod +++ b/data/scene/missions/newhorizons/jupiter/ganymede/ganymede.mod @@ -1,3 +1,5 @@ +local ganymede_local = 1.8213E6 + return { -- Ganymede module { @@ -7,9 +9,10 @@ return { Type = "RenderablePlanetProjection", Frame = "IAU_GANYMEDE", Body = "GANYMEDE", + Radius = ganymede_local, Geometry = { Type = "SimpleSphere", - Radius = 1.8213E6, + Radius = ganymede_local, Segments = 100 }, Textures = { diff --git a/data/scene/missions/newhorizons/jupiter/io/io.mod b/data/scene/missions/newhorizons/jupiter/io/io.mod index d4e5260cbd..60ed022544 100644 --- a/data/scene/missions/newhorizons/jupiter/io/io.mod +++ b/data/scene/missions/newhorizons/jupiter/io/io.mod @@ -1,3 +1,5 @@ +local io_radius = 1.8213E6 + return { -- Io module { @@ -7,9 +9,10 @@ return { Type = "RenderablePlanetProjection", Frame = "IAU_IO", Body = "IO", + Radius = io_radius, Geometry = { Type = "SimpleSphere", - Radius = 1.8213E6, + Radius = io_radius, Segments = 100 }, Textures = { @@ -74,7 +77,7 @@ return { Parent = "Io", Renderable = { Type = "RenderablePlane", - Size = {1.0, 7.4}, + Size = 10^7.4, Origin = "Center", Billboard = true, Texture = "textures/Io-Text.png", diff --git a/data/scene/missions/newhorizons/jupiter/jupiter/jupiter.mod b/data/scene/missions/newhorizons/jupiter/jupiter/jupiter.mod index 17f3a6afea..f4fbe278f0 100644 --- a/data/scene/missions/newhorizons/jupiter/jupiter/jupiter.mod +++ b/data/scene/missions/newhorizons/jupiter/jupiter/jupiter.mod @@ -1,3 +1,5 @@ +local jupiter_local = 0.71492E8 + return { -- Jupiter barycenter module { @@ -20,9 +22,10 @@ return { Type = "RenderablePlanetProjection", Frame = "IAU_JUPITER", Body = "JUPITER", + Radius = jupiter_local, Geometry = { Type = "SimpleSphere", - Radius = 0.71492E8, + Radius = jupiter_local, Segments = 200, }, Textures = { diff --git a/data/scene/missions/newhorizons/newhorizons/newhorizons.mod b/data/scene/missions/newhorizons/newhorizons/newhorizons.mod index 40368d7efc..3e00eac771 100644 --- a/data/scene/missions/newhorizons/newhorizons/newhorizons.mod +++ b/data/scene/missions/newhorizons/newhorizons/newhorizons.mod @@ -1,46 +1,36 @@ if UseAccurateNewHorizonsKernels then NewHorizonsKernels = { - -- SCLK - "${SPICE}/nh_kernels/sclk/new-horizons_0976.tsc", - -- "${SPICE}/NewHorizonsKernels/new_horizons_413.tsc", + "${SPICE}/nh_20170126/spk/nh_pred_20141201_20190301_od122.bsp", + "${SPICE}/nh_20170126/spk/NavSE_plu047_od122.bsp", + "${SPICE}/nh_20170126/spk/NavPE_de433_od122.bsp", - -- SPK - "${SPICE}/nh_kernels/spk/nh_pred_20141201_20190301_od122.bsp", - -- "${SPICE}/nh_kernels/spk/nh_pred_20120501_20160913_od093.bsp", - "${SPICE}/nh_kernels/spk/plu_all_mvi.spk", "${SPICE}/jup260.bsp", - -- "${SPICE}/NewHorizonsKernels/de413.bsp", - -- CK - "${SPICE}/nh_kernels/ck/nh_scispi_2015_pred.bc", - "${SPICE}/nh_kernels/ck/nh_scispi_2015_recon.bc", - "${SPICE}/nh_kernels/ck/nh_lorri_wcs.bc", - "${SPICE}/nh_kernels/ck/plutonet_PS104.bc", + "${SPICE}/nh_20170126/ck/nh_scispi_2015_pred.bc", + "${SPICE}/nh_20170126/ck/nh_scispi_2015_recon.bc", + "${SPICE}/nh_20170126/ck/nh_lorri_wcs.bc", + + "${SPICE}/nh_20170126/smithed_pc_and_sp/PLU_LORRI_ALL_161216.bc", - -- FK - "${SPICE}/nh_kernels/fk/nh_soc_misc_v001.tf", - "${SPICE}/nh_kernels/fk/nh_v220.tf", + "${SPICE}/nh_20170126/sclk/new-horizons_1121.tsc", - -- IK - "${SPICE}/nh_kernels/ik/nh_alice_v120.ti", - "${SPICE}/nh_kernels/ik/nh_allinstruments_v002.ti", - "${SPICE}/nh_kernels/ik/nh_astr_v000.ti", - "${SPICE}/nh_kernels/ik/nh_fss_v000.ti", - "${SPICE}/nh_kernels/ik/nh_lorri_v100.ti", - "${SPICE}/nh_kernels/ik/nh_pepssi_v110.ti", - "${SPICE}/nh_kernels/ik/nh_ralph_v100.ti", - "${SPICE}/nh_kernels/ik/nh_rex_v100.ti", - "${SPICE}/nh_kernels/ik/nh_sdc_v101.ti", - "${SPICE}/nh_kernels/ik/nh_swap_v100.ti", + "${SPICE}/nh_20170126/pck/nh_targets_v001.tpc", + "${SPICE}/nh_20170126/pck/nh_pcnh_005.tpc", - -- LSK - "${SPICE}/nh_kernels/lsk/naif0011.tls", - - -- PCK - "${SPICE}/nh_kernels/pck/nh_targets_v001.tpc", - "${SPICE}/nh_kernels/pck/pck00010.tpc", - "${SPICE}/nh_kernels/pck/nh_pcnh_002.tpc" - }; + "${SPICE}/nh_20170126/fk/nh_v220.tf", + "${SPICE}/nh_20170126/ik/nh_allinstruments_v002.ti", + "${SPICE}/nh_20170126/ik/nh_alice_v200.ti", + "${SPICE}/nh_20170126/ik/nh_lorri_v201.ti", + "${SPICE}/nh_20170126/ik/nh_pepssi_v110.ti", + "${SPICE}/nh_20170126/ik/nh_ralph_v100.ti", + "${SPICE}/nh_20170126/ik/nh_rex_v100.ti", + "${SPICE}/nh_20170126/ik/nh_sdc_v101.ti", + "${SPICE}/nh_20170126/ik/nh_swap_v100.ti", + "${SPICE}/nh_20170126/ik/nh_astr_v000.ti", + "${SPICE}/nh_20170126/ik/nh_fss_v000.ti", + "${SPICE}/nh_20170126/fk/nh_soc_misc_v001.tf", + "${SPICE}/nh_20170126/spk/nh_stars.bsp", + } else NewHorizonsKernels = { --SCLK @@ -118,12 +108,6 @@ return { Ghosting = false, }, }, - Transform = { - Scale = { - Type = "StaticScale", - Scale = 100 - } - }, }, --NewHorizonsTrail module --[[{ diff --git a/data/scene/missions/newhorizons/newhorizonsfov/newhorizonsfov.mod b/data/scene/missions/newhorizons/newhorizonsfov/newhorizonsfov.mod index 7ece77d4e9..7c2c7fd4e5 100644 --- a/data/scene/missions/newhorizons/newhorizonsfov/newhorizonsfov.mod +++ b/data/scene/missions/newhorizons/newhorizonsfov/newhorizonsfov.mod @@ -1,22 +1,21 @@ +local LorriOffset = { -6.626, -4.1, -3.23 } +local RalphOffset = { -6.9, -4.6, 8.7 } +local AliceOffset = { -7.9, -1.7, 8.3 } +local RexOffset = { 0, 0, 0 } + return { -- NewHorizonsFov main module - { + { Name = "NH_LORRI", Parent = "NewHorizonsPosition", Renderable = { Type = "RenderableFov", Body = "NEW HORIZONS", Frame = "NH_SPACECRAFT", - RGB = { 0.8, 0.7, 0.7 }, - Textures = { - Type = "simple", - Color = "textures/glare_blue.png", - -- need to add different texture - }, - Instrument = { + Color = { 0.8, 0.7, 0.7 }, + Instrument = { Name = "NH_LORRI", - Method = "ELLIPSOID", - Aberration = "NONE", + Aberration = "NONE" }, PotentialTargets = { "Pluto", @@ -24,281 +23,311 @@ return { "Jupiter", "Io", "Europa", "Ganymede", "Callisto" } }, + Transform = { + Translation = { + Type = "StaticTranslation", + Position = LorriOffset + } + } }, + -- NewHorizonsFov module NH_RALPH_LEISA - { - Name = "NH_RALPH_LEISA", - Parent = "NewHorizonsPosition", - Renderable = { - Type = "RenderableFov", - Body = "NEW HORIZONS", - Frame = "NH_SPACECRAFT", - RGB = { 0.8, 0.7, 0.7 }, - Textures = { - Type = "simple", - Color = "textures/glare_blue.png", - -- need to add different texture - }, - Instrument = { - Name = "NH_RALPH_LEISA", - Method = "ELLIPSOID", - Aberration = "NONE", - }, - PotentialTargets = { - "Pluto", - "Charon", - "Jupiter", "Io", "Europa", "Ganymede", "Callisto" - } +{ + Name = "NH_RALPH_LEISA", + Parent = "NewHorizonsPosition", + 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" + } }, + Transform = { + Translation = { + Type = "StaticTranslation", + Position = RalphOffset + } + } +}, - -- NewHorizonsFov module NH_RALPH_MVIC_PAN1 - { - Name = "NH_RALPH_MVIC_PAN1", - Parent = "NewHorizonsPosition", - Renderable = { - Type = "RenderableFov", - Body = "NEW HORIZONS", - Frame = "NH_SPACECRAFT", - RGB = { 0.8, 0.7, 0.7 }, - Textures = { - Type = "simple", - Color = "textures/glare_blue.png", - -- need to add different texture - }, - Instrument = { - Name = "NH_RALPH_MVIC_PAN1", - Method = "ELLIPSOID", - Aberration = "NONE", - }, - PotentialTargets = { - "Pluto", - "Charon", - "Jupiter", "Io", "Europa", "Ganymede", "Callisto" - } +-- NewHorizonsFov module NH_RALPH_MVIC_PAN1 +{ + Name = "NH_RALPH_MVIC_PAN1", + Parent = "NewHorizonsPosition", + 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" + } }, - -- NewHorizonsFov module NH_RALPH_MVIC_PAN2 - { - Name = "NH_RALPH_MVIC_PAN2", - Parent = "NewHorizonsPosition", - Renderable = { - Type = "RenderableFov", - Body = "NEW HORIZONS", - Frame = "NH_SPACECRAFT", - RGB = { 0.8, 0.7, 0.7 }, - Textures = { - Type = "simple", - Color = "textures/glare_blue.png", - -- need to add different texture - }, - Instrument = { - Name = "NH_RALPH_MVIC_PAN2", - Method = "ELLIPSOID", - Aberration = "NONE", - }, - PotentialTargets = { - "Pluto", - "Charon", - "Jupiter", "Io", "Europa", "Ganymede", "Callisto" - } + Transform = { + Translation = { + Type = "StaticTranslation", + Position = RalphOffset + } + } +}, +-- NewHorizonsFov module NH_RALPH_MVIC_PAN2 +{ + Name = "NH_RALPH_MVIC_PAN2", + Parent = "NewHorizonsPosition", + 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" + } }, - -- NewHorizonsFov module NH_RALPH_MVIC_RED - { - Name = "NH_RALPH_MVIC_RED", - Parent = "NewHorizonsPosition", - Renderable = { - Type = "RenderableFov", - Body = "NEW HORIZONS", - Frame = "NH_SPACECRAFT", - RGB = { 0.8, 0.7, 0.7 }, - Textures = { - Type = "simple", - Color = "textures/glare_blue.png", - -- need to add different texture - }, - Instrument = { - Name = "NH_RALPH_MVIC_RED", - Method = "ELLIPSOID", - Aberration = "NONE", - }, - PotentialTargets = { - "Pluto", - "Charon", - "Jupiter", "Io", "Europa", "Ganymede", "Callisto" - } + Transform = { + Translation = { + Type = "StaticTranslation", + Position = RalphOffset + } + } +}, +-- NewHorizonsFov module NH_RALPH_MVIC_RED +{ + Name = "NH_RALPH_MVIC_RED", + Parent = "NewHorizonsPosition", + 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" + } }, - -- NewHorizonsFov module NH_RALPH_MVIC_BLUE - { - Name = "NH_RALPH_MVIC_BLUE", - Parent = "NewHorizonsPosition", - Renderable = { - Type = "RenderableFov", - Body = "NEW HORIZONS", - Frame = "NH_SPACECRAFT", - RGB = { 0.8, 0.7, 0.7 }, - Textures = { - Type = "simple", - Color = "textures/glare_blue.png", - -- need to add different texture - }, - Instrument = { - Name = "NH_RALPH_MVIC_BLUE", - Method = "ELLIPSOID", - Aberration = "NONE", - }, - PotentialTargets = { - "Pluto", - "Charon", - "Jupiter", "Io", "Europa", "Ganymede", "Callisto" - } + Transform = { + Translation = { + Type = "StaticTranslation", + Position = RalphOffset + } + } +}, + + -- NewHorizonsFov module NH_RALPH_MVIC_BLUE + { + Name = "NH_RALPH_MVIC_BLUE", + Parent = "NewHorizonsPosition", + 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" + } }, - -- NewHorizonsFov module NH_RALPH_MVIC_FT - { - Name = "NH_RALPH_MVIC_FT", - Parent = "NewHorizonsPosition", - Renderable = { - Type = "RenderableFov", - Body = "NEW HORIZONS", - Frame = "NH_SPACECRAFT", - RGB = { 0.8, 0.7, 0.7 }, - Textures = { - Type = "simple", - Color = "textures/glare_blue.png", - -- need to add different texture - }, - Instrument = { - Name = "NH_RALPH_MVIC_FT", - Method = "ELLIPSOID", - Aberration = "NONE", - }, - PotentialTargets = { - "Pluto", - "Charon", - "Jupiter", "Io", "Europa", "Ganymede", "Callisto" - } + Transform = { + Translation = { + Type = "StaticTranslation", + Position = RalphOffset + } + } +}, + +-- NewHorizonsFov module NH_RALPH_MVIC_FT +{ + Name = "NH_RALPH_MVIC_FT", + Parent = "NewHorizonsPosition", + 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" + } }, - -- NewHorizonsFov module NH_RALPH_MVIC_METHANE - { - Name = "NH_RALPH_MVIC_METHANE", - Parent = "NewHorizonsPosition", - Renderable = { - Type = "RenderableFov", - Body = "NEW HORIZONS", - Frame = "NH_SPACECRAFT", - RGB = { 0.8, 0.7, 0.7 }, - Textures = { - Type = "simple", - Color = "textures/glare_blue.png", - -- need to add different texture - }, - Instrument = { - Name = "NH_RALPH_MVIC_METHANE", - Method = "ELLIPSOID", - Aberration = "NONE", - }, - PotentialTargets = { - "Pluto", - "Charon", - "Jupiter", "Io", "Europa", "Ganymede", "Callisto" - } + Transform = { + Translation = { + Type = "StaticTranslation", + Position = RalphOffset + } + } +}, + +-- NewHorizonsFov module NH_RALPH_MVIC_METHANE +{ + Name = "NH_RALPH_MVIC_METHANE", + Parent = "NewHorizonsPosition", + 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" + } }, - -- NewHorizonsFov module NH_RALPH_MVIC_NIR - { - Name = "NH_RALPH_MVIC_NIR", - Parent = "NewHorizonsPosition", - Renderable = { - Type = "RenderableFov", - Body = "NEW HORIZONS", - Frame = "NH_SPACECRAFT", - RGB = { 0.8, 0.7, 0.7 }, - Textures = { - Type = "simple", - Color = "textures/glare_blue.png", - -- need to add different texture - }, - Instrument = { - Name = "NH_RALPH_MVIC_NIR", - Method = "ELLIPSOID", - Aberration = "NONE", - }, - PotentialTargets = { - "Pluto", - "Charon", - "Jupiter", "Io", "Europa", "Ganymede", "Callisto" - } + Transform = { + Translation = { + Type = "StaticTranslation", + Position = RalphOffset + } + } +}, + +-- NewHorizonsFov module NH_RALPH_MVIC_NIR +{ + Name = "NH_RALPH_MVIC_NIR", + Parent = "NewHorizonsPosition", + 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" + } }, - -- NewHorizonsFov module NH_ALICE_AIRGLOW - { - Name = "NH_ALICE_AIRGLOW", - Parent = "NewHorizonsPosition", - Renderable = { - Type = "RenderableFov", - Body = "NEW HORIZONS", - Frame = "NH_SPACECRAFT", - RGB = { 0.8, 0.7, 0.7 }, - Textures = { - Type = "simple", - Color = "textures/glare_blue.png", - -- need to add different texture - }, - Instrument = { - Name = "NH_ALICE_AIRGLOW", - Method = "ELLIPSOID", - Aberration = "NONE", - }, - PotentialTargets = { - "Pluto", - "Charon", - "Jupiter", "Io", "Europa", "Ganymede", "Callisto" - } + Transform = { + Translation = { + Type = "StaticTranslation", + Position = RalphOffset + } + } +}, + +-- NewHorizonsFov module NH_ALICE_AIRGLOW +{ + Name = "NH_ALICE_AIRGLOW", + Parent = "NewHorizonsPosition", + 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" + } }, - -- NewHorizonsFov module NH_ALICE_SOC - { - Name = "NH_ALICE_SOC", - Parent = "NewHorizonsPosition", - Renderable = { - Type = "RenderableFov", - Body = "NEW HORIZONS", - Frame = "NH_SPACECRAFT", - RGB = { 0.8, 0.7, 0.7 }, - Textures = { - Type = "simple", - Color = "textures/glare_blue.png", - -- need to add different texture - }, - Instrument = { - Name = "NH_ALICE_SOC", - Method = "ELLIPSOID", - Aberration = "NONE", - }, - PotentialTargets = { - "Pluto", - "Charon", - "Jupiter", "Io", "Europa", "Ganymede", "Callisto" - } + Transform = { + Translation = { + Type = "StaticTranslation", + Position = AliceOffset + } + } +}, + +-- NewHorizonsFov module NH_ALICE_SOC +{ + Name = "NH_ALICE_SOC", + Parent = "NewHorizonsPosition", + 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" + } }, - { - Name = "NH_REX", - Parent = "NewHorizonsPosition", - Renderable = { - Type = "RenderableCrawlingLine", - Source = "NH_REX", - Target = "EARTH", - -- Body = "NEW HORIZONS", - Frame = "GALACTIC", - Color = { 1.0, 0.7, 0.0 }, - Instrument = "NH_REX" + Transform = { + Translation = { + Type = "StaticTranslation", + Position = AliceOffset }, } -} \ No newline at end of file + }, + +-- Module NH_REX +{ + Name = "NH_REX", + Parent = "NewHorizonsPosition", + 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 = { + 0.0, 1.0, 0.0, + 0.0, 0.0, 1.0, + 1.0, 0.0, 0.0 + } + }, + Translation = { + Type = "StaticTranslation", + Position = RexOffset + } + } +} +} diff --git a/data/scene/missions/newhorizons/pluto/charon/charon.mod b/data/scene/missions/newhorizons/pluto/charon/charon.mod index 7cc7544f84..1813547e25 100644 --- a/data/scene/missions/newhorizons/pluto/charon/charon.mod +++ b/data/scene/missions/newhorizons/pluto/charon/charon.mod @@ -1,6 +1,9 @@ +local charon_radius = 6.035E5 + if UseAccurateNewHorizonsKernels then NewHorizonsKernels = { - "${SPICE}/nh_kernels/spk/NavSE_plu047_od122.bsp" + "${SPICE}/nh_20170126/spk/NavSE_plu047_od122.bsp", + "${SPICE}/nh_20170126/spk/NavPE_de433_od122.bsp", } else NewHorizonsKernels = { @@ -8,12 +11,12 @@ else } end -Files = { +local Files = { low = "textures/charon_highres.jpg", med = "textures/charon_highres.jpg", high = "textures/cpmap_cyl_HR_0e.jpg" } -ColorTexture = Files[TextureResolution] +local ColorTexture = Files[TextureResolution] return { -- CharonProjection module @@ -22,9 +25,10 @@ return { Parent = "PlutoBarycenter", Renderable = { Type = "RenderablePlanetProjection", + Radius = charon_radius, Geometry = { Type = "SimpleSphere", - Radius = 6.035E5, + Radius = charon_radius, Segments = 100 }, Textures = { diff --git a/data/scene/missions/newhorizons/pluto/hydra/hydra.mod b/data/scene/missions/newhorizons/pluto/hydra/hydra.mod index dbffd9a8a2..9418f4ceb4 100644 --- a/data/scene/missions/newhorizons/pluto/hydra/hydra.mod +++ b/data/scene/missions/newhorizons/pluto/hydra/hydra.mod @@ -1,6 +1,8 @@ +local charon_radius = 0.53E5 + if UseAccurateNewHorizonsKernels then NewHorizonsKernels = { - "${SPICE}/nh_kernels/spk/NavSE_plu047_od122.bsp" + "${SPICE}/nh_20170126/spk/NavSE_plu047_od122.bsp" } else NewHorizonsKernels = { @@ -17,9 +19,10 @@ return { Type = "RenderablePlanet", Frame = "IAU_PLUTO", Body = "HYDRA", + Radius = charon_radius, Geometry = { Type = "SimpleSphere", - Radius = { 0.53 , 5 }, + Radius = charon_radius, Segments = 100 }, Textures = { diff --git a/data/scene/missions/newhorizons/pluto/kerberos/kerberos.mod b/data/scene/missions/newhorizons/pluto/kerberos/kerberos.mod index 5710783747..9dab2c556f 100644 --- a/data/scene/missions/newhorizons/pluto/kerberos/kerberos.mod +++ b/data/scene/missions/newhorizons/pluto/kerberos/kerberos.mod @@ -1,6 +1,8 @@ +local kerberos_radius = 0.1E5 + if UseAccurateNewHorizonsKernels then NewHorizonsKernels = { - "${SPICE}/nh_kernels/spk/NavSE_plu047_od122.bsp" + "${SPICE}/nh_20170126/spk/NavSE_plu047_od122.bsp" } else NewHorizonsKernels = { @@ -17,9 +19,10 @@ return { Type = "RenderablePlanet", Frame = "IAU_PLUTO", Body = "KERBEROS", + Radius = kerberos_radius, Geometry = { Type = "SimpleSphere", - Radius = { 0.1 , 5 }, + Radius = kerberos_radius, Segments = 100 }, Textures = { diff --git a/data/scene/missions/newhorizons/pluto/nix/nix.mod b/data/scene/missions/newhorizons/pluto/nix/nix.mod index 8a4373431c..5ea9374cf0 100644 --- a/data/scene/missions/newhorizons/pluto/nix/nix.mod +++ b/data/scene/missions/newhorizons/pluto/nix/nix.mod @@ -1,6 +1,8 @@ +local nix_radius = 0.45E5 + if UseAccurateNewHorizonsKernels then NewHorizonsKernels = { - "${SPICE}/nh_kernels/spk/NavSE_plu047_od122.bsp" + "${SPICE}/nh_20170126/spk/NavSE_plu047_od122.bsp" } else NewHorizonsKernels = { @@ -17,9 +19,10 @@ return { Type = "RenderablePlanet", Frame = "IAU_PLUTO", Body = "NIX", + Radius = nix_radius, Geometry = { Type = "SimpleSphere", - Radius = 0.45E5, + Radius = nix_radius, Segments = 100 }, Textures = { diff --git a/data/scene/missions/newhorizons/pluto/pluto/pluto.mod b/data/scene/missions/newhorizons/pluto/pluto/pluto.mod index 6709f03fdb..4e54ff8b2a 100644 --- a/data/scene/missions/newhorizons/pluto/pluto/pluto.mod +++ b/data/scene/missions/newhorizons/pluto/pluto/pluto.mod @@ -1,7 +1,9 @@ +local pluto_radius = 1.173E6 + if UseAccurateNewHorizonsKernels then NewHorizonsKernels = { - "${SPICE}/nh_kernels/spk/NavPE_de433_od122.bsp", - "${SPICE}/nh_kernels/spk/NavSE_plu047_od122.bsp" + "${SPICE}/nh_20170126/spk/NavPE_de433_od122.bsp", + "${SPICE}/nh_20170126/spk/NavSE_plu047_od122.bsp" } else NewHorizonsKernels = { @@ -9,12 +11,12 @@ else } end -Files = { +local Files = { low = "textures/pluto_large.jpg", med = "textures/Shenk_180.jpg", high = "textures/pmap_cyl_HR_LOR_lowres.jpg" } -ColorTexture = Files[TextureResolution] +local ColorTexture = Files[TextureResolution] return { -- Pluto barycenter module @@ -36,9 +38,10 @@ return { Parent = "PlutoBarycenter", Renderable = { Type = "RenderablePlanetProjection", + Radius = pluto_radius, Geometry = { Type = "SimpleSphere", - Radius = 1.173E6, + Radius = pluto_radius, Segments = 100 }, Textures = { @@ -205,7 +208,7 @@ return { Parent = "Pluto", Renderable = { Type = "RenderablePlane", - Size = {1.0, 6.4}, + Size = 10.0^6.4, Origin = "Center", Billboard = true, ProjectionListener = false, diff --git a/data/scene/missions/newhorizons/pluto/styx/styx.mod b/data/scene/missions/newhorizons/pluto/styx/styx.mod index 8637601452..da6e1bce05 100644 --- a/data/scene/missions/newhorizons/pluto/styx/styx.mod +++ b/data/scene/missions/newhorizons/pluto/styx/styx.mod @@ -1,6 +1,8 @@ +local styx_radius = 0.75E4 + if UseAccurateNewHorizonsKernels then NewHorizonsKernels = { - "${SPICE}/nh_kernels/spk/NavSE_plu047_od122.bsp" + "${SPICE}/nh_20170126/spk/NavSE_plu047_od122.bsp" } else NewHorizonsKernels = { @@ -17,9 +19,10 @@ return { Type = "RenderablePlanet", Frame = "IAU_PLUTO", Body = "STYX", + Radius = styx_radius, Geometry = { Type = "SimpleSphere", - Radius = 0.75E4, + Radius = styx_radius, Segments = 100 }, Textures = { diff --git a/modules/base/shaders/model_fs.glsl b/modules/base/shaders/model_fs.glsl index 3a14dc24dd..d53c5c30ae 100644 --- a/modules/base/shaders/model_fs.glsl +++ b/modules/base/shaders/model_fs.glsl @@ -22,8 +22,6 @@ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * ****************************************************************************************/ -// Uniforms -uniform float transparency; uniform float fading; uniform bool performShading = true; @@ -76,10 +74,8 @@ Fragment getFragment() { color = diffuseAlbedo; } - float alpha = fading * transparency; - Fragment frag; - frag.color = vec4(color, alpha); + frag.color = vec4(color, fading); frag.depth = vs_positionScreenSpace.w; return frag; diff --git a/modules/newhorizons/rendering/renderableplanetprojection.cpp b/modules/newhorizons/rendering/renderableplanetprojection.cpp index db8e1710a5..ed13725709 100644 --- a/modules/newhorizons/rendering/renderableplanetprojection.cpp +++ b/modules/newhorizons/rendering/renderableplanetprojection.cpp @@ -280,7 +280,7 @@ void RenderablePlanetProjection::imageProjectGPU( if (_geometry->hasProperty("radius")){ ghoul::any r = _geometry->property("radius")->get(); - if (glm::vec4* radius = ghoul::any_cast(&r)){ + if (glm::vec3* radius = ghoul::any_cast(&r)){ _fboProgramObject->setUniform("_radius", radius); } }else{ diff --git a/modules/newhorizons/shaders/renderableModel_fs.glsl b/modules/newhorizons/shaders/renderableModel_fs.glsl index 2b9f770cc0..92cc06e689 100644 --- a/modules/newhorizons/shaders/renderableModel_fs.glsl +++ b/modules/newhorizons/shaders/renderableModel_fs.glsl @@ -90,6 +90,7 @@ Fragment getFragment() { Fragment frag; frag.color = vec4(color, 1.0); - frag.depth = vs_positionScreenSpace.w; + // frag.depth = vs_positionScreenSpace.w; + frag.depth = 0.0; return frag; } diff --git a/modules/newhorizons/shaders/renderablePlanetProjection_fs.glsl b/modules/newhorizons/shaders/renderablePlanetProjection_fs.glsl index 34020b7eef..db707936a1 100644 --- a/modules/newhorizons/shaders/renderablePlanetProjection_fs.glsl +++ b/modules/newhorizons/shaders/renderablePlanetProjection_fs.glsl @@ -37,14 +37,14 @@ uniform mat4 ProjectorMatrix; uniform mat4 ModelTransform; uniform vec2 _scaling; -uniform vec4 _radius; +uniform vec3 _radius; uniform int _segments; uniform vec3 boresight; #define M_PI 3.14159265358979323846 -vec4 uvToModel(vec2 uv, vec4 radius, float segments){ +vec4 uvToModel(vec2 uv, vec3 radius, float segments){ float fj = uv.x * segments; float fi = (1.0 - uv.y) * segments; @@ -55,7 +55,7 @@ vec4 uvToModel(vec2 uv, vec4 radius, float segments){ float y = radius[1] * cos(theta); // up float z = radius[2] * cos(phi) * sin(theta); // - return vec4(x, y, z, radius[3]); + return vec4(x, y, z, 0); } bool inRange(float x, float a, float b){ @@ -79,7 +79,7 @@ void main() { vec3 v_b = normalize(boresight); - if((inRange(projected.x, 0, 1) && + if((inRange(projected.x, 0, 1) && inRange(projected.y, 0, 1)) && dot(v_b, normal) < 0 ) {