Renamed default_nh.scene to newhorizons.scene

Remove all 'projection' suffices from newhorizons classes

.gitignore

@@ -44,12 +44,8 @@ gui/externaltimecontrol/mainwindow.h
 data/scene/rosetta/67P/obj/67P_rotated_5_130.obj
 data/spice/NewHorizonsKernels/
 data/spice/RosettaKernels/
-data/scene/newhorizons/pluto/plutoprojection/textures/
-data/scene/newhorizons/pluto/plutoprojection/textures/Shenk_180.jpg
-data/scene/newhorizons/pluto/plutoprojection/textures/barycenter.png
-data/scene/newhorizons/pluto/plutoprojection/textures/defaultProj.png
-data/scene/newhorizons/pluto/plutoprojection/textures/pluto_highres_180.jpg
-data/scene/newhorizons/pluto/plutoprojection/utcEvents.txt
+data/scene/newhorizons/pluto/pluto/textures/
+data/scene/newhorizons/pluto/pluto/utcEvents.txt
 data/scene/rosetta/rosetta/obj/mainbodyros.obj
 data/scene/rosetta/rosetta/obj/solarpanelleft.obj
 data/scene/rosetta/rosetta/obj/solarpanelright.obj
@@ -69,7 +65,7 @@ data/scene/uranus/textures/uranus.jpg
 data/scene/venus/textures/venus.jpg
 data/scene/dawn/vestaprojection/VestaComet/VestaComet_5000.obj
 data/spice/DawnKernels/
-data/scene/newhorizons/jupiter/jupiterprojection/ProjectionsOfInterest/
+data/scene/newhorizons/jupiter/jupiter/ProjectionsOfInterest/
 data/scene/rosetta/67P/textures/black.jpg
 data/scene/rosetta/67P/textures/defaultProj.png
 data/scene/rosetta/67P/textures/gray.jpg
@@ -77,12 +73,12 @@ data/scene/rosetta/67P/textures/gray.png
 data/scene/rosetta/67P/textures/texmapflipped.jpg
 data/scene/rosetta/67P/textures/white.jpg
 data/scene/rosetta/67P/textures/white.png
-data/scene/newhorizons/jupiter/callistoprojection/textures/callisto.jpg
+data/scene/newhorizons/jupiter/callisto/textures/callisto.jpg
 data/scene/dawn/ceres/textures/gray.png
-data/scene/newhorizons/pluto/charonprojection/textures/Charon-Text.png
-data/scene/newhorizons/pluto/charonprojection/textures/charon_highres.jpg
-data/scene/newhorizons/pluto/charonprojection/textures/charon_highres_annotated.jpg
-data/scene/newhorizons/pluto/charonprojection/textures/defaultProj.png
+data/scene/newhorizons/pluto/charon/textures/Charon-Text.png
+data/scene/newhorizons/pluto/charon/textures/charon_highres.jpg
+data/scene/newhorizons/pluto/charon/textures/charon_highres_annotated.jpg
+data/scene/newhorizons/pluto/charon/textures/defaultProj.png
 data/scene/dawn/dawn/obj/mainbodydawn.obj
 data/scene/dawn/dawn/obj/solarpanelleft.obj
 data/scene/dawn/dawn/obj/solarpanelright.obj
@@ -93,9 +89,9 @@ data/scene/earth/textures/earth_bluemarble.jpg
 data/scene/earth/textures/earth_bluemarble_height.jpg
 data/scene/earth/textures/earth_night.jpg
 data/scene/earth/textures/marker.png
-data/scene/newhorizons/jupiter/europaprojection/textures/europa.jpg
-data/scene/newhorizons/jupiter/ganymedeprojection/textures/ganymede.jpg
-data/scene/newhorizons/jupiter/ioprojection/textures/io.jpg
+data/scene/newhorizons/jupiter/europa/textures/europa.jpg
+data/scene/newhorizons/jupiter/ganymede/textures/ganymede.jpg
+data/scene/newhorizons/jupiter/io/textures/io.jpg
 data/scene/jupiter/jupiter/textures/jupiter.jpg
 data/scene/mars/textures/mars.jpg
 data/scene/mercury/textures/mercury.jpg
