diff options
| author | Tim Redfern <tim@baker.(none)> | 2012-12-10 23:25:07 +0000 |
|---|---|---|
| committer | Tim Redfern <tim@baker.(none)> | 2012-12-10 23:25:07 +0000 |
| commit | 0309e35763702675e03bf993b6350a004c267ed3 (patch) | |
| tree | 1fb3da7b2fb83185557de682eb214b8b7d3576c4 /src/testApp.cpp | |
| parent | ec11fe054dedc8c892df1918640fd056f5aebab7 (diff) | |
ready for demo with tiger glass
Diffstat (limited to 'src/testApp.cpp')
| -rw-r--r-- | src/testApp.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
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); |