Merge from globebrowsing

data/scene/debugglobe/debugglobe.mod

@@ -1,23 +1,9 @@
 return {
-    -- Earth barycenter module
-    {
-        Name = "EarthBarycenter",
-        Parent = "SolarSystemBarycenter",
-        Static = true,
-        Ephemeris = {
-            Type = "Spice",
-            Body = "EARTH BARYCENTER",
-            Reference = "ECLIPJ2000",
-            Observer = "SUN",
-            Kernels = {
-                "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp"
-            }
-        },
-    },
+
     -- RenderableGlobe module
     {   
         Name = "DebugGlobe",
-        Parent = "EarthBarycenter",
+        Parent = "Root",
         Renderable = {
             Type = "RenderableGlobe",
             Frame = "IAU_EARTH",
@@ -67,11 +53,7 @@ return {
                         Enabled = true,
                     },
                     --[[
-                    {
-                        Name = "Mars Viking Clr",
-                        FilePath = "textures/Mars_Viking_ClrMosaic_global_925m_longlat_full.vrt",
-                        Enabled = true,
-                    },
+
                     {
                         Name = "On Mercury Color",
                         FilePath = "map_service_configs/mercury/OnMercuryColor.xml",
@@ -86,7 +68,7 @@ return {
                     {
                         Name = "CTX Mosaic",
                         FilePath = "map_service_configs/mars/CTX_Mosaic.xml",
-                        Enabled = false,
+                        Enabled = true,
                     },
 
                     --[[
@@ -129,7 +111,6 @@ return {
                     },
                 },
                 HeightMaps = {
-
                     {
                         Name = "Mola Elevation",
                         FilePath = "map_service_configs/mars/Mola_Elevation.xml",
@@ -173,30 +154,4 @@ return {
         },
         GuiName = "/Solar/Planets/DebugGlobe"
     },
-    -- EarthTrail module
-    {   
-        Name = "EarthTrail",
-        Parent = "SolarSystemBarycenter",
-        Renderable = {
-            Type = "RenderableTrail",
-            Body = "EARTH",
-            Frame = "GALACTIC",
-            Observer = "SUN",
-            RGB = { 0.5, 0.8, 1.0},
-            TropicalOrbitPeriod = 365.242,
-            EarthOrbitRatio = 1,
-            DayLength = 24
-        },
-        GuiName = "/Solar/EarthTrail"
-    }
-    --[[,
-    {
-        Name = "DebugPlane",
-        Parent = "DebugGlobe",
-        Renderable = {
-            Type = "RenderableDebugPlane",
-            Texture = 34,
-            Size = { 1, 7 }
-        }
-    }]]
 }

data/scene/globebrowsing-debug.scene

@@ -0,0 +1,46 @@
+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"
+    }
+}
+

data/scene/lodmars/lodmars.mod

@@ -48,7 +48,6 @@ return {
                     {
                         Name = "MARS_Viking_MDIM21",
                         FilePath = "map_service_configs/MARS_Viking_MDIM21.xml",
-                        Enabled = true,
                     },
                     {
                         Name = "Mars Viking Clr",

data/scene/rosetta/67P/67P.data

@@ -1,6 +1,7 @@
 return {
     FileRequest = {
-        { Identifier = "67p_textures", Destination = "textures", Version = 2 }
+        { Identifier = "67p_textures", Destination = "textures", Version = 2 },
+        { Identifier = "rosettaimages", Destination = "rosettaimages", Version = 1}
     },
     TorrentFiles = {
         { File = "67P_rotated_5_130.obj.torrent", Destination = "obj" },