diff options
| -rw-r--r-- | bin/data/calibrator_model.3DS | bin | 0 -> 4083 bytes | |||
| -rw-r--r-- | bin/data/settings.xml | 45 | ||||
| -rwxr-xr-x | bin/data/tigerglass.3DS | bin | 0 -> 137281 bytes | |||
| -rwxr-xr-x | bin/data/tigerglass_np.3DS | bin | 0 -> 132681 bytes | |||
| -rw-r--r-- | bin/data/tigerglass_texture.mov | bin | 0 -> 76568 bytes | |||
| -rwxr-xr-x | bin/data/tigerglass_texture.png | bin | 0 -> 1277642 bytes | |||
| -rw-r--r-- | map4.layout | 18 | ||||
| -rw-r--r-- | src/testApp.cpp | 8 |
8 files changed, 55 insertions, 16 deletions
diff --git a/bin/data/calibrator_model.3DS b/bin/data/calibrator_model.3DS Binary files differnew file mode 100644 index 0000000..ea8a3d8 --- /dev/null +++ b/bin/data/calibrator_model.3DS 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 @@ <?xml version="1.0" encoding="UTF-8" ?> -<map4 model="tigerglass.3DS" x="0" y="117" z="0"> +<map4 model="bottle-strongbow-lid.3DS" x="0" y="117" z="0"> <view> - <settings x="0.000000" y="0.000000" w="0.500000" h="1.000000" distort="0.000000" fov="27.813326" roll="0.000000" targX="0.000000" targY="120.614464" targZ="-28.251997" lat="24.353056" lng="-52.803280" dolly="737.189148" /> + <settings x="0.000000" y="0.000000" w="0.500000" h="1.000000" distort="0.000000" fov="17.250000" roll="90.000000" targX="0.000000" targY="100.000000" targZ="0.000000" lat="50.352390" lng="-74.018013" dolly="662.707520" /> </view> + <view> + <settings x="0.500000" y="0.000000" w="0.500000" h="1.000000" distort="0.000000" fov="17.250000" roll="90.000000" targX="0.000000" targY="100.000000" targZ="0.000000" lat="54.604073" lng="32.265820" dolly="647.777954" /> + </view> + <clip> + <settings file="black.mov" /> + </clip> + <clip> + <settings file="strongbow/plain_bottle.mov" /> + </clip> + <clip> + <settings file="strongbow/rotate_shatter.mov" /> + </clip> + <clip> + <settings file="strongbow/Strongbow_pulse.mov" /> + </clip> + <clip> + <settings file="strongbow/ad_in_bottle.mov" /> + </clip> + <clip> + <settings file="strongbow/grid.mov" /> + </clip> + <clip> + <settings file="strongbow/balls_in_bottle.mov" /> + </clip> + <clip> + <settings file="strongbow/pulse_scan.mov" /> + </clip> + <clip> + <settings file="strongbow/tron_gold.mov" /> + </clip> + <clip> + <settings file="strongbow/gold_bars.mov" /> + </clip> + <clip> + <settings file="strongbow/Strongbow_rings.mov" /> + </clip> + <clip> + <settings file="strongbow/cube_wave.mov" /> + </clip> <clip> - <settings file="tiger/glow_cracks.mov" /> + <settings file="strongbow/timelapse.mov" /> </clip> </map4> diff --git a/bin/data/tigerglass.3DS b/bin/data/tigerglass.3DS Binary files differnew file mode 100755 index 0000000..ff6db77 --- /dev/null +++ b/bin/data/tigerglass.3DS diff --git a/bin/data/tigerglass_np.3DS b/bin/data/tigerglass_np.3DS Binary files differnew file mode 100755 index 0000000..c661d05 --- /dev/null +++ b/bin/data/tigerglass_np.3DS diff --git a/bin/data/tigerglass_texture.mov b/bin/data/tigerglass_texture.mov Binary files differnew file mode 100644 index 0000000..a467965 --- /dev/null +++ b/bin/data/tigerglass_texture.mov diff --git a/bin/data/tigerglass_texture.png b/bin/data/tigerglass_texture.png Binary files differnew file mode 100755 index 0000000..726610b --- /dev/null +++ b/bin/data/tigerglass_texture.png diff --git a/map4.layout b/map4.layout index 5a68183..adfebdf 100644 --- a/map4.layout +++ b/map4.layout @@ -1,14 +1,14 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <CodeBlocks_layout_file> <ActiveTarget name="Debug" /> - <File name="addons.make" open="1" top="0" tabpos="1"> + <File name="addons.make" open="1" top="1" tabpos="1"> <Cursor position="9" topLine="0" /> </File> <File name="bin/data/defaults.xml" open="0" top="0" tabpos="3"> <Cursor position="1033" topLine="0" /> </File> - <File name="bin/data/settings.xml" open="1" top="1" tabpos="3"> - <Cursor position="81" topLine="0" /> + <File name="bin/data/settings.xml" open="1" top="0" tabpos="7"> + <Cursor position="1599" topLine="15" /> </File> <File name="config.make" open="1" top="0" tabpos="2"> <Cursor position="631" topLine="0" /> @@ -19,7 +19,7 @@ <File name="src/keyVar.h" open="0" top="0" tabpos="8"> <Cursor position="0" topLine="0" /> </File> - <File name="src/main.cpp" open="1" top="0" tabpos="5"> + <File name="src/main.cpp" open="1" top="0" tabpos="4"> <Cursor position="439" topLine="0" /> </File> <File name="src/mapUtils.cpp" open="0" top="0" tabpos="4"> @@ -28,13 +28,13 @@ <File name="src/mapUtils.h" open="0" top="0" tabpos="6"> <Cursor position="165" topLine="0" /> </File> - <File name="src/testApp.cpp" open="1" top="0" tabpos="4"> - <Cursor position="1796" topLine="50" /> + <File name="src/testApp.cpp" open="1" top="0" tabpos="3"> + <Cursor position="2174" topLine="135" /> </File> - <File name="src/testApp.h" open="1" top="0" tabpos="6"> - <Cursor position="2180" topLine="91" /> + <File name="src/testApp.h" open="1" top="0" tabpos="5"> + <Cursor position="2180" topLine="88" /> </File> - <File name="src/viewpoint.cpp" open="0" top="0" tabpos="4"> + <File name="src/viewpoint.cpp" open="1" top="0" tabpos="6"> <Cursor position="2230" topLine="0" /> </File> <File name="src/viewpoint.h" open="0" top="0" tabpos="6"> 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(); |
