projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Ignore generated files, such as PNG files.
[synfig.git]
/
synfig-core
/
trunk
/
src
/
synfig
/
waypoint.h
diff --git
a/synfig-core/trunk/src/synfig/waypoint.h
b/synfig-core/trunk/src/synfig/waypoint.h
index
3536839
..
6c9a66f
100644
(file)
--- a/
synfig-core/trunk/src/synfig/waypoint.h
+++ b/
synfig-core/trunk/src/synfig/waypoint.h
@@
-6,6
+6,7
@@
**
** \legal
** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
**
** \legal
** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+** Copyright (c) 2008 Chris Moore
**
** This package is free software; you can redistribute it and/or
** modify it under the terms of the GNU General Public License as
**
** This package is free software; you can redistribute it and/or
** modify it under the terms of the GNU General Public License as
@@
-79,7
+80,7
@@
public:
Model():
// we don't need to initialise these 5, but the compiler thinks they're used uninitialised if we don't
// and this constructor isn't called often, so it's ok
Model():
// we don't need to initialise these 5, but the compiler thinks they're used uninitialised if we don't
// and this constructor isn't called often, so it's ok
- priority(0), tension(0), continuity(0), bias(0), temporal_tension(0),
+ priority(0),
before(INTERPOLATION_NIL), after(INTERPOLATION_NIL),
tension(0), continuity(0), bias(0), temporal_tension(0),
priority_flag(false),
before_flag(false),
priority_flag(false),
before_flag(false),
@@
-145,6
+146,13
@@
public:
}
};
}
};
+ enum Side
+ {
+ SIDE_UNSPECIFIED, SIDE_LEFT, SIDE_RIGHT,
+
+ SIDE_END=2 //!< \internal
+ };
+
/*
-- ** -- D A T A -------------------------------------------------------------
*/
/*
-- ** -- D A T A -------------------------------------------------------------
*/
@@
-223,8
+231,6
@@
public:
bool is_static()const;
bool is_static()const;
- float get_time_tension()const { return time_tension; }
- void set_time_tension(const float& x) { time_tension=x; }
float get_temporal_tension()const { return time_tension; }
void set_temporal_tension(const float& x) { time_tension=x; }
float get_temporal_tension()const { return time_tension; }
void set_temporal_tension(const float& x) { time_tension=x; }