From 623e1924aeea83ea70c8ae7f645b067f17a293ea Mon Sep 17 00:00:00 2001
From: Tim Redfern <tim@eclectronics.org>
Date: Wed, 28 Mar 2012 16:28:45 +0100
Subject: mesh loader and morpher working

---
 morpher/src/morphmesh.h | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'morpher/src/morphmesh.h')

diff --git a/morpher/src/morphmesh.h b/morpher/src/morphmesh.h
index 3f401c6..303533c 100644
--- a/morpher/src/morphmesh.h
+++ b/morpher/src/morphmesh.h
@@ -1,6 +1,9 @@
 #ifndef MORPHMESH_H
 #define MORPHMESH_H
 
+#include <iostream>
+#include <iterator>
+
 #include <ofMesh.h>
 #include <ofxXmlSettings.h>
 
@@ -10,10 +13,14 @@ class morphmesh : public ofMesh
     public:
         morphmesh();
         virtual ~morphmesh();
-	bool loadmesh(string filename);
+	bool loadfile(string filename);
+	void draw(int target);
+	void draw(const vector<float>& targetBlend);
+    int getNumTargets();
     protected:
     private:
-	vector < <vector <ofVec3f> >targets;
+    //vector < <vector <ofVec3f> >targets;
+    vector< vector<ofVec3f> > targets;
 };
 
 #endif // MORPHMESH_H
-- 
cgit v1.2.3