@@ -109,9 +105,9 @@ data/scene/newhorizons/newhorizons/textures/labels.png
 data/scene/pluto/textures/
 data/scene/pluto/textures/Shenk_180.jpg
 data/scene/pluto/textures/pluto_highres_180.jpg
-data/scene/newhorizons/pluto/plutoprojection/assets/core_v9h_obs_getmets_v8_time_fix_nofrcd_mld.txt
-data/scene/newhorizons/pluto/plutoprojection/textures/3.jpg
-data/scene/newhorizons/pluto/plutoprojection/textures/Pluto-Text.png
+data/scene/newhorizons/pluto/pluto/assets/core_v9h_obs_getmets_v8_time_fix_nofrcd_mld.txt
+data/scene/newhorizons/pluto/pluto/textures/3.jpg
+data/scene/newhorizons/pluto/pluto/textures/Pluto-Text.png
 data/scene/dawn/vestaprojection/VestaComet/VestaComet.mtl
 data/scene/dawn/vestaprojection/textures/defaultProj_backup.png
 data/scene/dawn/vestaprojection/textures/dummy.jpg
@@ -120,7 +116,7 @@ data/scene/dawn/vestaprojection/textures/projectMe.png
 data/spice/MAR063.BSP
 data/spice/de430_1850-2150.bsp
 data/spice/jup260.bsp
-data/scene/newhorizons/pluto/plutoprojection/images
+data/scene/newhorizons/pluto/pluto/images
 data/spice/nh_kernels/
 data/scene/jupiter/jupiter/textures/Jupiter-text.png
 data/scene/jupiter/callisto/textures/callisto.jpg

data/scene/newhorizons.scene

@@ -8,7 +8,13 @@ function preInitialization()
     critical objects.
     ]]--
 
-    openspace.time.setTime("2015-07-14T10:00:00.00")
+    -- openspace.time.setTime("2015-07-08T15:57:45.00")
+    -- openspace.time.setTime("2015-07-12T07:41:00.00")
+    -- openspace.time.setTime("2015-07-12T15:43:00.00")
+    -- openspace.time.setTime("2015-07-12T22:19:20.00")
+    -- openspace.time.setTime("2015-07-13T20:59:00.00")
+    -- openspace.time.setTime("2015-07-14T02:41:55.00")
+    openspace.time.setTime("2015-07-14T10:05:00.00")
     openspace.time.setDeltaTime(0)
     dofile(openspace.absPath('${SCRIPTS}/bind_keys.lua'))
 end

data/scene/newhorizons/pluto/pluto/pluto.mod

@@ -50,7 +50,7 @@ return {
                 MieColor = {1.0, 1.0, 1.0}
             },
             Projection = {
-                Sequence       = "${OPENSPACE_DATA}/scene/newhorizons/pluto/plutoprojection/images",
+                Sequence       = "${OPENSPACE_DATA}/scene/newhorizons/pluto/plutoprojection/all_images",
                 EventFile      = "${OPENSPACE_DATA}/scene/newhorizons/pluto/plutoprojection/assets/core_v9h_obs_getmets_v8_time_fix_nofrcd_mld.txt",
                 SequenceType   = "hybrid",
                 Observer       = "NEW HORIZONS",

openspace.cfg

@@ -7,7 +7,7 @@ return {
 
     -- Sets the scene that is to be loaded by OpenSpace. A scene file is a description
     -- of all entities that will be visible during an instance of OpenSpace
-    Scene = "${SCENE}/default_nh.scene",
+    Scene = "${SCENE}/newhorizons.scene",
     
     Paths = {
         SGCT = "${BASE_PATH}/config/sgct",