diff --git a/.gitignore b/.gitignore index 0980cb3856..1006d42b46 100644 --- a/.gitignore +++ b/.gitignore @@ -68,6 +68,10 @@ data/scene/newhorizons/pluto/pluto/assets data/scene/newhorizons/pluto/pluto/full_images data/scene/newhorizons/pluto/pluto/images data/scene/newhorizons/pluto/pluto/textures +data/scene/osirisrex/bennu/models +data/scene/osirisrex/bennu/textures +data/scene/osirisrex/osirisrex/models +data/scene/osirisrex/osirisrex/textures data/scene/pluto/textures data/scene/saturn/textures data/scene/rosetta/67P/obj @@ -91,5 +95,6 @@ data/spice/de430_1850-2150.bsp data/spice/MAR063.BSP data/spice/NewHorizonsKernels data/spice/nh_kernels +data/spice/OsirisRexKernels data/spice/Rosetta diff --git a/data/scene/atmosphereearth/atmosphereearth.mod b/data/scene/atmosphereearth/atmosphereearth.mod index 166a0bdbad..f54904ac1f 100644 --- a/data/scene/atmosphereearth/atmosphereearth.mod +++ b/data/scene/atmosphereearth/atmosphereearth.mod @@ -7,11 +7,8 @@ return { Ephemeris = { Type = "Spice", Body = "EARTH BARYCENTER", - Reference = "ECLIPJ2000", Observer = "SUN", - Kernels = { - "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp" - } + Kernels = "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp" }, }, -- Earth module @@ -101,9 +98,7 @@ return { -- G = 0.65, -- }, } - }, - - GuiName = "/Solar/Planets/Earth" + } }, -- EarthTrail module { @@ -118,8 +113,7 @@ return { TropicalOrbitPeriod = 365.242, EarthOrbitRatio = 1, DayLength = 24 - }, - GuiName = "/Solar/EarthTrail" + } }, { Name = "EarthMarker", diff --git a/data/scene/batsrus/batsrus.mod b/data/scene/batsrus/batsrus.mod index f512afb550..a948893e53 100644 --- a/data/scene/batsrus/batsrus.mod +++ b/data/scene/batsrus/batsrus.mod @@ -57,8 +57,6 @@ return { TransferFunctionName = "BatsrusPTF", TransferFunction = "transferfunctions/p.txt", Sampler = "psampler.glsl", - }, - GuiName = "/Volumes/Volume" + } } - --]] } \ No newline at end of file diff --git a/data/scene/common/common.mod b/data/scene/common/common.mod index aa9e0d050c..22ac4fa860 100644 --- a/data/scene/common/common.mod +++ b/data/scene/common/common.mod @@ -2,10 +2,6 @@ return { -- Solar System module { Name = "SolarSystem", - Parent = "Root", - Ephemeris = { - Type = "Static", - Position = { 0, 0, 0, 0} - } + Parent = "Root" }, } \ No newline at end of file diff --git a/data/scene/constellationbounds/constellationbounds.mod b/data/scene/constellationbounds/constellationbounds.mod index 8d1ff2f91b..e23d57dc37 100644 --- a/data/scene/constellationbounds/constellationbounds.mod +++ b/data/scene/constellationbounds/constellationbounds.mod @@ -8,9 +8,6 @@ return { File = "${OPENSPACE_DATA}/scene/constellationbounds/data/bound_20.dat", ConstellationFile = "${OPENSPACE_DATA}/scene/constellationbounds/data/constellations.dat", ReferenceFrame = "J2000" - }, - Ephemeris = { - Type = "Static" } } } \ No newline at end of file diff --git a/data/scene/dawn/ceres/ceres.mod b/data/scene/dawn/ceres/ceres.mod index 2c2406d4a6..ff9c413a2a 100644 --- a/data/scene/dawn/ceres/ceres.mod +++ b/data/scene/dawn/ceres/ceres.mod @@ -23,7 +23,6 @@ return { Ephemeris = { Type = "Spice", Body = "CERES", - Reference = "GALACTIC", Observer = "SUN", Kernels = { "${OPENSPACE_DATA}/spice/DawnKernels/pck/dawn_ceres_v01.tpc", @@ -35,9 +34,7 @@ return { Type = "Spice", Frame = "IAU_CERES", Reference = "GALACTIC" - }, - - GuiName = "/Solar/Ceres" + } }, --[[ Ceres Trail Module { @@ -62,8 +59,7 @@ return { }, StartTime = "2010 JAN 01T00:00:00", EndTime = "2018 JAN 22 12:00:00" - }, - GuiName = "/Solar/CeresTrail" + } } --]] } \ No newline at end of file diff --git a/data/scene/dawn/dawn/dawn.mod b/data/scene/dawn/dawn/dawn.mod index e93fd3522b..65e003ac47 100644 --- a/data/scene/dawn/dawn/dawn.mod +++ b/data/scene/dawn/dawn/dawn.mod @@ -25,7 +25,6 @@ return { Ephemeris = { Type = "Spice", Body = "DAWN", - Reference = "GALACTIC", Observer = "SUN", Kernels = { "${OPENSPACE_DATA}/spice/DawnKernels/spk/dawn_ref_070926-150201_070829.bsp", @@ -621,8 +620,7 @@ return { "${OPENSPACE_DATA}/spice/DawnKernels/ck/dawn_sa_120903_120909.bc", "${OPENSPACE_DATA}/spice/DawnKernels/ck/dawn_sa_120910_120916.bc", } - }, - GuiName = "/Solar/Dawn" + } }, -- Dawn Solar Array module 1 @@ -719,7 +717,6 @@ return { StartTime = "2007 SEP 26 13:28:00", EndTime = "2012 SEP 12 12:00:00" }, - GuiName = "DawnTrail" }, -- -- -- Dawn Trail Module @@ -771,7 +768,6 @@ return { "CERES" } }, - GuiName = "/Solar/Dawn_FC1" }, -- DawnFov 1 @@ -798,6 +794,5 @@ return { "CERES" } }, - GuiName = "/Solar/Dawn_FC" }, } diff --git a/data/scene/dawn/vestaprojection/vestaprojection.mod b/data/scene/dawn/vestaprojection/vestaprojection.mod index bb5dc312ae..4de4d75dee 100644 --- a/data/scene/dawn/vestaprojection/vestaprojection.mod +++ b/data/scene/dawn/vestaprojection/vestaprojection.mod @@ -88,16 +88,12 @@ return { Ephemeris = { Type = "Spice", Body = "VESTA", - Reference = "GALACTIC", Observer = "SUN", Kernels = { --"${OPENSPACE_DATA}/spice/DAWN_KERNELS/pck/dawn_vesta_v06.tpc", "${OPENSPACE_DATA}/spice/DawnKernels/spk/sb_vesta_071107.bsp", } - }, - - - GuiName = "/Solar/Vesta" + } }, -- Vesta Trail Module { @@ -122,7 +118,6 @@ return { }, StartTime = "2007 JUL 20 12:00:00", EndTime = "2018 JAN 22 12:00:00" - }, - GuiName = "/Solar/VestaTrail" + } } } diff --git a/data/scene/debugglobe/debugglobe.mod b/data/scene/debugglobe/debugglobe.mod index ae21e2f03a..7f559dce3a 100644 --- a/data/scene/debugglobe/debugglobe.mod +++ b/data/scene/debugglobe/debugglobe.mod @@ -7,11 +7,8 @@ return { Ephemeris = { Type = "Spice", Body = "EARTH BARYCENTER", - Reference = "ECLIPJ2000", Observer = "SUN", - Kernels = { - "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp" - } + Kernels = "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp" }, }, -- RenderableGlobe module @@ -170,8 +167,7 @@ return { Kernels = { "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp" } - }, - GuiName = "/Solar/Planets/DebugGlobe" + } }, -- EarthTrail module { @@ -186,8 +182,7 @@ return { TropicalOrbitPeriod = 365.242, EarthOrbitRatio = 1, DayLength = 24 - }, - GuiName = "/Solar/EarthTrail" + } } --[[, { diff --git a/data/scene/debugmodel/debugmodel.mod b/data/scene/debugmodel/debugmodel.mod deleted file mode 100644 index 3bfbd088af..0000000000 --- a/data/scene/debugmodel/debugmodel.mod +++ /dev/null @@ -1,25 +0,0 @@ -return { - { - Name = "DebugModel", - Parent = "Root", - Renderable = { - Type = "RenderableModel", - Body = "SUN", - Geometry = { - Type = "MultiModelGeometry", - GeometryFile = "models/OSIRIS-REx GSFC Animation/OSIRIS-REx GSFC Animation/OREXE1.obj", - Magnification = 4, - }, - Textures = { - Type = "simple", - Color = "textures/NHTexture.jpg", - }, - Shading = { - PerformShading = true, - Fadeable = false, - Ghosting = false, - }, - }, - GuiName = "/Solar/DebugModel" - }, -} \ No newline at end of file diff --git a/data/scene/earth/earth.mod b/data/scene/earth/earth.mod index 0456dfaa13..cda7130a76 100644 --- a/data/scene/earth/earth.mod +++ b/data/scene/earth/earth.mod @@ -33,11 +33,8 @@ return { Translation = { Type = "SpiceEphemeris", Body = "EARTH", - Reference = "ECLIPJ2000", Observer = "SUN", - Kernels = { - "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp" - } + Kernels = "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp" }, Rotation = { Type = "SpiceRotation", diff --git a/data/scene/enlil/enlil.mod b/data/scene/enlil/enlil.mod index ae6f91073f..6d31327448 100644 --- a/data/scene/enlil/enlil.mod +++ b/data/scene/enlil/enlil.mod @@ -4,14 +4,9 @@ return { { Name = "Enlil", Parent = "Root", - Ephemeris = { - Type = "Static", - Position = { 0.0, 0.0, 0.0, 0} - }, RenderableToggle = "e", Renderable = { Type = "RenderableVolumeGL", - ---[[ BoxScaling = { f, f, f}, VolumeName = "EnlilVolume", Volume = "${OPENSPACE_DATA}/enlil/Hong_Xie_120312_SH_1.enlil.0016.cdf", @@ -26,8 +21,6 @@ return { TransferFunction = "transferfunctions/t2.txt", -- TransferFunction = "transferfunctions/t1.txt", Sampler = "sampler.glsl", - --]] - }, - GuiName = "/Volumes/Volume" + } } } diff --git a/data/scene/enlilnh/enlilnh.mod b/data/scene/enlilnh/enlilnh.mod index 78a1e2bd07..b065e04501 100644 --- a/data/scene/enlilnh/enlilnh.mod +++ b/data/scene/enlilnh/enlilnh.mod @@ -3,10 +3,6 @@ return { { Name = "Enlil New Horizons", Parent = "Root", - Ephemeris = { - Type = "Static", - Position = { 0.0, 0.0, 0.0, 0} - }, Renderable = { Type = "RenderableMultiresVolume", ReferenceFrame = "HEEQ", @@ -18,7 +14,6 @@ return { ErrorHistogramsSource = "tsp/enlil_nh_128_128_16_50.errorHistograms", TransferFunction = "transferfunctions/fire.txt", BrickSelector = "tf", - }, - GuiName = "/Volumes/ENLIL New Horizons" + } } } diff --git a/data/scene/fieldlines/fieldlines.mod b/data/scene/fieldlines/fieldlines.mod index c017daa93d..e0609029cb 100644 --- a/data/scene/fieldlines/fieldlines.mod +++ b/data/scene/fieldlines/fieldlines.mod @@ -10,10 +10,6 @@ return { { Name = "Fieldlines1", Parent = "Earth", - Ephemeris = { - Type = "Static", - Position = { 0, 0, 0, 0}, - }, Renderable = { Type = "RenderableFieldlines", VectorField = { @@ -30,16 +26,11 @@ return { Type = "File", File = '${OPENSPACE_DATA}/scene/fieldlines/bats_seeds/BATS_R_US_closed_seeds_all.txt'; } - }, - GuiName = "/Geometry/Fieldlines" + } }, { Name = "Fieldlines2", Parent = "Earth", - Ephemeris = { - Type = "Static", - Position = { 0, 0, 0, 0}, - }, Renderable = { Type = "RenderableFieldlines", VectorField = { @@ -56,16 +47,11 @@ return { Type = "File", File = '${OPENSPACE_DATA}/scene/fieldlines/bats_seeds/BATS_R_US_open_north_all.txt' } - }, - GuiName = "/Geometry/Fieldlines" + } }, { Name = "Fieldlines3", Parent = "Earth", - Ephemeris = { - Type = "Static", - Position = { 0, 0, 0, 0}, - }, Renderable = { Type = "RenderableFieldlines", VectorField = { @@ -82,16 +68,11 @@ return { Type = "File", File = '${OPENSPACE_DATA}/scene/fieldlines/bats_seeds/BATS_R_US_open_south_all.txt' } - }, - GuiName = "/Geometry/Fieldlines" + } }, { Name = "Fieldlines4", Parent = "Earth", - Ephemeris = { - Type = "Static", - Position = { 0, 0, 0, 0}, - }, Renderable = { Type = "RenderableFieldlines", VectorField = { @@ -108,16 +89,11 @@ return { Type = "File", File = '${OPENSPACE_DATA}/scene/fieldlines/bats_seeds/BATS_R_US_solar_wind_all.txt' } - }, - GuiName = "/Geometry/Fieldlines" + } }, { Name = "Fieldlines5", Parent = "Earth", - Ephemeris = { - Type = "Static", - Position = { 0, 0, 0, 0}, - }, Renderable = { Type = "RenderableFieldlines", VectorField = { @@ -134,7 +110,6 @@ return { Type = "File", File = '${OPENSPACE_DATA}/scene/fieldlines/bats_seeds/BATS_R_US_separatrix_seeds_all.txt' } - }, - GuiName = "/Geometry/Fieldlines" + } } } \ No newline at end of file diff --git a/data/scene/flare/flare.mod b/data/scene/flare/flare.mod index 6dbf429c68..c0b9b8b5dd 100644 --- a/data/scene/flare/flare.mod +++ b/data/scene/flare/flare.mod @@ -3,10 +3,6 @@ return { { Name = "Flare", Parent = "Root", - Ephemeris = { - Type = "Static", - Position = { 0, 0, 0, 0} - }, Renderable = { Type = "RenderableFlare", Source = "${OPENSPACE_DATA}/enlil_64_32_8.tsp", @@ -23,7 +19,6 @@ return { tsp_traveral_stepsize = 0.02, raycaster_stepsize = 0.005, - }, - GuiName = "/Volumes/Flare" + } } } \ No newline at end of file diff --git a/data/scene/grids/gridEcliptic/gridEcliptic.mod b/data/scene/grids/gridEcliptic/gridEcliptic.mod index 3aea1790ae..ed4e7fb452 100644 --- a/data/scene/grids/gridEcliptic/gridEcliptic.mod +++ b/data/scene/grids/gridEcliptic/gridEcliptic.mod @@ -3,7 +3,6 @@ return { { Name = "SphericalGrid", Parent = "Root", - Static = true, Renderable = { Type = "RenderableSphericalGrid", GridType = "ECLIPJ2000", @@ -13,22 +12,6 @@ return { -0.09647644, 0.8622859, 0.4971472 , 0.0, 0.0 , 0.0 , 0.0 , 1.0 }, GridSegments = 36, - }, - Ephemeris = { - Type = "Static" -- for now, might change. - }, - - --[[ - Ephemeris = { - Type = "Spice", - Body = "EARTH", - Reference = "ECLIPJ2000", - Observer = "EARTH BARYCENTER", - Kernels = { - "kernels/earth.bsp" - } - }, - --]] - GuiName = "/Grid/Ecliptic" + } } } \ No newline at end of file diff --git a/data/scene/grids/gridEquatorial/gridEquatorial.mod b/data/scene/grids/gridEquatorial/gridEquatorial.mod index e35fdf7ee6..ccee24ccad 100644 --- a/data/scene/grids/gridEquatorial/gridEquatorial.mod +++ b/data/scene/grids/gridEquatorial/gridEquatorial.mod @@ -3,7 +3,6 @@ return { { Name = "SphericalGrid", Parent = "Root", - Static = true, Renderable = { Type = "RenderableSphericalGrid", GridType = "ICRF", @@ -13,11 +12,6 @@ return { -0.483835 , 0.7469823, 0.4559838, 0.0, 0.0 , 0.0 , 0.0 , 1.0 }, GridSegments = 36, - }, - Ephemeris = { - Type = "Static" -- for now, might change. - }, - - GuiName = "/Grid/Equatorial" + } } } \ No newline at end of file diff --git a/data/scene/grids/gridGalactic/gridGalactic.mod b/data/scene/grids/gridGalactic/gridGalactic.mod index 95f25afe4f..b27d939b6c 100644 --- a/data/scene/grids/gridGalactic/gridGalactic.mod +++ b/data/scene/grids/gridGalactic/gridGalactic.mod @@ -3,32 +3,15 @@ return { { Name = "gridGalactic", Parent = "SolarSystem", - Static = true, Renderable = { Type = "RenderableSphericalGrid", GridType = "GALACTIC", GridColor = { 0.0, 0.4, 0.4, 1}, - GridMatrix = { 1.0, 0.0, 0.0, 0.0, - 0.0, 1.0, 0.0, 0.0, - 0.0, 0.0, 1.0, 0.0, + GridMatrix = { 1.0, 0.0, 0.0, 0.0, + 0.0, 1.0, 0.0, 0.0, + 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0 }, GridSegments = 36, - }, - Ephemeris = { - Type = "Static" -- for now, might change. - }, - - --[[ - Ephemeris = { - Type = "Spice", - Body = "EARTH", - Reference = "ECLIPJ2000", - Observer = "EARTH BARYCENTER", - Kernels = { - "kernels/earth.bsp" - } - }, - --]] - GuiName = "/Grid/Galactic" + } } } \ No newline at end of file diff --git a/data/scene/imageplane/imageplane.mod b/data/scene/imageplane/imageplane.mod deleted file mode 100644 index 6d6cf14f06..0000000000 --- a/data/scene/imageplane/imageplane.mod +++ /dev/null @@ -1,34 +0,0 @@ -return { - -- Latest image taken by LORRI - --[[ - { - Name = "ImagePlane", - Parent = "PlutoProjection", - Renderable = { - Type = "RenderablePlaneProjection", - Frame = "NH_SPACECRAFT", - DefaultTarget = "PLUTO", - Spacecraft = "NEW HORIZONS", - Instrument = "NH_LORRI", - Moving = false, - Texture = "textures/squarefov.png", - }, - }, - - -- LORRI FoV square - { - Name = "ImagePlane2", - Parent = "NewHorizons", - Renderable = { - Type = "RenderablePlaneProjection", - Frame = "IAU_JUPITER", - DefaultTarget = "JUPITER", - Spacecraft = "NEW HORIZONS", - Instrument = "NH_LORRI", - Moving = true, - Texture = "textures/squarefov.png", - }, - } - ]] -} - diff --git a/data/scene/imageplane/textures/squarefov.png b/data/scene/imageplane/textures/squarefov.png deleted file mode 100644 index 1d48dc35f4..0000000000 Binary files a/data/scene/imageplane/textures/squarefov.png and /dev/null differ diff --git a/data/scene/imageplane/textures/test.jpg b/data/scene/imageplane/textures/test.jpg deleted file mode 100644 index 1978087d08..0000000000 Binary files a/data/scene/imageplane/textures/test.jpg and /dev/null differ diff --git a/data/scene/juno/juno/juno.mod b/data/scene/juno/juno/juno.mod index 01006cfa80..ec95c0c83f 100644 --- a/data/scene/juno/juno/juno.mod +++ b/data/scene/juno/juno/juno.mod @@ -31,7 +31,6 @@ return { Ephemeris = { Type = "Spice", Body = "JUNO", - Reference = "GALACTIC", Observer = "JUPITER BARYCENTER", Kernels = { "spice/JNO_SCLKSCET.00039.tsc", @@ -120,8 +119,7 @@ return { "spice/ck/juno_sc_prl_160729_160826_jm0002rp_v01.bc", "spice/ck/juno_sc_prl_161115_161213_jx0405rp_v01.bc" } - }, - GuiName = "/Solar/Juno" + } }, --NewHorizonsTrail module { diff --git a/data/scene/jupiter/callisto/callisto.mod b/data/scene/jupiter/callisto/callisto.mod index 1288472c2a..1af5b70f73 100644 --- a/data/scene/jupiter/callisto/callisto.mod +++ b/data/scene/jupiter/callisto/callisto.mod @@ -26,11 +26,8 @@ return { Translation = { Type = "SpiceEphemeris", Body = "CALLISTO", - Reference = "ECLIPJ2000", Observer = "JUPITER BARYCENTER", - Kernels = { - "${OPENSPACE_DATA}/spice/jup260.bsp" - } + Kernels = "${OPENSPACE_DATA}/spice/jup260.bsp" }, Rotation = { Type = "SpiceRotation", @@ -41,8 +38,7 @@ return { Type = "StaticScale", Scale = 1, }, - }, - GuiName = "/Solar/Planets/Callisto" + } }, -- CallistoTrail module { @@ -62,7 +58,6 @@ return { Color = "${COMMON_MODULE}/textures/glare_blue.png", -- need to add different texture }, - }, - GuiName = "/Solar/CallistoTrail" + } } } diff --git a/data/scene/jupiter/europa/europa.mod b/data/scene/jupiter/europa/europa.mod index 15ec4270e2..44c2ded0a5 100644 --- a/data/scene/jupiter/europa/europa.mod +++ b/data/scene/jupiter/europa/europa.mod @@ -26,11 +26,8 @@ return { Translation = { Type = "SpiceEphemeris", Body = "EUROPA", - Reference = "ECLIPJ2000", Observer = "JUPITER BARYCENTER", - Kernels = { - "${OPENSPACE_DATA}/spice/jup260.bsp" - } + Kernels = "${OPENSPACE_DATA}/spice/jup260.bsp" }, Rotation = { Type = "SpiceRotation", @@ -41,8 +38,7 @@ return { Type = "StaticScale", Scale = 1, }, - }, - GuiName = "/Solar/Planets/EUROPA" + } }, -- EuropaTrail module { @@ -62,7 +58,6 @@ return { Color = "${COMMON_MODULE}/textures/glare_blue.png", -- need to add different texture }, - }, - GuiName = "/Solar/EuropaTrail" + } } } diff --git a/data/scene/jupiter/ganymede/ganymede.mod b/data/scene/jupiter/ganymede/ganymede.mod index b7710e3124..c31809f2be 100644 --- a/data/scene/jupiter/ganymede/ganymede.mod +++ b/data/scene/jupiter/ganymede/ganymede.mod @@ -26,11 +26,8 @@ return { Translation = { Type = "SpiceEphemeris", Body = "GANYMEDE", - Reference = "ECLIPJ2000", Observer = "JUPITER BARYCENTER", - Kernels = { - "${OPENSPACE_DATA}/spice/jup260.bsp" - } + Kernels = "${OPENSPACE_DATA}/spice/jup260.bsp" }, Rotation = { Type = "SpiceRotation", @@ -41,8 +38,7 @@ return { Type = "StaticScale", Scale = 1, }, - }, - GuiName = "/Solar/Planets/Ganymede" + } }, -- GanymedeTrail module { @@ -62,7 +58,6 @@ return { Color = "${COMMON_MODULE}/textures/glare_blue.png", -- need to add different texture }, - }, - GuiName = "/Solar/GanymedeTrail" + } } } diff --git a/data/scene/jupiter/io/io.mod b/data/scene/jupiter/io/io.mod index 7019330621..ba04eb8c6d 100644 --- a/data/scene/jupiter/io/io.mod +++ b/data/scene/jupiter/io/io.mod @@ -26,11 +26,8 @@ return { Translation = { Type = "SpiceEphemeris", Body = "IO", - Reference = "ECLIPJ2000", Observer = "JUPITER BARYCENTER", - Kernels = { - "${OPENSPACE_DATA}/spice/jup260.bsp" - } + Kernels = "${OPENSPACE_DATA}/spice/jup260.bsp" }, Rotation = { Type = "SpiceRotation", @@ -41,8 +38,7 @@ return { Type = "StaticScale", Scale = 1, }, - }, - GuiName = "/Solar/Planets/Jupiter" + } }, -- IoTrail module { @@ -62,7 +58,6 @@ return { Color = "${COMMON_MODULE}/textures/glare_blue.png", -- need to add different texture }, - }, - GuiName = "/Solar/IoTrail" + } } } diff --git a/data/scene/jupiter/jupiter/jupiter.mod b/data/scene/jupiter/jupiter/jupiter.mod index b8c3752bf6..6d51c47314 100644 --- a/data/scene/jupiter/jupiter/jupiter.mod +++ b/data/scene/jupiter/jupiter/jupiter.mod @@ -7,11 +7,8 @@ return { Translation = { Type = "SpiceEphemeris", Body = "JUPITER BARYCENTER", - Reference = "ECLIPJ2000", Observer = "SUN", - Kernels = { - "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp" - } + Kernels = "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp" }, }, }, @@ -52,8 +49,7 @@ return { Type = "StaticScale", Scale = 1, }, - }, - GuiName = "/Solar/Planets/Jupiter" + } }, -- JupiterTrail module { @@ -73,7 +69,6 @@ return { Color = "${COMMON_MODULE}/textures/glare_blue.png", -- need to add different texture }, - }, - GuiName = "/Solar/JupiterTrail" + } } } diff --git a/data/scene/jupiter/textures/Jupiter-text.png b/data/scene/jupiter/textures/Jupiter-text.png deleted file mode 100644 index c8ec1a2b71..0000000000 Binary files a/data/scene/jupiter/textures/Jupiter-text.png and /dev/null differ diff --git a/data/scene/lodearth/lodearth.mod b/data/scene/lodearth/lodearth.mod index 14b8355677..f7ca2e8291 100644 --- a/data/scene/lodearth/lodearth.mod +++ b/data/scene/lodearth/lodearth.mod @@ -8,11 +8,8 @@ return { Translation = { Type = "SpiceEphemeris", Body = "EARTH", - Reference = "ECLIPJ2000", Observer = "SUN", - Kernels = { - "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp" - } + Kernels = "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp" }, }, }, @@ -29,8 +26,7 @@ return { TropicalOrbitPeriod = 365.242, EarthOrbitRatio = 1, DayLength = 24 - }, - GuiName = "/Solar/EarthTrail" + } }, -- RenderableGlobe module { @@ -130,7 +126,6 @@ return { }, }, }, - }, - GuiName = "/Solar/Planets/Earth" + } }, } \ No newline at end of file diff --git a/data/scene/lodesritest/lodesritest.mod b/data/scene/lodesritest/lodesritest.mod index a6ee718e67..db213b3e6c 100644 --- a/data/scene/lodesritest/lodesritest.mod +++ b/data/scene/lodesritest/lodesritest.mod @@ -3,9 +3,6 @@ return { { Name = "EarthBarycenter", Parent = "SolarSystemBarycenter", - Ephemeris = { - Type = "Static" - } }, -- EarthTrail module { @@ -30,11 +27,8 @@ return { Ephemeris = { Type = "Spice", Body = "EARTH", - Reference = "ECLIPJ2000", Observer = "SUN", - Kernels = { - "${OPENSPACE_DATA}/spice/de430.bsp" - } + Kernels = "${OPENSPACE_DATA}/spice/de430.bsp" }, Rotation = { Type = "Spice", @@ -86,8 +80,7 @@ return { HeightMapOverlays = { }, }, - }, - GuiName = "/Solar/Planets/LodEarth" + } }, { Name = "LodMoon", @@ -95,11 +88,8 @@ return { Ephemeris = { Type = "Spice", Body = "MOON", - Reference = "ECLIPJ2000", Observer = "SUN", - Kernels = { - "${OPENSPACE_DATA}/spice/de430.bsp" - } + Kernels = "${OPENSPACE_DATA}/spice/de430.bsp" }, Rotation = { Type = "Spice", @@ -180,11 +170,8 @@ return { Ephemeris = { Type = "Spice", Body = "MARS", - Reference = "ECLIPJ2000", Observer = "SUN", - Kernels = { - "${OPENSPACE_DATA}/spice/MAR063.BSP" - } + Kernels = "${OPENSPACE_DATA}/spice/MAR063.BSP" }, Rotation = { Type = "Spice", @@ -243,8 +230,7 @@ return { HeightMapOverlays = { }, }, - }, - GuiName = "/Solar/Planets/LodEarth" + } }, { Name = "LodMercury", @@ -252,11 +238,8 @@ return { Ephemeris = { Type = "Spice", Body = "MERCURY", - Reference = "ECLIPJ2000", Observer = "SUN", - Kernels = { - "${OPENSPACE_DATA}/spice/de430.bsp" - } + Kernels = "${OPENSPACE_DATA}/spice/de430.bsp" }, Rotation = { Type = "Spice", @@ -303,7 +286,6 @@ return { }, }, - }, - GuiName = "/Solar/Planets/LodEarth" + } }, } diff --git a/data/scene/lodmars/lodmars.mod b/data/scene/lodmars/lodmars.mod index 34a78abda3..dce7bf881b 100644 --- a/data/scene/lodmars/lodmars.mod +++ b/data/scene/lodmars/lodmars.mod @@ -8,11 +8,8 @@ return { Translation = { Type = "SpiceEphemeris", Body = "MARS BARYCENTER", - Reference = "ECLIPJ2000", Observer = "SUN", - Kernels = { - "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp" - } + Kernels = "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp" }, }, }, @@ -128,9 +125,7 @@ return { }, }, }, - }, - - GuiName = "/Solar/Planets/LodMars" + } }, -- MarsTrail module { @@ -145,7 +140,6 @@ return { TropicalOrbitPeriod = 686.973, EarthOrbitRatio = 1.881, DayLength = 24.6597, - }, - GuiName = "/Solar/MarsTrail" + } } } diff --git a/data/scene/lodmercury/lodmercury.mod b/data/scene/lodmercury/lodmercury.mod index a46dba8f25..f949495ff1 100644 --- a/data/scene/lodmercury/lodmercury.mod +++ b/data/scene/lodmercury/lodmercury.mod @@ -7,11 +7,8 @@ return { Translation = { Type = "SpiceEphemeris", Body = "MERCURY", - Reference = "ECLIPJ2000", Observer = "SUN", - Kernels = { - "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp" - } + Kernels = "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp" }, }, }, @@ -70,7 +67,6 @@ return { }, }, }, - GuiName = "/Solar/Planets/LodMercury" }, -- MercuryTrail module @@ -87,6 +83,5 @@ return { EarthOrbitRatio = 0.241, DayLength = 4222.6, }, - GuiName = "/Solar/MercuryTrail" } } diff --git a/data/scene/lodmoon/lodmoon.mod b/data/scene/lodmoon/lodmoon.mod index 267fff5e5b..d295f114f9 100644 --- a/data/scene/lodmoon/lodmoon.mod +++ b/data/scene/lodmoon/lodmoon.mod @@ -7,11 +7,8 @@ return { Translation = { Type = "SpiceEphemeris", Body = "MOON", - Reference = "ECLIPJ2000", Observer = "EARTH BARYCENTER", - Kernels = { - "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp" - } + Kernels = "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp" }, Rotation = { Type = "SpiceRotation", @@ -59,8 +56,7 @@ return { }, }, }, - }, - GuiName = "/Solar/Planets/Moon" + } }, -- MoonTrail module { @@ -75,7 +71,6 @@ return { TropicalOrbitPeriod = 60, EarthOrbitRatio = 0.01, DayLength = 1.0, - }, - GuiName = "/Solar/MoonTrail" + } } } diff --git a/data/scene/mars/mars.mod b/data/scene/mars/mars.mod index 27c3219930..20dc40c5ea 100644 --- a/data/scene/mars/mars.mod +++ b/data/scene/mars/mars.mod @@ -31,11 +31,8 @@ return { Translation = { Type = "SpiceEphemeris", Body = "MARS BARYCENTER", - Reference = "ECLIPJ2000", Observer = "SUN", - Kernels = { - "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp" - } + Kernels = "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp" }, Rotation = { Type = "SpiceRotation", @@ -46,8 +43,7 @@ return { Type = "StaticScale", Scale = 1, }, - }, - GuiName = "/Solar/Planets/Mars" + } }, -- MarsTrail module { @@ -67,7 +63,6 @@ return { Color = "${COMMON_MODULE}/textures/glare_blue.png", -- need to add different texture }, - }, - GuiName = "/Solar/MarsTrail" + } } } diff --git a/data/scene/mercury/mercury.mod b/data/scene/mercury/mercury.mod index d77b76f693..caacb59af8 100644 --- a/data/scene/mercury/mercury.mod +++ b/data/scene/mercury/mercury.mod @@ -31,11 +31,8 @@ return { Translation = { Type = "SpiceEphemeris", Body = "MERCURY", - Reference = "ECLIPJ2000", Observer = "SUN", - Kernels = { - "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp" - } + Kernels = "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp" }, Rotation = { Type = "SpiceRotation", @@ -46,8 +43,7 @@ return { Type = "StaticScale", Scale = 1, }, - }, - GuiName = "/Solar/Planets/Mercury" + } }, -- MercuryTrail module { @@ -67,7 +63,6 @@ return { Color = "${COMMON_MODULE}/textures/glare_blue.png", -- need to add different texture }, - }, - GuiName = "/Solar/MercuryTrail" + } } } diff --git a/data/scene/milkyway-eso/milkyway-eso.mod b/data/scene/milkyway-eso/milkyway-eso.mod index dc668afbb3..0a080a28d5 100644 --- a/data/scene/milkyway-eso/milkyway-eso.mod +++ b/data/scene/milkyway-eso/milkyway-eso.mod @@ -2,12 +2,9 @@ return { { Name = "MilkyWay", Parent = "SolarSystem", - Ephemeris = { - Type = "Static" - }, Renderable = { Type = "RenderableSphere", - Size = {10, 20}, + Size = { 10, 20 }, Segments = 40, Texture = "textures/eso0932a_blend.png", Orientation = "Inside/Outside" diff --git a/data/scene/milkyway/milkyway.mod b/data/scene/milkyway/milkyway.mod index 148ac2b331..8fa37be7a5 100644 --- a/data/scene/milkyway/milkyway.mod +++ b/data/scene/milkyway/milkyway.mod @@ -2,12 +2,9 @@ return { { Name = "MilkyWay", Parent = "SolarSystem", - Ephemeris = { - Type = "Static" - }, Renderable = { Type = "RenderableSphere", - Size = {10, 22}, + Size = { 10, 22 }, Segments = 40, Texture = "textures/DarkUniverse_mellinger_8k.jpg", Orientation = "Inside/Outside" diff --git a/data/scene/moon/moon.mod b/data/scene/moon/moon.mod index 2af54da003..586cdc1081 100644 --- a/data/scene/moon/moon.mod +++ b/data/scene/moon/moon.mod @@ -5,8 +5,8 @@ return { Parent = "EarthBarycenter", Renderable = { Type = "RenderablePlanet", - Frame = "IAU_MOON", - Body = "MOON", + Frame = "IAU_MOON", + Body = "MOON", Geometry = { Type = "SimpleSphere", Radius = { 1.737, 6}, @@ -32,11 +32,8 @@ return { Translation = { Type = "SpiceEphemeris", Body = "MOON", - Reference = "ECLIPJ2000", Observer = "EARTH BARYCENTER", - Kernels = { - "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp" - } + Kernels = "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp" }, Rotation = { Type = "SpiceRotation", @@ -44,7 +41,6 @@ return { DestinationFrame = "ECLIPJ2000" }, }, - GuiName = "/Solar/Planets/MOON" }, -- MoonTrail module { @@ -65,6 +61,5 @@ return { -- need to add different texture }, }, - GuiName = "/Solar/MoonTrail" } } diff --git a/data/scene/neptune/neptune.mod b/data/scene/neptune/neptune.mod index 23e0e41dbf..2a44ae7098 100644 --- a/data/scene/neptune/neptune.mod +++ b/data/scene/neptune/neptune.mod @@ -3,9 +3,6 @@ return { { Name = "NeptuneBarycenter", Parent = "SolarSystemBarycenter", - Ephemeris = { - Type = "Static" - } }, -- Neptune module @@ -29,18 +26,14 @@ return { Ephemeris = { Type = "Spice", Body = "NEPTUNE BARYCENTER", - Reference = "ECLIPJ2000", Observer = "SUN", - Kernels = { - "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp" - } + Kernels = "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp" }, Rotation = { Type = "Spice", Frame = "IAU_NEPTUNE", Reference = "ECLIPJ2000" }, - GuiName = "/Solar/Planets/Neptune" }, -- NeptuneTrail module { @@ -61,6 +54,5 @@ return { -- need to add different texture }, }, - GuiName = "/Solar/NeptuneTrail" } } diff --git a/data/scene/newhorizons.scene b/data/scene/newhorizons.scene index 71841075fc..812f30ee3d 100644 --- a/data/scene/newhorizons.scene +++ b/data/scene/newhorizons.scene @@ -70,7 +70,6 @@ return { -- "stars-denver", "milkyway", -- "milkyway-eso", - "imageplane", "newhorizons/newhorizons", "newhorizons/newhorizonsfov", } diff --git a/data/scene/newhorizons/jupiter/callisto/callisto.mod b/data/scene/newhorizons/jupiter/callisto/callisto.mod index 44bae2484b..c00cd996e1 100644 --- a/data/scene/newhorizons/jupiter/callisto/callisto.mod +++ b/data/scene/newhorizons/jupiter/callisto/callisto.mod @@ -6,7 +6,7 @@ return { Renderable = { Type = "RenderablePlanetProjection", Frame = "IAU_CALLISTO", - Body = "CALLISTO", + Body = "CALLISTO", Geometry = { Type = "SimpleSphere", Radius = { 1.8213, 6 }, @@ -37,31 +37,12 @@ return { "JUPITER", "IO", "EUROPA", "GANYMEDE", "CALLISTO" } }, - --[[ - Ephemeris = { - Type = "Spice", - Body = "CALLISTO", - Reference = "ECLIPJ2000", - Observer = "JUPITER BARYCENTER", - Kernels = { - "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp" - } - }, - Rotation = { - Type = "Spice", - Frame = "IAU_CALLISTO", - Reference = "ECLIPJ2000" - }, - ]] Transform = { Translation = { Type = "SpiceEphemeris", Body = "CALLISTO", - Reference = "ECLIPJ2000", Observer = "JUPITER BARYCENTER", - Kernels = { - "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp" - } + Kernels = "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp" }, Rotation = { Type = "SpiceRotation", @@ -69,7 +50,6 @@ return { DestinationFrame = "ECLIPJ2000", }, }, - GuiName = "/Solar/Planets/Jupiter" }, { Name = "CallistoText", @@ -115,6 +95,5 @@ return { -- need to add different texture }, }, - GuiName = "/Solar/CallistoTrail" } } diff --git a/data/scene/newhorizons/jupiter/europa/europa.mod b/data/scene/newhorizons/jupiter/europa/europa.mod index a3e9b4a882..fc7c032a2b 100644 --- a/data/scene/newhorizons/jupiter/europa/europa.mod +++ b/data/scene/newhorizons/jupiter/europa/europa.mod @@ -37,31 +37,12 @@ return { "JUPITER", "IO", "EUROPA", "GANYMEDE", "CALLISTO" } }, - --[[ - Ephemeris = { - Type = "Spice", - Body = "EUROPA", - Reference = "ECLIPJ2000", - Observer = "JUPITER BARYCENTER", - Kernels = { - "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp" - } - }, - Rotation = { - Type = "Spice", - Frame = "IAU_EUROPA", - Reference = "ECLIPJ2000" - }, - ]] Transform = { Translation = { Type = "SpiceEphemeris", Body = "EUROPA", - Reference = "ECLIPJ2000", Observer = "JUPITER BARYCENTER", - Kernels = { - "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp" - } + Kernels = "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp" }, Rotation = { Type = "SpiceRotation", @@ -69,7 +50,6 @@ return { DestinationFrame = "ECLIPJ2000", }, }, - GuiName = "/Solar/Planets/Jupiter" }, { Name = "EuropaText", @@ -115,6 +95,5 @@ return { -- need to add different texture }, }, - GuiName = "/Solar/EuropaTrail" } } diff --git a/data/scene/newhorizons/jupiter/ganymede/ganymede.mod b/data/scene/newhorizons/jupiter/ganymede/ganymede.mod index 11fcfe432b..3f14d6495f 100644 --- a/data/scene/newhorizons/jupiter/ganymede/ganymede.mod +++ b/data/scene/newhorizons/jupiter/ganymede/ganymede.mod @@ -41,11 +41,8 @@ return { Translation = { Type = "SpiceEphemeris", Body = "GANYMEDE", - Reference = "ECLIPJ2000", Observer = "JUPITER BARYCENTER", - Kernels = { - "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp" - } + Kernels = "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp" }, Rotation = { Type = "SpiceRotation", @@ -53,23 +50,6 @@ return { DestinationFrame = "ECLIPJ2000", }, }, - --[[ - Ephemeris = { - Type = "Spice", - Body = "GANYMEDE", - Reference = "ECLIPJ2000", - Observer = "JUPITER BARYCENTER", - Kernels = { - "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp" - } - }, - Rotation = { - Type = "Spice", - Frame = "IAU_GANYMEDE", - Reference = "ECLIPJ2000" - }, - ]] - GuiName = "/Solar/Planets/Jupiter" }, { Name = "GanymedeText", @@ -109,6 +89,5 @@ return { -- need to add different texture }, }, - GuiName = "/Solar/GanymedeTrail" } } diff --git a/data/scene/newhorizons/jupiter/io/io.mod b/data/scene/newhorizons/jupiter/io/io.mod index 76615815b8..7fde7e5650 100644 --- a/data/scene/newhorizons/jupiter/io/io.mod +++ b/data/scene/newhorizons/jupiter/io/io.mod @@ -41,11 +41,8 @@ return { Translation = { Type = "SpiceEphemeris", Body = "IO", - Reference = "ECLIPJ2000", Observer = "JUPITER BARYCENTER", - Kernels = { - "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp" - } + Kernels = "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp" }, Rotation = { Type = "SpiceRotation", @@ -69,7 +66,6 @@ return { Reference = "ECLIPJ2000" }, ]] - GuiName = "/Solar/Planets/Jupiter" }, { Name = "IoText", @@ -109,6 +105,5 @@ return { -- need to add different texture }, }, - GuiName = "/Solar/IoTrail" } } diff --git a/data/scene/newhorizons/jupiter/jupiter/jupiter.mod b/data/scene/newhorizons/jupiter/jupiter/jupiter.mod index fd8222df3b..ccb6649f29 100644 --- a/data/scene/newhorizons/jupiter/jupiter/jupiter.mod +++ b/data/scene/newhorizons/jupiter/jupiter/jupiter.mod @@ -7,11 +7,8 @@ return { Translation = { Type = "SpiceEphemeris", Body = "JUPITER BARYCENTER", - Reference = "ECLIPJ2000", Observer = "SUN", - Kernels = { - "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp" - } + Kernels = "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp" }, }, }, @@ -97,7 +94,6 @@ return { DestinationFrame = "GALACTIC", }, }, - GuiName = "/Solar/Planets/Jupiter" }, { Name = "JupiterText", @@ -136,7 +132,6 @@ return { -- need to add different texture }, }, - GuiName = "/Solar/JupiterTrail" } } diff --git a/data/scene/newhorizons/newhorizons/newhorizons.mod b/data/scene/newhorizons/newhorizons/newhorizons.mod index 7b4b4c1eca..a4ba9124f4 100644 --- a/data/scene/newhorizons/newhorizons/newhorizons.mod +++ b/data/scene/newhorizons/newhorizons/newhorizons.mod @@ -102,23 +102,10 @@ return { Ghosting = false, }, }, - --[[ - Ephemeris = { - Type = "Spice", - Body = "NEW HORIZONS", - -- Reference = "ECLIPJ2000", - Reference = "GALACTIC", - -- Observer = "PLUTO BARYCENTER", - Observer = "SUN", - -- Observer = "JUPITER BARYCENTER", - Kernels = NewHorizonsKernels - }, - ]] Transform = { Translation = { Type = "SpiceEphemeris", Body = "NEW HORIZONS", - Reference = "GALACTIC", Observer = "SUN", Kernels = NewHorizonsKernels }, @@ -128,7 +115,6 @@ return { DestinationFrame = "GALACTIC", }, }, - GuiName = "/Solar/NewHorizons" }, --NewHorizonsTrail module --[[{ @@ -181,7 +167,6 @@ return { Ghosting = false, }, }, - GuiName = "/Solar/NewHorizons" }, { @@ -209,7 +194,6 @@ return { SampleDeltaTime = 3600, -- Seconds between each point SubSamples = 3, }, - GuiName = "/Solar/NewHorizonsTrailPluto" }, --[[ -- NewHorizonsPath module diff --git a/data/scene/newhorizons/newhorizonsfov/newhorizonsfov.mod b/data/scene/newhorizons/newhorizonsfov/newhorizonsfov.mod index e33f7136b8..f2b4fab3f5 100644 --- a/data/scene/newhorizons/newhorizonsfov/newhorizonsfov.mod +++ b/data/scene/newhorizons/newhorizonsfov/newhorizonsfov.mod @@ -24,7 +24,6 @@ return { "Jupiter", "Io", "Europa", "Ganymede", "Callisto" } }, - GuiName = "/Solar/NH_LORRI" }, -- NewHorizonsFov module NH_RALPH_LEISA { @@ -51,7 +50,6 @@ return { "Jupiter", "Io", "Europa", "Ganymede", "Callisto" } }, - GuiName = "/Solar/NH_RALPH_LEISA" }, -- NewHorizonsFov module NH_RALPH_MVIC_PAN1 @@ -79,7 +77,6 @@ return { "Jupiter", "Io", "Europa", "Ganymede", "Callisto" } }, - GuiName = "/Solar/NH_RALPH_MVIC_PAN1" }, -- NewHorizonsFov module NH_RALPH_MVIC_PAN2 { @@ -107,7 +104,6 @@ return { } }, - GuiName = "/Solar/NH_RALPH_MVIC_PAN2" }, -- NewHorizonsFov module NH_RALPH_MVIC_RED { @@ -135,7 +131,6 @@ return { } }, - GuiName = "/Solar/NH_RALPH_MVIC_RED" }, -- NewHorizonsFov module NH_RALPH_MVIC_BLUE { @@ -162,7 +157,6 @@ return { "Jupiter", "Io", "Europa", "Ganymede", "Callisto" } }, - GuiName = "/Solar/NH_RALPH_MVIC_BLUE" }, -- NewHorizonsFov module NH_RALPH_MVIC_FT { @@ -189,7 +183,6 @@ return { "Jupiter", "Io", "Europa", "Ganymede", "Callisto" } }, - GuiName = "/Solar/NH_RALPH_MVIC_FT" }, -- NewHorizonsFov module NH_RALPH_MVIC_METHANE { @@ -216,7 +209,6 @@ return { "Jupiter", "Io", "Europa", "Ganymede", "Callisto" } }, - GuiName = "/Solar/NH_RALPH_MVIC_METHANE" }, -- NewHorizonsFov module NH_RALPH_MVIC_NIR { @@ -243,7 +235,6 @@ return { "Jupiter", "Io", "Europa", "Ganymede", "Callisto" } }, - GuiName = "/Solar/NH_RALPH_MVIC_METHANE" }, -- NewHorizonsFov module NH_ALICE_AIRGLOW { @@ -270,7 +261,6 @@ return { "Jupiter", "Io", "Europa", "Ganymede", "Callisto" } }, - GuiName = "/Solar/NH_ALICE_AIRGLOW" }, -- NewHorizonsFov module NH_ALICE_SOC { @@ -297,7 +287,6 @@ return { "Jupiter", "Io", "Europa", "Ganymede", "Callisto" } }, - GuiName = "/Solar/NH_ALICE_SOC" }, { Name = "NH_REX", diff --git a/data/scene/newhorizons/newhorizonspath/newhorizonspath.mod b/data/scene/newhorizons/newhorizonspath/newhorizonspath.mod index 6ebf488e5f..d11cb2a8bb 100644 --- a/data/scene/newhorizons/newhorizonspath/newhorizonspath.mod +++ b/data/scene/newhorizons/newhorizonspath/newhorizonspath.mod @@ -15,6 +15,5 @@ return { -- need to add different texture }, }, - GuiName = "/Solar/NewHorizonsPath" } } \ No newline at end of file diff --git a/data/scene/newhorizons/newhorizonstrail/newhorizonstrail.mod b/data/scene/newhorizons/newhorizonstrail/newhorizonstrail.mod index ac6d22401b..e8a334b6ae 100644 --- a/data/scene/newhorizons/newhorizonstrail/newhorizonstrail.mod +++ b/data/scene/newhorizons/newhorizonstrail/newhorizonstrail.mod @@ -18,6 +18,5 @@ return { -- need to add different texture }, }, - GuiName = "/Solar/NewHorizonsTrail" } } \ No newline at end of file diff --git a/data/scene/newhorizons/pluto/charon/charon.mod b/data/scene/newhorizons/pluto/charon/charon.mod index 8fbe1de3e5..f7a2f5e35a 100644 --- a/data/scene/newhorizons/pluto/charon/charon.mod +++ b/data/scene/newhorizons/pluto/charon/charon.mod @@ -56,25 +56,10 @@ return { "CHARON" } }, - --[[ - Ephemeris = { - Type = "Spice", - Body = "CHARON", - Reference = "ECLIPJ2000", - Observer = "PLUTO BARYCENTER", - Kernels = NewHorizonsKernels - }, - Rotation = { - Type = "Spice", - Frame = "IAU_CHARON", - Reference = "ECLIPJ2000" - }, - ]] Transform = { Translation = { Type = "SpiceEphemeris", Body = "CHARON", - Reference = "GALACTIC", Observer = "PLUTO BARYCENTER", Kernels = NewHorizonsKernels }, @@ -84,7 +69,6 @@ return { DestinationFrame = "GALACTIC" }, }, - GuiName = "/Solar/Planets/Charon" }, { Name = "CharonText", @@ -103,12 +87,6 @@ return { Position = {0, -1000000, 0} }, }, - --[[ - Ephemeris = { - Type = "Static", - Position = {0, -10, 0, 5} - } - ]] }, { Name = "CharonShadow", @@ -143,6 +121,5 @@ return { -- need to add different texture }, }, - GuiName = "/Solar/CharonTrail" } } diff --git a/data/scene/newhorizons/pluto/hydra/hydra.mod b/data/scene/newhorizons/pluto/hydra/hydra.mod index 272f45c417..89246a82f6 100644 --- a/data/scene/newhorizons/pluto/hydra/hydra.mod +++ b/data/scene/newhorizons/pluto/hydra/hydra.mod @@ -27,25 +27,10 @@ return { Color = "textures/gray.jpg", } }, - --[[ - Ephemeris = { - Type = "Spice", - Body = "Hydra", - Reference = "ECLIPJ2000", - Observer = "PLUTO BARYCENTER", - Kernels = NewHorizonsKernels - }, - Rotation = { - Type = "Spice", - Frame = "IAU_PLUTO", - Reference = "ECLIPJ2000" - }, - ]] Transform = { Translation = { Type = "SpiceEphemeris", Body = "HYDRA", - Reference = "ECLIPJ2000", Observer = "PLUTO BARYCENTER", Kernels = NewHorizonsKernels }, @@ -55,7 +40,6 @@ return { DestinationFrame = "ECLIPJ2000" }, }, - GuiName = "/Solar/Planets/Hydra" }, { Name = "HydraText", @@ -73,12 +57,6 @@ return { Position = {1000000, 0, 1000000}, }, }, - --[[ - Ephemeris = { - Type = "Static", - Position = {1, 0, 1, 6} - } - ]] }, -- HydraTrail module { @@ -100,7 +78,6 @@ return { -- need to add different texture }, }, - GuiName = "/Solar/HydraTrail" } } diff --git a/data/scene/newhorizons/pluto/kerberos/kerberos.mod b/data/scene/newhorizons/pluto/kerberos/kerberos.mod index 4fa0d6d45c..ba541c4de2 100644 --- a/data/scene/newhorizons/pluto/kerberos/kerberos.mod +++ b/data/scene/newhorizons/pluto/kerberos/kerberos.mod @@ -27,25 +27,10 @@ return { Color = "textures/gray.jpg", } }, - --[[ - Ephemeris = { - Type = "Spice", - Body = "KERBEROS", - Reference = "ECLIPJ2000", - Observer = "PLUTO BARYCENTER", - Kernels = NewHorizonsKernels - }, - Rotation = { - Type = "Spice", - Frame = "IAU_PLUTO", - Reference = "ECLIPJ2000" - }, - ]] Transform = { Translation = { Type = "SpiceEphemeris", Body = "KERBEROS", - Reference = "ECLIPJ2000", Observer = "PLUTO BARYCENTER", Kernels = NewHorizonsKernels }, @@ -55,7 +40,6 @@ return { DestinationFrame = "ECLIPJ2000" }, }, - GuiName = "/Solar/Planets/Kerberos" }, { Name = "KerberosText", @@ -67,12 +51,6 @@ return { Billboard = true, Texture = "textures/Kerberos-Text.png" }, - --[[ - Ephemeris = { - Type = "Static", - Position = {1, 0, 1, 6} - } - ]] Transform = { Translation = { Type = "StaticEphemeris", @@ -100,7 +78,6 @@ return { -- need to add different texture }, }, - GuiName = "/Solar/KerberosTrail" } } diff --git a/data/scene/newhorizons/pluto/nix/nix.mod b/data/scene/newhorizons/pluto/nix/nix.mod index 483c3174c6..10145a29ae 100644 --- a/data/scene/newhorizons/pluto/nix/nix.mod +++ b/data/scene/newhorizons/pluto/nix/nix.mod @@ -31,7 +31,6 @@ return { Translation = { Type = "SpiceEphemeris", Body = "NIX", - Reference = "ECLIPJ2000", Observer = "PLUTO BARYCENTER", Kernels = NewHorizonsKernels }, @@ -41,21 +40,6 @@ return { DestinationFrame = "ECLIPJ2000" }, }, - --[[ - Ephemeris = { - Type = "Spice", - Body = "NIX", - Reference = "ECLIPJ2000", - Observer = "PLUTO BARYCENTER", - Kernels = NewHorizonsKernels - }, - Rotation = { - Type = "Spice", - Frame = "IAU_PLUTO", - Reference = "ECLIPJ2000" - }, - ]] - GuiName = "/Solar/Planets/Nix" }, { Name = "NixText", @@ -67,12 +51,6 @@ return { Billboard = true, Texture = "textures/Nix-Text.png" }, - --[[ - Ephemeris = { - Type = "Static", - Position = {0, 0, 0, 0} - } - ]] }, -- StyxTrail module { @@ -94,7 +72,6 @@ return { -- need to add different texture }, }, - GuiName = "/Solar/NixTrail" } } diff --git a/data/scene/newhorizons/pluto/pluto/pluto.mod b/data/scene/newhorizons/pluto/pluto/pluto.mod index 59fe90b53b..c6bae149dd 100644 --- a/data/scene/newhorizons/pluto/pluto/pluto.mod +++ b/data/scene/newhorizons/pluto/pluto/pluto.mod @@ -21,20 +21,10 @@ return { { Name = "PlutoBarycenter", Parent = "SolarSystemBarycenter", - --[[ - Ephemeris = { - Type = "Spice", - Body = "PLUTO BARYCENTER", - Reference = "ECLIPJ2000", - Observer = "SUN", - Kernels = NewHorizonsKernels - }, - ]] Transform = { Translation = { Type = "SpiceEphemeris", Body = "PLUTO BARYCENTER", - Reference = "ECLIPJ2000", Observer = "SUN", Kernels = NewHorizonsKernels }, @@ -165,25 +155,10 @@ return { "P4", } }, - --[[ - Ephemeris = { - Type = "Spice", - Body = "PLUTO", - Reference = "GALACTIC", - Observer = "PLUTO BARYCENTER", - Kernels = NewHorizonsKernels - }, - Rotation = { - Type = "Spice", - Frame = "IAU_PLUTO", - Reference = "GALACTIC" - }, - ]] Transform = { Translation = { Type = "SpiceEphemeris", Body = "PLUTO", - Reference = "GALACTIC", Observer = "PLUTO BARYCENTER", Kernels = NewHorizonsKernels }, @@ -193,7 +168,6 @@ return { DestinationFrame = "GALACTIC", } }, - GuiName = "/Solar/Planets/Pluto" }, { Name = "PlutoBarycenterLabel", @@ -209,12 +183,6 @@ return { MieColor = {1.0, 1.0, 1.0} } }, - --[[ - Ephemeris = { - Type = "Static", - Position = {0, 0, 0, 1} - }, - ]] }, { Name = "PlutoText", @@ -233,12 +201,6 @@ return { Position = {0, -2000000, 0} }, }, - --[[ - Ephemeris = { - Type = "Static", - Position = {0, -20, 0, 5} - } - ]] }, { Name = "PlutoTexture", @@ -257,12 +219,6 @@ return { Position = {0, -4000000, 0} }, }, - --[[ - Ephemeris = { - Type = "Static", - Position = {0, 0, 40, 5} - } - ]] }, { Name = "PlutoShadow", @@ -297,7 +253,6 @@ return { -- need to add different texture }, }, - GuiName = "/Solar/CharonTrail" }, -- PlutoTrail module { @@ -318,6 +273,5 @@ return { -- need to add different texture }, }, - GuiName = "/Solar/PlutoTrail" } } diff --git a/data/scene/newhorizons/pluto/styx/styx.mod b/data/scene/newhorizons/pluto/styx/styx.mod index ec081220b2..52918a7d26 100644 --- a/data/scene/newhorizons/pluto/styx/styx.mod +++ b/data/scene/newhorizons/pluto/styx/styx.mod @@ -27,26 +27,10 @@ return { Color = "textures/gray.jpg", } }, - --[[ - Ephemeris = { - Type = "Spice", - Body = "STYX", - Reference = "ECLIPJ2000", - Observer = "PLUTO BARYCENTER", - Kernels = NewHorizonsKernels - }, - Rotation = { - Type = "Spice", - Frame = "IAU_PLUTO", - Reference = "ECLIPJ2000" - }, - ]] - Transform = { Translation = { Type = "SpiceEphemeris", Body = "STYX", - Reference = "ECLIPJ2000", Observer = "PLUTO BARYCENTER", Kernels = NewHorizonsKernels }, @@ -56,7 +40,6 @@ return { DestinationFrame = "ECLIPJ2000" }, }, - GuiName = "/Solar/Planets/Styx" }, { Name = "StyxText", @@ -75,12 +58,6 @@ return { Position = {1000000, 0, 1000000} }, }, - --[[ - Ephemeris = { - Type = "Static", - Position = {1, 0, 1, 6} - } - ]] }, -- StyxTrail module { @@ -102,7 +79,6 @@ return { -- need to add different texture }, }, - GuiName = "/Solar/CharonTrail" } } diff --git a/data/scene/osirisrex/bennu/bennu.mod b/data/scene/osirisrex/bennu/bennu.mod index 33722c7ca9..6ab9afaa94 100644 --- a/data/scene/osirisrex/bennu/bennu.mod +++ b/data/scene/osirisrex/bennu/bennu.mod @@ -11,12 +11,9 @@ return { Translation = { Type = "SpiceEphemeris", Body = BENNU_BODY, - Reference = "GALACTIC", Observer = "SUN", }, }, - - GuiName = "/Solar/Bennu" }, { Name = "Bennu2", @@ -97,8 +94,6 @@ return { DestinationFrame = "GALACTIC", }, }, - - GuiName = "/Solar/Bennu" }, { Name = "BennuTrail", @@ -124,6 +119,5 @@ return { SampleDeltaTime = 3600, -- Seconds between each point SubSamples = 0, }, - GuiName = "OsirisRexTrailLocal" }, } diff --git a/data/scene/osirisrex/osirisrex/osirisrex.mod b/data/scene/osirisrex/osirisrex/osirisrex.mod index b56ed536f7..d0c8918d2f 100644 --- a/data/scene/osirisrex/osirisrex/osirisrex.mod +++ b/data/scene/osirisrex/osirisrex/osirisrex.mod @@ -29,7 +29,6 @@ return { Translation = { Type = "SpiceEphemeris", Body = "OSIRIS-REX", - Reference = "GALACTIC", Observer = "SUN", }, Rotation = { @@ -38,7 +37,6 @@ return { DestinationFrame = "GALACTIC", }, }, - GuiName = "/Solar/OsirisRex" }, { Name = "ORX_OCAMS_POLYCAM", @@ -72,7 +70,6 @@ return { DestinationFrame = "ORX_SPACECRAFT", }, }, - GuiName = "/Solar/ORX_OCAMS_POLYCAM" }, { Name = "ORX_REXIS", @@ -104,11 +101,10 @@ return { Type = "SpiceRotation", SourceFrame = "ORX_REXIS", DestinationFrame = "ORX_SPACECRAFT", - }, }, - - GuiName = "/Solar/ORX_REXIS" + }, + }, }, - { + { Name = "POLYCAM FOV", Parent = "ORX_OCAMS_POLYCAM", Renderable = { @@ -125,9 +121,8 @@ return { BENNU_BODY -- Bennu } }, - GuiName = "/Solar/POLYCAM FOV" }, - { + { Name = "REXIS FOV", Parent = "ORX_REXIS", Renderable = { @@ -144,7 +139,6 @@ return { BENNU_BODY -- Bennu } }, - GuiName = "/Solar/REXIS FOV" }, --[[ -- Latest image taken by POLYCAM @@ -211,7 +205,6 @@ return { SampleDeltaTime = 60, -- Seconds between each point SubSamples = 59, }, - GuiName = "OsirisRexTrailEarth" }, -- Trail relative to solar system barycenter @@ -240,7 +233,6 @@ return { SampleDeltaTime = 3600, -- Seconds between each point SubSamples = 0, }, - GuiName = "OsirisRexTrailSolarSystem" }, -- Trail relative to Bennu @@ -269,7 +261,6 @@ return { SampleDeltaTime = 3600, -- Seconds between each point SubSamples = 3, }, - GuiName = "OsirisRexTrailBennu" }, diff --git a/data/scene/pluto/pluto.mod b/data/scene/pluto/pluto.mod index 779e78e6e2..e8bdf8b37e 100644 --- a/data/scene/pluto/pluto.mod +++ b/data/scene/pluto/pluto.mod @@ -6,12 +6,8 @@ return { Ephemeris = { Type = "Spice", Body = "PLUTO BARYCENTER", - Reference = "GALACTIC", Observer = "SUN", - Kernels = { - "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp", - -- "${OPENSPACE_DATA}/spice/Pluto/EPHEMERIDES/nh_plu017.bsp" - } + Kernels = "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp", }, }, @@ -41,20 +37,14 @@ return { Ephemeris = { Type = "Spice", Body = "PLUTO", - Reference = "GALACTIC", Observer = "PLUTO BARYCENTER", - Kernels = { - "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp", - -- "${OPENSPACE_DATA}/spice/Pluto/EPHEMERIDES/nh_plu017.bsp" - -- "C:/Users/michal/NewHorizons/SPICE/nh_plu017.bsp" - } + Kernels = "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp", }, Rotation = { Type = "Spice", Frame = "IAU_PLUTO", Reference = "GALACTIC" }, - GuiName = "/Solar/Planets/Pluto" }, { Name = "Charon", @@ -81,20 +71,15 @@ return { Ephemeris = { Type = "Spice", Body = "CHARON", - Reference = "ECLIPJ2000", Observer = "PLUTO BARYCENTER", - Kernels = { - "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp" - } + Kernels = "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp" }, Rotation = { Type = "Spice", Frame = "IAU_CHARON", Reference = "ECLIPJ2000" }, - GuiName = "/Solar/Planets/Charon" }, - -- CharonTrail module { Name = "CharonTrail", @@ -114,7 +99,6 @@ return { -- need to add different texture }, }, - GuiName = "/Solar/CharonTrail" } --[[ -- PlutoTrail module diff --git a/data/scene/rosetta/67P/67P.mod b/data/scene/rosetta/67P/67P.mod index d28d3874ff..84af8afce9 100644 --- a/data/scene/rosetta/67P/67P.mod +++ b/data/scene/rosetta/67P/67P.mod @@ -7,11 +7,9 @@ return { Translation = { Type = "SpiceEphemeris", Body = "CHURYUMOV-GERASIMENKO", - Reference = "GALACTIC", Observer = "SUN", }, }, - GuiName = "/Solar/67PBarycenter", }, { Name = "67P", @@ -89,7 +87,6 @@ return { DestinationFrame = "GALACTIC", }, }, - GuiName = "/Solar/67P", }, -- 67P Trail Module { @@ -117,7 +114,6 @@ return { SampleDeltaTime = 3600, -- Seconds between each point SubSamples = 0, }, - GuiName = "/Solar/67PTrail" }, --[[ { diff --git a/data/scene/rosetta/rosetta/rosetta.mod b/data/scene/rosetta/rosetta/rosetta.mod index 70572026ac..73b8181ecc 100644 --- a/data/scene/rosetta/rosetta/rosetta.mod +++ b/data/scene/rosetta/rosetta/rosetta.mod @@ -64,7 +64,6 @@ return { Translation = { Type = "SpiceEphemeris", Body = "ROSETTA", - Reference = "GALACTIC", Observer = "SUN", Kernels = RosettaKernels }, @@ -276,7 +275,6 @@ return { Translation = { Type = "SpiceEphemeris", Body = "PHILAE", - Reference = "GALACTIC", Observer = "CHURYUMOV-GERASIMENKO", Kernels = RosettaKernels }, @@ -361,7 +359,6 @@ return { Color = "textures/tex_01.png" }, Rotation = { ModelTransform = RotationMatrix } - } }, { @@ -389,7 +386,6 @@ return { SampleDeltaTime = 3600, -- Seconds between each point SubSamples = 3, }, - GuiName = "/Solar/RosettaCometTrail" }, { Name = "PhilaeTrail", @@ -416,12 +412,10 @@ return { SampleDeltaTime = 2, -- Seconds between each point SubSamples = 0, }, - GuiName = "/Solar/RosettaCometTrail" }, { Name = "NAVCAM", Parent = "Rosetta", - GuiName = "/Solar/Rosetta_navcam" }, { Name = "NAVCAM FOV", @@ -445,7 +439,6 @@ return { "CHURYUMOV-GERASIMENKO" } }, - GuiName = "/Solar/Rosetta_navcam" }, -- Latest image taken by NAVCAM { diff --git a/data/scene/saturn/saturn.mod b/data/scene/saturn/saturn.mod index aa42c4d4b2..1f7e68170d 100644 --- a/data/scene/saturn/saturn.mod +++ b/data/scene/saturn/saturn.mod @@ -32,11 +32,8 @@ return { Translation = { Type = "SpiceEphemeris", Body = "SATURN BARYCENTER", - Reference = "ECLIPJ2000", Observer = "SUN", - Kernels = { - "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp" - } + Kernels = "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp" }, Rotation = { Type = "SpiceRotation", @@ -48,7 +45,6 @@ return { Scale = 1, }, }, - GuiName = "/Solar/Planets/Saturn" }, -- SaturnTrail module { @@ -69,6 +65,5 @@ return { -- need to add different texture }, }, - GuiName = "/Solar/SaturnTrail" } } diff --git a/data/scene/stars-denver/stars-denver.mod b/data/scene/stars-denver/stars-denver.mod index 5f9b5c0ec1..0064624bd1 100644 --- a/data/scene/stars-denver/stars-denver.mod +++ b/data/scene/stars-denver/stars-denver.mod @@ -9,8 +9,5 @@ return { Texture = "textures/halo.png", ColorMap = "denver_colorbv.cmap" }, - Ephemeris = { - Type = "Static" - } } } diff --git a/data/scene/stars/stars.mod b/data/scene/stars/stars.mod index e9d48b4901..0cb9ed85cc 100644 --- a/data/scene/stars/stars.mod +++ b/data/scene/stars/stars.mod @@ -9,8 +9,5 @@ return { Texture = "${OPENSPACE_DATA}/scene/stars/textures/halo.png", ColorMap = "${OPENSPACE_DATA}/scene/stars/colorbv.cmap" }, - Ephemeris = { - Type = "Static" - } } } diff --git a/data/scene/sun/sun.mod b/data/scene/sun/sun.mod index 17caf205be..f377c83011 100644 --- a/data/scene/sun/sun.mod +++ b/data/scene/sun/sun.mod @@ -3,9 +3,6 @@ return { { Name = "SolarSystemBarycenter", Parent = "SolarSystem", - Ephemeris = { - Type = "Static", - }, }, -- Sun module @@ -30,11 +27,8 @@ return { Ephemeris = { Type = "Spice", Body = "SUN", - Reference = "GALACTIC", Observer = "SSB", - Kernels = { - "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp" - } + Kernels = "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp" }, Rotation = { Type = "Spice", @@ -56,12 +50,9 @@ return { Ephemeris = { Type = "Spice", Body = "SUN", - Reference = "GALACTIC", Observer = "SSB", - Kernels = { - "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp" - } - }, + Kernels = "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp" + }, }, { Name = "SunMarker", diff --git a/data/scene/toyvolume/toyvolume.mod b/data/scene/toyvolume/toyvolume.mod index 2a432c2a5b..eed9efd8e4 100644 --- a/data/scene/toyvolume/toyvolume.mod +++ b/data/scene/toyvolume/toyvolume.mod @@ -2,10 +2,6 @@ return { { Name = "ToyVolume 1", Parent = "Sun", - Ephemeris = { - Type = "Static", - Position = {0, 0, 0, 0} - }, Renderable = { Type = "RenderableToyVolume", Color = {1.0, 0.0, 0.0, 0.7}, @@ -13,39 +9,28 @@ return { Rotation = {0.5, 0, 0}, ScalingExponent = 11 }, - GuiName = "/Volumes/ToyVolume1" }, { Name = "ToyVolume 2", Parent = "Earth", - Ephemeris = { - Type = "Static", - Position = {0, 0, 0, 0} - }, Renderable = { Type = "RenderableToyVolume", Color = {1.0, 0.8, 0.0, 0.7}, Translation = {0.0, 0.0, 0.0}, - Scaling = {5.0, 2.5, 5.0}, + Scaling = {5.0, 2.5, 5.0}, ScalingExponent = 6 }, - GuiName = "/Volumes/ToyVolume2" }, { Name = "ToyVolume 3", Parent = "Earth", - Ephemeris = { - Type = "Static", - Translation = {0, 0, 0, 0} - }, Renderable = { Type = "RenderableToyVolume", Scaling = {2.0, 2.0, 2.0}, Rotation = {3.14/2.0, 0, 0}, Color = {1.0, 1.0, 1.0, 0.7}, Translation = {0.0, 0.0, 0.0}, - ScalingExponent = 6 + ScalingExponent = 6 }, - GuiName = "/Volumes/ToyVolume3" } } diff --git a/data/scene/uranus/uranus.mod b/data/scene/uranus/uranus.mod index b31648ea1a..77bac51663 100644 --- a/data/scene/uranus/uranus.mod +++ b/data/scene/uranus/uranus.mod @@ -32,11 +32,8 @@ return { Translation = { Type = "SpiceEphemeris", Body = "URANUS BARYCENTER", - Reference = "ECLIPJ2000", Observer = "SUN", - Kernels = { - "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp" - } + Kernels = "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp" }, Rotation = { Type = "SpiceRotation", @@ -48,7 +45,6 @@ return { Scale = 1, }, }, - GuiName = "/Solar/Planets/Uranus" }, -- UranusTrail module { @@ -69,6 +65,5 @@ return { -- need to add different texture }, }, - GuiName = "/Solar/UranusTrail" } } diff --git a/data/scene/venus/venus.mod b/data/scene/venus/venus.mod index 753e164b55..6b96b1ca1b 100644 --- a/data/scene/venus/venus.mod +++ b/data/scene/venus/venus.mod @@ -3,9 +3,6 @@ return { { Name = "VenusBarycenter", Parent = "SolarSystemBarycenter", - Ephemeris = { - Type = "Static" - } }, -- Venus module @@ -34,18 +31,14 @@ return { Ephemeris = { Type = "Spice", Body = "VENUS", - Reference = "ECLIPJ2000", Observer = "SUN", - Kernels = { - "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp" - } + Kernels = "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp" }, Rotation = { Type = "Spice", Frame = "IAU_VENUS", Reference = "ECLIPJ2000" }, - GuiName = "/Solar/Planets/VENUS" }, -- VenusTrail module { @@ -66,6 +59,5 @@ return { -- need to add different texture }, }, - GuiName = "/Solar/VenusTrail" } } diff --git a/data/scene/volumetricmilkyway/volumetricmilkyway.mod b/data/scene/volumetricmilkyway/volumetricmilkyway.mod index 44f857fa41..d30a718d3a 100644 --- a/data/scene/volumetricmilkyway/volumetricmilkyway.mod +++ b/data/scene/volumetricmilkyway/volumetricmilkyway.mod @@ -4,10 +4,6 @@ return { { Name = "Volumetric Milky Way", Parent = "Root", - Ephemeris = { - Type = "Static", - Position = {0, 0, 0, 0} - }, Renderable = { Type = "RenderableGalaxy", Translation = {0, 0, 0}, @@ -21,6 +17,5 @@ return { Scaling = {kiloparsec, kiloparsec, kiloparsec} } }, - GuiName = "/VolumetricMilkyWay" } } diff --git a/include/openspace/documentation/documentation.h b/include/openspace/documentation/documentation.h index a200be79a8..515863d546 100644 --- a/include/openspace/documentation/documentation.h +++ b/include/openspace/documentation/documentation.h @@ -285,4 +285,13 @@ using documentation::Documentation; } // namespace openspace +// Make the overload for std::to_string available for the Offense::Reason for easier +// error logging + +namespace std { + +std::string to_string(openspace::documentation::TestResult::Offense::Reason reason); + +} // namespace + #endif // __DOCUMENTATION_H__ diff --git a/include/openspace/scene/ephemeris.h b/include/openspace/scene/ephemeris.h index ff7ae0a441..ae56fe8569 100644 --- a/include/openspace/scene/ephemeris.h +++ b/include/openspace/scene/ephemeris.h @@ -25,28 +25,25 @@ #ifndef __EPHEMERIS_H__ #define __EPHEMERIS_H__ -#include -#include -#include +#include #include +#include + +#include namespace openspace { -class Ephemeris { +class Ephemeris : public properties::PropertyOwner { public: static Ephemeris* createFromDictionary(const ghoul::Dictionary& dictionary); - Ephemeris(const ghoul::Dictionary& dictionary); virtual ~Ephemeris(); virtual bool initialize(); - virtual const glm::dvec3& position() const = 0; + virtual glm::dvec3 position() const = 0; virtual void update(const UpdateData& data); static openspace::Documentation Documentation(); - -protected: - Ephemeris(); }; } // namespace openspace diff --git a/include/openspace/scene/scale.h b/include/openspace/scene/scale.h index 86e4fcaac8..40a694af4a 100644 --- a/include/openspace/scene/scale.h +++ b/include/openspace/scene/scale.h @@ -25,11 +25,12 @@ #ifndef __SCALE_H__ #define __SCALE_H__ -#include -#include #include #include +#include + +#include namespace openspace { @@ -37,16 +38,12 @@ class Scale : public properties::PropertyOwner { public: static Scale* createFromDictionary(const ghoul::Dictionary& dictionary); - Scale(const ghoul::Dictionary& dictionary); virtual ~Scale(); virtual bool initialize(); virtual double scaleValue() const = 0; virtual void update(const UpdateData& data); static openspace::Documentation Documentation(); - -protected: - Scale(); }; } // namespace openspace diff --git a/modules/base/basemodule.cpp b/modules/base/basemodule.cpp index 8694b42b35..e1725442fe 100644 --- a/modules/base/basemodule.cpp +++ b/modules/base/basemodule.cpp @@ -136,7 +136,9 @@ void BaseModule::internalInitialize() { std::vector BaseModule::documentations() const { return { - StaticScale::Documentation() + StaticScale::Documentation(), + StaticEphemeris::Documentation(), + SpiceEphemeris::Documentation() }; } diff --git a/modules/base/ephemeris/spiceephemeris.cpp b/modules/base/ephemeris/spiceephemeris.cpp index 85df8a21c9..59d6e6a1b4 100644 --- a/modules/base/ephemeris/spiceephemeris.cpp +++ b/modules/base/ephemeris/spiceephemeris.cpp @@ -29,83 +29,118 @@ #include -namespace { - const std::string _loggerCat = "SpiceEphemeris"; - //const std::string keyGhosting = "EphmerisGhosting"; +#include +namespace { const std::string KeyBody = "Body"; - const std::string KeyOrigin = "Observer"; + const std::string KeyObserver = "Observer"; const std::string KeyKernels = "Kernels"; + + const std::string ReferenceFrame = "GALACTIC"; } namespace openspace { +Documentation SpiceEphemeris::Documentation() { + using namespace openspace::documentation; + + return { + "Spice Translation", + "base_translation_spicetranslation", + { + { + "Type", + new StringEqualVerifier("SpiceEphemeris"), + "", + Optional::No + }, + { + KeyBody, + new StringAnnotationVerifier("A valid SPICE NAIF name or identifier"), + "This is the SPICE NAIF name for the body whose translation is to be " + "computed by the SpiceTranslation. It can either be a fully qualified " + "name (such as 'EARTH') or a NAIF integer id code (such as '399').", + Optional::No + }, + { + KeyObserver, + new StringAnnotationVerifier("A valid SPICE NAIF name or identifier"), + "This is the SPICE NAIF name for the parent of the body whose " + "translation is to be computed by the SpiceTranslation. It can either be " + "a fully qualified name (such as 'SOLAR SYSTEM BARYCENTER') or a NAIF " + "integer id code (such as '0').", + Optional::No + }, + { + KeyKernels, + new OrVerifier( + new TableVerifier({ + { "*", new StringVerifier } + }), + new StringVerifier + ), + "A single kernel or list of kernels that this SpiceTranslation depends " + "on. All provided kernels will be loaded before any other operation is " + "performed.", + Optional::Yes + } + }, + Exhaustive::Yes + }; +} + SpiceEphemeris::SpiceEphemeris(const ghoul::Dictionary& dictionary) - : _targetName("") - , _originName("") - , _position() + : _target("target", "Target", "") + , _origin("origin", "Origin", "") , _kernelsLoadedSuccessfully(true) { - const bool hasBody = dictionary.getValue(KeyBody, _targetName); - if (!hasBody) - LERROR("SpiceEphemeris does not contain the key '" << KeyBody << "'"); + documentation::testSpecificationAndThrow( + Documentation(), + dictionary, + "SpiceEphemeris" + ); - const bool hasObserver = dictionary.getValue(KeyOrigin, _originName); - if (!hasObserver) - LERROR("SpiceEphemeris does not contain the key '" << KeyOrigin << "'"); - - //dictionary.getValue(keyGhosting, _ghosting); - - ghoul::Dictionary kernels; - dictionary.getValue(KeyKernels, kernels); - for (size_t i = 1; i <= kernels.size(); ++i) { - std::string kernel; - bool success = kernels.getValue(std::to_string(i), kernel); - if (!success) { - LERROR("'" << KeyKernels << "' has to be an array-style table"); - break; - } + _target = dictionary.value(KeyBody); + _origin = dictionary.value(KeyObserver); + auto loadKernel = [](const std::string& kernel) { if (!FileSys.fileExists(kernel)) { - LERROR("Kernel '" << kernel << "' does not exist"); - continue; + throw SpiceManager::SpiceException("Kernel '" + kernel + "' does not exist"); } try { SpiceManager::ref().loadKernel(kernel); - _kernelsLoadedSuccessfully = true; } - catch (const SpiceManager::SpiceException& e) { - LERROR("Could not load SPICE kernel: " << e.what()); - _kernelsLoadedSuccessfully = false; + catch (const SpiceManager::SpiceException& exception) { + LERRORC("SpiceEphemeris", exception.message); + } + }; + + if (dictionary.hasKey(KeyKernels)) { + // Due to the specification, we can be sure it is either a Dictionary or a string + if (dictionary.hasValue(KeyKernels)) { + std::string kernel = dictionary.value(KeyKernels); + loadKernel(kernel); + } + else { + ghoul::Dictionary kernels = dictionary.value(KeyKernels); + for (size_t i = 1; i <= kernels.size(); ++i) { + std::string kernel = kernels.value(std::to_string(i)); + loadKernel(kernel); + } } } } -const glm::dvec3& SpiceEphemeris::position() const { +glm::dvec3 SpiceEphemeris::position() const { return _position; } void SpiceEphemeris::update(const UpdateData& data) { - if (!_kernelsLoadedSuccessfully) - return; - double lightTime = 0.0; - glm::dvec3 position = SpiceManager::ref().targetPosition( - _targetName, _originName, "GALACTIC", {}, data.time, lightTime); - - //double interval = openspace::ImageSequencer::ref().getIntervalLength(); - //if (_ghosting == "TRUE" && interval > 60){ - // double _time = openspace::ImageSequencer::ref().getNextCaptureTime(); - // SpiceManager::ref().getTargetPosition(_targetName, _originName, - // "GALACTIC", "NONE", _time, position, lightTime); - //} - // - - - //_position = psc::CreatePowerScaledCoordinate(position.x, position.y, position.z); - //_position[3] += 3; - _position = position * glm::pow(10.0, 3.0); + _position = SpiceManager::ref().targetPosition( + _target, _origin, ReferenceFrame, {}, data.time, lightTime + ) * glm::pow(10.0, 3.0); } -} // namespace openspace \ No newline at end of file +} // namespace openspace diff --git a/modules/base/ephemeris/spiceephemeris.h b/modules/base/ephemeris/spiceephemeris.h index 973c388072..92d9991e1e 100644 --- a/modules/base/ephemeris/spiceephemeris.h +++ b/modules/base/ephemeris/spiceephemeris.h @@ -27,23 +27,25 @@ #include -#include +#include +#include namespace openspace { class SpiceEphemeris : public Ephemeris { public: SpiceEphemeris(const ghoul::Dictionary& dictionary); - virtual const glm::dvec3& position() const; + glm::dvec3 position() const; void update(const UpdateData& data) override; + static openspace::Documentation Documentation(); + private: - std::string _targetName; - std::string _originName; + properties::StringProperty _target; + properties::StringProperty _origin; + glm::dvec3 _position; bool _kernelsLoadedSuccessfully; - //std::string _ghosting; - std::string _name; }; } // namespace openspace diff --git a/modules/base/ephemeris/staticephemeris.cpp b/modules/base/ephemeris/staticephemeris.cpp index e95e324546..551da7a05c 100644 --- a/modules/base/ephemeris/staticephemeris.cpp +++ b/modules/base/ephemeris/staticephemeris.cpp @@ -24,27 +24,69 @@ #include +#include + namespace { const std::string KeyPosition = "Position"; } namespace openspace { -StaticEphemeris::StaticEphemeris(const ghoul::Dictionary& dictionary) - : _position(0.0, 0.0, 0.0) +Documentation StaticEphemeris::Documentation() { + using namespace openspace::documentation; + return { + "Static Translation", + "base_transform_translation_static", + { + { + "Type", + new StringEqualVerifier("StaticEphemeris"), + "", + Optional::No + }, + { + KeyPosition, + new DoubleVector3Verifier, + "Specifies the position (in meters) that this scenegraph node is located " + "at relative to its parent", + Optional::No + } + }, + Exhaustive::Yes + }; +} + + +StaticEphemeris::StaticEphemeris() + : _position( + "position", + "Position", + glm::dvec3(0.0), + glm::dvec3(-std::numeric_limits::max()), + glm::dvec3(std::numeric_limits::max()) + ) { - const bool hasPosition = dictionary.hasKeyAndValue(KeyPosition); - if (hasPosition) { - dictionary.getValue(KeyPosition, _position); - } + addProperty(_position); +} + +StaticEphemeris::StaticEphemeris(const ghoul::Dictionary& dictionary) + : StaticEphemeris() +{ + documentation::testSpecificationAndThrow( + Documentation(), + dictionary, + "StaticEphemeris" + ); + + _position = dictionary.value(KeyPosition); } StaticEphemeris::~StaticEphemeris() {} -const glm::dvec3& StaticEphemeris::position() const { +glm::dvec3 StaticEphemeris::position() const { return _position; } void StaticEphemeris::update(const UpdateData&) {} -} // namespace openspace \ No newline at end of file +} // namespace openspace diff --git a/modules/base/ephemeris/staticephemeris.h b/modules/base/ephemeris/staticephemeris.h index 491a872b7a..d85f3eba41 100644 --- a/modules/base/ephemeris/staticephemeris.h +++ b/modules/base/ephemeris/staticephemeris.h @@ -27,17 +27,23 @@ #include +#include +#include + namespace openspace { -class StaticEphemeris: public Ephemeris { +class StaticEphemeris : public Ephemeris { public: - StaticEphemeris(const ghoul::Dictionary& dictionary - = ghoul::Dictionary()); + StaticEphemeris(); + StaticEphemeris(const ghoul::Dictionary& dictionary); virtual ~StaticEphemeris(); - virtual const glm::dvec3& position() const; + virtual glm::dvec3 position() const; virtual void update(const UpdateData& data) override; + + static openspace::Documentation Documentation(); + private: - glm::dvec3 _position; + properties::DVec3Property _position; }; } // namespace openspace diff --git a/modules/base/rendering/renderableplanet.cpp b/modules/base/rendering/renderableplanet.cpp index 8cc278a29c..eac80732c3 100644 --- a/modules/base/rendering/renderableplanet.cpp +++ b/modules/base/rendering/renderableplanet.cpp @@ -599,8 +599,7 @@ bool RenderablePlanet::isReady() const { return ready; } -void RenderablePlanet::render(const RenderData& data) -{ +void RenderablePlanet::render(const RenderData& data) { // activate shader _programObject->activate(); diff --git a/src/documentation/documentation.cpp b/src/documentation/documentation.cpp index 5cda43ce74..52a652ed92 100644 --- a/src/documentation/documentation.cpp +++ b/src/documentation/documentation.cpp @@ -51,6 +51,22 @@ namespace std { std::string to_string(std::string value) { return value; } + +std::string to_string(openspace::documentation::TestResult::Offense::Reason reason) { + switch (reason) { + case openspace::documentation::TestResult::Offense::Reason::ExtraKey: + return "Extra key"; + case openspace::documentation::TestResult::Offense::Reason::MissingKey: + return "Missing key"; + case openspace::documentation::TestResult::Offense::Reason::UnknownIdentifier: + return "Unknown identifier"; + case openspace::documentation::TestResult::Offense::Reason::Verification: + return "Verification failed"; + case openspace::documentation::TestResult::Offense::Reason::WrongType: + return "Wrong type"; + } +} + } // namespace std namespace openspace { diff --git a/src/scene/ephemeris.cpp b/src/scene/ephemeris.cpp index 7bba161310..9051d5a977 100644 --- a/src/scene/ephemeris.cpp +++ b/src/scene/ephemeris.cpp @@ -51,7 +51,8 @@ Documentation Ephemeris::Documentation() { "on application startup into the FactoryDocumentation.", Optional::No } - } + }, + Exhaustive::No }; } @@ -74,10 +75,6 @@ Ephemeris* Ephemeris::createFromDictionary(const ghoul::Dictionary& dictionary) return result; } -Ephemeris::Ephemeris() {} - -Ephemeris::Ephemeris(const ghoul::Dictionary& dictionary) {} - Ephemeris::~Ephemeris() {} bool Ephemeris::initialize() { diff --git a/src/scene/scale.cpp b/src/scene/scale.cpp index 22bd2d7cbe..c58c83ead6 100644 --- a/src/scene/scale.cpp +++ b/src/scene/scale.cpp @@ -51,7 +51,8 @@ Documentation Scale::Documentation() { "application startup into the FactoryDocumentation.", Optional::No } - } + }, + Exhaustive::No }; } @@ -71,10 +72,6 @@ Scale* Scale::createFromDictionary(const ghoul::Dictionary& dictionary) { return result; } -Scale::Scale() {} - -Scale::Scale(const ghoul::Dictionary& dictionary) {} - Scale::~Scale() {} bool Scale::initialize() { diff --git a/src/scene/scenegraph.cpp b/src/scene/scenegraph.cpp index 4c84157a54..ed78e988c0 100644 --- a/src/scene/scenegraph.cpp +++ b/src/scene/scenegraph.cpp @@ -345,8 +345,17 @@ bool SceneGraph::loadFromFile(const std::string& sceneDescription) { }; for (const ModuleInformation& i : moduleDictionaries) { - LINFO("Adding module: " << i.moduleName); - addModule(i); + try { + LINFO("Adding module: " << i.moduleName); + addModule(i); + } + catch (const documentation::SpecificationError& specError) { + LERROR("Error loading module: " << i.moduleName); + LERRORC(specError.component, specError.message); + for (const auto& offense : specError.result.offenses) { + LERRORC(offense.offender, std::to_string(offense.reason)); + } + } } } // ghoul::lua::destroyLuaState(state);