Merge pull request #379 from OpenSpace/misc/various-fixes

Misc/various fixes

.gitignore

@@ -55,8 +55,8 @@ data/scene/lodglobes/uranus/textures
 data/scene/lodglobes/venus/textures
 data/scene/mars/textures
 data/scene/mercury/textures
-data/scene/milkyway/textures
-data/scene/milkyway-eso/textures
+data/scene/milkyway/digitaluniverse/textures
+data/scene/milkyway/eso/textures
 data/scene/missions/dawn/ceres/textures
 data/scene/missions/dawn/dawn/obj
 data/scene/missions/dawn/dawn/textures
@@ -98,12 +98,12 @@ 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
-data/scene/stars-denver/denver_colorbv.cmap
-data/scene/stars-denver/speck
-data/scene/stars-denver/textures
+data/scene/stars/digitaluniverse/colorbv.cmap
+data/scene/stars/digitaluniverse/speck
+data/scene/stars/digitaluniverse/textures
+data/scene/stars/denver/denver_colorbv.cmap
+data/scene/stars/denver/speck
+data/scene/stars/denver/textures
 data/scene/sun/textures
 data/scene/uranus/textures
 data/scene/venus/textures

data/scene/atmosphereearth.scene

@@ -42,14 +42,14 @@ return {
     Camera = {
         Focus = "Earth",
         Position = {1, 0, 0},
-		Rotation = {0.250635, -0.028751, 0.879269, 0.404030},
+        Rotation = {0.250635, -0.028751, 0.879269, 0.404030},
     },
     Modules = {
         "sun",
         "earth",
-        "stars",
-        --"stars-denver",
-        "milkyway",
-        -- "milkyway-eso",
+        "stars/digitaluniverse",
+        -- "stars/denver",
+        "milkyway/digitaluniverse",
+        --"milkyway/eso",
     }
 }

data/scene/atmosphereearth/atmosphereearth.mod

@@ -40,10 +40,10 @@ return {
                 },
                 --Caster2 = { Name = "Independency Day Ship", Radius = 0 }
             },
