diff options
author | Ton Roosendaal <ton@blender.org> | 2005-12-17 13:08:57 +0300 |
---|---|---|
committer | Ton Roosendaal <ton@blender.org> | 2005-12-17 13:08:57 +0300 |
commit | e506a34bf860cf0cdc0b423e1f5635390359c125 (patch) | |
tree | f443353c2dde4f3f55322759a56ca6a3d622ea9d /source/blender/makesdna/DNA_nla_types.h | |
parent | 466ef7667b580ee58ceeff965a16da24fd4aa1a7 (diff) |
Orange:
For some ancient reason, the stride option only worked on a single strip,
and extended always. This made it nearly impossible to integrate it well
with other actions in NLA.
This commit changes it as follows;
- As any strip, the striding-strip also stops at the end of a strip
- This allows to put multiple different actions on a single path, and if
all of these have the striding option set, the actions will each do their
own individual stride.
- To match the different actions, a new "Action Offset" button was added
in the NLA Panel, which allows to internally cycle the action.
- Of course, blend-in and blend-out works nicely too.
Here's a quick AVI test with 2 actions. There's some slipping of the feet
between actions still, because of the stridebone blending. I might look
at that later, for now you can correct it with a simple Ipo on Armature too
http://www.blender.org/bf/0007_0151.avi
Diffstat (limited to 'source/blender/makesdna/DNA_nla_types.h')
-rw-r--r-- | source/blender/makesdna/DNA_nla_types.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/makesdna/DNA_nla_types.h b/source/blender/makesdna/DNA_nla_types.h index fa1a4fbe456..fe01fa91eb2 100644 --- a/source/blender/makesdna/DNA_nla_types.h +++ b/source/blender/makesdna/DNA_nla_types.h @@ -47,6 +47,7 @@ typedef struct bActionStrip { struct Object *object; /* For groups, the actual object being nla'ed */ float start, end; /* The range of frames covered by this strip */ float actstart, actend; /* The range of frames taken from the action */ + float actoffs, padf; /* Offset within action, for cycles and striding */ float stridelen; /* The stridelength (considered when flag & ACT_USESTRIDE) */ float repeat; /* The number of times to repeat the action range */ |