Merged develop.

2026-04-24 04:58:59 -05:00 · 2016-11-16 09:27:47 -05:00
parent cb5a2b4c7b 789f931979
commit dd21d49845
286 changed files with 16479 additions and 12978 deletions
@@ -34,17 +34,8 @@ log.html
 ScriptLog.txt

 data/scene/atmosphereearth/textures
-data/scene/dawn/ceres/textures
-data/scene/dawn/dawn/obj
-data/scene/dawn/dawn/textures
-data/scene/dawn/vestaprojection/textures
-data/scene/dawn/vestaprojection/VestaComet
 data/scene/debugglobe/textures
 data/scene/earth/textures
-data/scene/juno/juno/Juno.mtl
-data/scene/juno/juno/Juno.obj
-data/scene/juno/juno/spice
-data/scene/juno/juno/textures
 data/scene/jupiter/callisto/textures
 data/scene/jupiter/europa/textures
 data/scene/jupiter/ganymede/textures
@@ -54,31 +45,47 @@ data/scene/mars/textures
 data/scene/mercury/textures
 data/scene/milkyway/textures
 data/scene/milkyway-eso/textures
+data/scene/missions/dawn/ceres/textures
+data/scene/missions/dawn/dawn/obj
+data/scene/missions/dawn/dawn/textures
+data/scene/missions/dawn/vestaprojection/textures
+data/scene/missions/dawn/vestaprojection/VestaComet
+data/scene/missions/juno/juno/Juno.mtl
+data/scene/missions/juno/juno/Juno.obj
+data/scene/missions/juno/juno/spice
+data/scene/missions/juno/juno/textures
+data/scene/missions/newhorizons/jupiter/callisto/textures
+data/scene/missions/newhorizons/jupiter/europa/textures
+data/scene/missions/newhorizons/jupiter/ganymede/textures
+data/scene/missions/newhorizons/jupiter/io/textures
+data/scene/missions/newhorizons/jupiter/jupiter/ProjectionsOfInterest
+data/scene/missions/newhorizons/newhorizons/models
+data/scene/missions/newhorizons/newhorizons/textures
+data/scene/missions/newhorizons/pluto/charon/textures
+data/scene/missions/newhorizons/pluto/pluto/assets
+data/scene/missions/newhorizons/pluto/pluto/full_images
+data/scene/missions/newhorizons/pluto/pluto/images
+data/scene/missions/newhorizons/pluto/pluto/textures
+data/scene/missions/osirisrex/bennu/models
+data/scene/missions/osirisrex/bennu/textures
+data/scene/missions/osirisrex/osirisrex/models
+data/scene/missions/osirisrex/osirisrex/textures
+data/scene/missions/rosetta/67P/obj
+data/scene/missions/rosetta/67P/rosettaimages
+data/scene/missions/rosetta/67P/textures
+data/scene/missions/rosetta/rosetta/rosetta
+data/scene/missions/rosetta/rosetta/textures
 data/scene/moon/textures
 data/scene/neptune/textures
-data/scene/newhorizons/jupiter/callisto/textures
-data/scene/newhorizons/jupiter/europa/textures
-data/scene/newhorizons/jupiter/ganymede/textures
-data/scene/newhorizons/jupiter/io/textures
-data/scene/newhorizons/jupiter/jupiter/ProjectionsOfInterest
-data/scene/newhorizons/newhorizons/models
-data/scene/newhorizons/newhorizons/textures
-data/scene/newhorizons/pluto/charon/textures
-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
-data/scene/rosetta/67P/rosettaimages
-data/scene/rosetta/67P/textures
-data/scene/rosetta/rosetta/rosetta
-data/scene/rosetta/rosetta/textures
+data/scene/saturn/dione/textures
+data/scene/saturn/enceladus/textures
+data/scene/saturn/iapetus/textures
+data/scene/saturn/mimas/textures
+data/scene/saturn/rhea/textures
+data/scene/saturn/saturn/textures
+data/scene/saturn/tethys/textures
+data/scene/saturn/titan/textures
 data/scene/stars/colorbv.cmap
 data/scene/stars/speck
 data/scene/stars/textures
@@ -90,11 +97,11 @@ data/scene/uranus/textures
 data/scene/venus/textures
 data/scene/volumetricmilkyway/milkyway
 data/spice/DawnKernels
-data/spice/jup260.bsp
 data/spice/de430_1850-2150.bsp
+data/spice/jup260.bsp
 data/spice/MAR063.BSP
 data/spice/NewHorizonsKernels
 data/spice/nh_kernels
 data/spice/OsirisRexKernels
 data/spice/Rosetta
-
+data/spice/sat375.bsp
@@ -31,8 +31,9 @@
 #include <ghoul/ghoul.h>
 #include <ghoul/filesystem/filesystem.h>
 #include <ghoul/filesystem/file.h>
-#include <ghoul/misc/dictionary.h>
+#include <ghoul/logging/logmanager.h>
 #include <ghoul/lua/ghoul_lua.h>
+#include <ghoul/misc/dictionary.h>

 #include <QApplication>
 #include <QCheckBox>
@@ -10,6 +10,7 @@ function preInitialization()
    openspace.spice.loadKernel("${SPICE}/pck00010.tpc")

    openspace.time.setTime(openspace.time.currentWallTime())
+<<<<<<< HEAD

     --YYYY-MM-DDTHH:MN:SS
     --openspace.time.setTime(openspace.time.currentWallTime())
@@ -36,6 +37,9 @@ function preInitialization()


    dofile(openspace.absPath('${SCRIPTS}/bind_keys.lua'))
+=======
+    dofile(openspace.absPath('${SCRIPTS}/bind_common_keys.lua'))
+>>>>>>> develop
 end

 function postInitialization()
@@ -10,7 +10,7 @@ function preInitialization()
    openspace.spice.loadKernel("${SPICE}/pck00010.tpc")

    openspace.time.setTime("2011 AUG 06 00:00:00")
-    dofile(openspace.absPath('${SCRIPTS}/bind_keys.lua'))
+    dofile(openspace.absPath('${SCRIPTS}/bind_common_keys.lua'))
 end

 function postInitialization()
@@ -46,18 +46,14 @@ return {
        "venus",
        "earth",
        "mars",
-        "jupiter",
-        "saturn",
+        "jupiter/jupiter",
+        "saturn/saturn",
        "uranus",
        "neptune",
        "pluto",
        "stars",
        "milkyway",
-        "rosetta",
-        "67P",
-        "dawn",
-        "vestaprojection",
-        "ceres"
+        "missions/dawn"
    }
 }

