From 0309e35763702675e03bf993b6350a004c267ed3 Mon Sep 17 00:00:00 2001
From: Tim Redfern <tim@baker.(none)>
Date: Mon, 10 Dec 2012 23:25:07 +0000
Subject: ready for demo with tiger glass

---
 src/testApp.cpp | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'src/testApp.cpp')

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);
-- 
cgit v1.2.3