some renaming

7 files changed, 40 insertions, 19 deletions

diff --git a/bin/data/board.3DS b/bin/data/board.3DS
deleted file mode 100644
index 576b4da..0000000
--- a/bin/data/board.3DS
+++ /dev/null
diff --git a/bin/data/bottle.3DS b/bin/data/bottle.3DS
deleted file mode 100644
index abd5aea..0000000
--- a/bin/data/bottle.3DS
+++ /dev/null
diff --git a/bin/data/box.3DS b/bin/data/box.3DS
deleted file mode 100644
index 5ff6ce4..0000000
--- a/bin/data/box.3DS
+++ /dev/null
diff --git a/bin/data/gradblend01.mov b/bin/data/gradblend01.mov
deleted file mode 100644
index 049c092..0000000
--- a/bin/data/gradblend01.mov
+++ /dev/null
diff --git a/bin/data/settings.xml b/bin/data/settings.xml
index ba0a4f8..da2c13a 100644
--- a/bin/data/settings.xml
+++ b/bin/data/settings.xml
@@ -1,30 +1,51 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<map4 model="tigerbottle.3DS" x="0" y="101" z="0">
+<map4 model="bottle-tiger.3DS" x="0" y="101" z="0">
     <view>
-        <settings x="0.000000" y="0.000000" w="0.500000" h="1.000000" distort="0.000000" fov="14.054886" roll="90.000000" targX="0.000000" targY="112.000000" targZ="0.000000" lat="37.457062" lng="12.734703" dolly="737.189148" />
+        <settings x="0.000000" y="0.000000" w="0.500000" h="1.000000" distort="0.000000" fov="17.25" roll="90.000000" targX="0.000000" targY="112.000000" targZ="0.000000" lat="37.457062" lng="12.734703" dolly="737.189148" />
     </view>
     <view>
-        <settings x="0.500000" y="0.000000" w="0.500000" h="1.000000" distort="0.000000" fov="14.324753" roll="90.000000" targX="0.000000" targY="112.000000" targZ="0.000000" lat="37.458065" lng="106.842819" dolly="723.159424" />
+        <settings x="0.500000" y="0.000000" w="0.500000" h="1.000000" distort="0.000000" fov="17.25" roll="90.000000" targX="0.000000" targY="112.000000" targZ="0.000000" lat="37.458065" lng="106.842819" dolly="723.159424" />
     </view>
     <clip>
-        <settings file="glow_bars.mov" />
+        <settings file="tiger/label_shiny_still.mov" />
     </clip>
     <clip>
-        <settings file="glow_cracks.mov" />
+        <settings file="tiger/tiger_ribbon.mov" />
     </clip>
     <clip>
-        <settings file="shift over.mov" />
+        <settings file="tiger/ribbon_logo.mov" />
     </clip>
     <clip>
-        <settings file="tiger_squares.mov" />
+        <settings file="tiger/label_shiny_still.mov" />
     </clip>
     <clip>
-        <settings file="MadMapper_update.mov" />
+        <settings file="tiger/timelapse_resize.mov" />
     </clip>
     <clip>
-        <settings file="label_animation.mov" />
+        <settings file="tiger/tronlightdrive.mov" />
     </clip>
     <clip>
-        <settings file="label_animation_2.mov" />
+        <settings file="tiger/label_shiny_still.mov" />
+    </clip>
+    <clip>
+        <settings file="tiger/tiger_squares_updated.mov" />
+    </clip>
+    <clip>
+        <settings file="tiger/disc_sea_colour.mov" />
+    </clip>
+    <clip>
+        <settings file="tiger/label_shiny_still.mov" />
+    </clip>
+    <clip>
+        <settings file="tiger/glow_cracks.mov" />
+    </clip>
+    <clip>
+        <settings file="tiger/label_shiny_still.mov" />
+    </clip>
+    <clip>
+        <settings file="tiger/glow_bars.mov" />
+    </clip>
+    <clip>
+        <settings file="tiger/shift over.mov" />
     </clip>
 </map4>
diff --git a/bin/data/tigerbottle.3DS b/bin/data/tigerbottle.3DS
deleted file mode 100755
index abf920a..0000000
--- a/bin/data/tigerbottle.3DS
+++ /dev/null
diff --git a/map4.layout b/map4.layout
index 291d1d1..11e325d 100644
--- a/map4.layout
+++ b/map4.layout
@@ -4,22 +4,22 @@
 	<File name="../../../addons/ofx3DModelLoader/src/3DS/model3DS.h" open="0" top="0" tabpos="0">
 		<Cursor position="136" topLine="0" />
 	</File>
-	<File name="bin/data/defaults.xml" open="1" top="0" tabpos="4">
+	<File name="bin/data/defaults.xml" open="1" top="0" tabpos="3">
 		<Cursor position="1033" topLine="0" />
 	</File>
-	<File name="bin/data/settings.xml" open="1" top="0" tabpos="3">
-		<Cursor position="69" topLine="0" />
+	<File name="bin/data/settings.xml" open="1" top="1" tabpos="11">
+		<Cursor position="781" topLine="0" />
 	</File>
 	<File name="config.make" open="0" top="0" tabpos="3">
 		<Cursor position="548" topLine="0" />
 	</File>
-	<File name="src/keyVar.cpp" open="1" top="0" tabpos="8">
+	<File name="src/keyVar.cpp" open="1" top="0" tabpos="7">
 		<Cursor position="1236" topLine="16" />
 	</File>
 	<File name="src/keyVar.h" open="0" top="0" tabpos="8">
 		<Cursor position="0" topLine="0" />
 	</File>
-	<File name="src/main.cpp" open="1" top="0" tabpos="6">
+	<File name="src/main.cpp" open="1" top="0" tabpos="5">
 		<Cursor position="275" topLine="0" />
 	</File>
 	<File name="src/mapUtils.cpp" open="0" top="0" tabpos="7">
@@ -28,16 +28,16 @@
 	<File name="src/mapUtils.h" open="0" top="0" tabpos="6">
 		<Cursor position="165" topLine="0" />
 	</File>
-	<File name="src/testApp.cpp" open="1" top="1" tabpos="2">
-		<Cursor position="706" topLine="4" />
+	<File name="src/testApp.cpp" open="1" top="0" tabpos="2">
+		<Cursor position="6396" topLine="188" />
 	</File>
 	<File name="src/testApp.h" open="1" top="0" tabpos="1">
 		<Cursor position="1267" topLine="33" />
 	</File>
-	<File name="src/viewpoint.cpp" open="1" top="0" tabpos="5">
+	<File name="src/viewpoint.cpp" open="1" top="0" tabpos="4">
 		<Cursor position="566" topLine="0" />
 	</File>
-	<File name="src/viewpoint.h" open="1" top="0" tabpos="7">
+	<File name="src/viewpoint.h" open="1" top="0" tabpos="6">
 		<Cursor position="808" topLine="13" />
 	</File>
 </CodeBlocks_layout_file>