From 189d6fc9b5f1e2d23c73da53a1db508c59d07df1 Mon Sep 17 00:00:00 2001 From: Tim Redfern Date: Wed, 29 Feb 2012 10:45:51 +0000 Subject: strongbow ready --- bin/data/settings.strongbow | 51 ++++++++++++++++++++++++++++++++++++++++++++ bin/data/settings.tiger | 51 ++++++++++++++++++++++++++++++++++++++++++++ bin/data/settings.tiger~ | 51 ++++++++++++++++++++++++++++++++++++++++++++ bin/data/settings.xml | 52 ++++++++++++--------------------------------- src/main.cpp | 4 ++-- src/testApp.cpp | 2 +- 6 files changed, 170 insertions(+), 41 deletions(-) create mode 100644 bin/data/settings.strongbow create mode 100644 bin/data/settings.tiger create mode 100644 bin/data/settings.tiger~ 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 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 @@ - + - + - + - + - - - - - + + - - + + - - + + - - + + - - - - - - - - - - - - - - - - - - - - - - - + + 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; -- cgit v1.2.3