@@ -1,53 +0,0 @@
-- TextureResolution = "low"
-TextureResolution = "med"
-- TextureResolution = "high"
-
-function preInitialization()
-    --[[
-    The scripts in this function are executed after the scene is loaded but before the
-    scene elements have been initialized, thus they should be used to set the time at
-    which the scene should start and other settings that might determine initialization
-    critical objects.
-    ]]--
-
-    dofile(openspace.absPath('${SCRIPTS}/bind_keys.lua'))
-
-    openspace.spice.loadKernel("${SPICE}/naif0011.tls")
-    openspace.spice.loadKernel("${SPICE}/pck00010.tpc")
-
-    openspace.time.setTime("2018-10-25T04:00:00.00")
-    openspace.time.setDeltaTime(0)
-end
-
-function postInitialization()
-    --[[
-    The scripts in this function are executed after all objects in the scene have been
-    created and initialized, but before the first render call. This is the place to set
-    graphical settings for the renderables.
-    ]]--
-    openspace.printInfo("Setting default values")
-
-    openspace.setPropertyValue("Sun.renderable.enabled", false)
-    openspace.setPropertyValue("SunGlare.renderable.enabled", false)
-    openspace.setPropertyValue("SunMarker.renderable.enabled", false)
-
-    openspace.printInfo("Done setting default values")
-
-    openspace.resetCameraDirection()
-end
-
-return {
-    ScenePath = ".",
-    CommonFolder = "common",
-    Camera = {
-        Focus = "DebugModel",
-        Position = {292946.630948, 377755.961928, 366248.427057},
-        Rotation = {0.732615, -0.137003, 0.430036, 0.509485},
-    },
-    Modules = {
-        "sun",
-        "stars",
-        "debugmodel",
-    }
-}
-
@@ -1,93 +0,0 @@
-function preInitialization()
-    --[[
-    The scripts in this function are executed after the scene is loaded but before the
-    scene elements have been initialized, thus they should be used to set the time at
-    which the scene should start and other settings that might determine initialization
-    critical objects.
-    ]]--
-
-    --YYYY-MM-DDTHH:MN:SS
-    --openspace.time.setTime(openspace.time.currentWallTime())
-     --[[
-     --   March 9, 2016 total eclipse times from land
-     --   Palembang, South Sumatra, Indonesia
-     --   Partial solar eclipse begins: 6:20 a.m. local Western Indonesian Time
-     --   Total solar eclipse begins: 7:20 a.m. local time
-     --   Maximum eclipse: 7:21 a.m. local time
-     --   Total solar eclipse ends: 7:22 a.m. local time
-     --   Partial solar eclipse ends: 8:31 a.m. local time
-
-     --   6:20 -> 23:20 day before in UTC
-    ]]--
-    openspace.spice.loadKernel("${SPICE}/naif0011.tls")
-    openspace.spice.loadKernel("${SPICE}/pck00010.tpc")
-
-    openspace.time.setTime("2016-03-08T22:45:00")
-
-
-    -- Total Lunar Eclipse Jan 31, 2018 at 10:51:13 UTC
-    -- Regions seeing, at least, some parts of the eclipse: North/East Europe,
-    -- Asia, Australia, North/East Africa, North America, North/East South America,
-    -- Pacific, Atlantic, Indian Ocean, Arctic, Antarctica.
-    --openspace.time.setTime("2018-01-31T10:30:00")
-
-    --openspace.time.setDeltaTime(200.0)
-    dofile(openspace.absPath('${SCRIPTS}/bind_keys.lua'))
-end
-
-function postInitialization()
-    --[[
-    The scripts in this function are executed after all objects in the scene have been
-    created and initialized, but before the first render call. This is the place to set
-    graphical settings for the renderables.
-    ]]--
-    openspace.printInfo("Setting default values")
-    openspace.setPropertyValue("Sun.renderable.enabled", false)
-    openspace.setPropertyValue("SunMarker.renderable.enabled", false)
-    openspace.setPropertyValue("EarthMarker.renderable.enabled", false)
-    --openspace.setPropertyValue("Constellation Bounds.renderable.enabled", false)
-    openspace.setPropertyValue("PlutoTrail.renderable.enabled", false)
-    openspace.setPropertyValue("PlutoTexture.renderable.enabled", false)
-
-    openspace.setPropertyValue("MilkyWay.renderable.transparency", 0.55)
-    openspace.setPropertyValue("MilkyWay.renderable.segments", 50)
-
-    openspace.printInfo("Done setting default values")
-end
-
-return {
-    ScenePath = ".",
-    CommonFolder = "common",
-    Camera = {
-        Focus = "Earth",
-        --Focus = "Moon",
-        Position = {526781518487.171326, 257168309890.072144, -1381125204152.817383},
-        Rotation = {-0.106166, 0.981574, -0.084545, 0.134513},
-    },
-    Modules = {
-        "sun",
-        "mercury",
-        "venus",
-        "earth",
-        "moon",
-        "mars",
-        --"jupiter",
-        "saturn",
-        "uranus",
-        "neptune",
-        "stars",
-        -- "stars-denver",
-        "milkyway",
-        -- "milkyway-eso",
-        --"constellationbounds",
-        -- "fieldlines",
-        --"io",
-        --"europa",
-        --"ganymede",
-        --"callisto",
-        --"gridGalactic",
-        --"gridEcliptic",
-        --"gridEquatorial",
-    }
-}
-
@@ -10,7 +10,7 @@ function preInitialization()
    openspace.spice.loadKernel("${SPICE}/pck00010.tpc")

    openspace.time.setTime(openspace.time.currentWallTime())
-    dofile(openspace.absPath('${SCRIPTS}/bind_keys.lua'))
+    dofile(openspace.absPath('${SCRIPTS}/bind_common_keys.lua'))

 end

@@ -21,7 +21,7 @@ function postInitialization()
    graphical settings for the renderables.
    ]]--
    openspace.printInfo("Setting default values")
-    openspace.setPropertyValue("Sun.renderable.enab`led", true)
+    openspace.setPropertyValue("Sun.renderable.enabled", true)
    openspace.setPropertyValue("SunGlare.renderable.enabled", false)
    openspace.setPropertyValue("SunMarker.renderable.enabled", false)
    openspace.setPropertyValue("EarthMarker.renderable.enabled", false)
@@ -35,17 +35,7 @@ function postInitialization()
    openspace.printInfo("Done setting default values")

    if openspace.modules.isLoaded("ISWA") then
-    
        openspace.iswa.addCdfFiles("${OPENSPACE_DATA}/cdflist.json");
-
-        --openspace.iswa.addCygnet(7);
-
-        --openspace.iswa.addCygnet(-4,"Data","Gm");
-        --openspace.iswa.addCygnet(-5,"Data","Gm");
-        --openspace.iswa.addCygnet(-6,"Data","Gm");
-        --openspace.iswa.addCygnet(-7,"Data","Gm");
-        --openspace.iswa.addCygnet(-8,"Data","Gm");
-        --openspace.iswa.addCygnet(-9,"Data","Gm");
    end
 end

