From ec11fe054dedc8c892df1918640fd056f5aebab7 Mon Sep 17 00:00:00 2001 From: Comment Date: Mon, 10 Dec 2012 19:15:12 +0000 Subject: tigerglass version --- bin/data/calibrator_model.3DS | Bin 0 -> 4083 bytes bin/data/settings.xml | 45 +++++++++++++++++++++++++++++++++++++--- bin/data/tigerglass.3DS | Bin 0 -> 137281 bytes bin/data/tigerglass_np.3DS | Bin 0 -> 132681 bytes bin/data/tigerglass_texture.mov | Bin 0 -> 76568 bytes bin/data/tigerglass_texture.png | Bin 0 -> 1277642 bytes map4.layout | 18 ++++++++-------- src/testApp.cpp | 8 +++---- 8 files changed, 55 insertions(+), 16 deletions(-) create mode 100644 bin/data/calibrator_model.3DS create mode 100755 bin/data/tigerglass.3DS create mode 100755 bin/data/tigerglass_np.3DS create mode 100644 bin/data/tigerglass_texture.mov create mode 100755 bin/data/tigerglass_texture.png diff --git a/bin/data/calibrator_model.3DS b/bin/data/calibrator_model.3DS new file mode 100644 index 0000000..ea8a3d8 Binary files /dev/null and b/bin/data/calibrator_model.3DS differ diff --git a/bin/data/settings.xml b/bin/data/settings.xml index af842d1..ba48808 100644 --- a/bin/data/settings.xml +++ b/bin/data/settings.xml @@ -1,9 +1,48 @@ - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + diff --git a/bin/data/tigerglass.3DS b/bin/data/tigerglass.3DS new file mode 100755 index 0000000..ff6db77 Binary files /dev/null and b/bin/data/tigerglass.3DS differ diff --git a/bin/data/tigerglass_np.3DS b/bin/data/tigerglass_np.3DS new file mode 100755 index 0000000..c661d05 Binary files /dev/null and b/bin/data/tigerglass_np.3DS differ diff --git a/bin/data/tigerglass_texture.mov b/bin/data/tigerglass_texture.mov new file mode 100644 index 0000000..a467965 Binary files /dev/null and b/bin/data/tigerglass_texture.mov differ diff --git a/bin/data/tigerglass_texture.png b/bin/data/tigerglass_texture.png new file mode 100755 index 0000000..726610b Binary files /dev/null and b/bin/data/tigerglass_texture.png differ diff --git a/map4.layout b/map4.layout index 5a68183..adfebdf 100644 --- a/map4.layout +++ b/map4.layout @@ -1,14 +1,14 @@ - + - - + + @@ -19,7 +19,7 @@ - + @@ -28,13 +28,13 @@ - - + + - - + + - + diff --git a/src/testApp.cpp b/src/testApp.cpp index afaaad0..2f822f4 100644 --- a/src/testApp.cpp +++ b/src/testApp.cpp @@ -34,7 +34,7 @@ void testApp::setup(){ //ofDisableArbTex(); - mode=DISPLAY; + mode=CALIBRATE; transTime=0; transition=false; @@ -74,8 +74,8 @@ void testApp::setup(){ //-------------------------------------------------------------- void testApp::update(){ - texture.idleMovie(); - calibrator_label.idleMovie(); + texture.update(); + calibrator_label.update(); //mixAmount=sin(ofGetElapsedTimef())+1.0; doTransition(); @@ -243,7 +243,7 @@ void testApp::draw(){ ofPushMatrix(); ofRotate(90,0,1,0); //calibrator_model.draw(); - ///calibrator_label.draw(0,0); + //calibrator_label.draw(0,0); ofPopMatrix(); unbindTexture(calibrator_label); //texture); // //calibrator_label.getTextureReference().unbind(); -- cgit v1.2.3