diff options
| author | Tim Redfern <tim@eclectronics.org> | 2012-02-05 23:13:12 +0000 |
|---|---|---|
| committer | Tim Redfern <tim@eclectronics.org> | 2012-02-05 23:13:12 +0000 |
| commit | ed2d4581aa354d6c4040b061349fbe38f8af5e45 (patch) | |
| tree | aa23dac5f906a1fba7e893c040a13acfdcf259ba /src/testApp.cpp | |
| parent | dc4013f1380e9fabd6565c741664daed6d8cd7db (diff) | |
restore settings correctly
Diffstat (limited to 'src/testApp.cpp')
| -rw-r--r-- | src/testApp.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/testApp.cpp b/src/testApp.cpp index 4aaa009..c2772aa 100644 --- a/src/testApp.cpp +++ b/src/testApp.cpp @@ -17,18 +17,19 @@ void testApp::setup(){ glEnable (GL_COLOR_MATERIAL); //load the bottle model - the 3ds and the texture file need to be in the same folder - bottle.loadModel("bottle.3DS", 1); + bottle.loadModel("tigerbottle.3DS", 1); bottle.setRotation(0, 180, 1, 0, 0); - bottle.setPosition(0, 112, 0); + bottle.setPosition(0, 101, 0); //ofDisableArbTex(); - mode=CALIBRATE; + mode=DISPLAY; loadSettings("settings.xml"); whichClip=0; texture.loadMovie(clips[whichClip]); + texture.setLoopState(OF_LOOP_NORMAL); texture.play(); light=true; @@ -109,14 +110,14 @@ void testApp::keyPressed(int key){ case '<': whichClip--; if (whichClip<0) whichClip+=numClips; - texture.close(); + texture.stop(); texture.loadMovie(clips[whichClip]); texture.play(); break; case '.': case '>': whichClip=(whichClip+1)%numClips; - texture.close(); + texture.stop(); texture.loadMovie(clips[whichClip]); texture.play(); break; |
