From 2aff44b0fbe58af83fbed9612c3395502866efb3 Mon Sep 17 00:00:00 2001
From: Tim <tim@baker.(none)>
Date: Tue, 11 Dec 2012 10:08:54 +0000
Subject: stupid fixes. 3DS format weird changes

---
 bin/data/settings.xml           |   8 ++++----
 bin/data/tigerglass_texture.mov | Bin 76568 -> 3224195 bytes
 bin/libs/libfmodex.so           | Bin 1338632 -> 1381296 bytes
 config.make                     |   2 +-
 src/testApp.cpp                 |   6 +++---
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/bin/data/settings.xml b/bin/data/settings.xml
index a59ca79..b2c6948 100644
--- a/bin/data/settings.xml
+++ b/bin/data/settings.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<map4 model="tigerglass.3DS" x="0" y="112" z="0">
+<map4 model="tigerglass.3DS" x="-48" y="0" z="226">
     <view>
-        <settings x="0.000000" y="0.000000" w="0.333300" h="1.000000" distort="0.000000" fov="17.250000" roll="91.561943" targX="3.472998" targY="126.327347" targZ="0.000000" lat="-9.123949" lng="4.967611" dolly="373.471558" />
+        <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" />
     </view>
     <view>
-        <settings x="0.333300" y="0.000000" w="0.333300" h="1.000000" distort="0.000000" fov="17.250000" roll="90.000000" targX="0.000000" targY="114.036995" targZ="0.000000" lat="54.604073" lng="37.272793" dolly="360.782593" />
+        <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" />
     </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="391.531952" />
+        <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" />
     </view>
     <clip>
         <settings file="black.mov" />
diff --git a/bin/data/tigerglass_texture.mov b/bin/data/tigerglass_texture.mov
index a467965..de71ced 100644
Binary files a/bin/data/tigerglass_texture.mov and b/bin/data/tigerglass_texture.mov differ
diff --git a/bin/libs/libfmodex.so b/bin/libs/libfmodex.so
index 9e5d07e..ede2f98 100644
Binary files a/bin/libs/libfmodex.so and b/bin/libs/libfmodex.so differ
diff --git a/config.make b/config.make
index 794005e..8e24bb6 100644
--- a/config.make
+++ b/config.make
@@ -3,7 +3,7 @@
 # OF_ROOT allows to move projects outside apps/* just set this variable to the
 # absoulte path to the OF root folder
 
-OF_ROOT = ../openFrameworks
+OF_ROOT = ../openFrameworks1
 
 
 # USER_CFLAGS allows to pass custom flags to the compiler
diff --git a/src/testApp.cpp b/src/testApp.cpp
index e5685c2..7ab2683 100644
--- a/src/testApp.cpp
+++ b/src/testApp.cpp
@@ -34,7 +34,7 @@ void testApp::setup(){
 
     //ofDisableArbTex();
 
-   mode=CALIBRATE;
+    mode=CALIBRATE;
 
 	transTime=0;
 	transition=false;
@@ -257,7 +257,7 @@ void testApp::draw(){
 		    drawBoard(0,225,0);
                 bindTexture(texture); //
                 ofPushMatrix();
-                    ofRotate(90,0,1,0);
+                    ofRotate(-90,1,0,0); //ofRotate(90,0,1,0);
                     model.draw();
                 ofPopMatrix();
                 unbindTexture(texture); //
@@ -266,7 +266,7 @@ void testApp::draw(){
             case GRAB:
                 bindTex(videoTexture);
                 ofPushMatrix();
-                    ofRotate(90,0,1,0);
+                    ofRotate(-90,1,0,0); //ofRotate(90,0,1,0);
                     model.draw();
                 ofPopMatrix();
                 unbindTex(videoTexture);
-- 
cgit v1.2.3