+            ColorTexture = "textures/earth_bluemarble.jpg",
+            NightTexture = "textures/earth_night.jpg",
             Textures = {
                 Type = "simple",
-                Color = "textures/earth_bluemarble.jpg",
-                Night = "textures/earth_night.jpg",
                 --Height = "textures/earth_bluemarble_height.jpg",                
                 -- Depth = "textures/earth_depth.png",
                 Reflectance = "textures/earth_reflectance.png",
@@ -110,7 +110,7 @@ return {
             Type = "RenderableTrailOrbit",
             Translation = {
                 Type = "SpiceTranslation",
-                Body = "EARTH",
+                Target = "EARTH",
                 Observer = "SUN"
             },
             Color = { 0.5, 0.8, 1.0 },

data/scene/constellationbounds/constellationbounds.mod

@@ -1,3 +1,8 @@
+local zodiacs = {
+    "Cancer", "Taurus", "Pisces", "Aries", "Libra", "Aquarius", "Capricornus", "Scorpius",
+    "Virgo", "Sagittarius", "Gemini", "Leo"
+}
+
 return {
     -- Stars module
     {   
@@ -6,7 +11,8 @@ return {
         Renderable = {
             Type = "RenderableConstellationBounds",
             File = "${OPENSPACE_DATA}/scene/constellationbounds/data/bound_20.dat",
-            ConstellationFile = "${OPENSPACE_DATA}/scene/constellationbounds/data/constellations.dat"
+            ConstellationFile = "${OPENSPACE_DATA}/scene/constellationbounds/data/constellations.dat",
+            -- ConstellationSelection = zodiacs
         },
         Transform = {
             Rotation = {

data/scene/dawn.scene

@@ -51,8 +51,10 @@ return {
         "uranus",
         "neptune",
         "pluto",
-        "stars",
-        "milkyway",
+        "stars/digitaluniverse",
+        -- "stars/denver",
+        "milkyway/digitaluniverse",
+        --"milkyway/eso",
         "missions/dawn"
     }
 }

data/scene/default.scene

@@ -1,3 +1,8 @@
+-- Add folders to this list that contain .info files describing HiRISE patches
+local mars_folders = {
+    -- Add a folder here whose contents will be automatically added to the Mars globe
+}
+
 function preInitialization()
     --[[
     The scripts in this function are executed after the scene is loaded but before the
@@ -11,35 +16,76 @@ function preInitialization()
 
     openspace.time.setTime(openspace.time.currentWallTime())
     dofile(openspace.absPath('${SCRIPTS}/bind_common_keys.lua'))
+
+
+    -- Toggle night texture, shading, atmosphere and water
+    openspace.bindKey("s",
+        helper.property.invert('Earth.RenderableGlobe.Layers.NightLayers.Earth at Night 2012.Enabled') ..
+        helper.property.invert('Earth.RenderableGlobe.PerformShading') ..
+        helper.property.invert('Earth.RenderableGlobe.Atmosphere') ..
+        helper.property.invert('Earth.RenderableGlobe.Layers.WaterMasks.MODIS_Water_Mask.Enabled'),
+        "Toggle night texture, shading, atmosphere, and water for Earth."
+    )
+
+    -- Toggle background
+    openspace.bindKey("b",
+        helper.property.invert('MilkyWay.renderable.Enabled') ..
+        helper.property.invert('Stars.renderable.Enabled'),
+        "Toggle background (Stars and Milkyway)."
+    )
+
+    openspace.bindKey("g",
+        helper.property.invert('MilkyWay.renderable.Enabled') ..
+        helper.property.invert('Stars.renderable.Enabled') ..
+        helper.property.invert('Earth.RenderableGlobe.Layers.NightLayers.Earth at Night 2012.Enabled') ..
+        helper.property.invert('Earth.RenderableGlobe.PerformShading') ..
+        helper.property.invert('Mars.RenderableGlobe.PerformShading') ..
+        helper.property.invert('Earth.RenderableGlobe.Atmosphere') ..
+        helper.property.invert('Earth.RenderableGlobe.Layers.WaterMasks.MODIS_Water_Mask.Enabled') ..
+        helper.property.invert('Moon.RenderableGlobe.Enabled') ..
+        helper.property.invert('Sun.renderable.Enabled'),
+        "Toogles background and shading mode on the Earth and Mars alongside visibility of the Moon and the Sun"
+    )
+
+    openspace.bindKey("h",
+        "openspace.setPropertyValue('*Trail.renderable.Enabled', false)",
+        "Disables visibility of the trails"
+    )
 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("SunMarker.renderable.Enabled", false)
-    openspace.setPropertyValue("EarthMarker.renderable.Enabled", false)
-    openspace.setPropertyValue("Constellation Bounds.renderable.Enabled", false)
-
-    openspace.setPropertyValue("MilkyWay.renderable.Transparency", 0.55)
-    openspace.setPropertyValue("MilkyWay.renderable.Segments", 50)
-
     openspace.addVirtualProperty(
         "BoolProperty",
         "Show Trails",
-        "*Trail.renderable.enabled",
+        "*Trail.renderable.Enabled",
         "Disable or enable all trails of the scene at the same time",
         true,
         nil,
         nil
     )
 
-    openspace.navigation.resetCameraDirection()
+    openspace.printInfo("Setting default values")
+
+    openspace.setPropertyValue("SunGlare.renderable.Enabled", false)
+    openspace.setPropertyValue("SunMarker.renderable.Enabled", false)
+    
+    openspace.setPropertyValue("Constellation Bounds.renderable.Enabled", false)
+    
+    openspace.setPropertyValue("Earth.RenderableGlobe.Atmosphere", true)
+    openspace.setPropertyValue("Earth.RenderableGlobe.Debug.LevelByProjectedAreaElseDistance", false)
+
+    openspace.setPropertyValue("Ecliptic Grid.renderable.Enabled", false)
+    openspace.setPropertyValue("Equatorial Grid.renderable.Enabled", false)
+    openspace.setPropertyValue("Galactic Grid.renderable.Enabled", false)
+
+    openspace.globebrowsing.goToGeo(58.5877, 16.1924, 20000000)
 
     openspace.printInfo("Done setting default values")
+
+    -- Add the HiRISE patches described at the top of this file
+    for _, file in pairs(mars_folders) do
+        openspace.globebrowsing.addBlendingLayersFromDirectory(file, "Mars")
+    end
 end
 
 
@@ -48,23 +94,27 @@ return {
     CommonFolder = "common",
     Camera = {
         Focus = "Earth",
-        Position = {505370268486.696167, 1089706179272.719116, -890259148524.319458},
-        Rotation = {0.250635, -0.028751, 0.879269, 0.404030},
+        Position = {0, 0, 0},
+        Rotation = {0.758797, 0.221490, -0.605693, -0.091135},
     },
     Modules = {
         "sun",
         "mercury",
         "venus",
         "earth",
+        "moon",
         "mars",
         "jupiter",
         "saturn",
         "uranus",
         "neptune",
-        "stars",
-        -- "stars-denver",
-        "milkyway",
-        --"milkyway-eso",
+        "stars/digitaluniverse",
+        -- "stars/denver",
+        "milkyway/digitaluniverse",
+        --"milkyway/eso",
+        -- "satellites"
         "constellationbounds",
+        "grids"
     }
 }
+

data/scene/earth/earth.data

@@ -1,5 +0,0 @@
-return {
-    FileRequest = {
-        { Identifier = "earth_textures", Destination = "textures", Version = 2 }
-    },
-}

data/scene/earth/earth.mod

@@ -1,3 +1,4 @@
+earthEllipsoid = {6378137.0, 6378137.0, 6356752.314245} -- Earth's radii
 return {
     -- Earth barycenter module
     {
@@ -6,7 +7,7 @@ return {
         Transform = {
             Translation = {
                 Type = "SpiceTranslation",
-                Body = "EARTH",
+                Target = "EARTH",
                 Observer = "SUN",
                 Kernels = "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp"
             }
@@ -20,58 +21,19 @@ return {
             Rotation = {
                 Type = "SpiceRotation",
                 SourceFrame = "J2000",
-                DestinationFrame = "GALACTIC",
+                DestinationFrame = "GALACTIC"
             }
-        },
-    },
-    -- Earth module
-    {   
-        Name = "Earth",
-        Parent = "EarthBarycenter",
-        Renderable = {
-            Type = "RenderablePlanet",
-            Frame = "IAU_EARTH",
-            Body = "EARTH",
-            Geometry = {
-                Type = "SimpleSphere",
-                Radius = 6.371E6,
-                Segments = 100
-            },
-            Textures = {
-                Type = "simple",
-                Color = "textures/earth_bluemarble.jpg",
-                Night = "textures/earth_night.jpg",
-                Height = "textures/earth_bluemarble_height.jpg"
-            },
-            Atmosphere = {
-                Type = "Nishita", -- for example, values missing etc etc
-                MieFactor = 1.0,
-                MieColor = {1.0, 1.0, 1.0}
-            }
-        },
-        Tag = {"planet_solarSystem", "planet_terrestrial"},
-        Transform = {
-            Rotation = {
-                Type = "SpiceRotation",
-                SourceFrame = "IAU_EARTH",
-                DestinationFrame = "GALACTIC",
-            },
-            Scale = {
-                Type = "StaticScale",
-                Scale = 1,
-            },
-        },
-        GuiName = "/Solar/Planets/Earth"
+        }
     },
     -- EarthTrail module
-    {   
+    {
         Name = "EarthTrail",
         Parent = "SolarSystemBarycenter",
         Renderable = {
             Type = "RenderableTrailOrbit",
             Translation = {
                 Type = "SpiceTranslation",
-                Body = "EARTH",
+                Target = "EARTH",
                 Observer = "SUN"
             },
             Color = { 0.5, 0.8, 1.0 },
@@ -79,27 +41,154 @@ return {
             -- EndTime = "2017 JAN 01 12:00:00.000",
             -- SampleInterval = 3600
             Period = 365.242,
-            Resolution = 1000,
-            Tag = {"planetTrail_solarSystem", "planetTrail_terrestrial"}
+            Resolution = 1000
         },
-        GuiName = "/Solar/EarthTrail",
+        Tag = { "planetTrail_solarSystem", "planetTrail_terrestrial" },
+        GuiName = "/Solar/EarthTrail"
     },
-    --[[
+    -- RenderableGlobe module
     {
-        Name = "EarthMarker",
-        Parent = "Earth",
-        Renderable = {
-            Type = "RenderablePlane",
-            Size = 3.0E11,
-            Origin = "Center",
-            Billboard = true,
-            Texture = "textures/marker.png",
-            BlendMode = "Additive"
+        Name = "Earth",
+        Parent = "EarthBarycenter",
+        Transform = {
+            Rotation = {
+                Type = "SpiceRotation",
+                SourceFrame = "IAU_EARTH",
+                DestinationFrame = "GALACTIC",
+            }
         },
-        Ephemeris = {
-            Type = "Static",
-            Position = {0, 0, 0, 5}
+        Tag = { "planet_solarSystem", "planet_terrestrial" },
+        Renderable = {
+            Type = "RenderableGlobe",
+            Radii = earthEllipsoid,
+            SegmentsPerPatch = 64,
+            Layers = {
+                ColorLayers = {
+                    {
+                        Name = "ESRI VIIRS Combo",
+                        Type = "ByLevelTileLayer",
+                        LevelTileProviders = {
+                            {
+                                MaxLevel = 3, 
+                                TileProvider = {
+                                    Name = "Temporal VIIRS SNPP",
+                                    Type = "TemporalTileLayer",
+                                    FilePath = "map_service_configs/GIBS/Temporal_VIIRS_SNPP_CorrectedReflectance_TrueColor.xml",
+                                }
+                            },
+                            {
+                                MaxLevel = 22,
+                                TileProvider = {
+                                    Name = "ESRI Imagery World 2D",
+                                    FilePath = "map_service_configs/ESRI/ESRI_Imagery_World_2D.wms"
+                                }
+                            },
+                        },
+                        Enabled = true,
+                    },
+                    {
+                        Name = "ESRI Imagery World 2D",
+                        FilePath = "map_service_configs/ESRI/ESRI_Imagery_World_2D.wms",
+                    },
+                    {
+                        Name = "Temporal VIIRS SNPP",
+                        Type = "TemporalTileLayer",
+                        FilePath = "map_service_configs/GIBS/Temporal_VIIRS_SNPP_CorrectedReflectance_TrueColor.xml",
+                    },
+                    {
+                        Name = "BMNG",
+                        FilePath = "map_service_configs/Utah/Bmng.wms"
+                    },
+                    {
+                        Name = "Temporal_AMSR2_GCOM_W1_Sea_Ice_Concentration",
+                        Type = "TemporalTileLayer",
+                        FilePath = "map_service_configs/GIBS/Temporal_AMSR2_GCOM_W1_Sea_Ice_Concentration.xml",
+                    },
+                    {
+                        Name = "MODIS_Terra_Chlorophyll_A",
+                        Type = "TemporalTileLayer",
+                        FilePath = openspace.globebrowsing.createTemporalGibsGdalXml(
+                            "MODIS_Terra_Chlorophyll_A",
+                            "2013-07-02",
+                            "Yesterday",
+                            "1d",
+                            "1km",
+                            "png"
+                        )
+                    },
+                    {
+                        Name = "GHRSST_L4_G1SST_Sea_Surface_Temperature",
+                        Type = "TemporalTileLayer",
+                        FilePath = openspace.globebrowsing.createTemporalGibsGdalXml(
+                            "GHRSST_L4_G1SST_Sea_Surface_Temperature",
+                            "2010-06-21",
+                            "Yesterday",
+                            "1d",
+                            "1km",
+                            "png"
+                        )
+                    },
+                },
+                NightLayers = {
+                    {
+                        Name = "Earth at Night 2012",
+                        FilePath = "map_service_configs/GIBS/VIIRS_CityLights_2012.xml",
+                        Enabled = true,
+                        Settings = {
+                            Opacity = 1.0,
+                            Gamma = 1.5,
+                            Multiplier = 15.0,
+                        },
+                    },
+                    {
+                        Name = "Temporal Earth at Night",
+                        Type = "TemporalTileLayer",
+                        FilePath = "map_service_configs/GIBS/Temporal_VIIRS_SNPP_DayNightBand_ENCC.xml"
+                    }
+                },
+                WaterMasks = {
+                    {
+                        Name = "MODIS_Water_Mask",
+                        FilePath = "map_service_configs/GIBS/MODIS_Water_Mask.xml",
+                        Enabled = true,
+                    },
+                    {
+                        Name = "GEBCO",
+                        FilePath = "map_service_configs/Utah/Gebco.wms",
+                    }
+                },
+                Overlays = {
+                    {
+                        Name = "Coastlines",
+                        FilePath = "map_service_configs/GIBS/Coastlines.xml",
+                    },
+                    {
+                        Name = "Reference_Features",
+                        FilePath = "map_service_configs/GIBS/Reference_Features.xml",
+                    },
+                    {
+                        Name = "Reference_Labels",
+                        FilePath = "map_service_configs/GIBS/Reference_Labels.xml",
+                    },
+                    {
+                        Name = "Tile Indices",
+                        Type = "TileIndexTileLayer",
+                    },
+                    {
+                        Name = "Size Reference",
+                        Type = "SizeReferenceTileLayer",
+                        Radii = earthEllipsoid,
+                    },
+                },
+                HeightLayers = {
+                    {
+                        Name = "Terrain tileset",
+                        FilePath = "map_service_configs/ESRI/TERRAIN.wms",
+                        Enabled = true,
+                        TilePixelSize = 64,
+                    }
+                }
+            }
         }
     }
-    ]]
 }

data/scene/fieldlines.scene

@@ -49,11 +49,11 @@ return {
         "saturn",
         "uranus",
         "neptune",
-        "stars",
         "fieldlines",
-        -- "stars-denver",
-        "milkyway",
-        -- "milkyway-eso",
+        "stars/digitaluniverse",
+        -- "stars/denver",
+        "milkyway/digitaluniverse",
+        --"milkyway/eso",
         "constellationbounds",
     }
 }

data/scene/globebrowsing.scene

@@ -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.
-    ]]--
-
-    openspace.spice.loadKernel("${SPICE}/naif0012.tls")
-    openspace.spice.loadKernel("${SPICE}/pck00010.tpc")
-
-    -- For unit test
-    --openspace.time.setTime("2016 SEP 8 23:00:00.500")
-    --openspace.time.togglePause()
-
-    openspace.time.setTime(openspace.time.currentWallTime())
-    dofile(openspace.absPath('${SCRIPTS}/bind_common_keys.lua'))
-
-
-    -- Toggle night texture, shading, atmosphere and water
-    openspace.bindKey("s",
-        helper.property.invert('Earth.RenderableGlobe.Layers.NightLayers.Earth at Night 2012.Enabled') ..
-        helper.property.invert('Earth.RenderableGlobe.PerformShading') ..
-        helper.property.invert('Earth.RenderableGlobe.Atmosphere') ..
-        helper.property.invert('Earth.RenderableGlobe.Layers.WaterMasks.MODIS_Water_Mask.Enabled'),
-        "Toggle night texture, shading, atmosphere, and water for Earth."
-    )
-
-    -- Toggle background
-    openspace.bindKey("b",
-        helper.property.invert('MilkyWay.renderable.Enabled') ..
-        helper.property.invert('Stars.renderable.Enabled'),
-        "Toggle background (Stars and Milkyway)."
-    )
-
-    openspace.bindKey("g",
-        "openspace.setInteractionMode('GlobeBrowsing')" ..
-        helper.property.invert('MilkyWay.renderable.Enabled') ..
-        helper.property.invert('Stars.renderable.Enabled') ..
-        helper.property.invert('Earth.RenderableGlobe.Layers.NightLayers.Earth at Night 2012.Enabled') ..
-        helper.property.invert('Earth.RenderableGlobe.PerformShading') ..
-        helper.property.invert('Mars.RenderableGlobe.PerformShading') ..
-        helper.property.invert('Earth.RenderableGlobe.Atmosphere') ..
-        helper.property.invert('Earth.RenderableGlobe.Layers.WaterMasks.MODIS_Water_Mask.Enabled') ..
-        helper.property.invert('Moon.RenderableGlobe.Enabled') ..
-        helper.property.invert('Sun.renderable.Enabled'),
-        "Toogles background and shading mode on the Earth and Mars alongside visibility of the Moon and the Sun"
-    )
-
-    openspace.bindKey("h",
-        "openspace.setPropertyValue('*Trail.renderable.Enabled', false)",
-        "Disables visibility of the trails"
-    )
-end
-
-function postInitialization()
-    openspace.printInfo("Setting default values")
-
-    openspace.setPropertyValue("MilkyWay.renderable.Transparency", 0.55)
-    openspace.setPropertyValue("MilkyWay.renderable.Segments", 50)
-
-    openspace.setPropertyValue("Sun.renderable.Enabled", true)
-    openspace.setPropertyValue("SunGlare.renderable.Enabled", false)
-    openspace.setPropertyValue("SunMarker.renderable.Enabled", false)
-    
-    openspace.setPropertyValue("Earth.RenderableGlobe.Atmosphere", true)
-    openspace.setPropertyValue("Earth.RenderableGlobe.Debug.LevelByProjectedAreaElseDistance", false)
-    openspace.setPropertyValue("Earth.RenderableGlobe.Layers.ColorLayers.BlendTileLevels", true)
-
-    openspace.globebrowsing.goToGeo(0, 0, 20000000)
-
-    openspace.printInfo("Done setting default values")
-end
-
-
-return {
-    ScenePath = ".",
-    CommonFolder = "common",
-    Camera = {
-        Focus = "Earth",
-        Position = {0, 0, 0},
-        Rotation = {0.758797, 0.221490, -0.605693, -0.091135},
-    },
-
-    Modules = {
-        "lodglobes",
-        "sun",
-        "stars",
-        "milkyway",
-        -- "satellites"
-    }
-}
-

data/scene/grids/gridEcliptic/gridEcliptic.mod

@@ -1,17 +0,0 @@
-return {
-    -- SphericalGrid module
-    {   
-        Name = "SphericalGrid",
-        Parent = "Root",
-        Renderable = {
-            Type = "RenderableSphericalGrid",
-            GridType = "ECLIPJ2000",
-            GridColor = { 0.4, 0.0, 0.0, 1},
-            GridMatrix = { -0.05487554,  0.4941095, -0.8676661   , 0.0,
-                           -0.9938214 , -0.1109906, -0.0003515167, 0.0,
-                           -0.09647644,  0.8622859,  0.4971472   , 0.0,
-                            0.0       ,  0.0      ,  0.0         , 1.0 },
-            GridSegments = 36,
-        }
-    }
-}

data/scene/grids/gridEquatorial/gridEquatorial.mod

@@ -1,17 +0,0 @@
-return {
-    -- SphericalGrid module
-    {   
-        Name = "SphericalGrid",
-        Parent = "Root",
-        Renderable = {
-            Type = "RenderableSphericalGrid",
-            GridType = "ICRF",
-            GridColor = { 0.0, 0.0, 0.4, 1},
-            GridMatrix = { -0.05487554,  0.4941095, -0.8676661, 0.0,
-                              -0.8734371 , -0.4448296, -0.1980764, 0.0,
-                           -0.483835  ,  0.7469823,  0.4559838, 0.0,
-                             0.0       ,  0.0      ,  0.0      , 1.0 },
-            GridSegments = 36,
-        }
-    }
-}

data/scene/grids/gridGalactic/gridGalactic.mod

@@ -1,17 +0,0 @@
-return {
-    -- gridGalactic module
-    {   
-        Name = "gridGalactic",
-        Parent = "SolarSystem",
-        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,
-                           0.0,  0.0, 0.0, 1.0 },
-            GridSegments = 36,
-        }
-    }
-}

data/scene/grids/grids.mod

@@ -0,0 +1,38 @@
+return {
+    -- SphericalGrid module
+    {   
+        Name = "Ecliptic Grid",
+        Parent = "Root",
+        Renderable = {
+            Type = "RenderableSphericalGrid",
+            GridColor = { 0.75, 0.0, 0.0, 1.0},
+            LineWidth = 0.75,
+            GridMatrix = { -0.05487554,  0.4941095, -0.8676661   , 0.0,
+                           -0.9938214 , -0.1109906, -0.0003515167, 0.0,
+                           -0.09647644,  0.8622859,  0.4971472   , 0.0,
+                            0.0       ,  0.0      ,  0.0         , 1.0 }
+        }
+    },
+    {
+        Name = "Equatorial Grid",
+        Parent = "Root",
+        Renderable = {
+            Type = "RenderableSphericalGrid",
+            GridColor = { 0.0, 0.0, 0.75, 1.0},
+            LineWidth = 0.75,
+            GridMatrix = { -0.05487554,  0.4941095, -0.8676661, 0.0,
+                           -0.8734371 , -0.4448296, -0.1980764, 0.0,
+                           -0.483835  ,  0.7469823,  0.4559838, 0.0,
+                            0.0       ,  0.0      ,  0.0      , 1.0 }
+        }
+    },
+    {
+        Name = "Galactic Grid",
+        Parent = "SolarSystem",
+        Renderable = {
+            Type = "RenderableSphericalGrid",
+            LineWidth = 0.75,
+            GridColor = { 0.0, 0.75, 0.75, 1.0}
+        }
+    }
+}

data/scene/juno.scene

@@ -55,8 +55,10 @@ return {
         "saturn/saturn",
         "uranus",
         "neptune",
-        "stars",
-        "milkyway",
+        "stars/digitaluniverse",
+        -- "stars/denver",
+        "milkyway/digitaluniverse",
+        --"milkyway/eso",
         "missions/juno"
     }
 }

data/scene/jupiter/callisto/callisto.mod

@@ -1,46 +1,38 @@
 return {
-    -- Callisto module
-    {   
+    -- RenderableGlobe module
+    {
         Name = "Callisto",
         Parent = "JupiterBarycenter",
-        Renderable = {
-            Type = "RenderablePlanet",
-            Frame = "IAU_CALLISTO", -- should exist. 
-            Body = "CALLISTO",
-            Geometry = {
-                Type = "SimpleSphere",
-                Radius = 2.631E6,
-                Segments = 100
-            },
-            Textures = {
-                Type = "simple",
-                Color = "textures/callisto.jpg",
-            },
-            Atmosphere = {
-                Type = "Nishita", -- for example, values missing etc etc
-                MieFactor = 1.0,
-                MieColor = {1.0, 1.0, 1.0}
-            }
-        },
         Transform = {
-            Translation = {
-                Type = "SpiceTranslation",
-                Body = "CALLISTO",
-                Observer = "JUPITER BARYCENTER",
-                Kernels = "${OPENSPACE_DATA}/spice/jup260.bsp"
-            },
             Rotation = {
                 Type = "SpiceRotation",
                 SourceFrame = "IAU_CALLISTO",
-                DestinationFrame = "IAU_JUPITER",
-            },
-            Scale = {
-                Type = "StaticScale",
-                Scale = 1,
+                DestinationFrame = "GALACTIC",
             },
+            Translation = {
+                Type = "SpiceTranslation",
+                Target = "CALLISTO",
+                Observer = "JUPITER BARYCENTER",
+                Kernels = "${OPENSPACE_DATA}/spice/jup260.bsp"
+            }
+        },
+        Renderable = {
+            Type = "RenderableGlobe",
+            Radii = 2410000,
+            SegmentsPerPatch = 64,
+            Layers = {
+                ColorLayers = {
+                    {
+                        Name = "Callisto Texture",
+                        FilePath = "textures/callisto.jpg",
+                        Enabled = true
+                    }
+                }
+            }
         }
     },
-    -- CallistoTrail module
+
+    -- Trail module
     {   
         Name = "CallistoTrail",
         Parent = "JupiterBarycenter",
@@ -48,11 +40,11 @@ return {
             Type = "RenderableTrailOrbit",
             Translation = {
                 Type = "SpiceTranslation",
-                Body = "CALLISTO",
-                Observer = "JUPITER BARYCENTER",
+                Target = "CALLISTO",
+                Observer = "JUPITER BARYCENTER"
             },
             Color = { 0.4, 0.3, 0.01 },
-            Period =  17,
+            Period = 17,
             Resolution = 1000
         }
     }

data/scene/jupiter/europa/europa.mod

@@ -1,42 +1,38 @@
 return {
-    -- Europa module
-    {   
+    -- RenderableGlobe module
+    {
         Name = "Europa",
         Parent = "JupiterBarycenter",
-        Renderable = {
-            Type = "RenderablePlanet",
-            Frame = "IAU_EUROPA", -- should exist. 
-            Body = "EUROPA",
-            Geometry = {
-                Type = "SimpleSphere",
-                Radius = 1.561E6,
-                Segments = 100
-            },
-            Textures = {
-                Type = "simple",
-                Color = "textures/europa.jpg",
-            },
-            Atmosphere = {
-                Type = "Nishita", -- for example, values missing etc etc
-                MieFactor = 1.0,
-                MieColor = {1.0, 1.0, 1.0}
-            }
-        },
         Transform = {
-            Translation = {
-                Type = "SpiceTranslation",
-                Body = "EUROPA",
-                Observer = "JUPITER BARYCENTER",
-                Kernels = "${OPENSPACE_DATA}/spice/jup260.bsp"
-            },
             Rotation = {
                 Type = "SpiceRotation",
                 SourceFrame = "IAU_EUROPA",
-                DestinationFrame = "IAU_JUPITER",
-            }
+                DestinationFrame = "GALACTIC",
+            },
+            Translation = {
+                Type = "SpiceTranslation",
+                Target = "EUROPA",
+                Observer = "JUPITER BARYCENTER",
+                Kernels = "${OPENSPACE_DATA}/spice/jup260.bsp"
+            },
+        },
+        Renderable = {
+            Type = "RenderableGlobe",
+            Radii = 1560800,
+            SegmentsPerPatch = 64,
+            Layers = {
+                ColorLayers = {
+                    {
+                        Name = "Europa Texture",
+                        FilePath = "textures/europa.jpg",
+                        Enabled = true,
+                    },
+                },
+            },
         }
     },
-    -- EuropaTrail module
+
+    -- Trail module
     {   
         Name = "EuropaTrail",
         Parent = "JupiterBarycenter",
@@ -44,7 +40,7 @@ return {
             Type = "RenderableTrailOrbit",
             Translation = {
                 Type = "SpiceTranslation",
-                Body = "EUROPA",
+                Target = "EUROPA",
                 Observer = "JUPITER BARYCENTER",
             },
             Color = { 0.5, 0.3, 0.3 },

data/scene/jupiter/ganymede/ganymede.mod

@@ -1,46 +1,37 @@
 return {
-    -- Ganymede module
-    {   
+    -- RenderableGlobe module
+    {
         Name = "Ganymede",
         Parent = "JupiterBarycenter",
-        Renderable = {
-            Type = "RenderablePlanet",
-            Frame = "IAU_GANYMEDE", -- should exist. 
-            Body = "JUPITER BARYCENTER",
-            Geometry = {
-                Type = "SimpleSphere",
-                Radius = 2.631E6,
-                Segments = 100
-            },
-            Textures = {
-                Type = "simple",
-                Color = "textures/ganymede.jpg",
-            },
-            Atmosphere = {
-                Type = "Nishita", -- for example, values missing etc etc
-                MieFactor = 1.0,
-                MieColor = {1.0, 1.0, 1.0}
-            }
-        },
         Transform = {
-            Translation = {
-                Type = "SpiceTranslation",
-                Body = "GANYMEDE",
-                Observer = "JUPITER BARYCENTER",
-                Kernels = "${OPENSPACE_DATA}/spice/jup260.bsp"
-            },
             Rotation = {
                 Type = "SpiceRotation",
                 SourceFrame = "IAU_GANYMEDE",
-                DestinationFrame = "IAU_JUPITER",
-            },
-            Scale = {
-                Type = "StaticScale",
-                Scale = 1,
+                DestinationFrame = "GALACTIC"
             },
+            Translation = {
+                Type = "SpiceTranslation",
+                Target = "GANYMEDE",
+                Observer = "JUPITER BARYCENTER",
+                Kernels = "${OPENSPACE_DATA}/spice/jup260.bsp"
+            }
+        },
+        Renderable = {
+            Type = "RenderableGlobe",
+            Radii = 2631000,
+            SegmentsPerPatch = 64,
+            Layers = {
+                ColorLayers = {
+                    {
+                        Name = "Ganymede Texture",
+                        FilePath = "textures/ganymede.jpg",
+                        Enabled = true
+                    }
+                }
+            }
         }
     },
-    -- GanymedeTrail module
+    -- Trail module
     {   
         Name = "GanymedeTrail",
         Parent = "JupiterBarycenter",
@@ -48,8 +39,8 @@ return {
             Type = "RenderableTrailOrbit",
             Translation = {
                 Type = "SpiceTranslation",
-                Body = "GANYMEDE",
-                Observer = "JUPITER BARYCENTER",
+                Target = "GANYMEDE",
+                Observer = "JUPITER BARYCENTER"
             },
             Color = { 0.4, 0.3, 0.3 },
             Period =  172 / 24,

data/scene/jupiter/io/io.mod

@@ -1,46 +1,37 @@
 return {
-    -- Io module
-    {   
+    -- RenderableGlobe module
+    {
         Name = "Io",
         Parent = "JupiterBarycenter",
-        Renderable = {
-            Type = "RenderablePlanet",
-            Frame = "IAU_IO", -- should exist. 
-            Body = "IO",
-            Geometry = {
-                Type = "SimpleSphere",
-                Radius = 1.8213E6,
-                Segments = 100
-            },
-            Textures = {
-                Type = "simple",
-                Color = "textures/io.jpg",
-            },
-            Atmosphere = {
-                Type = "Nishita", -- for example, values missing etc etc
-                MieFactor = 1.0,
-                MieColor = {1.0, 1.0, 1.0}
-            }
-        },
         Transform = {
-            Translation = {
-                Type = "SpiceTranslation",
-                Body = "IO",
-                Observer = "JUPITER BARYCENTER",
-                Kernels = "${OPENSPACE_DATA}/spice/jup260.bsp"
-            },
             Rotation = {
                 Type = "SpiceRotation",
                 SourceFrame = "IAU_IO",
-                DestinationFrame = "IAU_JUPITER",
+                DestinationFrame = "GALACTIC"
             },
-            Scale = {
-                Type = "StaticScale",
-                Scale = 1,
+            Translation = {
+                Type = "SpiceTranslation",
+                Target = "IO",
+                Observer = "JUPITER BARYCENTER",
+                Kernels = "${OPENSPACE_DATA}/spice/jup260.bsp"
             },
+        },
+        Renderable = {
+            Type = "RenderableGlobe",
+            Radii = 1821600,
+            SegmentsPerPatch = 64,
+            Layers = {
+                ColorLayers = {
+                    {
+                        Name = "Io Texture",
+                        FilePath = "textures/io.jpg",
+                        Enabled = true
+                    }
+                }
+            }
         }
     },
-    -- IoTrail module
+    -- Trail module
     {   
         Name = "IoTrail",
         Parent = "JupiterBarycenter",
@@ -48,8 +39,8 @@ return {
             Type = "RenderableTrailOrbit",
             Translation = {
                 Type = "SpiceTranslation",
-                Body = "IO",
-                Observer = "JUPITER BARYCENTER",
+                Target = "IO",
+                Observer = "JUPITER BARYCENTER"
             },
             Color = { 0.4, 0.4, 0.2 },
             Period =  42 / 24,

data/scene/jupiter/jupiter/jupiter.mod

@@ -1,58 +1,45 @@
 return {
-    -- Jupiter barycenter module
+    -- Barycenter module
     {
         Name = "JupiterBarycenter",
         Parent = "SolarSystemBarycenter",
         Transform = {
             Translation = {
                 Type = "SpiceTranslation",
-                Body = "JUPITER BARYCENTER",
+                Target = "JUPITER BARYCENTER",
                 Observer = "SUN",
                 Kernels = "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp"
-            },
-        },
+            }
+        }
     },
-    -- Jupiter module
-    {   
+    -- RenderableGlobe module
+    {
         Name = "Jupiter",
         Parent = "JupiterBarycenter",
-        Renderable = {
-            Type = "RenderablePlanet",
-            Frame = "IAU_JUPITER",
-            Body = "JUPITER BARYCENTER",
-            Geometry = {
-                Type = "SimpleSphere",
-                Radius = 0.71492E8,
-                Segments = 200
-            },
-            Textures = {
-                Type = "simple",
-                Color = "textures/jupiter.jpg",
-            },
-            Atmosphere = {
-                Type = "Nishita", -- for example, values missing etc etc
-                MieFactor = 1.0,
-                MieColor = {1.0, 1.0, 1.0}
-            }
-        },
-        Tag = "planet_solarSystem",
         Transform = {
-            Translation = {
-                Type = "StaticTranslation",
-                Position = {0, 0, 0}, -- jupiter is at its barycenter
-            },
             Rotation = {
                 Type = "SpiceRotation",
                 SourceFrame = "IAU_JUPITER",
-                DestinationFrame = "ECLIPJ2000",
+                DestinationFrame = "GALACTIC"
             },
-            Scale = {
-                Type = "StaticScale",
-                Scale = 1,
-            },
-        }
+        },
+        Renderable = {
+            Type = "RenderableGlobe",
+            Radii = { 71492000, 71492000, 66854000 },
+            SegmentsPerPatch = 64,
+            Layers = {
+                ColorLayers = {
+                    {
+                        Name = "Jupiter Texture",
+                        FilePath = "textures/jupiter.jpg",
+                        Enabled = true
+                    }
+                }
+            }
+        },
+        Tag = { "planet_solarSystem", "planet_giants" },
     },
-    -- JupiterTrail module
+    -- Trail module
     {   
         Name = "JupiterTrail",
         Parent = "SolarSystemBarycenter",
@@ -60,13 +47,13 @@ return {
             Type = "RenderableTrailOrbit",
             Translation = {
                 Type = "SpiceTranslation",
-                Body = "JUPITER BARYCENTER",
-                Observer = "SUN",
+                Target = "JUPITER BARYCENTER",
+                Observer = "SUN"
             },
             Color = { 0.8, 0.7, 0.7 },
             Period = 4330.595,
-            Resolution = 1000,
+            Resolution = 1000
         },
-        Tag = "planetTrail_solarSystem"
+        Tag = { "planetTrail_solarSystem", "planetTrail_giants" }
     }
-}
+}

data/scene/lodglobes/earth/earth.data

@@ -1,5 +0,0 @@
-return {
-    FileRequest = {
-        { Identifier = "earth_textures", Destination = "textures", Version = 2 }
-    },
-}

data/scene/lodglobes/earth/earth.mod

@@ -1,188 +0,0 @@
-earthEllipsoid = {6378137.0, 6378137.0, 6356752.314245} -- Earth's radii
-return {
-    -- Earth barycenter module
-    {
-        Name = "EarthBarycenter",
-        Parent = "SolarSystemBarycenter",
-        Transform = {
-            Translation = {
-                Type = "SpiceTranslation",
-                Body = "EARTH",
-                Observer = "SUN",
-                Kernels = "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp"
-            },
-        },
-    },
-    {
-    -- The default reference frame for Earth-orbiting satellites
-        Name = "EarthInertial",
-        Parent = "EarthBarycenter",
-        Transform = {
-            Rotation = {
-                Type = "SpiceRotation",
-                SourceFrame = "J2000",
-                DestinationFrame = "GALACTIC",
-            }
-        },
-    },    
-    -- EarthTrail module
-    {   
-        Name = "EarthTrail",
-        Parent = "SolarSystemBarycenter",
-        Renderable = {
-            Type = "RenderableTrailOrbit",
-            Translation = {
-                Type = "SpiceTranslation",
-                Body = "EARTH",
-                Observer = "SUN"
-            },
-            Color = { 0.5, 0.8, 1.0 },
-            -- StartTime = "2016 JUN 01 12:00:00.000",
-            -- EndTime = "2017 JAN 01 12:00:00.000",
-            -- SampleInterval = 3600
-            Period = 365.242,
-            Resolution = 1000
-        },
-        GuiName = "/Solar/EarthTrail"
-    },
-    -- RenderableGlobe module
-    {
-        Name = "Earth",
-        Parent = "EarthBarycenter",
-        Transform = {
-            Rotation = {
-                Type = "SpiceRotation",
-                SourceFrame = "IAU_EARTH",
-                DestinationFrame = "GALACTIC",
-            },
-            Scale = {
-                Type = "StaticScale",
-                Scale = 1,
-            },
-        },
-        Renderable = {
-            Type = "RenderableGlobe",
-            Radii = earthEllipsoid,
-            SegmentsPerPatch = 64,
-            Layers = {
-                ColorLayers = {
-                    {
-                        Name = "ESRI VIIRS Combo",
-                        Type = "ByLevelTileLayer",
-                        LevelTileProviders = {
-                            {
-                                MaxLevel = 3, 
-                                TileProvider = {
-                                    Type = "TemporalTileLayer",
-                                    Name = "Temporal VIIRS SNPP",
-                                    FilePath = "map_service_configs/GIBS/Temporal_VIIRS_SNPP_CorrectedReflectance_TrueColor.xml", }, 
-                            },
-                            {
-                                MaxLevel = 22,
-                                TileProvider = {
-                                    Name = "ESRI Imagery World 2D",
-                                    FilePath = "map_service_configs/ESRI/ESRI_Imagery_World_2D.wms"
-                                },
-                            },
-                        },
-                        Enabled = true,
-                    },
-					{
-						FilePath = "map_service_configs/ESRI/ESRI_Imagery_World_2D.wms",
-						Name = "ESRI",
-					},
-                    {
-                        Name = "BMNG",
-                        FilePath = "map_service_configs/Utah/Bmng.wms"
-                    },
-                    {
-                        Type = "TemporalTileLayer",
-                        Name = "Temporal_AMSR2_GCOM_W1_Sea_Ice_Concentration",
-                        FilePath = "map_service_configs/GIBS/Temporal_AMSR2_GCOM_W1_Sea_Ice_Concentration.xml",
-                    },
-                    {
-                        Type = "TemporalTileLayer",
-                        Name = "MODIS_Terra_Chlorophyll_A",
-                        FilePath = openspace.globebrowsing.createTemporalGibsGdalXml(
-                            "MODIS_Terra_Chlorophyll_A",
-                            "2013-07-02",
-                            "Yesterday",
-                            "1d",
-                            "1km",
-                            "png")
-                    },
-                    {
-                        Type = "TemporalTileLayer",
-                        Name = "GHRSST_L4_G1SST_Sea_Surface_Temperature",
-                        FilePath = openspace.globebrowsing.createTemporalGibsGdalXml(
-                            "GHRSST_L4_G1SST_Sea_Surface_Temperature",
-                            "2010-06-21",
-                            "Yesterday",
-                            "1d",
-                            "1km",
-                            "png")
-                    },
-                },
-                NightLayers = {
-                    {
-                        Name = "Earth at Night 2012",
-                        FilePath = "map_service_configs/GIBS/VIIRS_CityLights_2012.xml",
-                        Enabled = true,
-                        Settings = {
-                            Opacity = 1.0,
-                            Gamma = 1.5,
-                            Multiplier = 15.0,
-                        },
-                    },
-                    {
-                        Type = "TemporalTileLayer",
-                        Name = "Temporal Earth at Night",
-                        FilePath = "map_service_configs/GIBS/Temporal_VIIRS_SNPP_DayNightBand_ENCC.xml"
-                    }
-                },
-                WaterMasks = {
-                    {
-                        Name = "MODIS_Water_Mask",
-                        FilePath = "map_service_configs/GIBS/MODIS_Water_Mask.xml",
-                        Enabled = true,
-                    },
-                    {
-                        Name = "GEBCO",
-                        FilePath = "map_service_configs/Utah/Gebco.wms",
-                    }
-                },
-                Overlays = {
-                    {
-                        Name = "Coastlines",
-                        FilePath = "map_service_configs/GIBS/Coastlines.xml",
-                    },
-                    {
-                        Name = "Reference_Features",
-                        FilePath = "map_service_configs/GIBS/Reference_Features.xml",
-                    },
-                    {
-                        Name = "Reference_Labels",
-                        FilePath = "map_service_configs/GIBS/Reference_Labels.xml",
-                    },
-                    {
-                        Type = "TileIndexTileLayer",
-                        Name = "Tile Indices",
-                    },
-                    {
-                        Type = "SizeReferenceTileLayer",
-                        Name = "Size Reference",
-                        Radii = earthEllipsoid,
-                    },
-                },
-                HeightLayers = {
-                    {
-                        Name = "Terrain tileset",
-                        FilePath = "map_service_configs/ESRI/TERRAIN.wms",
-                        Enabled = true,
-                        TilePixelSize = 64,
-                    },
-                },
-            },
-        }
-    },
-}

data/scene/lodglobes/jupiter/callisto/callisto.data

@@ -1,5 +0,0 @@
-return {
-    FileRequest = {
-        { Identifier = "callisto_textures", Destination = "textures", Version = 1 }
-    },
-}

data/scene/lodglobes/jupiter/callisto/callisto.mod

@@ -1,54 +0,0 @@
-return {
-    -- RenderableGlobe module
-    {
-        Name = "Callisto",
-        Parent = "JupiterBarycenter",
-        Transform = {
-            Rotation = {
-                Type = "SpiceRotation",
-                SourceFrame = "IAU_CALLISTO",
-                DestinationFrame = "GALACTIC",
-            },
-            Translation = {
-                Type = "SpiceTranslation",
-                Body = "CALLISTO",
-                Observer = "JUPITER BARYCENTER",
-                Kernels = "${OPENSPACE_DATA}/spice/jup260.bsp"
-            },
-            Scale = {
-                Type = "StaticScale",
-                Scale = 1,
-            },
-        },
-        Renderable = {
-            Type = "RenderableGlobe",
-            Radii = {2631000, 2631000, 2631000},
-            SegmentsPerPatch = 64,
-            Layers = {
-                ColorLayers = {
-                    {
-                        Name = "Callisto Texture",
-                        FilePath = "textures/callisto.jpg",
-                        Enabled = true,
-                    },
-                },
-            },
-        }
-    },
-    -- Trail module
-    {   
-        Name = "CallistoTrail",
-        Parent = "JupiterBarycenter",
-        Renderable = {
-            Type = "RenderableTrailOrbit",
-            Translation = {
-                Type = "SpiceTranslation",
-                Body = "CALLISTO",
-                Observer = "JUPITER BARYCENTER",
-            },
-            Color = { 0.4, 0.3, 0.01 },
-            Period =  17,
-            Resolution = 1000
-        }
-    }
-}

data/scene/lodglobes/jupiter/europa/europa.data

@@ -1,5 +0,0 @@
-return {
-    FileRequest = {
-        { Identifier = "europa_textures", Destination = "textures", Version = 1 }
-    },
-}

data/scene/lodglobes/jupiter/europa/europa.mod

@@ -1,55 +0,0 @@
-return {
-    -- RenderableGlobe module
-    {
-        Name = "Europa",
-        Parent = "JupiterBarycenter",
-        Transform = {
-            Rotation = {
-                Type = "SpiceRotation",
-                SourceFrame = "IAU_EUROPA",
-                DestinationFrame = "GALACTIC",
-            },
-            Translation = {
-                Type = "SpiceTranslation",
-                Body = "EUROPA",
-                Observer = "JUPITER BARYCENTER",
-                Kernels = "${OPENSPACE_DATA}/spice/jup260.bsp"
-            },
-            Scale = {
-                Type = "StaticScale",
-                Scale = 1,
-            },
-        },
-        Renderable = {
-            Type = "RenderableGlobe",
-            Radii = {1561000, 1561000, 1561000},
-            SegmentsPerPatch = 64,
-            Layers = {
-                ColorLayers = {
-                    {
-                        Name = "Europa Texture",
-                        FilePath = "textures/europa.jpg",
-                        Enabled = true,
-                    },
-                },
-            },
-        }
-    },
-
-    -- Trail module
-    {   
-        Name = "EuropaTrail",
-        Parent = "JupiterBarycenter",
-        Renderable = {
-            Type = "RenderableTrailOrbit",
-            Translation = {
-                Type = "SpiceTranslation",
-                Body = "EUROPA",
-                Observer = "JUPITER BARYCENTER",
-            },
-            Color = { 0.5, 0.3, 0.3 },
-            Period =  85 / 24,
-            Resolution = 1000
-        }
-    }
-}

data/scene/lodglobes/jupiter/ganymede/ganymede.data

@@ -1,5 +0,0 @@
-return {
-    FileRequest = {
-        { Identifier = "ganymede_textures", Destination = "textures", Version = 1 }
-    },
-}

data/scene/lodglobes/jupiter/ganymede/ganymede.mod

@@ -1,54 +0,0 @@
-return {
-    -- RenderableGlobe module
-    {
-        Name = "Ganymede",
-        Parent = "JupiterBarycenter",
-        Transform = {
-            Rotation = {
-                Type = "SpiceRotation",
-                SourceFrame = "IAU_GANYMEDE",
-                DestinationFrame = "GALACTIC",
-            },
-            Translation = {
-                Type = "SpiceTranslation",
-                Body = "GANYMEDE",
-                Observer = "JUPITER BARYCENTER",
-                Kernels = "${OPENSPACE_DATA}/spice/jup260.bsp"
-            },
-            Scale = {
-                Type = "StaticScale",
-                Scale = 1,
-            },
-        },
-        Renderable = {
-            Type = "RenderableGlobe",
-            Radii = {2631000, 2631000, 2631000},
-            SegmentsPerPatch = 64,
-            Layers = {
-                ColorLayers = {
-                    {
-                        Name = "Ganymede Texture",
-                        FilePath = "textures/ganymede.jpg",
-                        Enabled = true,
-                    },
-                },
-            },
-        }
-    },
-    -- Trail module
-    {   
-        Name = "GanymedeTrail",
-        Parent = "JupiterBarycenter",
-        Renderable = {
-            Type = "RenderableTrailOrbit",
-            Translation = {
-                Type = "SpiceTranslation",
-                Body = "GANYMEDE",
-                Observer = "JUPITER BARYCENTER",
-            },
-            Color = { 0.4, 0.3, 0.3 },
-            Period =  172 / 24,
-            Resolution = 1000
-        }
-    }
-}

data/scene/lodglobes/jupiter/io/io.data

@@ -1,5 +0,0 @@
-return {
-    FileRequest = {
-        { Identifier = "io_textures", Destination = "textures", Version = 1 }
-    },
-}

data/scene/lodglobes/jupiter/io/io.mod

@@ -1,54 +0,0 @@
-return {
-    -- RenderableGlobe module
-    {
-        Name = "Io",
-        Parent = "JupiterBarycenter",
-        Transform = {
-            Rotation = {
-                Type = "SpiceRotation",
-                SourceFrame = "IAU_IO",
-                DestinationFrame = "GALACTIC",
-            },
-            Translation = {
-                Type = "SpiceTranslation",
-                Body = "IO",
-                Observer = "JUPITER BARYCENTER",
-                Kernels = "${OPENSPACE_DATA}/spice/jup260.bsp"
-            },
-            Scale = {
-                Type = "StaticScale",
-                Scale = 1,
-            },
-        },
-        Renderable = {
-            Type = "RenderableGlobe",
-            Radii = {1821300, 1821300, 1821300},
-            SegmentsPerPatch = 64,
-            Layers = {
-                ColorLayers = {
-                    {
-                        Name = "Io Texture",
-                        FilePath = "textures/io.jpg",
-                        Enabled = true,
-                    },
-                },
-            },
-        }
-    },
-    -- Trail module
-    {   
-        Name = "IoTrail",
-        Parent = "JupiterBarycenter",
-        Renderable = {
-            Type = "RenderableTrailOrbit",
-            Translation = {
-                Type = "SpiceTranslation",
-                Body = "IO",
-                Observer = "JUPITER BARYCENTER",
-            },
-            Color = { 0.4, 0.4, 0.2 },
-            Period =  42 / 24,
-            Resolution = 1000
-        }
-    }
-}

data/scene/lodglobes/jupiter/jupiter/jupiter.data

@@ -1,8 +0,0 @@
-return {
-    FileRequest = {
-        { Identifier = "jupiter_textures", Destination = "textures", Version = 1 }
-    },
-    TorrentFiles = {
-        { File = "jup260.bsp.torrent", Destination = "${SPICE}" },
-    }
-}

data/scene/lodglobes/jupiter/jupiter/jupiter.mod

@@ -1,65 +0,0 @@
-return {
-    -- Barycenter module
-    {
-        Name = "JupiterBarycenter",
-        Parent = "SolarSystemBarycenter",
-        Transform = {
-            Translation = {
-                Type = "SpiceTranslation",
-                Body = "JUPITER BARYCENTER",
-                Observer = "SUN",
-                Kernels = "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp"
-            },
-        },
-    },
-    -- RenderableGlobe module
-    {
-        Name = "Jupiter",
-        Parent = "JupiterBarycenter",
-        Transform = {
-            Rotation = {
-                Type = "SpiceRotation",
-                SourceFrame = "IAU_JUPITER",
-                DestinationFrame = "GALACTIC",
-            },
-            Translation = {
-                Type = "StaticTranslation",
-                Position = {0, 0, 0}, -- jupiter is at its barycenter
-            },
-            Scale = {
-                Type = "StaticScale",
-                Scale = 1,
-            },
-        },
-        Renderable = {
-            Type = "RenderableGlobe",
-            Radii = {71492000, 71492000, 66854000},
-            SegmentsPerPatch = 64,
-            Layers = {
-                ColorLayers = {
-                    {
-                        Name = "Jupiter Texture",
-                        FilePath = "textures/jupiter.jpg",
-                        Enabled = true,
-                    },
-                },
-            },
-        }
-    },
-    -- Trail module
-    {   
-        Name = "JupiterTrail",
-        Parent = "SolarSystemBarycenter",
-        Renderable = {
-            Type = "RenderableTrailOrbit",
-            Translation = {
-                Type = "SpiceTranslation",
-                Body = "JUPITER BARYCENTER",
-                Observer = "SUN",
-            },
-            Color = { 0.8, 0.7, 0.7 },
-            Period = 4330.595,
-            Resolution = 1000
-        }
-    }
-}

data/scene/lodglobes/mars/mars.data

@@ -1,8 +0,0 @@
-return {
-    FileRequest = {
-        { Identifier = "mars_textures", Destination = "textures", Version = 1 }
-    },
-    TorrentFiles = {
-        -- { File = "MAR063.BSP.torrent", Destination = "${SPICE}" }
-    }
-}

data/scene/lodglobes/mars/mars.mod

@@ -1,96 +0,0 @@
-local marsEllipsoid = {3396190.0, 3396190.0, 3376200.0}
-
-return {
-    -- Barycenter module
-    {
-        Name = "MarsBarycenter",
-        Parent = "SolarSystemBarycenter",
-        Transform = {
-            Translation = {
-                Type = "SpiceTranslation",
-                Body = "MARS BARYCENTER",
-                Observer = "SUN",
-                Kernels = "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp"
-            },
-        },
-    },
-    -- RenderableGlobe module
-    {   
-        Name = "Mars",
-        Parent = "MarsBarycenter",
-        Transform = {
-            Rotation = {
-                Type = "SpiceRotation",
-                SourceFrame = "IAU_MARS",
-                DestinationFrame = "GALACTIC",
-            },
-            Scale = {
-                Type = "StaticScale",
-                Scale = 1,
-            },
-        },
-        Renderable = {
-            Type = "RenderableGlobe",
-            Radii = marsEllipsoid,
-            SegmentsPerPatch = 90,
-            Layers = {
-                ColorLayers = {
-                    {
-                        Name = "Viking",
-                        FilePath = "map_service_configs/MARS_Viking_MDIM21.xml",
-                        Enabled = true,
-                    },
-                    {
-                        Name = "MOLA Pseudo Color",
-                        FilePath = "map_service_configs/Utah/MolaPseudoColor.xml",
-                    },
-                    {
-                        Name = "CTX Mosaic [Europe]",
-                        FilePath = "map_service_configs/CTX_Mosaic.xml",
-                        BlendMode = "Color"
-                    },
-                    {
-                        Name = "CTX Mosaic [Utah]",
-                        FilePath = "map_service_configs/Utah/CTX_Mosaic.xml",
-                        BlendMode = "Color"
-                    },
-                },
-                Overlays = {
-                    {
-                        Type = "TileIndexTileLayer",
-                        Name = "Indices",
-                    },
-                    {
-                        Type = "SizeReferenceTileLayer",
-                        Name = "Size Reference",
-                        Radii = marsEllipsoid,
-                    },
-                },
-                HeightLayers = {
-                    {
-                        Name = "Mola Elevation [Europe]",
-                        FilePath = "map_service_configs/Mola_Elevation.xml",
-                        Enabled = true,
-                        TilePixelSize = 90,
-                    },
-                },
-            },
-        }
-    },
-    -- Trail module
-    {   
-        Name = "MarsTrail",
-        Parent = "SolarSystemBarycenter",
-        Renderable = {
-            Type = "RenderableTrailOrbit",
-            Translation = {
-                Type = "SpiceTranslation",
-                Body = "MARS BARYCENTER",
-                Observer = "SUN",
-            },
-            Color = { 0.814, 0.305, 0.220 },
-            Period = 686.973,
-            Resolution = 1000
-        }
-    }
-}