fixing for new demo 2013HEADmaster

3 files changed, 15 insertions, 13 deletions

diff --git a/bin/data/settings.xml b/bin/data/settings.xml
index 53083f7..af65ec6 100644
--- a/bin/data/settings.xml
+++ b/bin/data/settings.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<map4 model="bottle-tiger.3DS" x="0" y="101" z="0">
+<map4 model="bottle-tiger.3DS" x="0" y="0" z="225">
     <view>
-        <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" />
+        <settings x="0.000000" y="0.000000" w="0.333300" h="1.000000" distort="0.000000" fov="19.000000" roll="90.000000" targX="0.000000" targY="112.000000" targZ="0.000000" lat="-4.922048" lng="20.000000" dolly="950.000000" />
     </view>
     <view>
-        <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" />
+        <settings x="0.333300" y="0.000000" w="0.333300" h="1.000000" distort="0.000000" fov="19.000000" roll="90.000000" targX="0.000000" targY="112.000000" targZ="0.000000" lat="-4.000000" lng="140.000000" dolly="950.000000" />
     </view>
     <view>
-        <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" />
+        <settings x="0.667000" y="0.000000" w="0.333300" h="1.000000" distort="0.000000" fov="19.000000" roll="90.000000" targX="0.000000" targY="112.000000" targZ="0.000000" lat="-4.000000" lng="260.000000" dolly="950.000000" />
     </view>
     <clip>
         <settings file="tiger/label_shiny_still.mov" />
diff --git a/map4.layout b/map4.layout
index 4b5ee34..3a27a91 100644
--- a/map4.layout
+++ b/map4.layout
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
 <CodeBlocks_layout_file>
-	<ActiveTarget name="Release" />
+	<ActiveTarget name="Debug" />
 	<File name="Makefile" open="0" top="0" tabpos="10">
 		<Cursor position="20" topLine="0" />
 	</File>
@@ -22,23 +22,23 @@
 	<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="1" tabpos="5">
-		<Cursor position="0" topLine="57" />
+	<File name="src/mapUtils.cpp" open="1" top="0" tabpos="5">
+		<Cursor position="0" topLine="75" />
 	</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="898" topLine="305" />
+		<Cursor position="1493" topLine="0" />
 	</File>
 	<File name="src/testApp.h" open="1" top="0" tabpos="1">
-		<Cursor position="830" topLine="46" />
+		<Cursor position="830" topLine="57" />
 	</File>
 	<File name="src/viewpoint.cpp" open="1" top="0" tabpos="3">
-		<Cursor position="566" topLine="47" />
+		<Cursor position="1225" topLine="0" />
 	</File>
 	<File name="src/viewpoint.h" open="1" top="0" tabpos="4">
-		<Cursor position="569" topLine="25" />
+		<Cursor position="569" topLine="0" />
 	</File>
 	<File name="../openFrameworks/addons/ofxAvahiCore/src/ofxAvahiCoreBrowser.cpp" open="1" top="0" tabpos="11">
 		<Cursor position="496" topLine="0" />
diff --git a/src/testApp.cpp b/src/testApp.cpp
index 7ab2683..88c73fe 100644
--- a/src/testApp.cpp
+++ b/src/testApp.cpp
@@ -56,7 +56,7 @@ void testApp::setup(){
 
 
 	vidGrabber.setDeviceID(0);
-	grabberAvailable=vidGrabber.initGrabber(camWidth,camHeight);
+	grabberAvailable=false; //vidGrabber.initGrabber(camWidth,camHeight);
 	//printf("asked for 320 by 240 - actual size is %i by %i\n", vidGrabber.width, vidGrabber.height);
 
 	videoInverted 	= new unsigned char[camWidth*camHeight*3];
@@ -219,7 +219,8 @@ void testApp::ProcessMessages(){
 		}
 	}
 }
-
+//22-04-13
+//what the hell is the correct positioning for the bottle!
 
 
 //--------------------------------------------------------------
@@ -239,6 +240,7 @@ void testApp::draw(){
 		//calibrator_label.getTextureReference().bind();
               drawBoard(0,225,0);
 		bindTexture(calibrator_label); //
+            //drawCylinder(26.5,200,0,225,0);
             drawCylinder(26.5,200,0,225,0);
                 ofPushMatrix();
                     ofRotate(90,0,1,0);