strongbow ready

6 files changed, 170 insertions, 41 deletions

diff --git a/bin/data/settings.strongbow b/bin/data/settings.strongbow
new file mode 100644
index 0000000..c5a4d6a
--- /dev/null
+++ b/bin/data/settings.strongbow
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<map4 model="bottle-strongbow-lid.3DS" x="0" y="117" z="0">
+    <view>
+        <settings x="0.000000" y="0.000000" w="0.500000" h="1.000000" distort="0.000000" fov="17.250000" roll="90.000000" targX="0.000000" targY="112.000000" targZ="0.000000" lat="24.353056" lng="-52.803280" dolly="737.189148" />
+    </view>
+    <view>
+        <settings x="0.500000" y="0.000000" w="0.500000" h="1.000000" distort="0.000000" fov="17.250000" roll="90.000000" targX="0.000000" targY="112.000000" targZ="0.000000" lat="30.002064" lng="47.074490" dolly="723.159424" />
+    </view>
+    <clip>
+        <settings file="tiger/label_shiny_still.mov" />
+    </clip>
+    <clip>
+        <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/bin/data/settings.tiger b/bin/data/settings.tiger
new file mode 100644
index 0000000..da2c13a
--- /dev/null
+++ b/bin/data/settings.tiger
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<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="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="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="tiger/label_shiny_still.mov" />
+    </clip>
+    <clip>
+        <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/bin/data/settings.tiger~ b/bin/data/settings.tiger~
new file mode 100644
index 0000000..a685b9d
--- /dev/null
+++ b/bin/data/settings.tiger~
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<map4 model="bottle-strongbow-lid.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="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="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="tiger/label_shiny_still.mov" />
+    </clip>
+    <clip>
+        <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/bin/data/settings.xml b/bin/data/settings.xml
index da2c13a..b475f2d 100644
--- a/bin/data/settings.xml
+++ b/bin/data/settings.xml
@@ -1,51 +1,27 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<map4 model="bottle-tiger.3DS" x="0" y="101" z="0">
+<map4 model="bottle-strongbow-lid.3DS" x="0" y="117" z="0">
     <view>
-        <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" />
+        <settings x="0.000000" y="0.000000" w="0.500000" h="1.000000" distort="0.000000" fov="17.250000" roll="90.000000" targX="0.000000" targY="112.000000" targZ="0.000000" lat="24.353056" lng="-52.803280" dolly="737.189148" />
     </view>
     <view>
-        <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" />
+        <settings x="0.500000" y="0.000000" w="0.500000" h="1.000000" distort="0.000000" fov="17.250000" roll="90.000000" targX="0.000000" targY="112.000000" targZ="0.000000" lat="30.002064" lng="47.074490" dolly="723.159424" />
     </view>
     <clip>
-        <settings file="tiger/label_shiny_still.mov" />
+        <settings file="strongbow/texture_lit.mov" />
     </clip>
-    <clip>
-        <settings file="tiger/tiger_ribbon.mov" />
-    </clip>
-    <clip>
-        <settings file="tiger/ribbon_logo.mov" />
+   <clip>
+        <settings file="strongbow/archer_bottle.mov" />
     </clip>
-    <clip>
-        <settings file="tiger/label_shiny_still.mov" />
+<clip>
+        <settings file="strongbow/gold_bars.mov" />
     </clip>
-    <clip>
-        <settings file="tiger/timelapse_resize.mov" />
+<clip>
+        <settings file="strongbow/gold_squares.mov" />
     </clip>
-    <clip>
-        <settings file="tiger/tronlightdrive.mov" />
+<clip>
+        <settings file="strongbow/logo_rotate_shatter.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>
+        <settings file="strongbow/balls_in_a_can_loop.mov" />
     </clip>
 </map4>
diff --git a/src/main.cpp b/src/main.cpp
index a0adc83..209de67 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -17,8 +17,8 @@
 int main( ){
 
     ofAppGlutWindow window;
-	//ofSetupOpenGL(&window, 2048,768, OF_FULLSCREEN);			// <-------- setup the GL context
-	ofSetupOpenGL(&window, 1024,300, OF_WINDOW);
+    ofSetupOpenGL(&window, 2048,768, OF_FULLSCREEN);			// <-------- setup the GL context
+	//ofSetupOpenGL(&window, 1024,300, OF_WINDOW);
 	glutIgnoreKeyRepeat(1);
 	glutSetKeyRepeat(GLUT_KEY_REPEAT_OFF); //these don't work!!!
 	printf("key repeat ignore: %i\n",glutDeviceGet(GLUT_DEVICE_IGNORE_KEY_REPEAT));
diff --git a/src/testApp.cpp b/src/testApp.cpp
index 7ae3aca..0e6e0d5 100644
--- a/src/testApp.cpp
+++ b/src/testApp.cpp
@@ -30,7 +30,7 @@ void testApp::setup(){
 
     //ofDisableArbTex();
 
-   mode=CALIBRATE;
+   mode=DISPLAY;