@@ -55,8 +45,8 @@ return {
    CommonFolder = "common",
    Camera = {
        Focus = "Earth",
-        Position = {526781518487.171326, 257168309890.072144, -1381125204152.817383},
-        Rotation = {-0.106166, 0.981574, -0.084545, 0.134513},
+        Position = {505370268486.696167, 1089706179272.719116, -890259148524.319458},
+        Rotation = {0.250635, -0.028751, 0.879269, 0.404030},
    },
    Modules = {
        "sun",
@@ -3,6 +3,14 @@ return {
    {
        Name = "EarthBarycenter",
        Parent = "SolarSystemBarycenter",
+        Transform = {
+            Translation = {
+                Type = "SpiceTranslation",
+                Body = "EARTH",
+                Observer = "SUN",
+                Kernels = "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp"
+            }
+        }
    },
    -- Earth module
    {   
@@ -30,12 +38,6 @@ return {
            }
        },
        Transform = {
-            Translation = {
-                Type = "SpiceTranslation",
-                Body = "EARTH",
-                Observer = "SUN",
-                Kernels = "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp"
-            },
            Rotation = {
                Type = "SpiceRotation",
                SourceFrame = "IAU_EARTH",
@@ -51,7 +53,7 @@ return {
    -- EarthTrail module
    {   
        Name = "EarthTrail",
-        Parent = "EarthBarycenter",
+        Parent = "SolarSystemBarycenter",
        Renderable = {
            Type = "RenderableTrail",
            Body = "EARTH",
@@ -10,7 +10,7 @@ function preInitialization()
    openspace.spice.loadKernel("${SPICE}/pck00010.tpc")

    openspace.time.setTime("2015 JAN 01 12:00:00.000")
-    dofile(openspace.absPath('${SCRIPTS}/bind_keys.lua'))
+    dofile(openspace.absPath('${SCRIPTS}/bind_common_keys.lua'))
 end

 function postInitialization()
@@ -1,46 +0,0 @@
-function preInitialization()
-    --[[
-    The scripts in this function are executed after the scene is loaded but before the
-    scene elements have been initialized, thus they should be used to set the time at
-    which the scene should start and other settings that might determine initialization
-    critical objects.
-    ]]--
-
-    --openspace.time.setTime(openspace.time.currentWallTime())
-    openspace.spice.loadKernel("${SPICE}/naif0011.tls")
-    openspace.spice.loadKernel("${SPICE}/pck00010.tpc")
-
-    openspace.time.setTime("2015 NOV 24 00:00:00")
-
-
-    dofile(openspace.absPath('${SCRIPTS}/bind_keys.lua'))
-end
-
-function postInitialization()
-    openspace.printInfo("Setting default values")
-
-    openspace.setInteractionMode('GlobeBrowsing')
-    
-    openspace.time.setDeltaTime(0)
-    openspace.restoreCameraStateFromFile("debugstart.view")
-    openspace.resetCameraDirection()
-    openspace.gui.show()
-
-    openspace.printInfo("Done setting default values")
-end
-
-
-return {
-    ScenePath = ".",
-    CommonFolder = "common",
-    Camera = {
-        Focus = "DebugGlobe",
-        Position = {3428016.852415, 616607.056698, 60430.587719},
-        Rotation = {0.178551, -0.280661, 0.916566, 0.221935},
-    },
-
-    Modules = {
-        "debugglobe"
-    }
-}
-
@@ -10,17 +10,16 @@ function preInitialization()
    openspace.spice.loadKernel("${SPICE}/naif0011.tls")
    openspace.spice.loadKernel("${SPICE}/pck00010.tpc")

-    openspace.time.setTime("2015 NOV 24 00:00:00")
+    openspace.time.setTime(openspace.time.currentWallTime())

    openspace.time.setTime(openspace.time.currentWallTime())
-    dofile(openspace.absPath('${SCRIPTS}/bind_keys.lua'))
+    dofile(openspace.absPath('${SCRIPTS}/bind_common_keys.lua'))
 end

 function postInitialization()
    openspace.printInfo("Setting default values")

    openspace.setInteractionMode('GlobeBrowsing')
-    --openspace.restoreCameraStateFromFile("camera_lookat_planet.lua")

    openspace.setPropertyValue("MilkyWay.renderable.transparency", 0.55)
    openspace.setPropertyValue("MilkyWay.renderable.segments", 50)
@@ -28,10 +27,8 @@ function postInitialization()
    openspace.setPropertyValue("Sun.renderable.enabled", true)
    openspace.setPropertyValue("SunGlare.renderable.enabled", false)
    openspace.setPropertyValue("SunMarker.renderable.enabled", false)
-    

    openspace.resetCameraDirection()
-    openspace.time.setDeltaTime(0)

    openspace.printInfo("Done setting default values")
 end
@@ -53,7 +50,7 @@ return {
        "lodmercury",
        "sun",
        "stars",
-        "milkyway",    
+        "milkyway",
    }
 }

@@ -9,7 +9,6 @@ function preInitialization()
    openspace.spice.loadKernel("${SPICE}/pck00010.tpc")

    openspace.time.setTime("2016-07-05T10:05:00.00")
-    openspace.time.setDeltaTime(0)

    dofile(openspace.absPath('${SCRIPTS}/common.lua'))
    openspace.clearKeys()
@@ -18,8 +17,6 @@ function preInitialization()
      1, 5, 10, 20, 40, 90, 360, 720, 2880, 14400,
        28800, 57600, 115200, 230400, 460800, 921600, 1843200, 3686400, 7372800, 14745600
    })
-
-    openspace.bindKey("F6", "openspace.setPropertyValue('Interaction.coordinateSystem', 'Jupiter');");
 end

 function postInitialization()
@@ -55,12 +52,12 @@ return {
        "earth",
        "mars",
        "jupiter",
-        "saturn",
+        "saturn/saturn",
        "uranus",
        "neptune",
        "stars",
        "milkyway",
-        "juno"
+        "missions/juno"
    }
 }

@@ -33,11 +33,7 @@ return {
                Type = "SpiceRotation",
                SourceFrame = "IAU_EUROPA",
                DestinationFrame = "IAU_JUPITER",
-            },
-            Scale = {
-                Type = "StaticScale",
-                Scale = 1,
-            },
+            }
        }
    },
    -- EuropaTrail module
@@ -2,4 +2,7 @@ return {
    FileRequest = {
        { Identifier = "jupiter_textures", Destination = "textures", Version = 1 }
    },
+    TorrentFiles = {
+        { File = "jup260.bsp.torrent", Destination = "${SPICE}" },
+    }
 }
@@ -3,6 +3,14 @@ return {
    {
        Name = "MercuryBarycenter",
        Parent = "SolarSystemBarycenter",
+        Transform = {
+            Translation = {
+                Type = "SpiceTranslation",
+                Body = "MERCURY BARYCENTER",
+                Observer = "SUN",
+                Kernels = "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp"
+            },
+        }
    },
    -- Mercury module
    {   
@@ -28,12 +36,6 @@ return {
            }
        },
        Transform = {
-            Translation = {
-                Type = "SpiceTranslation",
-                Body = "MERCURY",
-                Observer = "SUN",
-                Kernels = "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp"
-            },
            Rotation = {
                Type = "SpiceRotation",
                SourceFrame = "IAU_MERCURY",
@@ -48,7 +50,7 @@ return {
    -- MercuryTrail module
    {   
        Name = "MercuryTrail",
-        Parent = "MercuryBarycenter",
+        Parent = "SolarSystemBarycenter",
        Renderable = {
            Type = "RenderableTrail",
            Body = "MERCURY",
@@ -1,144 +1,144 @@
-return {
-    -- New Horizons Body module
-    {   
-        Name = "Juno",
-        -- Parent = "PlutoBarycenter", 
-        -- Parent = "JupiterBarycenter", 
-        Parent = "JupiterBarycenter", 
-        Renderable = {
-            Type = "RenderableModel",
-            Body = "JUNO",
-            Geometry = {
-                Type = "MultiModelGeometry",
-                GeometryFile = "Juno.obj",
-                Magnification = 4,
-            }, 
-            Textures = {
-                Type = "simple",
-                Color =  "textures/gray.png",
-            },
-            Rotation = {
-                Source = "JUNO_SPACECRAFT",
-                Destination = "GALACTIC",
-                ModelTransform = {
-                    1.0, 0.0, 0.0,
-                    0.0, 0.0, 1.0,
-                    0.0, -1.0, 0.0
-                }
-            },
-        },
-
-        Ephemeris = {
-            Type = "Spice",
-            Body = "JUNO",
-            Observer = "JUPITER BARYCENTER",
-            Kernels = {
-                "spice/JNO_SCLKSCET.00039.tsc",
-                "spice/juno_jade_v00.ti",
-                "spice/juno_jedi_v00.ti",
-                "spice/juno_jiram_v01.ti",
-                "spice/juno_junocam_v00.ti",
-                "spice/juno_mag_v00.ti",
-                "spice/juno_mwr_v01.ti",
-                "spice/juno_struct_v01.ti",
-                "spice/juno_uvs_v00.ti",
-                "spice/juno_v08.tf",
-                "spice/juno_waves_v00.ti",
-                "spice/juno_mwr_v01.ti",
-                "spice/spk_merge_110805_171017_130515.bsp",
-                "spice/ck/juno_sc_prl_110930_111028_jc003c01_v01.bc",
-                "spice/ck/juno_sc_prl_111028_111125_jc004b00_v01.bc",
-                "spice/ck/juno_sc_prl_111125_111223_jc005b00_v01.bc",
-                "spice/ck/juno_sc_prl_111223_120127_jc006a02_v01.bc",
-                "spice/ck/juno_sc_prl_120127_120217_jc007a00_v01.bc",
-                "spice/ck/juno_sc_prl_120217_120316_jc008b00_v02.bc",
-                "spice/ck/juno_sc_prl_120316_120413_jc009a00_v01.bc",
-                "spice/ck/juno_sc_prl_120413_120511_jc010a04_v01.bc",
-                "spice/ck/juno_sc_prl_120511_120608_jc011a01_v02.bc",
-                "spice/ck/juno_sc_prl_120608_120706_jc012b01_v01.bc",
-                "spice/ck/juno_sc_prl_120706_120802_jc013a01_v01.bc",
-                "spice/ck/juno_sc_prl_120802_120824_jc014b01_v01.bc",
-                "spice/ck/juno_sc_prl_120824_120928_jc015m00_v01.bc",
-                "spice/ck/juno_sc_prl_120919_120928_jc015o00_v01.bc",
-                "spice/ck/juno_sc_prl_120928_121026_jc016c03_v01.bc",
-                "spice/ck/juno_sc_prl_121026_121123_jc017a01_v01.bc",
-                "spice/ck/juno_sc_prl_121123_121221_jc018b01_v01.bc",
-                "spice/ck/juno_sc_prl_121221_130118_jc019a01_v01.bc",
-                "spice/ck/juno_sc_prl_130118_130215_jc020b01_v01.bc",
-                "spice/ck/juno_sc_prl_130315_130412_jc022b01_v01.bc",
-                "spice/ck/juno_sc_prl_130412_130510_jc023b03_v01.bc",
-                "spice/ck/juno_sc_prl_130510_130607_jc024a01_v01.bc",
-                "spice/ck/juno_sc_prl_130607_130705_jc025a00_v01.bc",
-                "spice/ck/juno_sc_prl_130705_130802_jc026a01_v01.bc",
-                "spice/ck/juno_sc_prl_130726_131020_jx024a02_EFB_v03.bc",
-                "spice/ck/juno_sc_prl_130802_130830_jc027a02_v01.bc",
-                "spice/ck/juno_sc_prl_130830_130927_jc028a01_v01.bc",
-                "spice/ck/juno_sc_prl_130926_131025_jc029a00_v01.bc",
-                "spice/ck/juno_sc_prl_130927_131025_jc029c01_v01.bc",
-                "spice/ck/juno_sc_prl_131022_131025_jc029f00_v01.bc",
-                "spice/ck/juno_sc_prl_131025_131122_jc030b04_v01.bc",
-                "spice/ck/juno_sc_prl_131122_131220_jc031b01_v01.bc",
-                "spice/ck/juno_sc_prl_131220_140124_jc032a01_v01.bc",
-                "spice/ck/juno_sc_prl_140124_140214_jc033a01_v01.bc",
-                "spice/ck/juno_sc_prl_140214_140314_jc034b01_v01.bc",
-                "spice/ck/juno_sc_prl_140314_140411_jc035a01_v01.bc",
-                "spice/ck/juno_sc_prl_140411_140509_jc036b01_v01.bc",
-                "spice/ck/juno_sc_prl_140509_140606_jc037b02_v01.bc",
-                "spice/ck/juno_sc_prl_140606_140704_jc038a01_v01.bc",
-                "spice/ck/juno_sc_prl_140704_140801_jc039b01_v01.bc",
-                "spice/ck/juno_sc_prl_140801_140829_jc040a01_v01.bc",
-                "spice/ck/juno_sc_prl_140829_140926_jc041a01_v01.bc",
-                "spice/ck/juno_sc_prl_140926_141024_jc042a01_v01.bc",
-                "spice/ck/juno_sc_prl_141024_141121_jc043a01_v01.bc",
-                "spice/ck/juno_sc_prl_141105_141121_jc043m01_v01.bc",
-                "spice/ck/juno_sc_prl_141107_141121_jc043s01_v01.bc",
-                "spice/ck/juno_sc_prl_141121_141219_jc044a01_v01.bc",
-                "spice/ck/juno_sc_prl_141219_150123_jc045a01_v01.bc",
-                "spice/ck/juno_sc_prl_150123_150213_jc046a01_v01.bc",
-                "spice/ck/juno_sc_prl_150213_150313_jc047a01_v01.bc",
-                "spice/ck/juno_sc_prl_150312_150409_jc048a01_v01.bc",
-                "spice/ck/juno_sc_prl_150410_150508_jc049a01_v01.bc",
-                "spice/ck/juno_sc_prl_150508_150605_jc050a01_v01.bc",
-                "spice/ck/juno_sc_prl_150605_150703_jc051a01_v01.bc",
-                "spice/ck/juno_sc_prl_150703_150731_jc052a01_v01.bc",
-                "spice/ck/juno_sc_prl_150731_150828_jc053a01_v01.bc",
-                "spice/ck/juno_sc_prl_150805_150828_jc053m00_v01.bc",
-                "spice/ck/juno_sc_prl_150807_150828_jc053s00_v01.bc",
-                "spice/ck/juno_sc_prl_150828_150924_jc054a00_v01.bc",
-                "spice/ck/juno_sc_prl_150924_151023_jc055a00_v01.bc",
-                "spice/ck/juno_sc_prl_151023_151120_jc056a00_v01.bc",
-                "spice/ck/juno_sc_prl_151120_151218_jc057a00_v01.bc",
-                "spice/ck/juno_sc_prl_151218_160115_jc058a00_v01.bc",
-                "spice/ck/juno_sc_prl_160115_160212_jc059a00_v01.bc",
-                "spice/ck/juno_sc_prl_160212_160311_jc060a00_v01.bc",
-                "spice/ck/juno_sc_prl_160311_160408_jc061a00_v01.bc",
-                "spice/ck/juno_sc_prl_160408_160506_jc062a00_v01.bc",
-                "spice/ck/juno_sc_prl_160506_160603_jc063a00_v01.bc",
-                "spice/ck/juno_sc_prl_160603_160630_jc064a00_v01.bc",
-                "spice/ck/juno_sc_prl_160708_160729_jm0001rp_v02.bc",
-                "spice/ck/juno_sc_prl_160729_160826_jm0002rp_v01.bc",
-                "spice/ck/juno_sc_prl_161115_161213_jx0405rp_v01.bc"
-            }
-        }
-    },
-    --NewHorizonsTrail module
-    {   
-        Name = "JunoTrail",
-        Parent = "JupiterBarycenter",
-        Renderable = {
-            Type = "RenderableTrail",
-            Body = "JUNO",
-            Frame = "GALACTIC",
-            Observer = "JUPITER BARYCENTER",
-            RGB = { 0.70,0.50,0.20 },
-            TropicalOrbitPeriod = 394250.0,
-            EarthOrbitRatio = 4.5,
-            DayLength = 9.9259,
-            TimeStamps = false,
-            Textures = {
-                Type = "simple",
-                Color = "textures/glare_blue.png",
-            },  
-        },
-    },
-    }
+return {
+    -- New Horizons Body module
+    {   
+        Name = "Juno",
+        -- Parent = "PlutoBarycenter", 
+        -- Parent = "JupiterBarycenter", 
+        Parent = "JupiterBarycenter", 
+        Renderable = {
+            Type = "RenderableModel",
+            Body = "JUNO",
+            Geometry = {
+                Type = "MultiModelGeometry",
+                GeometryFile = "Juno.obj",
+                Magnification = 4,
+            }, 
+            Textures = {
+                Type = "simple",
+                Color =  "textures/gray.png",
+            },
+            Rotation = {
+                Source = "JUNO_SPACECRAFT",
+                Destination = "GALACTIC",
+                ModelTransform = {
+                    1.0, 0.0, 0.0,
+                    0.0, 0.0, 1.0,
+                    0.0, -1.0, 0.0
+                }
+            },
+        },
+
+        Ephemeris = {
+            Type = "Spice",
+            Body = "JUNO",
+            Observer = "JUPITER BARYCENTER",
+            Kernels = {
+                "spice/JNO_SCLKSCET.00039.tsc",
+                "spice/juno_jade_v00.ti",
+                "spice/juno_jedi_v00.ti",
+                "spice/juno_jiram_v01.ti",
+                "spice/juno_junocam_v00.ti",
+                "spice/juno_mag_v00.ti",
+                "spice/juno_mwr_v01.ti",
+                "spice/juno_struct_v01.ti",
+                "spice/juno_uvs_v00.ti",
+                "spice/juno_v08.tf",
+                "spice/juno_waves_v00.ti",
+                "spice/juno_mwr_v01.ti",
+                "spice/spk_merge_110805_171017_130515.bsp",
+                "spice/ck/juno_sc_prl_110930_111028_jc003c01_v01.bc",
+                "spice/ck/juno_sc_prl_111028_111125_jc004b00_v01.bc",
+                "spice/ck/juno_sc_prl_111125_111223_jc005b00_v01.bc",
+                "spice/ck/juno_sc_prl_111223_120127_jc006a02_v01.bc",
+                "spice/ck/juno_sc_prl_120127_120217_jc007a00_v01.bc",
+                "spice/ck/juno_sc_prl_120217_120316_jc008b00_v02.bc",
+                "spice/ck/juno_sc_prl_120316_120413_jc009a00_v01.bc",
+                "spice/ck/juno_sc_prl_120413_120511_jc010a04_v01.bc",
+                "spice/ck/juno_sc_prl_120511_120608_jc011a01_v02.bc",
+                "spice/ck/juno_sc_prl_120608_120706_jc012b01_v01.bc",
+                "spice/ck/juno_sc_prl_120706_120802_jc013a01_v01.bc",
+                "spice/ck/juno_sc_prl_120802_120824_jc014b01_v01.bc",
+                "spice/ck/juno_sc_prl_120824_120928_jc015m00_v01.bc",
+                "spice/ck/juno_sc_prl_120919_120928_jc015o00_v01.bc",
+                "spice/ck/juno_sc_prl_120928_121026_jc016c03_v01.bc",
+                "spice/ck/juno_sc_prl_121026_121123_jc017a01_v01.bc",
+                "spice/ck/juno_sc_prl_121123_121221_jc018b01_v01.bc",
+                "spice/ck/juno_sc_prl_121221_130118_jc019a01_v01.bc",
+                "spice/ck/juno_sc_prl_130118_130215_jc020b01_v01.bc",
+                "spice/ck/juno_sc_prl_130315_130412_jc022b01_v01.bc",
+                "spice/ck/juno_sc_prl_130412_130510_jc023b03_v01.bc",
+                "spice/ck/juno_sc_prl_130510_130607_jc024a01_v01.bc",
+                "spice/ck/juno_sc_prl_130607_130705_jc025a00_v01.bc",
+                "spice/ck/juno_sc_prl_130705_130802_jc026a01_v01.bc",
+                "spice/ck/juno_sc_prl_130726_131020_jx024a02_EFB_v03.bc",
+                "spice/ck/juno_sc_prl_130802_130830_jc027a02_v01.bc",
+                "spice/ck/juno_sc_prl_130830_130927_jc028a01_v01.bc",
+                "spice/ck/juno_sc_prl_130926_131025_jc029a00_v01.bc",
+                "spice/ck/juno_sc_prl_130927_131025_jc029c01_v01.bc",
+                "spice/ck/juno_sc_prl_131022_131025_jc029f00_v01.bc",
+                "spice/ck/juno_sc_prl_131025_131122_jc030b04_v01.bc",
+                "spice/ck/juno_sc_prl_131122_131220_jc031b01_v01.bc",
+                "spice/ck/juno_sc_prl_131220_140124_jc032a01_v01.bc",
+                "spice/ck/juno_sc_prl_140124_140214_jc033a01_v01.bc",
+                "spice/ck/juno_sc_prl_140214_140314_jc034b01_v01.bc",
+                "spice/ck/juno_sc_prl_140314_140411_jc035a01_v01.bc",
+                "spice/ck/juno_sc_prl_140411_140509_jc036b01_v01.bc",
+                "spice/ck/juno_sc_prl_140509_140606_jc037b02_v01.bc",
+                "spice/ck/juno_sc_prl_140606_140704_jc038a01_v01.bc",
+                "spice/ck/juno_sc_prl_140704_140801_jc039b01_v01.bc",
+                "spice/ck/juno_sc_prl_140801_140829_jc040a01_v01.bc",
+                "spice/ck/juno_sc_prl_140829_140926_jc041a01_v01.bc",
+                "spice/ck/juno_sc_prl_140926_141024_jc042a01_v01.bc",
+                "spice/ck/juno_sc_prl_141024_141121_jc043a01_v01.bc",
+                "spice/ck/juno_sc_prl_141105_141121_jc043m01_v01.bc",
+                "spice/ck/juno_sc_prl_141107_141121_jc043s01_v01.bc",
+                "spice/ck/juno_sc_prl_141121_141219_jc044a01_v01.bc",
+                "spice/ck/juno_sc_prl_141219_150123_jc045a01_v01.bc",
+                "spice/ck/juno_sc_prl_150123_150213_jc046a01_v01.bc",
+                "spice/ck/juno_sc_prl_150213_150313_jc047a01_v01.bc",
+                "spice/ck/juno_sc_prl_150312_150409_jc048a01_v01.bc",
+                "spice/ck/juno_sc_prl_150410_150508_jc049a01_v01.bc",
+                "spice/ck/juno_sc_prl_150508_150605_jc050a01_v01.bc",
+                "spice/ck/juno_sc_prl_150605_150703_jc051a01_v01.bc",
+                "spice/ck/juno_sc_prl_150703_150731_jc052a01_v01.bc",
+                "spice/ck/juno_sc_prl_150731_150828_jc053a01_v01.bc",
+                "spice/ck/juno_sc_prl_150805_150828_jc053m00_v01.bc",
+                "spice/ck/juno_sc_prl_150807_150828_jc053s00_v01.bc",
+                "spice/ck/juno_sc_prl_150828_150924_jc054a00_v01.bc",
+                "spice/ck/juno_sc_prl_150924_151023_jc055a00_v01.bc",
+                "spice/ck/juno_sc_prl_151023_151120_jc056a00_v01.bc",
+                "spice/ck/juno_sc_prl_151120_151218_jc057a00_v01.bc",
+                "spice/ck/juno_sc_prl_151218_160115_jc058a00_v01.bc",
+                "spice/ck/juno_sc_prl_160115_160212_jc059a00_v01.bc",
+                "spice/ck/juno_sc_prl_160212_160311_jc060a00_v01.bc",
+                "spice/ck/juno_sc_prl_160311_160408_jc061a00_v01.bc",
+                "spice/ck/juno_sc_prl_160408_160506_jc062a00_v01.bc",
+                "spice/ck/juno_sc_prl_160506_160603_jc063a00_v01.bc",
+                "spice/ck/juno_sc_prl_160603_160630_jc064a00_v01.bc",
+                "spice/ck/juno_sc_prl_160708_160729_jm0001rp_v02.bc",
+                "spice/ck/juno_sc_prl_160729_160826_jm0002rp_v01.bc",
+                "spice/ck/juno_sc_prl_161115_161213_jx0405rp_v01.bc"
+            }
+        }
+    },
+    --NewHorizonsTrail module
+    {   
+        Name = "JunoTrail",
+        Parent = "JupiterBarycenter",
+        Renderable = {
+            Type = "RenderableTrail",
+            Body = "JUNO",
+            Frame = "GALACTIC",
+            Observer = "JUPITER BARYCENTER",
+            RGB = { 0.70,0.50,0.20 },
+            TropicalOrbitPeriod = 394250.0,
+            EarthOrbitRatio = 4.5,
+            DayLength = 9.9259,
+            TimeStamps = false,
+            Textures = {
+                Type = "simple",
+                Color = "textures/glare_blue.png",
+            },  
+        },
+    },
+    }
@@ -22,20 +22,22 @@ return {
                Observer   = "NEW HORIZONS",
                Target     = "CALLISTO",
                Aberration = "NONE",
-                AspectRatio = 2
+                AspectRatio = 2,
+
+                Instrument = {
+                    Name       = "NH_LORRI",
+                    Method     = "ELLIPSOID",
+                    Aberration = "NONE",
+                    Fovy       = 0.2907,
+                    Aspect     = 1,
+                    Near       = 0.2,
+                    Far        = 10000,
+                },
+
+                PotentialTargets = {
+                    "JUPITER", "IO", "EUROPA", "GANYMEDE", "CALLISTO"
+                }
            },
-            Instrument = {                
-                Name       = "NH_LORRI",
-                Method     = "ELLIPSOID",
-                Aberration = "NONE",
-                Fovy       = 0.2907,
-                Aspect     = 1,
-                Near       = 0.2,
-                Far        = 10000,
-            },
-            PotentialTargets = {
-                "JUPITER", "IO", "EUROPA", "GANYMEDE", "CALLISTO"
-            }            
        },
        Transform = {
            Translation = {
@@ -74,7 +76,7 @@ return {
                Position = {0, -10000000, 0}
            },
        },
-    },    
+    },
    -- CallistoTrail module
    {   
        Name = "CallistoTrail",
@@ -93,7 +95,7 @@ return {
                Type = "simple",
                Color = "${COMMON_MODULE}/textures/glare_blue.png",
                -- need to add different texture
-            },  
+            },
        },
    }
 }
@@ -22,20 +22,22 @@ return {
                Observer   = "NEW HORIZONS",
                Target     = "EUROPA",
                Aberration = "NONE",
-                AspectRatio = 2
+                AspectRatio = 2,
+
+                Instrument = {                
+                    Name       = "NH_LORRI",
+                    Method     = "ELLIPSOID",
+                    Aberration = "NONE",
+                    Fovy       = 0.2907,
+                    Aspect     = 1,
+                    Near       = 0.2,
+                    Far        = 10000,
+                },
+
+                PotentialTargets = {
+                    "JUPITER", "IO", "EUROPA", "GANYMEDE", "CALLISTO"
+                }
            },
-            Instrument = {                
-                Name       = "NH_LORRI",
-                Method     = "ELLIPSOID",
-                Aberration = "NONE",
-                Fovy       = 0.2907,
-                Aspect     = 1,
-                Near       = 0.2,
-                Far        = 10000,
-            },
-            PotentialTargets = {
-                "JUPITER", "IO", "EUROPA", "GANYMEDE", "CALLISTO"
-            }            
        },
        Transform = {
            Translation = {
@@ -22,20 +22,22 @@ return {
                Observer   = "NEW HORIZONS",
                Target     = "GANYMEDE",
                Aberration = "NONE",
-                AspectRatio = 2
+                AspectRatio = 2,
+
+                Instrument = {
+                    Name       = "NH_LORRI",
+                    Method     = "ELLIPSOID",
+                    Aberration = "NONE",
+                    Fovy       = 0.2907,
+                    Aspect     = 1,
+                    Near       = 0.2,
+                    Far        = 10000,
+                },
+
+                PotentialTargets = {
+                    "JUPITER", "IO", "EUROPA", "GANYMEDE", "CALLISTO"
+                }
            },
-            Instrument = {                
-                Name       = "NH_LORRI",
-                Method     = "ELLIPSOID",
-                Aberration = "NONE",
-                Fovy       = 0.2907,
-                Aspect     = 1,
-                Near       = 0.2,
-                Far        = 10000,
-            },
-            PotentialTargets = {
-                "JUPITER", "IO", "EUROPA", "GANYMEDE", "CALLISTO"
-            }            
        },
        Transform = {
            Translation = {
@@ -22,20 +22,22 @@ return {
                Observer   = "NEW HORIZONS",
                Target     = "IO",
                Aberration = "NONE",
-                AspectRatio = 2
+                AspectRatio = 2,
+
+                Instrument = {
+                    Name       = "NH_LORRI",
+                    Method     = "ELLIPSOID",
+                    Aberration = "NONE",
+                    Fovy       = 0.2907,
+                    Aspect     = 1,
+                    Near       = 0.2,
+                    Far        = 10000,
+                },
+
+                PotentialTargets = {
+                    "JUPITER", "IO", "EUROPA", "GANYMEDE", "CALLISTO"
+                }
            },
-            Instrument = {                
-                Name       = "NH_LORRI",
-                Method     = "ELLIPSOID",
-                Aberration = "NONE",
-                Fovy       = 0.2907,
-                Aspect     = 1,
-                Near       = 0.2,
-                Far        = 10000,
-            },
-            PotentialTargets = {
-                "JUPITER", "IO", "EUROPA", "GANYMEDE", "CALLISTO"
-            }            
        },
        Transform = {
            Translation = {
@@ -33,58 +33,59 @@ return {
            },
            Projection = {
                --Sequence   = "F:/JupiterFullSequence",
-                Sequence   = "${OPENSPACE_DATA}/scene/newhorizons/jupiter/jupiter/ProjectionsOfInterest",
+                Sequence   = "${OPENSPACE_DATA}/scene/missions/newhorizons/jupiter/jupiter/ProjectionsOfInterest",
                SequenceType = "image-sequence",
                Observer   = "NEW HORIZONS",
                Target     = "JUPITER",
                Aberration = "NONE",
-                AspectRatio = 2
-            },
-            DataInputTranslation = {
-                Instrument = {
-                    LORRI = {
-                        DetectorType  = "Camera",
-                        Spice = {"NH_LORRI"},
-                    },        
-                },                    
-                Target ={ 
-                    Read  = {
-                        "TARGET_NAME",
-                        "INSTRUMENT_HOST_NAME",
-                        "INSTRUMENT_ID", 
-                        "START_TIME", 
-                        "STOP_TIME", 
-                        "DETECTOR_TYPE",
-                        --"SEQUENCE_ID",
-                    },
-                    Convert = { 
-                        JRINGS      = {"IMAGE-PLANE" },
-                        J1IO        = {"IO"          },
-                        J2EUROPA    = {"EUROPA"      },
-                        J6HIMALIA   = {"IMAGE-PLANE" },
-                        J7ELARA     = {"IMAGE-PLANE" },
-                        CALIBRATION = {"CALIBRATION" },
-                        JUPITER     = {"JUPITER"     },
-                        CALLISTO    = {"CALLISTO"    },
-                        GANYMEDE    = {"GANYMEDE"    },
-                        EARTH       = {"EARTH"       },
-                        NEWHORIZONS = {"NEW HORIZONS"},
-                        CCD         = {"CAMERA"      },
-                        FRAMECCD    = {"SCANNER"     },
+                AspectRatio = 2,
+
+                DataInputTranslation = {
+                    Instrument = {
+                        LORRI = {
+                            DetectorType  = "Camera",
+                            Spice = {"NH_LORRI"},
+                        },        
+                    },                    
+                    Target ={ 
+                        Read  = {
+                            "TARGET_NAME",
+                            "INSTRUMENT_HOST_NAME",
+                            "INSTRUMENT_ID", 
+                            "START_TIME", 
+                            "STOP_TIME", 
+                            "DETECTOR_TYPE",
+                            --"SEQUENCE_ID",
+                        },
+                        Convert = { 
+                            JRINGS      = {"IMAGE-PLANE" },
+                            J1IO        = {"IO"          },
+                            J2EUROPA    = {"EUROPA"      },
+                            J6HIMALIA   = {"IMAGE-PLANE" },
+                            J7ELARA     = {"IMAGE-PLANE" },
+                            CALIBRATION = {"CALIBRATION" },
+                            JUPITER     = {"JUPITER"     },
+                            CALLISTO    = {"CALLISTO"    },
+                            GANYMEDE    = {"GANYMEDE"    },
+                            EARTH       = {"EARTH"       },
+                            NEWHORIZONS = {"NEW HORIZONS"},
+                            CCD         = {"CAMERA"      },
+                            FRAMECCD    = {"SCANNER"     },
+                        },
                    },
                },
-            },
-            Instrument = {                
-                Name       = "NH_LORRI",
-                Method     = "ELLIPSOID",
-                Aberration = "NONE",
-                Fovy       = 0.2907,
-                Aspect     = 1,
-                Near       = 0.2,
-                Far        = 10000,
-            },
-            PotentialTargets = {
-                "JUPITER", "IO", "EUROPA", "GANYMEDE", "CALLISTO"
+                Instrument = {                
+                    Name       = "NH_LORRI",
+                    Method     = "ELLIPSOID",
+                    Aberration = "NONE",
+                    Fovy       = 0.2907,
+                    Aspect     = 1,
+                    Near       = 0.2,
+                    Far        = 10000,
+                },
+                PotentialTargets = {
+                    "JUPITER", "IO", "EUROPA", "GANYMEDE", "CALLISTO"
+                }
            }
        },
        Transform = {
@@ -90,7 +90,7 @@ return {
            Geometry = {
                Type = "MultiModelGeometry",
                GeometryFile = "models/NewHorizonsCleanModel.obj",
-                Magnification = 4,
+                -- Magnification = 4,
            }, 
            Textures = {
                Type = "simple",
@@ -114,6 +114,10 @@ return {
                SourceFrame = "NH_SPACECRAFT",
                DestinationFrame = "GALACTIC",
            },
+            Scale = {
+                Type = "StaticScale",
+                Scale = 1000
+            }
        },
    },
    --NewHorizonsTrail module
@@ -150,7 +154,7 @@ return {
            Geometry = {
                Type = "MultiModelGeometry",
                GeometryFile = "models/Labels.obj",
-                Magnification = 4,
+                -- Magnification = 4,
            }, 
            Textures = {
                Type = "simple",
@@ -166,10 +170,9 @@ return {
                Fadeable = false,
                Ghosting = false,
            },
-        },
+        }
    },
-
-    {   
+    {
        Name = "NewHorizonsTrailPluto",
        Parent = "PlutoBarycenter",
        Renderable = {
@@ -22,38 +22,35 @@ return {
        Parent = "PlutoBarycenter",
        Renderable = {
            Type = "RenderablePlanetProjection",
-            Frame = "IAU_CHARON", 
-            Body = "CHARON",
            Geometry = {
                Type = "SimpleSphere",
                Radius = { 6.035 , 5 },
                Segments = 100
            },
            Textures = {
-                Type = "simple",
                Color = ColorTexture,
                Height = "textures/cpdem-Mcolor2-MLorriCA-lr-5_ZMfs-cyl.jpg",
-                Project = "textures/defaultProj.png",
-                Sequencing = "true",
            },
            Projection = {
                Observer   = "NEW HORIZONS",
                Target     = "CHARON",
                Aberration = "NONE",
-                AspectRatio = 2
-            },
-            Instrument = {                
-                Name       = "NH_LORRI",
-                Method     = "ELLIPSOID",
-                Aberration = "NONE",
-                Fovy       = 0.2907,
-                Aspect     = 1,
-                Near       = 0.2,
-                Far        = 10000,
-            },
-            PotentialTargets = {
-                "PLUTO",
-                "CHARON"
+                AspectRatio = 2,
+
+                Instrument = {
+                    Name       = "NH_LORRI",
+                    Method     = "ELLIPSOID",
+                    Aberration = "NONE",
+                    Fovy       = 0.2907,
+                    Aspect     = 1,
+                    Near       = 0.2,
+                    Far        = 10000,
+                },
+                
+                PotentialTargets = {
+                    "PLUTO",
+                    "CHARON"
+                }
            }
        },
        Transform = {
@@ -36,124 +36,122 @@ return {
        Parent = "PlutoBarycenter",
        Renderable = {
            Type = "RenderablePlanetProjection",
-            Frame = "IAU_PLUTO",
-            Body = "PLUTO",
            Geometry = {
                Type = "SimpleSphere",
                Radius = { 1.173 , 6 },
                Segments = 100
            },
            Textures = {
-                Type = "simple",
                Color = ColorTexture,
                Height = "textures/pluto_shenk_heightmap.jpg",
-                Project = "textures/3.jpg",
-                Sequencing = "true"
            },
            Projection = {
-                Sequence       = "${OPENSPACE_DATA}/scene/newhorizons/pluto/pluto/images",
-                EventFile      = "${OPENSPACE_DATA}/scene/newhorizons/pluto/pluto/assets/core_v9h_obs_getmets_v8_time_fix_nofrcd_mld.txt",
+                Sequence       = "${OPENSPACE_DATA}/scene/missions/newhorizons/pluto/pluto/images",
+                EventFile      = "${OPENSPACE_DATA}/scene/missions/newhorizons/pluto/pluto/assets/core_v9h_obs_getmets_v8_time_fix_nofrcd_mld.txt",
                SequenceType   = "hybrid",
                Observer       = "NEW HORIZONS",
                Target         = "PLUTO",
                Aberration     = "NONE",
-                AspectRatio = 2
-            },
-            DataInputTranslation = {
-                Instrument = {
-                    LORRI = {
-                        DetectorType  = "Camera",
-                        Spice = {"NH_LORRI"},
-                    },
-                    RALPH_MVIC_PAN_FRAME = {
-                        DetectorType  = "Scanner",
-                        StopCommand = "RALPH_ABORT",
-                        Spice = {"NH_RALPH_MVIC_FT"},
-                    },
-                    RALPH_MVIC_COLOR = {
-                        DetectorType = "Scanner",
-                        StopCommand = "END_NOM",
-                        Spice = { "NH_RALPH_MVIC_NIR", 
-                                  "NH_RALPH_MVIC_METHANE", 
-                                  "NH_RALPH_MVIC_RED", 
-                                  "NH_RALPH_MVIC_BLUE" },
-                    },
-                    RALPH_LEISA = {
-                        DetectorType = "Scanner",
-                        StopCommand = "END_NOM",
-                        Spice = {"NH_RALPH_LEISA"},
-                    },    
-                    RALPH_MVIC_PAN1 = {
-                        DetectorType = "Scanner",
-                        StopCommand = "END_NOM",
-                        Spice = {"NH_RALPH_MVIC_PAN1"},
-                    },
-                    RALPH_MVIC_PAN2 = {
-                        DetectorType = "Scanner",
-                        StopCommand = "END_NOM",
-                        Spice = {"NH_RALPH_MVIC_PAN2"},
-                    }, 
-                    ALICE_Use_AIRGLOW = {
-                        DetectorType = "Scanner",
-                        StopCommand = "ALICE_END_PIXELLIST",
-                        Spice = {"NH_ALICE_AIRGLOW"},
-                    },
-                    ALICE_Use_AIRGLOW = {
-                        DetectorType = "Scanner",
-                        StopCommand = "ALICE_END_HISTOGRAM",
-                        Spice = {"NH_ALICE_AIRGLOW"},
-                    },
-                    ALICE_Use_SOCC = {
-                        DetectorType = "Scanner",
-                        StopCommand = "ALICE_END_PIXELLIST",
-                        Spice = {"NH_ALICE_SOC"},
-                    },
-                    ALICE_Use_SOCC = {
-                        DetectorType = "Scanner",
-                        StopCommand = "ALICE_END_HISTOGRAM",
-                        Spice = {"NH_ALICE_SOC"},
-                    },
-                    REX_START = {
-                        DetectorType = "Scanner",
-                        StopCommand = "REX_MODE_OFF",
-                        Spice = { "NH_REX" },
-                    }
-                },                
-                Target ={ 
-                    Read  = {
-                        "TARGET_NAME",
-                        "INSTRUMENT_HOST_NAME",
-                        "INSTRUMENT_ID", 
-                        "START_TIME", 
-                        "STOP_TIME", 
-                        "DETECTOR_TYPE",
-                        --"SEQUENCE_ID",
-                    },
-                    Convert = { 
-                        PLUTO       = {"PLUTO"       },
-                        NEWHORIZONS = {"NEW HORIZONS"},
-                        CCD         = {"CAMERA"      },
-                        FRAMECCD    = {"SCANNER"     },
+                AspectRatio = 2,
+
+                DataInputTranslation = {
+                    Instrument = {
+                        LORRI = {
+                            DetectorType  = "Camera",
+                            Spice = {"NH_LORRI"},
+                        },
+                        RALPH_MVIC_PAN_FRAME = {
+                            DetectorType  = "Scanner",
+                            StopCommand = "RALPH_ABORT",
+                            Spice = {"NH_RALPH_MVIC_FT"},
+                        },
+                        RALPH_MVIC_COLOR = {
+                            DetectorType = "Scanner",
+                            StopCommand = "END_NOM",
+                            Spice = { "NH_RALPH_MVIC_NIR", 
+                                      "NH_RALPH_MVIC_METHANE", 
+                                      "NH_RALPH_MVIC_RED", 
+                                      "NH_RALPH_MVIC_BLUE" },
+                        },
+                        RALPH_LEISA = {
+                            DetectorType = "Scanner",
+                            StopCommand = "END_NOM",
+                            Spice = {"NH_RALPH_LEISA"},
+                        },    
+                        RALPH_MVIC_PAN1 = {
+                            DetectorType = "Scanner",
+                            StopCommand = "END_NOM",
+                            Spice = {"NH_RALPH_MVIC_PAN1"},
+                        },
+                        RALPH_MVIC_PAN2 = {
+                            DetectorType = "Scanner",
+                            StopCommand = "END_NOM",
+                            Spice = {"NH_RALPH_MVIC_PAN2"},
+                        }, 
+                        ALICE_Use_AIRGLOW = {
+                            DetectorType = "Scanner",
+                            StopCommand = "ALICE_END_PIXELLIST",
+                            Spice = {"NH_ALICE_AIRGLOW"},
+                        },
+                        ALICE_Use_AIRGLOW = {
+                            DetectorType = "Scanner",
+                            StopCommand = "ALICE_END_HISTOGRAM",
+                            Spice = {"NH_ALICE_AIRGLOW"},
+                        },
+                        ALICE_Use_SOCC = {
+                            DetectorType = "Scanner",
+                            StopCommand = "ALICE_END_PIXELLIST",
+                            Spice = {"NH_ALICE_SOC"},
+                        },
+                        ALICE_Use_SOCC = {
+                            DetectorType = "Scanner",
+                            StopCommand = "ALICE_END_HISTOGRAM",
+                            Spice = {"NH_ALICE_SOC"},
+                        },
+                        REX_START = {
+                            DetectorType = "Scanner",
+                            StopCommand = "REX_MODE_OFF",
+                            Spice = { "NH_REX" },
+                        }
+                    },                
+                    Target ={ 
+                        Read  = {
+                            "TARGET_NAME",
+                            "INSTRUMENT_HOST_NAME",
+                            "INSTRUMENT_ID", 
+                            "START_TIME", 
+                            "STOP_TIME", 
+                            "DETECTOR_TYPE",
+                            --"SEQUENCE_ID",
+                        },
+                        Convert = { 
+                            PLUTO       = {"PLUTO"       },
+                            NEWHORIZONS = {"NEW HORIZONS"},
+                            CCD         = {"CAMERA"      },
+                            FRAMECCD    = {"SCANNER"     },
+                        },
                    },
                },
+
+                Instrument = {                
+                    Name       = "NH_LORRI",
+                    Method     = "ELLIPSOID",
+                    Aberration = "NONE",
+                    Fovy       = 0.2907,
+                    Aspect     = 1,
+                    Near       = 0.2,
+                    Far        = 10000,
+                },
+                
+                PotentialTargets = {
+                     "PLUTO",
+                     "CHARON",
+                     "NIX",
+                     "HYDRA",
+                     "P5",
+                     "P4",
+                }
            },
-            Instrument = {                
-                Name       = "NH_LORRI",
-                Method     = "ELLIPSOID",
-                Aberration = "NONE",
-                Fovy       = 0.2907,
-                Aspect     = 1,
-                Near       = 0.2,
-                Far        = 10000,
-            },
-            PotentialTargets = {
-                 "PLUTO", 
-                 "CHARON", 
-                 "NIX", 
-                 "HYDRA", 
-                 "P5", 
-                 "P4",
-            }            
        },
        Transform = {
            Translation = {
@@ -16,7 +16,7 @@ return {
        },
    },
    {   
-        Name = "Bennu2",
+        Name = "Bennu",
        Parent = "BennuBarycenter",

        Renderable = {
@@ -38,53 +38,51 @@ return {
                Project = "textures/defaultProj.png",
                Default = "textures/defaultProj.png"
            },
-            Rotation = {
-                Source = "IAU_BENNU",
-                Destination = "GALACTIC"
-            },
            Projection = {
                Sequence   = "InstrumentTimes",
                SequenceType = "instrument-times",
                Observer   = "OSIRIS-REX",
                Target     = BENNU_BODY,
                Aberration = "NONE",
-                AspectRatio = 2
-            },
-            DataInputTranslation = {
-                Instruments = {
-                    ORX_OCAMS_POLYCAM = {
-                        DetectorType = "Camera",
-                        Spice = {"ORX_OCAMS_POLYCAM"},
-                        Files = {
-                            "BaseballDiamond_PolyCam.txt", 
-                            --"OrbitalB_Site08_PolyCamImages.txt",
-                            "Recon_225m_Equatorial_PolyCam.txt",
+                AspectRatio = 2,
+
+                DataInputTranslation = {
+                    Instruments = {
+                        ORX_OCAMS_POLYCAM = {
+                            DetectorType = "Camera",
+                            Spice = {"ORX_OCAMS_POLYCAM"},
+                            Files = {
+                                "BaseballDiamond_PolyCam.txt", 
+                                --"OrbitalB_Site08_PolyCamImages.txt",
+                                "Recon_225m_Equatorial_PolyCam.txt",
+                            },
                        },
-                    },
-                    ORX_REXIS = {
-                        DetectorType = "Camera",
-                        Spice = {"ORX_REXIS"},
-                        Files = {
-                            "DetailedSurvey_EquatorialStations_Spectrometers.txt", 
-                            "Recon_225m_Equatorial_spectrometers.txt",
-                            "Recon_525m_Equatorial_spectrometers.txt",
+                        ORX_REXIS = {
+                            DetectorType = "Camera",
+                            Spice = {"ORX_REXIS"},
+                            Files = {
+                                "DetailedSurvey_EquatorialStations_Spectrometers.txt", 
+                                "Recon_225m_Equatorial_spectrometers.txt",
+                                "Recon_525m_Equatorial_spectrometers.txt",
+                            },
                        },
+                    },       
+                    Target = {
+                        Body = BENNU_BODY, -- Do we need this?
                    },
-                },       
-                Target = {
-                    Body = BENNU_BODY, -- Do we need this?
+                },
+
+                Instrument = { -- INVALID DATA - JUST FOR TESTING
+                    Name       = "ORX_OCAMS_POLYCAM",
+                    Method     = "ELLIPSOID",
+                    Aberration = "NONE",
+                    Fovy       = 0.792,
+                    Aspect     = 1,
+                    Near       = 0.01,
+                    Far        = 1000000,
                },
            },

-            Instrument = { -- INVALID DATA - JUST FOR TESTING
-                Name       = "ORX_OCAMS_POLYCAM",
-                Method     = "ELLIPSOID",
-                Aberration = "NONE",
-                Fovy       = 0.792,
-                Aspect     = 1,
-                Near       = 0.01,
-                Far        = 1000000,
-            },
        },

        Transform = {
--- a/Show More
+++ b/Show More