another tiger demo

3 files changed, 58 insertions, 22 deletions

diff --git a/bin/data/settings.xml b/bin/data/settings.xml
index b2c6948..53083f7 100644
--- a/bin/data/settings.xml
+++ b/bin/data/settings.xml
@@ -1,18 +1,54 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<map4 model="tigerglass.3DS" x="-48" y="0" z="226">
+<map4 model="bottle-tiger.3DS" x="0" y="101" z="0">
     <view>
-        <settings x="0.000000" y="0.000000" w="0.333300" h="1.000000" distort="0.000000" fov="18.230345" roll="87.152634" targX="3.472998" targY="156.649658" targZ="-17.789478" lat="-9.123949" lng="-55.316231" dolly="661.799744" />
+        <settings x="0.000000" y="0.000000" w="0.3333" 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="0" dolly="737.189148" />
     </view>
     <view>
-        <settings x="0.333300" y="0.000000" w="0.333300" h="1.000000" distort="0.000000" fov="21.196981" roll="90.000000" targX="0.000000" targY="114.036995" targZ="0.000000" lat="54.604073" lng="66.245064" dolly="546.632568" />
+        <settings x="0.3333" y="0.000000" w="0.3333" 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="120" dolly="723.159424" />
     </view>
     <view>
-        <settings x="0.666600" y="0.000000" w="0.333300" h="1.000000" distort="0.000000" fov="17.250000" roll="91.700325" targX="14.393332" targY="114.319336" targZ="0.000000" lat="-13.422262" lng="122.463852" dolly="705.087280" />
+        <settings x="0.667" y="0.000000" w="0.3333" 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="240" dolly="723.159424" />
     </view>
     <clip>
-        <settings file="black.mov" />
+        <settings file="tiger/label_shiny_still.mov" />
     </clip>
     <clip>
-        <settings file="tigerglass_texture.mov" />
+        <settings file="tiger/tiger_ribbon.mov" />
+    </clip>
+    <clip>
+        <settings file="tiger/ribbon_logo.mov" />
+    </clip>
+    <clip>
+        <settings file="tiger/label_shiny_still.mov" />
+    </clip>
+    <clip>
+        <settings file="tiger/timelapse_resize.mov" />
+    </clip>
+    <clip>
+        <settings file="tiger/tronlightdrive.mov" />
+    </clip>
+    <clip>
+        <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/map4.layout b/map4.layout
index 8c19c5f..4b5ee34 100644
--- a/map4.layout
+++ b/map4.layout
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
 <CodeBlocks_layout_file>
-	<ActiveTarget name="Debug" />
-	<File name="Makefile" open="1" top="0" tabpos="10">
+	<ActiveTarget name="Release" />
+	<File name="Makefile" open="0" top="0" tabpos="10">
 		<Cursor position="20" topLine="0" />
 	</File>
-	<File name="bin/data/defaults.xml" open="1" top="0" tabpos="3">
+	<File name="bin/data/defaults.xml" open="0" top="0" tabpos="3">
 		<Cursor position="1033" topLine="0" />
 	</File>
-	<File name="bin/data/settings.xml" open="1" top="0" tabpos="7">
-		<Cursor position="847" topLine="0" />
+	<File name="bin/data/settings.xml" open="1" top="0" tabpos="6">
+		<Cursor position="969" topLine="8" />
 	</File>
-	<File name="config.make" open="1" top="1" tabpos="9">
-		<Cursor position="641" topLine="0" />
+	<File name="config.make" open="1" top="0" tabpos="8">
+		<Cursor position="183" topLine="0" />
 	</File>
 	<File name="src/keyVar.cpp" open="0" top="0" tabpos="7">
 		<Cursor position="1236" topLine="16" />
@@ -19,26 +19,26 @@
 	<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="8">
+	<File name="src/main.cpp" open="1" top="0" tabpos="7">
 		<Cursor position="396" topLine="0" />
 	</File>
-	<File name="src/mapUtils.cpp" open="1" top="0" tabpos="6">
-		<Cursor position="0" topLine="66" />
+	<File name="src/mapUtils.cpp" open="1" top="1" tabpos="5">
+		<Cursor position="0" topLine="57" />
 	</File>
 	<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="0" tabpos="2">
-		<Cursor position="6989" topLine="173" />
+		<Cursor position="898" topLine="305" />
 	</File>
 	<File name="src/testApp.h" open="1" top="0" tabpos="1">
 		<Cursor position="830" topLine="46" />
 	</File>
-	<File name="src/viewpoint.cpp" open="1" top="0" tabpos="4">
+	<File name="src/viewpoint.cpp" open="1" top="0" tabpos="3">
 		<Cursor position="566" topLine="47" />
 	</File>
-	<File name="src/viewpoint.h" open="1" top="0" tabpos="5">
-		<Cursor position="808" topLine="25" />
+	<File name="src/viewpoint.h" open="1" top="0" tabpos="4">
+		<Cursor position="569" topLine="25" />
 	</File>
 	<File name="../openFrameworks/addons/ofxAvahiCore/src/ofxAvahiCoreBrowser.cpp" open="1" top="0" tabpos="11">
 		<Cursor position="496" topLine="0" />
diff --git a/src/main.cpp b/src/main.cpp
index 909a134..01a6964 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -17,8 +17,8 @@
 int main(){
 
     ofAppGlutWindow window;
-    ofSetupOpenGL(&window, 1024,300, OF_WINDOW);			// <-------- setup the GL context
-	//ofSetupOpenGL(&window, 3840,720, OF_FULLSCREEN);
+    //ofSetupOpenGL(&window, 1024,300, OF_WINDOW);			// <-------- setup the GL context
+	ofSetupOpenGL(&window,2544,480, OF_FULLSCREEN);
 	glutIgnoreKeyRepeat(1);
 	glutSetKeyRepeat(GLUT_KEY_REPEAT_OFF); //these don't work!!!
 	printf("key repeat ignore: %i\n",glutDeviceGet(GLUT_DEVICE_IGNORE_KEY_REPEAT));