summaryrefslogtreecommitdiff
path: root/gaunt01/src/morphmesh.h
diff options
context:
space:
mode:
Diffstat (limited to 'gaunt01/src/morphmesh.h')
-rw-r--r--gaunt01/src/morphmesh.h8
1 files changed, 7 insertions, 1 deletions
diff --git a/gaunt01/src/morphmesh.h b/gaunt01/src/morphmesh.h
index bc22c3d..2e7eee7 100644
--- a/gaunt01/src/morphmesh.h
+++ b/gaunt01/src/morphmesh.h
@@ -55,7 +55,6 @@ class track
track();
map<float,float> keys;
float evaluate(float time);
-
};
class sequence
@@ -66,6 +65,10 @@ class sequence
//the sequence knows the time (absolute seconds) it was started
//sequencer keeps track of playback time and start/stop of sequences
//tracks is a map of time,value pairs - built in interpolation via multimap
+
+ //180612
+ //switching to relative time
+ //sequence start and stoptimes should be absolute but anim cycle times should be relative
public:
sequence(string _name="",float _length=1.0,float _fadeinTime=-2.0,float _fadeoutTime=-2.0);
string name;
@@ -103,8 +106,11 @@ class morphmesh : public ofMesh
int getNumTargets();
int getNumSequences();
map<string,sequence> sequences; //public for direct access
+ float speed; //animation playback speed
protected:
private:
+ float time; //time since morphmesh begun relative to playback speed
+ float lastTime; //used to compute relative time;
map< string,vector<ofVec3f> > morphs;
bool loaded;
};