diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/main.cpp | 6 | ||||
| -rw-r--r-- | src/testApp.cpp | 13 |
2 files changed, 10 insertions, 9 deletions
diff --git a/src/main.cpp b/src/main.cpp index 3d1510f..d4602e6 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -14,11 +14,11 @@ #endif //======================================================================== -int main( ){ +int main(){ ofAppGlutWindow window; - ofSetupOpenGL(&window, 1024,768, OF_WINDOW); // <-------- setup the GL context - //ofSetupOpenGL(&window, 1024,300, OF_WINDOW); + //ofSetupOpenGL(&window, 1024,300, OF_WINDOW); // <-------- setup the GL context + ofSetupOpenGL(&window, 3840,720, OF_FULLSCREEN); 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 2f822f4..e5685c2 100644 --- a/src/testApp.cpp +++ b/src/testApp.cpp @@ -39,8 +39,8 @@ void testApp::setup(){ transTime=0; transition=false; - whichClip=0; //0 is black - switchClip=0; //0 is black + whichClip=1; //0 is black + switchClip=1; //0 is black texture.loadMovie(clips[whichClip]); texture.setLoopState(OF_LOOP_NORMAL); texture.play(); @@ -237,15 +237,15 @@ void testApp::draw(){ case CALIBRATE: glDisable(GL_LIGHTING); //calibrator_label.getTextureReference().bind(); - drawBoard(0,225,0); - bindTexture(calibrator_label); //texture); // - drawCylinder(26.5,200,0,225,0); + drawBoard(0,225,0); + bindTexture(calibrator_label); // + drawCylinder(26.5,200,0,225,0); ofPushMatrix(); ofRotate(90,0,1,0); //calibrator_model.draw(); //calibrator_label.draw(0,0); ofPopMatrix(); - unbindTexture(calibrator_label); //texture); // + unbindTexture(calibrator_label); // //calibrator_label.getTextureReference().unbind(); break; case DISPLAY: @@ -254,6 +254,7 @@ void testApp::draw(){ glBlendFunc(GL_CONSTANT_ALPHA,GL_ZERO); glBlendColor(1.0f,1.0f,1.0f, mixAmount); } + drawBoard(0,225,0); bindTexture(texture); // ofPushMatrix(); ofRotate(90,0,1,0); |