Merge branch 'develop' into release/ips

.gitignore

@@ -136,12 +136,9 @@ data/scene/newhorizons/pluto/pluto/full_images/
 data/scene/rosetta/67P/rosettaimages/
 data/spice/RosettaKernels_New/
 data/scene/newhorizons/pluto/charon/utcEvents.txt
-data/scene/volumetricmilkyway/milkyway_512_512_64_RGBA32F.volume
-data/scene/volumetricmilkyway/milkyway_512_512_64_RGBA32F_old.volume
-data/scene/volumetricmilkyway/milkyway_points.binary
-data/scene/volumetricmilkyway/milkyway_points.off
 data/scene/rosetta/67P/obj/67P_HD_2015-05-09.obj
 data/scene/rosetta/67P/obj/may9_map.jpg
 data/scene/rosetta/67P/textures/may9_map.jpg
 data/scene/newhorizons/pluto/charon/textures/cpdem-Mcolor2-MLorriCA-lr-5_ZMfs-cyl.jpg
 data/scene/newhorizons/pluto/charon/textures/cpmap_cyl_HR_0e.jpg
+data/scene/volumetricmilkyway/milkyway/

data/scene/fieldlines.scene

@@ -0,0 +1,56 @@
+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())
+    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", true)
+    openspace.setPropertyValue("EarthMarker.renderable.enabled", true)
+    openspace.setPropertyValue("Constellation Bounds.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",
+        Position = {1, 0, 0, 5},
+    },
+    Modules = {
+        "sun",
+        "mercury",
+        "venus",
+        "earth",
+        "mars",
+        "jupiter",
+        "saturn",
+        "uranus",
+        "neptune",
+        "stars",
+        "fieldlines",
+        -- "stars-denver",
+        "milkyway",
+        -- "milkyway-eso",
+        "constellationbounds",
+    }
+}

data/scene/volumetricmilkyway.scene

@@ -0,0 +1,42 @@
+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())
+    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", true)
+    -- openspace.setPropertyValue("EarthMarker.renderable.enabled", true)
+    -- openspace.setPropertyValue("Constellation Bounds.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 = "Volumetric Milky Way",
+        Position = {1, 0, 0, 5},
+    },
+    Modules = {
+        "volumetricmilkyway"
+    }
+}

data/scene/volumetricmilkyway/volumetricmilkyway.data

@@ -0,0 +1,5 @@
+return {
+    TorrentFiles = {
+        { File = "milkyway.torrent", Destination = "." }
+    }
+}

data/scene/volumetricmilkyway/volumetricmilkyway.mod

@@ -0,0 +1,26 @@
+local kiloparsec = 3.086 * 10^19;
+
+return {
+    {   
+        Name = "Volumetric Milky Way",
+        Parent = "Root",
+        Ephemeris = {
+            Type = "Static",
+            Position = {0, 0, 0, 0}
+        },
+        Renderable = {
+             Type = "RenderableGalaxy",
+             Translation = {0, 0, 0},
+             Volume = {
+                 Filename = "${OPENSPACE_DATA}/scene/volumetricmilkyway/milkyway/milkyway_512_512_64_RGBA32F.volume",
+                 Dimensions = {512, 512, 64},
+                 Size = {50 * kiloparsec, 50 * kiloparsec, 12.5 * kiloparsec},
+             },
+             Points = {
+                  Filename = "${OPENSPACE_DATA}/scene/volumetricmilkyway/milkyway/milkyway_points.binary",
+                  Scaling = {kiloparsec, kiloparsec, kiloparsec}
+             }
+        },
+        GuiName = "/VolumetricMilkyWay"
+    }
+}