From 6ddd691156f1a3a24be9045056db39e78041b8d8 Mon Sep 17 00:00:00 2001 From: Tim Redfern Date: Tue, 10 Apr 2012 22:22:02 +0100 Subject: integrating --- morpher/bin/data/Bird-anim-test.xml | Bin 495 -> 0 bytes morpher/bin/data/Bird-test.xml | 39 ------------------------------------ morpher/morpher.layout | 12 +++++------ morpher/src/testApp.cpp | 2 +- 4 files changed, 7 insertions(+), 46 deletions(-) delete mode 100644 morpher/bin/data/Bird-anim-test.xml delete mode 100644 morpher/bin/data/Bird-test.xml (limited to 'morpher') diff --git a/morpher/bin/data/Bird-anim-test.xml b/morpher/bin/data/Bird-anim-test.xml deleted file mode 100644 index 245164e..0000000 Binary files a/morpher/bin/data/Bird-anim-test.xml and /dev/null differ diff --git a/morpher/bin/data/Bird-test.xml b/morpher/bin/data/Bird-test.xml deleted file mode 100644 index ebcdc00..0000000 --- a/morpher/bin/data/Bird-test.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/morpher/morpher.layout b/morpher/morpher.layout index 19ecc35..e0122f5 100644 --- a/morpher/morpher.layout +++ b/morpher/morpher.layout @@ -7,22 +7,22 @@ - + - + - + - + - + - + diff --git a/morpher/src/testApp.cpp b/morpher/src/testApp.cpp index 97d57db..e2163f5 100644 --- a/morpher/src/testApp.cpp +++ b/morpher/src/testApp.cpp @@ -11,7 +11,7 @@ void testApp::setup(){ mesh.sequences["hover"].start(); state=HOVER; - currentseq="attack"; + currentseq="hover"; texture.loadImage("TextureBird.jpg"); -- cgit v1.2.3