From 7b6dd23708ebfb9f4c88bfa6850950702462b8d2 Mon Sep 17 00:00:00 2001 From: Tim Date: Mon, 22 Apr 2013 23:41:39 +0100 Subject: fixing for new demo 2013 --- bin/data/settings.xml | 8 ++++---- map4.layout | 14 +++++++------- src/testApp.cpp | 6 ++++-- 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 @@ - + - + - + - + diff --git a/map4.layout b/map4.layout index 4b5ee34..3a27a91 100644 --- a/map4.layout +++ b/map4.layout @@ -1,6 +1,6 @@ - + @@ -22,23 +22,23 @@ - - + + - + - + - + - + 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); -- cgit v1.2.3