2002-10-12 11:37:38 +00:00
|
|
|
/**
|
|
|
|
* $Id$
|
|
|
|
*
|
2008-01-07 19:13:47 +00:00
|
|
|
* ***** BEGIN GPL LICENSE BLOCK *****
|
2002-10-12 11:37:38 +00:00
|
|
|
*
|
|
|
|
* This program is free software; you can redistribute it and/or
|
|
|
|
* modify it under the terms of the GNU General Public License
|
|
|
|
* as published by the Free Software Foundation; either version 2
|
2008-01-07 19:13:47 +00:00
|
|
|
* of the License, or (at your option) any later version.
|
2002-10-12 11:37:38 +00:00
|
|
|
*
|
|
|
|
* This program is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU General Public License
|
|
|
|
* along with this program; if not, write to the Free Software Foundation,
|
|
|
|
* Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|
|
|
*
|
2009-05-22 01:16:26 +00:00
|
|
|
* The Original Code is Copyright (C) 2009 Blender Foundation, Joshua Leung
|
2002-10-12 11:37:38 +00:00
|
|
|
* All rights reserved.
|
|
|
|
*
|
|
|
|
* The Original Code is: all of this file.
|
|
|
|
*
|
2009-05-22 01:16:26 +00:00
|
|
|
* Contributor(s): Joshua Leung (full recode)
|
2002-10-12 11:37:38 +00:00
|
|
|
*
|
2008-01-07 19:13:47 +00:00
|
|
|
* ***** END GPL LICENSE BLOCK *****
|
2002-10-12 11:37:38 +00:00
|
|
|
*/
|
|
|
|
|
|
|
|
#include <stdlib.h>
|
2009-05-22 01:16:26 +00:00
|
|
|
#include <stddef.h>
|
|
|
|
#include <stdio.h>
|
2009-07-10 23:25:30 +00:00
|
|
|
#include <string.h>
|
2009-05-22 01:16:26 +00:00
|
|
|
#include <math.h>
|
|
|
|
#include <float.h>
|
2002-10-12 11:37:38 +00:00
|
|
|
|
2006-02-18 15:57:46 +00:00
|
|
|
#include "MEM_guardedalloc.h"
|
|
|
|
|
2002-10-12 11:37:38 +00:00
|
|
|
#include "BLI_blenlib.h"
|
2009-07-10 23:25:30 +00:00
|
|
|
#include "BLI_ghash.h"
|
2006-02-18 15:57:46 +00:00
|
|
|
|
2009-05-22 01:16:26 +00:00
|
|
|
#include "DNA_anim_types.h"
|
2002-10-12 11:37:38 +00:00
|
|
|
#include "DNA_action_types.h"
|
2006-02-18 15:57:46 +00:00
|
|
|
|
2009-05-22 01:16:26 +00:00
|
|
|
#include "BKE_animsys.h"
|
2006-02-18 15:57:46 +00:00
|
|
|
#include "BKE_action.h"
|
2009-05-22 01:16:26 +00:00
|
|
|
#include "BKE_fcurve.h"
|
|
|
|
#include "BKE_nla.h"
|
2006-02-18 15:57:46 +00:00
|
|
|
#include "BKE_blender.h"
|
|
|
|
#include "BKE_library.h"
|
2009-05-22 01:16:26 +00:00
|
|
|
#include "BKE_object.h"
|
|
|
|
#include "BKE_utildefines.h"
|
2002-10-12 11:37:38 +00:00
|
|
|
|
2009-06-23 13:25:31 +00:00
|
|
|
#include "RNA_access.h"
|
|
|
|
#include "nla_private.h"
|
|
|
|
|
2006-02-18 15:57:46 +00:00
|
|
|
|
2002-11-25 12:02:15 +00:00
|
|
|
#ifdef HAVE_CONFIG_H
|
|
|
|
#include <config.h>
|
|
|
|
#endif
|
|
|
|
|
Big commit with work on Groups & Libraries:
-> Any Group Duplicate now can get local timing and local NLA override. This
enables to control the entire animation system of the Group.
Two methods for this have been implemented.
1) The quick way: just give the duplicator a "Startframe" offset.
2) Advanced: in the NLA Editor you can add ActionStrips to the duplicator
to override NLA/action of any Grouped Object.
For "Group NLA" to work, an ActionStrip needs to know which Object in a
group it controls. On adding a strip, the code checks if an Action was
already used by an Object in the Group, and assigns it automatic to that
Object.
You can also set this in the Nkey "Properties" panel for the strip.
Change in NLA: the SHIFT+A "Add strip" command now always adds strips to
the active Object. (It used to check where mouse was). This allows to add
NLA strips to Objects that didn't have actions/nla yet.
Important note: In Blender, duplicates are fully procedural and generated
on the fly for each redraw. This means that redraw speed equals to stepping
through frames, when using animated Duplicated Groups.
-> Recoded entire duplicator system
The old method was antique and clumsy, using globals and full temporal
copies of Object. The new system is nicer in control, faster, and since it
doesn't use temporal object copies anymore, it works better with Derived
Mesh and DisplayList and rendering.
By centralizing the code for duplicating, more options can be easier added.
Features to note:
- Duplicates now draw selected/unselected based on its Duplicator setting.
- Same goes for the drawtype (wire, solid, selection outline, etc)
- Duplicated Groups can be normally selected too
Bonus goodie: SHIFT+A (Toolbox) now has entry "Add group" too, with a
listing of all groups, allowing to add Group instances immediate.
-> Library System
- SHIFT+F4 data browse now shows the entire path for linked data
- Outliner draws Library Icons to denote linked data
- Outliner operation added: "Make Local" for library data.
- Outliner now also draws Groups in regular view, allowing to unlink too.
-> Fixes
- depsgraph missed signal update for bone-parented Objects
- on reading file, the entire database was tagged to "recalc" fully,
causing unnecessary slowdown on reading.
Might have missed stuff... :)
2005-12-11 13:23:30 +00:00
|
|
|
|
2009-05-22 01:16:26 +00:00
|
|
|
/* *************************************************** */
|
|
|
|
/* Data Management */
|
2002-10-12 11:37:38 +00:00
|
|
|
|
2009-05-22 01:16:26 +00:00
|
|
|
/* Freeing ------------------------------------------- */
|
|
|
|
|
|
|
|
/* Remove the given NLA strip from the NLA track it occupies, free the strip's data,
|
|
|
|
* and the strip itself.
|
|
|
|
*/
|
|
|
|
void free_nlastrip (ListBase *strips, NlaStrip *strip)
|
|
|
|
{
|
2009-07-06 03:44:44 +00:00
|
|
|
NlaStrip *cs, *csn;
|
|
|
|
|
2009-05-22 01:16:26 +00:00
|
|
|
/* sanity checks */
|
|
|
|
if (strip == NULL)
|
2002-10-12 11:37:38 +00:00
|
|
|
return;
|
2009-05-22 01:16:26 +00:00
|
|
|
|
2009-07-06 03:44:44 +00:00
|
|
|
/* free child-strips */
|
|
|
|
for (cs= strip->strips.first; cs; cs= csn) {
|
|
|
|
csn= cs->next;
|
|
|
|
free_nlastrip(&strip->strips, cs);
|
|
|
|
}
|
|
|
|
|
2009-05-22 01:16:26 +00:00
|
|
|
/* remove reference to action */
|
|
|
|
if (strip->act)
|
|
|
|
strip->act->id.us--;
|
|
|
|
|
|
|
|
/* free remapping info */
|
|
|
|
//if (strip->remap)
|
|
|
|
// BKE_animremap_free();
|
|
|
|
|
|
|
|
/* free own F-Curves */
|
|
|
|
free_fcurves(&strip->fcurves);
|
|
|
|
|
2009-07-02 05:25:14 +00:00
|
|
|
/* free own F-Modifiers */
|
|
|
|
free_fmodifiers(&strip->modifiers);
|
2009-05-22 01:16:26 +00:00
|
|
|
|
|
|
|
/* free the strip itself */
|
|
|
|
if (strips)
|
|
|
|
BLI_freelinkN(strips, strip);
|
|
|
|
else
|
|
|
|
MEM_freeN(strip);
|
|
|
|
}
|
2002-10-12 11:37:38 +00:00
|
|
|
|
2009-05-22 01:16:26 +00:00
|
|
|
/* Remove the given NLA track from the set of NLA tracks, free the track's data,
|
|
|
|
* and the track itself.
|
|
|
|
*/
|
|
|
|
void free_nlatrack (ListBase *tracks, NlaTrack *nlt)
|
|
|
|
{
|
|
|
|
NlaStrip *strip, *stripn;
|
Two wonderful new NLA & Armature editing features!
- FORWARD CYCLING & MATCHING
Up to no now, adding multiple actions in NLA with walkcycles required to
animate them standing still, as if walking on a conveyor belt. The stride
option then makes the object itself move forward, trying to keep the foot
stuck on the floor (with poor results!).
This option now allows to make walk cycles moving forward. By
indicating a reference Offset Bone, the NLA system will use that bone to
detect the correct offset for the Armature Pose to make it seamlessly going
forward.
Best of all, this option works as for cyclic Action Strips as well as for
individual Action Strips. Note that for individual strips, you have to set
the strip on "Hold". (Might become automatic detected later).
Here's an example edit image for NLA:
http://www.blender.org/bf/nla_match-cycle.jpg
And the animation for it:
http://download.blender.org/demo/test/2.43/0001_0150_match.avi
Blender file:
http://download.blender.org/demo/test/2.43/mancandy_matching.blend
Using this kind of cycling works pretty straightforward, and is a lot
easier to setup than Stride Bones.
To be further tested:
- Blending cycles
- matching rotation for the bones as well.
- ACTION MODIFIERS (motion deformors)
The above option was actually required for this feature. Typically walk
cycles are constructed with certain Bones to be the handles, controlling
for example the torso or feet.
An Action Modifier allows you to use a Curve Path to deform the motion of
these controlling bones. This uses the existing Curve Deformation option.
Modifiers can be added per Action Strip, each controlling a channel (bone)
by choice, and even allows to layer multiple modifiers on top of each other
(several paths deforming motion). This option is using the dependency graph,
so editing the Curve will give realtime changes in the Armature.
The previous walkcycle, controlled by two curves:
http://download.blender.org/demo/test/2.43/0001_0150_deform.avi
Blender file:
http://download.blender.org/demo/test/2.43/mancandy_actiondeform.blend
Action Modifiers can be added in the NLA Properties Panel. Per Modifier you
have to indicate the channel and a Curve Object. You can copy modifiers from
one strip to another using CTRL+C (only copies to active Object strips).
Setting up a correct Curve Path has to be carefully done:
- Use SHIFT+A "Curve Path" in top view, or ensure the path is not rotated.
- make sure the center point of the Curve Object is at the center of the
Armature (or above)
- move the first point of the curve to the center point as well.
- check if the path starts from this first point, you can change it using
(in Curve EditMode) the option Wkey -> "Switch Direction"
- Make sure alignment uses the correct axis; if the Armature walks into
the negative Y direction, you have to set in Object Buttons, "Anim settings"
Panel, the correct Track option. (Note; option will probably move to the
Modifier later).
This is a good reason to make such paths automatic (on a command). Is on the
todo list.
Also note this:
- the Curve Path extends in beginning and ending, that's (for now) the default,
and allows to use multiple paths. Make sure paths begin and end horizontal.
- Moving the Curve in Object Mode will change the "mapping" (as if the landscape
a character walks over moves). Moving the Curve in Edit Mode will change the
actual position of the deformation.
- Speed (Ipos) on paths is not supported yet, will be done.
- The Curve "Stretch" deform option doesn't work.
- Modifiers are executed *after* all actions in NLA are evaluated, there's no
support yet for blending multiple strips with Modifiers.
- This doesn't work yet for time-mapping...
This commit is mostly for review by character animators... some details or
working methods might change.
This feature can also be used for other modifiers, such as noise (Perlin) or
the mythical "Oomph" (frequency control) and of course Python.
Special thanks to Bassam & Matt for research & design help. Have fun!
2006-10-31 15:51:57 +00:00
|
|
|
|
2009-05-22 01:16:26 +00:00
|
|
|
/* sanity checks */
|
|
|
|
if (nlt == NULL)
|
|
|
|
return;
|
|
|
|
|
|
|
|
/* free strips */
|
|
|
|
for (strip= nlt->strips.first; strip; strip= stripn) {
|
|
|
|
stripn= strip->next;
|
|
|
|
free_nlastrip(&nlt->strips, strip);
|
Two wonderful new NLA & Armature editing features!
- FORWARD CYCLING & MATCHING
Up to no now, adding multiple actions in NLA with walkcycles required to
animate them standing still, as if walking on a conveyor belt. The stride
option then makes the object itself move forward, trying to keep the foot
stuck on the floor (with poor results!).
This option now allows to make walk cycles moving forward. By
indicating a reference Offset Bone, the NLA system will use that bone to
detect the correct offset for the Armature Pose to make it seamlessly going
forward.
Best of all, this option works as for cyclic Action Strips as well as for
individual Action Strips. Note that for individual strips, you have to set
the strip on "Hold". (Might become automatic detected later).
Here's an example edit image for NLA:
http://www.blender.org/bf/nla_match-cycle.jpg
And the animation for it:
http://download.blender.org/demo/test/2.43/0001_0150_match.avi
Blender file:
http://download.blender.org/demo/test/2.43/mancandy_matching.blend
Using this kind of cycling works pretty straightforward, and is a lot
easier to setup than Stride Bones.
To be further tested:
- Blending cycles
- matching rotation for the bones as well.
- ACTION MODIFIERS (motion deformors)
The above option was actually required for this feature. Typically walk
cycles are constructed with certain Bones to be the handles, controlling
for example the torso or feet.
An Action Modifier allows you to use a Curve Path to deform the motion of
these controlling bones. This uses the existing Curve Deformation option.
Modifiers can be added per Action Strip, each controlling a channel (bone)
by choice, and even allows to layer multiple modifiers on top of each other
(several paths deforming motion). This option is using the dependency graph,
so editing the Curve will give realtime changes in the Armature.
The previous walkcycle, controlled by two curves:
http://download.blender.org/demo/test/2.43/0001_0150_deform.avi
Blender file:
http://download.blender.org/demo/test/2.43/mancandy_actiondeform.blend
Action Modifiers can be added in the NLA Properties Panel. Per Modifier you
have to indicate the channel and a Curve Object. You can copy modifiers from
one strip to another using CTRL+C (only copies to active Object strips).
Setting up a correct Curve Path has to be carefully done:
- Use SHIFT+A "Curve Path" in top view, or ensure the path is not rotated.
- make sure the center point of the Curve Object is at the center of the
Armature (or above)
- move the first point of the curve to the center point as well.
- check if the path starts from this first point, you can change it using
(in Curve EditMode) the option Wkey -> "Switch Direction"
- Make sure alignment uses the correct axis; if the Armature walks into
the negative Y direction, you have to set in Object Buttons, "Anim settings"
Panel, the correct Track option. (Note; option will probably move to the
Modifier later).
This is a good reason to make such paths automatic (on a command). Is on the
todo list.
Also note this:
- the Curve Path extends in beginning and ending, that's (for now) the default,
and allows to use multiple paths. Make sure paths begin and end horizontal.
- Moving the Curve in Object Mode will change the "mapping" (as if the landscape
a character walks over moves). Moving the Curve in Edit Mode will change the
actual position of the deformation.
- Speed (Ipos) on paths is not supported yet, will be done.
- The Curve "Stretch" deform option doesn't work.
- Modifiers are executed *after* all actions in NLA are evaluated, there's no
support yet for blending multiple strips with Modifiers.
- This doesn't work yet for time-mapping...
This commit is mostly for review by character animators... some details or
working methods might change.
This feature can also be used for other modifiers, such as noise (Perlin) or
the mythical "Oomph" (frequency control) and of course Python.
Special thanks to Bassam & Matt for research & design help. Have fun!
2006-10-31 15:51:57 +00:00
|
|
|
}
|
|
|
|
|
2009-05-22 01:16:26 +00:00
|
|
|
/* free NLA track itself now */
|
|
|
|
if (tracks)
|
|
|
|
BLI_freelinkN(tracks, nlt);
|
|
|
|
else
|
|
|
|
MEM_freeN(nlt);
|
2002-10-12 11:37:38 +00:00
|
|
|
}
|
|
|
|
|
2009-05-22 01:16:26 +00:00
|
|
|
/* Free the elements of type NLA Tracks provided in the given list, but do not free
|
|
|
|
* the list itself since that is not free-standing
|
|
|
|
*/
|
|
|
|
void free_nladata (ListBase *tracks)
|
2002-10-12 11:37:38 +00:00
|
|
|
{
|
2009-05-22 01:16:26 +00:00
|
|
|
NlaTrack *nlt, *nltn;
|
|
|
|
|
|
|
|
/* sanity checks */
|
|
|
|
if ELEM(NULL, tracks, tracks->first)
|
2002-10-12 11:37:38 +00:00
|
|
|
return;
|
2009-05-22 01:16:26 +00:00
|
|
|
|
|
|
|
/* free tracks one by one */
|
|
|
|
for (nlt= tracks->first; nlt; nlt= nltn) {
|
|
|
|
nltn= nlt->next;
|
|
|
|
free_nlatrack(tracks, nlt);
|
2002-10-12 11:37:38 +00:00
|
|
|
}
|
2009-05-22 01:16:26 +00:00
|
|
|
|
|
|
|
/* clear the list's pointers to be safe */
|
|
|
|
tracks->first= tracks->last= NULL;
|
2002-10-12 11:37:38 +00:00
|
|
|
}
|
|
|
|
|
2009-05-22 01:16:26 +00:00
|
|
|
/* Copying ------------------------------------------- */
|
|
|
|
|
2009-05-23 09:36:18 +00:00
|
|
|
/* Copy NLA strip */
|
|
|
|
NlaStrip *copy_nlastrip (NlaStrip *strip)
|
|
|
|
{
|
|
|
|
NlaStrip *strip_d;
|
2009-07-06 03:44:44 +00:00
|
|
|
NlaStrip *cs, *cs_d;
|
2009-05-23 09:36:18 +00:00
|
|
|
|
|
|
|
/* sanity check */
|
|
|
|
if (strip == NULL)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
/* make a copy */
|
|
|
|
strip_d= MEM_dupallocN(strip);
|
|
|
|
strip_d->next= strip_d->prev= NULL;
|
|
|
|
|
|
|
|
/* increase user-count of action */
|
|
|
|
if (strip_d->act)
|
|
|
|
strip_d->act->id.us++;
|
|
|
|
|
|
|
|
/* copy F-Curves and modifiers */
|
|
|
|
copy_fcurves(&strip_d->fcurves, &strip->fcurves);
|
2009-07-02 05:25:14 +00:00
|
|
|
copy_fmodifiers(&strip_d->modifiers, &strip->modifiers);
|
2009-05-23 09:36:18 +00:00
|
|
|
|
2009-07-06 03:44:44 +00:00
|
|
|
/* make a copy of all the child-strips, one at a time */
|
|
|
|
strip_d->strips.first= strip_d->strips.last= NULL;
|
|
|
|
|
|
|
|
for (cs= strip->strips.first; cs; cs= cs->next) {
|
|
|
|
cs_d= copy_nlastrip(cs);
|
|
|
|
BLI_addtail(&strip_d->strips, cs_d);
|
|
|
|
}
|
|
|
|
|
2009-05-23 09:36:18 +00:00
|
|
|
/* return the strip */
|
|
|
|
return strip_d;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Copy NLA Track */
|
|
|
|
NlaTrack *copy_nlatrack (NlaTrack *nlt)
|
|
|
|
{
|
|
|
|
NlaStrip *strip, *strip_d;
|
|
|
|
NlaTrack *nlt_d;
|
|
|
|
|
|
|
|
/* sanity check */
|
|
|
|
if (nlt == NULL)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
/* make a copy */
|
|
|
|
nlt_d= MEM_dupallocN(nlt);
|
|
|
|
nlt_d->next= nlt_d->prev= NULL;
|
|
|
|
|
|
|
|
/* make a copy of all the strips, one at a time */
|
|
|
|
nlt_d->strips.first= nlt_d->strips.last= NULL;
|
|
|
|
|
|
|
|
for (strip= nlt->strips.first; strip; strip= strip->next) {
|
|
|
|
strip_d= copy_nlastrip(strip);
|
|
|
|
BLI_addtail(&nlt_d->strips, strip_d);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* return the copy */
|
|
|
|
return nlt_d;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Copy all NLA data */
|
|
|
|
void copy_nladata (ListBase *dst, ListBase *src)
|
|
|
|
{
|
|
|
|
NlaTrack *nlt, *nlt_d;
|
|
|
|
|
|
|
|
/* sanity checks */
|
|
|
|
if ELEM(NULL, dst, src)
|
|
|
|
return;
|
|
|
|
|
|
|
|
/* copy each NLA-track, one at a time */
|
|
|
|
for (nlt= src->first; nlt; nlt= nlt->next) {
|
|
|
|
/* make a copy, and add the copy to the destination list */
|
|
|
|
nlt_d= copy_nlatrack(nlt);
|
|
|
|
BLI_addtail(dst, nlt_d);
|
|
|
|
}
|
|
|
|
}
|
2009-05-22 01:16:26 +00:00
|
|
|
|
|
|
|
/* Adding ------------------------------------------- */
|
|
|
|
|
2009-06-11 03:19:08 +00:00
|
|
|
/* Add a NLA Track to the given AnimData
|
|
|
|
* - prev: NLA-Track to add the new one after
|
|
|
|
*/
|
|
|
|
NlaTrack *add_nlatrack (AnimData *adt, NlaTrack *prev)
|
2009-05-31 04:52:20 +00:00
|
|
|
{
|
|
|
|
NlaTrack *nlt;
|
|
|
|
|
|
|
|
/* sanity checks */
|
|
|
|
if (adt == NULL)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
/* allocate new track */
|
|
|
|
nlt= MEM_callocN(sizeof(NlaTrack), "NlaTrack");
|
|
|
|
|
|
|
|
/* set settings requiring the track to not be part of the stack yet */
|
|
|
|
nlt->flag = NLATRACK_SELECTED;
|
|
|
|
nlt->index= BLI_countlist(&adt->nla_tracks);
|
|
|
|
|
|
|
|
/* add track to stack, and make it the active one */
|
2009-06-11 03:19:08 +00:00
|
|
|
if (prev)
|
|
|
|
BLI_insertlinkafter(&adt->nla_tracks, prev, nlt);
|
|
|
|
else
|
|
|
|
BLI_addtail(&adt->nla_tracks, nlt);
|
2009-05-31 04:52:20 +00:00
|
|
|
BKE_nlatrack_set_active(&adt->nla_tracks, nlt);
|
|
|
|
|
|
|
|
/* must have unique name, but we need to seed this */
|
|
|
|
sprintf(nlt->name, "NlaTrack");
|
|
|
|
BLI_uniquename(&adt->nla_tracks, nlt, "NlaTrack", '.', offsetof(NlaTrack, name), 64);
|
|
|
|
|
|
|
|
/* return the new track */
|
|
|
|
return nlt;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Add a NLA Strip referencing the given Action */
|
|
|
|
NlaStrip *add_nlastrip (bAction *act)
|
2006-02-08 16:58:12 +00:00
|
|
|
{
|
2009-05-22 01:16:26 +00:00
|
|
|
NlaStrip *strip;
|
|
|
|
|
|
|
|
/* sanity checks */
|
2009-05-31 04:52:20 +00:00
|
|
|
if (act == NULL)
|
2009-05-22 01:16:26 +00:00
|
|
|
return NULL;
|
|
|
|
|
|
|
|
/* allocate new strip */
|
|
|
|
strip= MEM_callocN(sizeof(NlaStrip), "NlaStrip");
|
|
|
|
|
|
|
|
/* generic settings
|
|
|
|
* - selected flag to highlight this to the user
|
|
|
|
* - auto-blends to ensure that blend in/out values are automatically
|
|
|
|
* determined by overlaps of strips
|
|
|
|
* - (XXX) synchronisation of strip-length in accordance with changes to action-length
|
|
|
|
* is not done though, since this should only really happens in editmode for strips now
|
|
|
|
* though this decision is still subject to further review...
|
|
|
|
*/
|
|
|
|
strip->flag = NLASTRIP_FLAG_SELECT|NLASTRIP_FLAG_AUTO_BLENDS;
|
|
|
|
|
|
|
|
/* assign the action reference */
|
|
|
|
strip->act= act;
|
|
|
|
id_us_plus(&act->id);
|
|
|
|
|
|
|
|
/* determine initial range
|
|
|
|
* - strip length cannot be 0... ever...
|
|
|
|
*/
|
|
|
|
calc_action_range(strip->act, &strip->actstart, &strip->actend, 1);
|
|
|
|
|
|
|
|
strip->start = strip->actstart;
|
|
|
|
strip->end = (IS_EQ(strip->actstart, strip->actend)) ? (strip->actstart + 1.0f): (strip->actend);
|
|
|
|
|
|
|
|
/* strip should be referenced as-is */
|
|
|
|
strip->scale= 1.0f;
|
|
|
|
strip->repeat = 1.0f;
|
|
|
|
|
|
|
|
/* return the new strip */
|
|
|
|
return strip;
|
2006-02-08 16:58:12 +00:00
|
|
|
}
|
|
|
|
|
2009-05-31 04:52:20 +00:00
|
|
|
/* Add new NLA-strip to the top of the NLA stack - i.e. into the last track if space, or a new one otherwise */
|
|
|
|
NlaStrip *add_nlastrip_to_stack (AnimData *adt, bAction *act)
|
2006-02-08 16:58:12 +00:00
|
|
|
{
|
2009-06-19 04:45:56 +00:00
|
|
|
NlaStrip *strip;
|
2009-05-22 01:16:26 +00:00
|
|
|
NlaTrack *nlt;
|
|
|
|
|
|
|
|
/* sanity checks */
|
2009-05-31 04:52:20 +00:00
|
|
|
if ELEM(NULL, adt, act)
|
2009-05-22 01:16:26 +00:00
|
|
|
return NULL;
|
|
|
|
|
2009-05-31 04:52:20 +00:00
|
|
|
/* create a new NLA strip */
|
|
|
|
strip= add_nlastrip(act);
|
|
|
|
if (strip == NULL)
|
|
|
|
return NULL;
|
2009-05-22 01:16:26 +00:00
|
|
|
|
2009-06-19 04:45:56 +00:00
|
|
|
/* firstly try adding strip to last track, but if that fails, add to a new track */
|
|
|
|
if (BKE_nlatrack_add_strip(adt->nla_tracks.last, strip) == 0) {
|
|
|
|
/* trying to add to the last track failed (no track or no space),
|
|
|
|
* so add a new track to the stack, and add to that...
|
|
|
|
*/
|
2009-06-11 03:19:08 +00:00
|
|
|
nlt= add_nlatrack(adt, NULL);
|
2009-06-19 04:45:56 +00:00
|
|
|
BKE_nlatrack_add_strip(nlt, strip);
|
2009-05-31 04:52:20 +00:00
|
|
|
}
|
2009-05-22 01:16:26 +00:00
|
|
|
|
2009-07-10 23:25:30 +00:00
|
|
|
/* automatically name it too */
|
|
|
|
BKE_nlastrip_validate_name(adt, strip);
|
|
|
|
|
2009-05-31 04:52:20 +00:00
|
|
|
/* returns the strip added */
|
|
|
|
return strip;
|
2006-02-08 16:58:12 +00:00
|
|
|
}
|
|
|
|
|
2009-06-23 13:25:31 +00:00
|
|
|
/* *************************************************** */
|
|
|
|
/* NLA Evaluation <-> Editing Stuff */
|
|
|
|
|
|
|
|
/* Strip Mapping ------------------------------------- */
|
|
|
|
|
|
|
|
/* non clipped mapping for strip-time <-> global time (for Action-Clips)
|
|
|
|
* invert = convert action-strip time to global time
|
|
|
|
*/
|
2009-06-28 07:32:00 +00:00
|
|
|
static float nlastrip_get_frame_actionclip (NlaStrip *strip, float cframe, short mode)
|
2009-06-23 13:25:31 +00:00
|
|
|
{
|
2009-06-27 12:35:11 +00:00
|
|
|
float actlength, repeat, scale;
|
2009-06-23 13:25:31 +00:00
|
|
|
|
|
|
|
/* get number of repeats */
|
|
|
|
if (IS_EQ(strip->repeat, 0.0f)) strip->repeat = 1.0f;
|
|
|
|
repeat = strip->repeat;
|
|
|
|
|
|
|
|
/* scaling */
|
|
|
|
if (IS_EQ(strip->scale, 0.0f)) strip->scale= 1.0f;
|
|
|
|
scale = (float)fabs(strip->scale); /* scale must be positive - we've got a special flag for reversing */
|
|
|
|
|
|
|
|
/* length of referenced action */
|
|
|
|
actlength = strip->actend - strip->actstart;
|
|
|
|
if (IS_EQ(actlength, 0.0f)) actlength = 1.0f;
|
|
|
|
|
|
|
|
/* reversed = play strip backwards */
|
|
|
|
if (strip->flag & NLASTRIP_FLAG_REVERSE) {
|
2009-06-28 07:32:00 +00:00
|
|
|
// FIXME: this won't work right with Graph Editor?
|
|
|
|
if (mode == NLATIME_CONVERT_MAP) {
|
|
|
|
return strip->end - scale*(cframe - strip->actstart);
|
|
|
|
}
|
|
|
|
else if (mode == NLATIME_CONVERT_UNMAP) {
|
|
|
|
int repeatsNum = (int)((cframe - strip->start) / (actlength * scale));
|
|
|
|
|
|
|
|
/* this method doesn't clip the values to lie within the action range only
|
|
|
|
* - the '(repeatsNum * actlength * scale)' compensates for the fmod(...)
|
|
|
|
* - the fmod(...) works in the same way as for eval
|
|
|
|
*/
|
|
|
|
return strip->actend - (repeatsNum * actlength * scale)
|
|
|
|
- (fmod(cframe - strip->start, actlength*scale) / scale);
|
|
|
|
}
|
2009-06-27 12:35:11 +00:00
|
|
|
else {
|
|
|
|
if (IS_EQ(cframe, strip->end) && IS_EQ(strip->repeat, ((int)strip->repeat))) {
|
|
|
|
/* this case prevents the motion snapping back to the first frame at the end of the strip
|
|
|
|
* by catching the case where repeats is a whole number, which means that the end of the strip
|
|
|
|
* could also be interpreted as the end of the start of a repeat
|
|
|
|
*/
|
|
|
|
return strip->actstart;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
/* - the 'fmod(..., actlength*scale)' is needed to get the repeats working
|
|
|
|
* - the '/ scale' is needed to ensure that scaling influences the timing within the repeat
|
|
|
|
*/
|
|
|
|
return strip->actend - fmod(cframe - strip->start, actlength*scale) / scale;
|
|
|
|
}
|
|
|
|
}
|
2009-06-23 13:25:31 +00:00
|
|
|
}
|
|
|
|
else {
|
2009-06-28 07:32:00 +00:00
|
|
|
if (mode == NLATIME_CONVERT_MAP) {
|
|
|
|
return strip->start + scale*(cframe - strip->actstart);
|
|
|
|
}
|
|
|
|
else if (mode == NLATIME_CONVERT_UNMAP) {
|
|
|
|
int repeatsNum = (int)((cframe - strip->start) / (actlength * scale));
|
|
|
|
|
|
|
|
/* this method doesn't clip the values to lie within the action range only
|
|
|
|
* - the '(repeatsNum * actlength * scale)' compensates for the fmod(...)
|
|
|
|
* - the fmod(...) works in the same way as for eval
|
|
|
|
*/
|
|
|
|
return strip->actstart + (repeatsNum * actlength * scale)
|
|
|
|
+ (fmod(cframe - strip->start, actlength*scale) / scale);
|
|
|
|
}
|
|
|
|
else /* if (mode == NLATIME_CONVERT_EVAL) */{
|
2009-06-27 12:35:11 +00:00
|
|
|
if (IS_EQ(cframe, strip->end) && IS_EQ(strip->repeat, ((int)strip->repeat))) {
|
|
|
|
/* this case prevents the motion snapping back to the first frame at the end of the strip
|
|
|
|
* by catching the case where repeats is a whole number, which means that the end of the strip
|
|
|
|
* could also be interpreted as the end of the start of a repeat
|
|
|
|
*/
|
|
|
|
return strip->actend;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
/* - the 'fmod(..., actlength*scale)' is needed to get the repeats working
|
|
|
|
* - the '/ scale' is needed to ensure that scaling influences the timing within the repeat
|
|
|
|
*/
|
|
|
|
return strip->actstart + fmod(cframe - strip->start, actlength*scale) / scale;
|
|
|
|
}
|
|
|
|
}
|
2009-06-23 13:25:31 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* non clipped mapping for strip-time <-> global time (for Transitions)
|
|
|
|
* invert = convert action-strip time to global time
|
|
|
|
*/
|
2009-06-28 07:32:00 +00:00
|
|
|
static float nlastrip_get_frame_transition (NlaStrip *strip, float cframe, short mode)
|
2009-06-23 13:25:31 +00:00
|
|
|
{
|
|
|
|
float length;
|
|
|
|
|
|
|
|
/* length of strip */
|
|
|
|
length= strip->end - strip->start;
|
|
|
|
|
|
|
|
/* reversed = play strip backwards */
|
|
|
|
if (strip->flag & NLASTRIP_FLAG_REVERSE) {
|
2009-06-28 07:32:00 +00:00
|
|
|
if (mode == NLATIME_CONVERT_MAP)
|
2009-06-23 13:25:31 +00:00
|
|
|
return strip->end - (length * cframe);
|
|
|
|
else
|
|
|
|
return (strip->end - cframe) / length;
|
|
|
|
}
|
|
|
|
else {
|
2009-06-28 07:32:00 +00:00
|
|
|
if (mode == NLATIME_CONVERT_MAP)
|
2009-06-23 13:25:31 +00:00
|
|
|
return (length * cframe) + strip->start;
|
|
|
|
else
|
|
|
|
return (cframe - strip->start) / length;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* non clipped mapping for strip-time <-> global time
|
2009-06-28 07:32:00 +00:00
|
|
|
* mode = eNlaTime_ConvertModes[] -> NLATIME_CONVERT_*
|
2009-06-23 13:25:31 +00:00
|
|
|
*
|
|
|
|
* only secure for 'internal' (i.e. within AnimSys evaluation) operations,
|
|
|
|
* but should not be directly relied on for stuff which interacts with editors
|
|
|
|
*/
|
2009-06-28 07:32:00 +00:00
|
|
|
float nlastrip_get_frame (NlaStrip *strip, float cframe, short mode)
|
2009-06-23 13:25:31 +00:00
|
|
|
{
|
|
|
|
switch (strip->type) {
|
2009-07-07 11:37:33 +00:00
|
|
|
case NLASTRIP_TYPE_META: /* meta - for now, does the same as transition (is really just an empty container) */
|
2009-06-23 13:25:31 +00:00
|
|
|
case NLASTRIP_TYPE_TRANSITION: /* transition */
|
2009-06-28 07:32:00 +00:00
|
|
|
return nlastrip_get_frame_transition(strip, cframe, mode);
|
2009-06-23 13:25:31 +00:00
|
|
|
|
|
|
|
case NLASTRIP_TYPE_CLIP: /* action-clip (default) */
|
|
|
|
default:
|
2009-06-28 07:32:00 +00:00
|
|
|
return nlastrip_get_frame_actionclip(strip, cframe, mode);
|
2009-06-23 13:25:31 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Non clipped mapping for strip-time <-> global time
|
2009-06-28 07:32:00 +00:00
|
|
|
* mode = eNlaTime_ConvertModesp[] -> NLATIME_CONVERT_*
|
2009-06-23 13:25:31 +00:00
|
|
|
*
|
|
|
|
* Public API method - perform this mapping using the given AnimData block
|
|
|
|
* and perform any necessary sanity checks on the value
|
|
|
|
*/
|
2009-06-28 07:32:00 +00:00
|
|
|
float BKE_nla_tweakedit_remap (AnimData *adt, float cframe, short mode)
|
2009-06-23 13:25:31 +00:00
|
|
|
{
|
|
|
|
NlaStrip *strip;
|
|
|
|
|
|
|
|
/* sanity checks
|
|
|
|
* - obviously we've got to have some starting data
|
|
|
|
* - when not in tweakmode, the active Action does not have any scaling applied :)
|
2009-07-03 04:48:44 +00:00
|
|
|
* - when in tweakmode, if the no-mapping flag is set, do not map
|
2009-06-23 13:25:31 +00:00
|
|
|
*/
|
2009-07-03 04:48:44 +00:00
|
|
|
if ((adt == NULL) || (adt->flag & ADT_NLA_EDIT_ON)==0 || (adt->flag & ADT_NLA_EDIT_NOMAP))
|
2009-06-23 13:25:31 +00:00
|
|
|
return cframe;
|
|
|
|
|
|
|
|
/* if the active-strip info has been stored already, access this, otherwise look this up
|
|
|
|
* and store for (very probable) future usage
|
|
|
|
*/
|
|
|
|
if (adt->actstrip == NULL) {
|
2009-06-24 10:32:13 +00:00
|
|
|
NlaTrack *nlt= BKE_nlatrack_find_active(&adt->nla_tracks);
|
2009-06-23 13:25:31 +00:00
|
|
|
adt->actstrip= BKE_nlastrip_find_active(nlt);
|
|
|
|
}
|
|
|
|
strip= adt->actstrip;
|
|
|
|
|
|
|
|
/* sanity checks
|
|
|
|
* - in rare cases, we may not be able to find this strip for some reason (internal error)
|
|
|
|
* - for now, if the user has defined a curve to control the time, this correction cannot be performed
|
|
|
|
* reliably...
|
|
|
|
*/
|
|
|
|
if ((strip == NULL) || (strip->flag & NLASTRIP_FLAG_USR_TIME))
|
|
|
|
return cframe;
|
|
|
|
|
|
|
|
/* perform the correction now... */
|
2009-06-28 07:32:00 +00:00
|
|
|
return nlastrip_get_frame(strip, cframe, mode);
|
2009-06-23 13:25:31 +00:00
|
|
|
}
|
|
|
|
|
2009-05-22 01:16:26 +00:00
|
|
|
/* *************************************************** */
|
2009-07-10 23:25:30 +00:00
|
|
|
/* NLA API */
|
2006-02-08 16:58:12 +00:00
|
|
|
|
2009-07-06 03:44:44 +00:00
|
|
|
/* List of Strips ------------------------------------ */
|
|
|
|
/* (these functions are used for NLA-Tracks and also for nested/meta-strips) */
|
|
|
|
|
|
|
|
/* Check if there is any space in the given list to add the given strip */
|
|
|
|
short BKE_nlastrips_has_space (ListBase *strips, float start, float end)
|
|
|
|
{
|
|
|
|
NlaStrip *strip;
|
|
|
|
|
|
|
|
/* sanity checks */
|
|
|
|
if ((strips == NULL) || IS_EQ(start, end))
|
|
|
|
return 0;
|
|
|
|
if (start > end) {
|
|
|
|
puts("BKE_nlastrips_has_space() error... start and end arguments swapped");
|
|
|
|
SWAP(float, start, end);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* loop over NLA strips checking for any overlaps with this area... */
|
|
|
|
for (strip= strips->first; strip; strip= strip->next) {
|
|
|
|
/* if start frame of strip is past the target end-frame, that means that
|
|
|
|
* we've gone past the window we need to check for, so things are fine
|
|
|
|
*/
|
|
|
|
if (strip->start > end)
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
/* if the end of the strip is greater than either of the boundaries, the range
|
|
|
|
* must fall within the extents of the strip
|
|
|
|
*/
|
|
|
|
if ((strip->end > start) || (strip->end > end))
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* if we are still here, we haven't encountered any overlapping strips */
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Rearrange the strips in the track so that they are always in order
|
|
|
|
* (usually only needed after a strip has been moved)
|
|
|
|
*/
|
|
|
|
void BKE_nlastrips_sort_strips (ListBase *strips)
|
|
|
|
{
|
|
|
|
ListBase tmp = {NULL, NULL};
|
2009-07-07 10:25:55 +00:00
|
|
|
NlaStrip *strip, *sstrip, *stripn;
|
2009-07-06 03:44:44 +00:00
|
|
|
|
|
|
|
/* sanity checks */
|
|
|
|
if ELEM(NULL, strips, strips->first)
|
|
|
|
return;
|
2009-07-07 10:25:55 +00:00
|
|
|
|
2009-07-06 03:44:44 +00:00
|
|
|
/* we simply perform insertion sort on this list, since it is assumed that per track,
|
|
|
|
* there are only likely to be at most 5-10 strips
|
|
|
|
*/
|
2009-07-07 10:25:55 +00:00
|
|
|
for (strip= strips->first; strip; strip= stripn) {
|
2009-07-06 03:44:44 +00:00
|
|
|
short not_added = 1;
|
|
|
|
|
2009-07-07 10:25:55 +00:00
|
|
|
stripn= strip->next;
|
|
|
|
|
2009-07-06 03:44:44 +00:00
|
|
|
/* remove this strip from the list, and add it to the new list, searching from the end of
|
|
|
|
* the list, assuming that the lists are in order
|
|
|
|
*/
|
|
|
|
BLI_remlink(strips, strip);
|
|
|
|
|
2009-07-07 10:25:55 +00:00
|
|
|
for (sstrip= tmp.last; sstrip; sstrip= sstrip->prev) {
|
2009-07-06 03:44:44 +00:00
|
|
|
/* check if add after */
|
2009-07-07 10:25:55 +00:00
|
|
|
if (sstrip->end <= strip->start) {
|
2009-07-06 03:44:44 +00:00
|
|
|
BLI_insertlinkafter(&tmp, sstrip, strip);
|
|
|
|
not_added= 0;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* add before first? */
|
|
|
|
if (not_added)
|
|
|
|
BLI_addhead(&tmp, strip);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* reassign the start and end points of the strips */
|
|
|
|
strips->first= tmp.first;
|
|
|
|
strips->last= tmp.last;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Add the given NLA-Strip to the given list of strips, assuming that it
|
|
|
|
* isn't currently a member of another list
|
|
|
|
*/
|
|
|
|
short BKE_nlastrips_add_strip (ListBase *strips, NlaStrip *strip)
|
|
|
|
{
|
|
|
|
NlaStrip *ns;
|
|
|
|
short not_added = 1;
|
|
|
|
|
|
|
|
/* sanity checks */
|
|
|
|
if ELEM(NULL, strips, strip)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
/* check if any space to add */
|
|
|
|
if (BKE_nlastrips_has_space(strips, strip->start, strip->end)==0)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
/* find the right place to add the strip to the nominated track */
|
|
|
|
for (ns= strips->first; ns; ns= ns->next) {
|
|
|
|
/* if current strip occurs after the new strip, add it before */
|
|
|
|
if (ns->start > strip->end) {
|
|
|
|
BLI_insertlinkbefore(strips, ns, strip);
|
|
|
|
not_added= 0;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (not_added) {
|
|
|
|
/* just add to the end of the list of the strips then... */
|
|
|
|
BLI_addtail(strips, strip);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* added... */
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2009-07-06 11:06:34 +00:00
|
|
|
|
|
|
|
/* Meta-Strips ------------------------------------ */
|
|
|
|
|
|
|
|
/* Convert 'islands' (i.e. continuous string of) selected strips to be
|
|
|
|
* contained within 'Meta-Strips' which act as strips which contain strips.
|
|
|
|
* temp: are the meta-strips to be created 'temporary' ones used for transforms?
|
|
|
|
*/
|
|
|
|
void BKE_nlastrips_make_metas (ListBase *strips, short temp)
|
|
|
|
{
|
|
|
|
NlaStrip *mstrip = NULL;
|
|
|
|
NlaStrip *strip, *stripn;
|
|
|
|
|
|
|
|
/* sanity checks */
|
|
|
|
if ELEM(NULL, strips, strips->first)
|
|
|
|
return;
|
|
|
|
|
|
|
|
/* group all continuous chains of selected strips into meta-strips */
|
|
|
|
for (strip= strips->first; strip; strip= stripn) {
|
|
|
|
stripn= strip->next;
|
|
|
|
|
|
|
|
if (strip->flag & NLASTRIP_FLAG_SELECT) {
|
|
|
|
/* if there is an existing meta-strip, add this strip to it, otherwise, create a new one */
|
|
|
|
if (mstrip == NULL) {
|
|
|
|
/* add a new meta-strip, and add it before the current strip that it will replace... */
|
|
|
|
mstrip= MEM_callocN(sizeof(NlaStrip), "Meta-NlaStrip");
|
|
|
|
mstrip->type = NLASTRIP_TYPE_META;
|
|
|
|
BLI_insertlinkbefore(strips, strip, mstrip);
|
|
|
|
|
|
|
|
/* set flags */
|
|
|
|
mstrip->flag = NLASTRIP_FLAG_SELECT;
|
|
|
|
|
|
|
|
/* set temp flag if appropriate (i.e. for transform-type editing) */
|
|
|
|
if (temp)
|
|
|
|
mstrip->flag |= NLASTRIP_FLAG_TEMP_META;
|
2009-07-06 12:24:09 +00:00
|
|
|
|
|
|
|
/* set default repeat/scale values to prevent warnings */
|
|
|
|
mstrip->repeat= mstrip->scale= 1.0f;
|
2009-07-06 11:06:34 +00:00
|
|
|
|
|
|
|
/* make its start frame be set to the start frame of the current strip */
|
|
|
|
mstrip->start= strip->start;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* remove the selected strips from the track, and add to the meta */
|
|
|
|
BLI_remlink(strips, strip);
|
|
|
|
BLI_addtail(&mstrip->strips, strip);
|
|
|
|
|
|
|
|
/* expand the meta's dimensions to include the newly added strip- i.e. its last frame */
|
|
|
|
mstrip->end= strip->end;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
/* current strip wasn't selected, so the end of 'island' of selected strips has been reached,
|
|
|
|
* so stop adding strips to the current meta
|
|
|
|
*/
|
|
|
|
mstrip= NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-07-06 12:24:09 +00:00
|
|
|
/* Split a meta-strip into a set of normal strips */
|
|
|
|
void BKE_nlastrips_clear_metastrip (ListBase *strips, NlaStrip *strip)
|
|
|
|
{
|
|
|
|
NlaStrip *cs, *csn;
|
|
|
|
|
|
|
|
/* sanity check */
|
|
|
|
if ELEM(NULL, strips, strip)
|
|
|
|
return;
|
|
|
|
|
|
|
|
/* move each one of the meta-strip's children before the meta-strip
|
|
|
|
* in the list of strips after unlinking them from the meta-strip
|
|
|
|
*/
|
|
|
|
for (cs= strip->strips.first; cs; cs= csn) {
|
|
|
|
csn= cs->next;
|
|
|
|
BLI_remlink(&strip->strips, cs);
|
|
|
|
BLI_insertlinkbefore(strips, strip, cs);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* free the meta-strip now */
|
|
|
|
BLI_freelinkN(strips, strip);
|
|
|
|
}
|
|
|
|
|
2009-07-06 11:06:34 +00:00
|
|
|
/* Remove meta-strips (i.e. flatten the list of strips) from the top-level of the list of strips
|
|
|
|
* sel: only consider selected meta-strips, otherwise all meta-strips are removed
|
|
|
|
* onlyTemp: only remove the 'temporary' meta-strips used for transforms
|
|
|
|
*/
|
|
|
|
void BKE_nlastrips_clear_metas (ListBase *strips, short onlySel, short onlyTemp)
|
|
|
|
{
|
|
|
|
NlaStrip *strip, *stripn;
|
|
|
|
|
|
|
|
/* sanity checks */
|
|
|
|
if ELEM(NULL, strips, strips->first)
|
|
|
|
return;
|
|
|
|
|
|
|
|
/* remove meta-strips fitting the criteria of the arguments */
|
|
|
|
for (strip= strips->first; strip; strip= stripn) {
|
|
|
|
stripn= strip->next;
|
|
|
|
|
|
|
|
/* check if strip is a meta-strip */
|
|
|
|
if (strip->type == NLASTRIP_TYPE_META) {
|
|
|
|
/* if check if selection and 'temporary-only' considerations are met */
|
|
|
|
if ((onlySel==0) || (strip->flag & NLASTRIP_FLAG_SELECT)) {
|
|
|
|
if ((!onlyTemp) || (strip->flag & NLASTRIP_FLAG_TEMP_META)) {
|
2009-07-06 12:24:09 +00:00
|
|
|
BKE_nlastrips_clear_metastrip(strips, strip);
|
2009-07-06 11:06:34 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Add the given NLA-Strip to the given Meta-Strip, assuming that the
|
|
|
|
* strip isn't attached to anyy list of strips
|
|
|
|
*/
|
|
|
|
short BKE_nlameta_add_strip (NlaStrip *mstrip, NlaStrip *strip)
|
|
|
|
{
|
|
|
|
/* sanity checks */
|
|
|
|
if ELEM(NULL, mstrip, strip)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
/* firstly, check if the meta-strip has space for this */
|
|
|
|
if (BKE_nlastrips_has_space(&mstrip->strips, strip->start, strip->end) == 0)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
/* check if this would need to be added to the ends of the meta,
|
|
|
|
* and subsequently, if the neighbouring strips allow us enough room
|
|
|
|
*/
|
|
|
|
if (strip->start < mstrip->start) {
|
|
|
|
/* check if strip to the left (if it exists) ends before the
|
|
|
|
* start of the strip we're trying to add
|
|
|
|
*/
|
|
|
|
if ((mstrip->prev == NULL) || (mstrip->prev->end <= strip->start)) {
|
|
|
|
/* add strip to start of meta's list, and expand dimensions */
|
|
|
|
BLI_addhead(&mstrip->strips, strip);
|
|
|
|
mstrip->start= strip->start;
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
else /* failed... no room before */
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
else if (strip->end > mstrip->end) {
|
|
|
|
/* check if strip to the right (if it exists) starts before the
|
|
|
|
* end of the strip we're trying to add
|
|
|
|
*/
|
|
|
|
if ((mstrip->next == NULL) || (mstrip->next->start >= strip->end)) {
|
|
|
|
/* add strip to end of meta's list, and expand dimensions */
|
|
|
|
BLI_addtail(&mstrip->strips, strip);
|
|
|
|
mstrip->end= strip->end;
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
else /* failed... no room after */
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
/* just try to add to the meta-strip (no dimension changes needed) */
|
|
|
|
return BKE_nlastrips_add_strip(&mstrip->strips, strip);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Adjust the settings of NLA-Strips contained within a Meta-Strip (recursively),
|
|
|
|
* until the Meta-Strips children all fit within the Meta-Strip's new dimensions
|
|
|
|
*/
|
|
|
|
void BKE_nlameta_flush_transforms (NlaStrip *mstrip)
|
|
|
|
{
|
|
|
|
NlaStrip *strip;
|
|
|
|
float oStart, oEnd, offset;
|
2009-07-07 02:12:50 +00:00
|
|
|
float oLen, nLen;
|
|
|
|
short scaleChanged= 0;
|
2009-07-06 11:06:34 +00:00
|
|
|
|
|
|
|
/* sanity checks
|
|
|
|
* - strip must exist
|
|
|
|
* - strip must be a meta-strip with some contents
|
|
|
|
*/
|
|
|
|
if ELEM(NULL, mstrip, mstrip->strips.first)
|
|
|
|
return;
|
|
|
|
if (mstrip->type != NLASTRIP_TYPE_META)
|
|
|
|
return;
|
|
|
|
|
|
|
|
/* get the original start/end points, and calculate the start-frame offset
|
|
|
|
* - these are simply the start/end frames of the child strips,
|
|
|
|
* since we assume they weren't transformed yet
|
|
|
|
*/
|
|
|
|
oStart= ((NlaStrip *)mstrip->strips.first)->start;
|
|
|
|
oEnd= ((NlaStrip *)mstrip->strips.last)->end;
|
|
|
|
offset= mstrip->start - oStart;
|
|
|
|
|
|
|
|
/* optimisation:
|
|
|
|
* don't flush if nothing changed yet
|
|
|
|
* TODO: maybe we need a flag to say always flush?
|
|
|
|
*/
|
|
|
|
if (IS_EQ(oStart, mstrip->start) && IS_EQ(oEnd, mstrip->end))
|
|
|
|
return;
|
|
|
|
|
2009-07-07 02:12:50 +00:00
|
|
|
/* check if scale changed */
|
|
|
|
oLen = oEnd - oStart;
|
|
|
|
nLen = mstrip->end - mstrip->start;
|
|
|
|
if (IS_EQ(nLen, oLen) == 0)
|
|
|
|
scaleChanged= 1;
|
|
|
|
|
2009-07-06 11:06:34 +00:00
|
|
|
/* for each child-strip, calculate new start/end points based on this new info */
|
|
|
|
for (strip= mstrip->strips.first; strip; strip= strip->next) {
|
2009-07-07 02:12:50 +00:00
|
|
|
if (scaleChanged) {
|
|
|
|
PointerRNA ptr;
|
|
|
|
float p1, p2, nStart, nEnd;
|
|
|
|
|
|
|
|
/* compute positions of endpoints relative to old extents of strip */
|
|
|
|
p1= (strip->start - oStart) / oLen;
|
|
|
|
p2= (strip->end - oStart) / oLen;
|
|
|
|
|
|
|
|
/* compute the new strip endpoints using the proportions */
|
|
|
|
nStart= (p1 * nLen) + mstrip->start;
|
|
|
|
nEnd= (p2 * nLen) + mstrip->start;
|
|
|
|
|
|
|
|
/* firstly, apply the new positions manually, then apply using RNA
|
|
|
|
* - first time is to make sure no truncation errors from one endpoint not being
|
|
|
|
* set yet occur
|
|
|
|
* - second time is to make sure scale is computed properly...
|
|
|
|
*/
|
|
|
|
strip->start= nStart;
|
|
|
|
strip->end= nEnd;
|
|
|
|
|
|
|
|
RNA_pointer_create(NULL, &RNA_NlaStrip, strip, &ptr);
|
|
|
|
RNA_float_set(&ptr, "start_frame", nStart);
|
|
|
|
RNA_float_set(&ptr, "end_frame", nEnd);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
/* just apply the changes in offset to both ends of the strip */
|
|
|
|
strip->start += offset;
|
|
|
|
strip->end += offset;
|
|
|
|
}
|
2009-07-06 11:06:34 +00:00
|
|
|
|
|
|
|
/* finally, make sure the strip's children (if it is a meta-itself), get updated */
|
|
|
|
BKE_nlameta_flush_transforms(strip);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-05-23 09:36:18 +00:00
|
|
|
/* NLA-Tracks ---------------------------------------- */
|
2002-10-12 11:37:38 +00:00
|
|
|
|
2009-05-22 01:16:26 +00:00
|
|
|
/* Find the active NLA-track for the given stack */
|
|
|
|
NlaTrack *BKE_nlatrack_find_active (ListBase *tracks)
|
|
|
|
{
|
|
|
|
NlaTrack *nlt;
|
|
|
|
|
|
|
|
/* sanity check */
|
|
|
|
if ELEM(NULL, tracks, tracks->first)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
/* try to find the first active track */
|
|
|
|
for (nlt= tracks->first; nlt; nlt= nlt->next) {
|
|
|
|
if (nlt->flag & NLATRACK_ACTIVE)
|
|
|
|
return nlt;
|
Two wonderful new NLA & Armature editing features!
- FORWARD CYCLING & MATCHING
Up to no now, adding multiple actions in NLA with walkcycles required to
animate them standing still, as if walking on a conveyor belt. The stride
option then makes the object itself move forward, trying to keep the foot
stuck on the floor (with poor results!).
This option now allows to make walk cycles moving forward. By
indicating a reference Offset Bone, the NLA system will use that bone to
detect the correct offset for the Armature Pose to make it seamlessly going
forward.
Best of all, this option works as for cyclic Action Strips as well as for
individual Action Strips. Note that for individual strips, you have to set
the strip on "Hold". (Might become automatic detected later).
Here's an example edit image for NLA:
http://www.blender.org/bf/nla_match-cycle.jpg
And the animation for it:
http://download.blender.org/demo/test/2.43/0001_0150_match.avi
Blender file:
http://download.blender.org/demo/test/2.43/mancandy_matching.blend
Using this kind of cycling works pretty straightforward, and is a lot
easier to setup than Stride Bones.
To be further tested:
- Blending cycles
- matching rotation for the bones as well.
- ACTION MODIFIERS (motion deformors)
The above option was actually required for this feature. Typically walk
cycles are constructed with certain Bones to be the handles, controlling
for example the torso or feet.
An Action Modifier allows you to use a Curve Path to deform the motion of
these controlling bones. This uses the existing Curve Deformation option.
Modifiers can be added per Action Strip, each controlling a channel (bone)
by choice, and even allows to layer multiple modifiers on top of each other
(several paths deforming motion). This option is using the dependency graph,
so editing the Curve will give realtime changes in the Armature.
The previous walkcycle, controlled by two curves:
http://download.blender.org/demo/test/2.43/0001_0150_deform.avi
Blender file:
http://download.blender.org/demo/test/2.43/mancandy_actiondeform.blend
Action Modifiers can be added in the NLA Properties Panel. Per Modifier you
have to indicate the channel and a Curve Object. You can copy modifiers from
one strip to another using CTRL+C (only copies to active Object strips).
Setting up a correct Curve Path has to be carefully done:
- Use SHIFT+A "Curve Path" in top view, or ensure the path is not rotated.
- make sure the center point of the Curve Object is at the center of the
Armature (or above)
- move the first point of the curve to the center point as well.
- check if the path starts from this first point, you can change it using
(in Curve EditMode) the option Wkey -> "Switch Direction"
- Make sure alignment uses the correct axis; if the Armature walks into
the negative Y direction, you have to set in Object Buttons, "Anim settings"
Panel, the correct Track option. (Note; option will probably move to the
Modifier later).
This is a good reason to make such paths automatic (on a command). Is on the
todo list.
Also note this:
- the Curve Path extends in beginning and ending, that's (for now) the default,
and allows to use multiple paths. Make sure paths begin and end horizontal.
- Moving the Curve in Object Mode will change the "mapping" (as if the landscape
a character walks over moves). Moving the Curve in Edit Mode will change the
actual position of the deformation.
- Speed (Ipos) on paths is not supported yet, will be done.
- The Curve "Stretch" deform option doesn't work.
- Modifiers are executed *after* all actions in NLA are evaluated, there's no
support yet for blending multiple strips with Modifiers.
- This doesn't work yet for time-mapping...
This commit is mostly for review by character animators... some details or
working methods might change.
This feature can also be used for other modifiers, such as noise (Perlin) or
the mythical "Oomph" (frequency control) and of course Python.
Special thanks to Bassam & Matt for research & design help. Have fun!
2006-10-31 15:51:57 +00:00
|
|
|
}
|
|
|
|
|
2009-05-22 01:16:26 +00:00
|
|
|
/* none found */
|
|
|
|
return NULL;
|
2002-10-12 11:37:38 +00:00
|
|
|
}
|
|
|
|
|
2009-06-05 11:51:27 +00:00
|
|
|
/* Toggle the 'solo' setting for the given NLA-track, making sure that it is the only one
|
|
|
|
* that has this status in its AnimData block.
|
|
|
|
*/
|
|
|
|
void BKE_nlatrack_solo_toggle (AnimData *adt, NlaTrack *nlt)
|
|
|
|
{
|
|
|
|
NlaTrack *nt;
|
|
|
|
|
|
|
|
/* sanity check */
|
|
|
|
if ELEM(NULL, adt, adt->nla_tracks.first)
|
|
|
|
return;
|
|
|
|
|
|
|
|
/* firstly, make sure 'solo' flag for all tracks is disabled */
|
|
|
|
for (nt= adt->nla_tracks.first; nt; nt= nt->next) {
|
|
|
|
if (nt != nlt)
|
|
|
|
nt->flag &= ~NLATRACK_SOLO;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* now, enable 'solo' for the given track if appropriate */
|
|
|
|
if (nlt) {
|
|
|
|
/* toggle solo status */
|
|
|
|
nlt->flag ^= NLATRACK_SOLO;
|
|
|
|
|
|
|
|
/* set or clear solo-status on AnimData */
|
|
|
|
if (nlt->flag & NLATRACK_SOLO)
|
|
|
|
adt->flag |= ADT_NLA_SOLO_TRACK;
|
|
|
|
else
|
|
|
|
adt->flag &= ~ADT_NLA_SOLO_TRACK;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
adt->flag &= ~ADT_NLA_SOLO_TRACK;
|
|
|
|
}
|
|
|
|
|
2009-05-22 01:16:26 +00:00
|
|
|
/* Make the given NLA-track the active one for the given stack. If no track is provided,
|
|
|
|
* this function can be used to simply deactivate all the NLA tracks in the given stack too.
|
|
|
|
*/
|
|
|
|
void BKE_nlatrack_set_active (ListBase *tracks, NlaTrack *nlt_a)
|
2002-10-12 11:37:38 +00:00
|
|
|
{
|
2009-05-22 01:16:26 +00:00
|
|
|
NlaTrack *nlt;
|
|
|
|
|
|
|
|
/* sanity check */
|
|
|
|
if ELEM(NULL, tracks, tracks->first)
|
2002-10-12 11:37:38 +00:00
|
|
|
return;
|
2009-05-22 01:16:26 +00:00
|
|
|
|
|
|
|
/* deactive all the rest */
|
|
|
|
for (nlt= tracks->first; nlt; nlt= nlt->next)
|
|
|
|
nlt->flag &= ~NLATRACK_ACTIVE;
|
|
|
|
|
|
|
|
/* set the given one as the active one */
|
|
|
|
if (nlt_a)
|
|
|
|
nlt_a->flag |= NLATRACK_ACTIVE;
|
|
|
|
}
|
2002-10-12 11:37:38 +00:00
|
|
|
|
2009-07-06 03:44:44 +00:00
|
|
|
/* Check if there is any space in the given track to add a strip of the given length */
|
2009-05-23 09:36:18 +00:00
|
|
|
short BKE_nlatrack_has_space (NlaTrack *nlt, float start, float end)
|
|
|
|
{
|
|
|
|
/* sanity checks */
|
|
|
|
if ((nlt == NULL) || IS_EQ(start, end))
|
|
|
|
return 0;
|
|
|
|
if (start > end) {
|
2009-07-06 03:44:44 +00:00
|
|
|
puts("BKE_nlatrack_has_space() error... start and end arguments swapped");
|
2009-05-23 09:36:18 +00:00
|
|
|
SWAP(float, start, end);
|
|
|
|
}
|
|
|
|
|
2009-07-06 03:44:44 +00:00
|
|
|
/* check if there's any space left in the track for a strip of the given length */
|
|
|
|
return BKE_nlastrips_has_space(&nlt->strips, start, end);
|
2009-05-23 09:36:18 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Rearrange the strips in the track so that they are always in order
|
|
|
|
* (usually only needed after a strip has been moved)
|
|
|
|
*/
|
|
|
|
void BKE_nlatrack_sort_strips (NlaTrack *nlt)
|
|
|
|
{
|
|
|
|
/* sanity checks */
|
|
|
|
if ELEM(NULL, nlt, nlt->strips.first)
|
|
|
|
return;
|
|
|
|
|
2009-07-06 03:44:44 +00:00
|
|
|
/* sort the strips with a more generic function */
|
|
|
|
BKE_nlastrips_sort_strips(&nlt->strips);
|
2009-05-23 09:36:18 +00:00
|
|
|
}
|
2009-05-31 04:52:20 +00:00
|
|
|
|
2009-06-19 04:45:56 +00:00
|
|
|
/* Add the given NLA-Strip to the given NLA-Track, assuming that it
|
|
|
|
* isn't currently attached to another one
|
|
|
|
*/
|
|
|
|
short BKE_nlatrack_add_strip (NlaTrack *nlt, NlaStrip *strip)
|
|
|
|
{
|
|
|
|
/* sanity checks */
|
|
|
|
if ELEM(NULL, nlt, strip)
|
|
|
|
return 0;
|
|
|
|
|
2009-07-06 03:44:44 +00:00
|
|
|
/* try to add the strip to the track using a more generic function */
|
|
|
|
return BKE_nlastrips_add_strip(&nlt->strips, strip);
|
2009-06-19 04:45:56 +00:00
|
|
|
}
|
|
|
|
|
2009-05-31 04:52:20 +00:00
|
|
|
/* NLA Strips -------------------------------------- */
|
|
|
|
|
NLA SoC: More Drawing Tweaks
* Following user feedback, I've increased the separation between normal NLA-tracks and the 'action lines' to try and differentiate them more. This hopefully this will be sufficient, otherwise, I'm going to have to abandon the use of nice, generic channel-identification code for lists of channels...
* Improved drawing of 'active' strips.
- Now, the active strip (when NOT being 'tweaked') will be simply drawn as a yellow strip + a white border.
- The active strip (when BEING 'tweaked') will now be greenish + a white border. The colour here may be tweakable, but we'll see...
* Strip extrapolation modes (hold, etc.) are now visualised as rects with alpha and the same colour as the strip they belong to.
* Selecting strips now makes them 'active' (and deactivates the others). Only one strip can be active at a time. Still need to figure out precisely how this will work with multiple AnimData blocks + NLA-'tweaking'.
* Fixed view-matrix bug introduced in last commit for text drawing. For now, we'll just reset the view matrix after doing that, since it's not too acceptable to move these calls to the end yet, as they should get overlapped by some other editor features (such as the Current Frame indicator)
2009-06-03 11:22:49 +00:00
|
|
|
/* Find the active NLA-strip within the given track */
|
|
|
|
NlaStrip *BKE_nlastrip_find_active (NlaTrack *nlt)
|
|
|
|
{
|
|
|
|
NlaStrip *strip;
|
|
|
|
|
|
|
|
/* sanity check */
|
|
|
|
if ELEM(NULL, nlt, nlt->strips.first)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
/* try to find the first active strip */
|
|
|
|
for (strip= nlt->strips.first; strip; strip= strip->next) {
|
|
|
|
if (strip->flag & NLASTRIP_FLAG_ACTIVE)
|
|
|
|
return strip;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* none found */
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2009-05-31 11:14:50 +00:00
|
|
|
/* Does the given NLA-strip fall within the given bounds (times)? */
|
|
|
|
short BKE_nlastrip_within_bounds (NlaStrip *strip, float min, float max)
|
|
|
|
{
|
|
|
|
const float stripLen= (strip) ? strip->end - strip->start : 0.0f;
|
|
|
|
const float boundsLen= (float)fabs(max - min);
|
|
|
|
|
|
|
|
/* sanity checks */
|
|
|
|
if ((strip == NULL) || IS_EQ(stripLen, 0.0f) || IS_EQ(boundsLen, 0.0f))
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
/* only ok if at least part of the strip is within the bounding window
|
|
|
|
* - first 2 cases cover when the strip length is less than the bounding area
|
|
|
|
* - second 2 cases cover when the strip length is greater than the bounding area
|
|
|
|
*/
|
|
|
|
if ( (stripLen < boundsLen) &&
|
|
|
|
!(IN_RANGE(strip->start, min, max) ||
|
|
|
|
IN_RANGE(strip->end, min, max)) )
|
|
|
|
{
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
if ( (stripLen > boundsLen) &&
|
|
|
|
!(IN_RANGE(min, strip->start, strip->end) ||
|
|
|
|
IN_RANGE(max, strip->start, strip->end)) )
|
|
|
|
{
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* should be ok! */
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2009-05-31 04:52:20 +00:00
|
|
|
/* Is the given NLA-strip the first one to occur for the given AnimData block */
|
|
|
|
// TODO: make this an api method if necesary, but need to add prefix first
|
|
|
|
short nlastrip_is_first (AnimData *adt, NlaStrip *strip)
|
|
|
|
{
|
|
|
|
NlaTrack *nlt;
|
|
|
|
NlaStrip *ns;
|
|
|
|
|
|
|
|
/* sanity checks */
|
|
|
|
if ELEM(NULL, adt, strip)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
/* check if strip has any strips before it */
|
|
|
|
if (strip->prev)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
/* check other tracks to see if they have a strip that's earlier */
|
|
|
|
// TODO: or should we check that the strip's track is also the first?
|
|
|
|
for (nlt= adt->nla_tracks.first; nlt; nlt= nlt->next) {
|
|
|
|
/* only check the first strip, assuming that they're all in order */
|
|
|
|
ns= nlt->strips.first;
|
|
|
|
if (ns) {
|
|
|
|
if (ns->start < strip->start)
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* should be first now */
|
|
|
|
return 1;
|
|
|
|
}
|
2009-07-08 05:00:10 +00:00
|
|
|
|
2009-07-09 01:04:42 +00:00
|
|
|
/* Animated Strips ------------------------------------------- */
|
|
|
|
|
|
|
|
/* Check if the given NLA-Track has any strips with own F-Curves */
|
|
|
|
short BKE_nlatrack_has_animated_strips (NlaTrack *nlt)
|
|
|
|
{
|
|
|
|
NlaStrip *strip;
|
|
|
|
|
|
|
|
/* sanity checks */
|
|
|
|
if ELEM(NULL, nlt, nlt->strips.first)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
/* check each strip for F-Curves only (don't care about whether the flags are set) */
|
|
|
|
for (strip= nlt->strips.first; strip; strip= strip->next) {
|
|
|
|
if (strip->fcurves.first)
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* none found */
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Check if given NLA-Tracks have any strips with own F-Curves */
|
|
|
|
short BKE_nlatracks_have_animated_strips (ListBase *tracks)
|
|
|
|
{
|
|
|
|
NlaTrack *nlt;
|
|
|
|
|
|
|
|
/* sanity checks */
|
|
|
|
if ELEM(NULL, tracks, tracks->first)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
/* check each track, stopping on the first hit */
|
|
|
|
for (nlt= tracks->first; nlt; nlt= nlt->next) {
|
|
|
|
if (BKE_nlatrack_has_animated_strips(nlt))
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* none found */
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2009-07-08 05:00:10 +00:00
|
|
|
/* Validate the NLA-Strips 'control' F-Curves based on the flags set*/
|
|
|
|
void BKE_nlastrip_validate_fcurves (NlaStrip *strip)
|
|
|
|
{
|
|
|
|
FCurve *fcu;
|
|
|
|
|
|
|
|
/* sanity checks */
|
|
|
|
if (strip == NULL)
|
|
|
|
return;
|
|
|
|
|
|
|
|
/* if controlling influence... */
|
|
|
|
if (strip->flag & NLASTRIP_FLAG_USR_INFLUENCE) {
|
|
|
|
/* try to get F-Curve */
|
|
|
|
fcu= list_find_fcurve(&strip->fcurves, "influence", 0);
|
|
|
|
|
|
|
|
/* add one if not found */
|
|
|
|
if (fcu == NULL) {
|
|
|
|
/* make new F-Curve */
|
|
|
|
fcu= MEM_callocN(sizeof(FCurve), "NlaStrip FCurve");
|
|
|
|
BLI_addtail(&strip->fcurves, fcu);
|
|
|
|
|
|
|
|
/* set default flags */
|
|
|
|
fcu->flag = (FCURVE_VISIBLE|FCURVE_AUTO_HANDLES|FCURVE_SELECTED);
|
|
|
|
|
|
|
|
/* store path - make copy, and store that */
|
|
|
|
fcu->rna_path= BLI_strdupn("influence", 9);
|
|
|
|
|
|
|
|
// TODO: insert a few keyframes to ensure default behaviour?
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* if controlling time... */
|
|
|
|
if (strip->flag & NLASTRIP_FLAG_USR_TIME) {
|
|
|
|
/* try to get F-Curve */
|
|
|
|
fcu= list_find_fcurve(&strip->fcurves, "strip_time", 0);
|
|
|
|
|
|
|
|
/* add one if not found */
|
|
|
|
if (fcu == NULL) {
|
|
|
|
/* make new F-Curve */
|
|
|
|
fcu= MEM_callocN(sizeof(FCurve), "NlaStrip FCurve");
|
|
|
|
BLI_addtail(&strip->fcurves, fcu);
|
|
|
|
|
|
|
|
/* set default flags */
|
|
|
|
fcu->flag = (FCURVE_VISIBLE|FCURVE_AUTO_HANDLES|FCURVE_SELECTED);
|
|
|
|
|
|
|
|
/* store path - make copy, and store that */
|
|
|
|
fcu->rna_path= BLI_strdupn("strip_time", 10);
|
|
|
|
|
|
|
|
// TODO: insert a few keyframes to ensure default behaviour?
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2009-07-10 23:25:30 +00:00
|
|
|
|
|
|
|
/* Sanity Validation ------------------------------------ */
|
|
|
|
|
|
|
|
/* Find (and set) a unique name for a strip from the whole AnimData block
|
|
|
|
* Uses a similar method to the BLI method, but is implemented differently
|
|
|
|
* as we need to ensure that the name is unique over several lists of tracks,
|
|
|
|
* not just a single track.
|
|
|
|
*/
|
|
|
|
void BKE_nlastrip_validate_name (AnimData *adt, NlaStrip *strip)
|
|
|
|
{
|
|
|
|
GHash *gh;
|
|
|
|
NlaStrip *tstrip;
|
|
|
|
NlaTrack *nlt;
|
|
|
|
|
|
|
|
/* sanity checks */
|
|
|
|
if ELEM(NULL, adt, strip)
|
|
|
|
return;
|
|
|
|
|
|
|
|
/* give strip a default name if none already */
|
|
|
|
if (strip->name[0]==0) {
|
|
|
|
switch (strip->type) {
|
|
|
|
case NLASTRIP_TYPE_CLIP: /* act-clip */
|
|
|
|
sprintf(strip->name, "Act: %s", (strip->act)?(strip->act->id.name+2):("<None>"));
|
|
|
|
break;
|
|
|
|
case NLASTRIP_TYPE_TRANSITION: /* transition */
|
|
|
|
sprintf(strip->name, "Transition");
|
|
|
|
break;
|
|
|
|
case NLASTRIP_TYPE_META: /* meta */
|
|
|
|
sprintf(strip->name, "Meta");
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
sprintf(strip->name, "NLA Strip");
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* build a hash-table of all the strips in the tracks
|
|
|
|
* - this is easier than iterating over all the tracks+strips hierarchy everytime
|
|
|
|
* (and probably faster)
|
|
|
|
*/
|
|
|
|
gh= BLI_ghash_new(BLI_ghashutil_strhash, BLI_ghashutil_strcmp);
|
|
|
|
|
|
|
|
for (nlt= adt->nla_tracks.first; nlt; nlt= nlt->next) {
|
|
|
|
for (tstrip= nlt->strips.first; tstrip; tstrip= tstrip->next) {
|
|
|
|
/* don't add the strip of interest */
|
|
|
|
if (tstrip == strip)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
/* use the name of the strip as the key, and the strip as the value, since we're mostly interested in the keys */
|
|
|
|
BLI_ghash_insert(gh, tstrip->name, tstrip);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* if the hash-table has a match for this name, try other names...
|
|
|
|
* - in an extreme case, it might not be able to find a name, but then everything else in Blender would fail too :)
|
|
|
|
*/
|
|
|
|
if (BLI_ghash_haskey(gh, strip->name)) {
|
|
|
|
char tempname[128];
|
|
|
|
int number = 1;
|
|
|
|
char *dot;
|
|
|
|
|
|
|
|
/* Strip off the suffix */
|
|
|
|
dot = strchr(strip->name, '.');
|
|
|
|
if (dot) *dot=0;
|
|
|
|
|
|
|
|
/* Try different possibilities */
|
|
|
|
for (number = 1; number <= 999; number++) {
|
|
|
|
/* assemble alternative name */
|
|
|
|
BLI_snprintf(tempname, 128, "%s%c%03d", strip->name, ".", number);
|
|
|
|
|
|
|
|
/* if hash doesn't have this, set it */
|
|
|
|
if (BLI_ghash_haskey(gh, tempname) == 0) {
|
|
|
|
BLI_strncpy(strip->name, tempname, sizeof(strip->name));
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* free the hash... */
|
|
|
|
BLI_ghash_free(gh, NULL, NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Core Tools ------------------------------------------- */
|
2002-10-12 11:37:38 +00:00
|
|
|
|
2009-05-22 01:16:26 +00:00
|
|
|
/* For the given AnimData block, add the active action to the NLA
|
|
|
|
* stack (i.e. 'push-down' action). The UI should only allow this
|
|
|
|
* for normal editing only (i.e. not in editmode for some strip's action),
|
|
|
|
* so no checks for this are performed.
|
|
|
|
*/
|
|
|
|
// TODO: maybe we should have checks for this too...
|
|
|
|
void BKE_nla_action_pushdown (AnimData *adt)
|
|
|
|
{
|
|
|
|
NlaStrip *strip;
|
|
|
|
|
|
|
|
/* sanity checks */
|
|
|
|
// TODO: need to report the error for this
|
|
|
|
if ELEM(NULL, adt, adt->action)
|
|
|
|
return;
|
|
|
|
|
|
|
|
/* if the action is empty, we also shouldn't try to add to stack,
|
|
|
|
* as that will cause us grief down the track
|
|
|
|
*/
|
2009-05-23 09:36:18 +00:00
|
|
|
// TODO: what about modifiers?
|
2009-05-30 11:05:29 +00:00
|
|
|
if (action_has_motion(adt->action) == 0) {
|
|
|
|
printf("BKE_nla_action_pushdown(): action has no data \n");
|
2009-05-23 09:36:18 +00:00
|
|
|
return;
|
2009-05-30 11:05:29 +00:00
|
|
|
}
|
2009-05-22 01:16:26 +00:00
|
|
|
|
|
|
|
/* add a new NLA strip to the track, which references the active action */
|
2009-05-31 04:52:20 +00:00
|
|
|
strip= add_nlastrip_to_stack(adt, adt->action);
|
2009-05-22 01:16:26 +00:00
|
|
|
|
2009-05-31 04:52:20 +00:00
|
|
|
/* do other necessary work on strip */
|
2009-05-22 01:16:26 +00:00
|
|
|
if (strip) {
|
2009-05-31 04:52:20 +00:00
|
|
|
/* clear reference to action now that we've pushed it onto the stack */
|
2009-05-22 01:16:26 +00:00
|
|
|
adt->action->id.us--;
|
|
|
|
adt->action= NULL;
|
2009-05-31 04:52:20 +00:00
|
|
|
|
|
|
|
/* if the strip is the first one in the track it lives in, check if there
|
|
|
|
* are strips in any other tracks that may be before this, and set the extend
|
|
|
|
* mode accordingly
|
|
|
|
*/
|
|
|
|
if (nlastrip_is_first(adt, strip) == 0) {
|
|
|
|
/* not first, so extend mode can only be NLASTRIP_EXTEND_HOLD_FORWARD not NLASTRIP_EXTEND_HOLD,
|
|
|
|
* so that it doesn't override strips in previous tracks
|
|
|
|
*/
|
2009-07-03 01:10:46 +00:00
|
|
|
// FIXME: this needs to be more automated, since user can rearrange strips
|
2009-05-31 04:52:20 +00:00
|
|
|
strip->extendmode= NLASTRIP_EXTEND_HOLD_FORWARD;
|
|
|
|
}
|
2009-05-22 01:16:26 +00:00
|
|
|
}
|
2002-10-12 11:37:38 +00:00
|
|
|
}
|
2009-05-22 01:16:26 +00:00
|
|
|
|
NLA SoC: Operators for 'tweaking' strip actions (TAB-Key for both)
In this commit, I've introduced the mechanism by which actions already referenced by strips used in the NLA can be edited (or 'tweaked'). To use, simply select a strip you wish to edit, and hit that TAB key to start tweaking that strip's action, and hit TAB again once you're done.
What happens when you enter 'tweak mode':
1) The action of the active strip temporarily becomes the 'active action' of the AnimData block. You are now able to edit this in one of the Animation Editors (DopeSheet/Action, Graph Editors) as per normal (i.e. sliding keyframes around, inserting keyframes, etc.). The 'action-line' will therefore get drawn immediately above the active track containing the active strip, so that it's clear that that's what we're editing.
2) All the NLA-tracks (and all the strips within them) that occur after the track that the active strip lived in get disabled while you're in tweakmode. This is equivalent to travelling back to an earlier state in a construction history stack.
3) The active NLA track also gets disabled while in tweakmode, since it would otherwise interfere with the correct functioning of the tweaking for the action of interest.
4) The 'real' active action (i.e. the one displaced by the active strip's action) gets put into temp storage, and will be restored after you exit tweakmode.
5) Any strips which also reference the action being tweaked will get highlighted in red shading to indicate that you may be making some changes to the action which you don't really want to make for the other users too.
Please note though, that this is only a rough prototype of this functionality, with some niceties still to come. i.e.:
* NLA-tracks after the active track should still get drawn above the 'tweaking action line', but perhaps with different appearance?
* Various tools will still need awareness of this to prevent corrupting operations from taking place. How to proceed is still undecided...
* When exiting tweak-mode, the strip the action came from still needs some form of syncing with the modified action... there are a few tricky issues here that will need to be solved
* Evaluation code doesn't totally take this into account yet...
---
Also, fixed a number of bugs with various code (notably selection, and also a few drawing bugs)
2009-06-05 05:18:07 +00:00
|
|
|
|
|
|
|
/* Find the active strip + track combo, and set them up as the tweaking track,
|
|
|
|
* and return if successful or not.
|
|
|
|
*/
|
|
|
|
short BKE_nla_tweakmode_enter (AnimData *adt)
|
|
|
|
{
|
|
|
|
NlaTrack *nlt, *activeTrack=NULL;
|
|
|
|
NlaStrip *strip, *activeStrip=NULL;
|
|
|
|
|
|
|
|
/* verify that data is valid */
|
|
|
|
if ELEM(NULL, adt, adt->nla_tracks.first)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
/* if block is already in tweakmode, just leave, but we should report
|
|
|
|
* that this block is in tweakmode (as our returncode)
|
|
|
|
*/
|
|
|
|
if (adt->flag & ADT_NLA_EDIT_ON)
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
/* go over the tracks, finding the active one, and its active strip
|
|
|
|
* - if we cannot find both, then there's nothing to do
|
|
|
|
*/
|
|
|
|
for (nlt= adt->nla_tracks.first; nlt; nlt= nlt->next) {
|
|
|
|
/* check if active */
|
|
|
|
if (nlt->flag & NLATRACK_ACTIVE) {
|
|
|
|
/* store reference to this active track */
|
|
|
|
activeTrack= nlt;
|
|
|
|
|
|
|
|
/* now try to find active strip */
|
|
|
|
activeStrip= BKE_nlastrip_find_active(nlt);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if ELEM3(NULL, activeTrack, activeStrip, activeStrip->act) {
|
|
|
|
printf("NLA tweakmode enter - neither active requirement found \n");
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* go over all the tracks up to the active one, tagging each strip that uses the same
|
|
|
|
* action as the active strip, but leaving everything else alone
|
|
|
|
*/
|
|
|
|
for (nlt= activeTrack->prev; nlt; nlt= nlt->prev) {
|
|
|
|
for (strip= nlt->strips.first; strip; strip= strip->next) {
|
|
|
|
if (strip->act == activeStrip->act)
|
|
|
|
strip->flag |= NLASTRIP_FLAG_TWEAKUSER;
|
|
|
|
else
|
2009-07-03 01:10:46 +00:00
|
|
|
strip->flag &= ~NLASTRIP_FLAG_TWEAKUSER;
|
NLA SoC: Operators for 'tweaking' strip actions (TAB-Key for both)
In this commit, I've introduced the mechanism by which actions already referenced by strips used in the NLA can be edited (or 'tweaked'). To use, simply select a strip you wish to edit, and hit that TAB key to start tweaking that strip's action, and hit TAB again once you're done.
What happens when you enter 'tweak mode':
1) The action of the active strip temporarily becomes the 'active action' of the AnimData block. You are now able to edit this in one of the Animation Editors (DopeSheet/Action, Graph Editors) as per normal (i.e. sliding keyframes around, inserting keyframes, etc.). The 'action-line' will therefore get drawn immediately above the active track containing the active strip, so that it's clear that that's what we're editing.
2) All the NLA-tracks (and all the strips within them) that occur after the track that the active strip lived in get disabled while you're in tweakmode. This is equivalent to travelling back to an earlier state in a construction history stack.
3) The active NLA track also gets disabled while in tweakmode, since it would otherwise interfere with the correct functioning of the tweaking for the action of interest.
4) The 'real' active action (i.e. the one displaced by the active strip's action) gets put into temp storage, and will be restored after you exit tweakmode.
5) Any strips which also reference the action being tweaked will get highlighted in red shading to indicate that you may be making some changes to the action which you don't really want to make for the other users too.
Please note though, that this is only a rough prototype of this functionality, with some niceties still to come. i.e.:
* NLA-tracks after the active track should still get drawn above the 'tweaking action line', but perhaps with different appearance?
* Various tools will still need awareness of this to prevent corrupting operations from taking place. How to proceed is still undecided...
* When exiting tweak-mode, the strip the action came from still needs some form of syncing with the modified action... there are a few tricky issues here that will need to be solved
* Evaluation code doesn't totally take this into account yet...
---
Also, fixed a number of bugs with various code (notably selection, and also a few drawing bugs)
2009-06-05 05:18:07 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* go over all the tracks after AND INCLUDING the active one, tagging them as being disabled
|
|
|
|
* - the active track needs to also be tagged, otherwise, it'll overlap with the tweaks going on
|
|
|
|
*/
|
|
|
|
for (nlt= activeTrack; nlt; nlt= nlt->next)
|
|
|
|
nlt->flag |= NLATRACK_DISABLED;
|
|
|
|
|
|
|
|
/* handle AnimData level changes:
|
|
|
|
* - 'real' active action to temp storage (no need to change user-counts)
|
2009-06-06 05:06:46 +00:00
|
|
|
* - action of active strip set to be the 'active action', and have its usercount incremented
|
NLA SoC: Operators for 'tweaking' strip actions (TAB-Key for both)
In this commit, I've introduced the mechanism by which actions already referenced by strips used in the NLA can be edited (or 'tweaked'). To use, simply select a strip you wish to edit, and hit that TAB key to start tweaking that strip's action, and hit TAB again once you're done.
What happens when you enter 'tweak mode':
1) The action of the active strip temporarily becomes the 'active action' of the AnimData block. You are now able to edit this in one of the Animation Editors (DopeSheet/Action, Graph Editors) as per normal (i.e. sliding keyframes around, inserting keyframes, etc.). The 'action-line' will therefore get drawn immediately above the active track containing the active strip, so that it's clear that that's what we're editing.
2) All the NLA-tracks (and all the strips within them) that occur after the track that the active strip lived in get disabled while you're in tweakmode. This is equivalent to travelling back to an earlier state in a construction history stack.
3) The active NLA track also gets disabled while in tweakmode, since it would otherwise interfere with the correct functioning of the tweaking for the action of interest.
4) The 'real' active action (i.e. the one displaced by the active strip's action) gets put into temp storage, and will be restored after you exit tweakmode.
5) Any strips which also reference the action being tweaked will get highlighted in red shading to indicate that you may be making some changes to the action which you don't really want to make for the other users too.
Please note though, that this is only a rough prototype of this functionality, with some niceties still to come. i.e.:
* NLA-tracks after the active track should still get drawn above the 'tweaking action line', but perhaps with different appearance?
* Various tools will still need awareness of this to prevent corrupting operations from taking place. How to proceed is still undecided...
* When exiting tweak-mode, the strip the action came from still needs some form of syncing with the modified action... there are a few tricky issues here that will need to be solved
* Evaluation code doesn't totally take this into account yet...
---
Also, fixed a number of bugs with various code (notably selection, and also a few drawing bugs)
2009-06-05 05:18:07 +00:00
|
|
|
* - editing-flag for this AnimData block should also get turned on (for more efficient restoring)
|
2009-06-23 13:25:31 +00:00
|
|
|
* - take note of the active strip for mapping-correction of keyframes in the action being edited
|
NLA SoC: Operators for 'tweaking' strip actions (TAB-Key for both)
In this commit, I've introduced the mechanism by which actions already referenced by strips used in the NLA can be edited (or 'tweaked'). To use, simply select a strip you wish to edit, and hit that TAB key to start tweaking that strip's action, and hit TAB again once you're done.
What happens when you enter 'tweak mode':
1) The action of the active strip temporarily becomes the 'active action' of the AnimData block. You are now able to edit this in one of the Animation Editors (DopeSheet/Action, Graph Editors) as per normal (i.e. sliding keyframes around, inserting keyframes, etc.). The 'action-line' will therefore get drawn immediately above the active track containing the active strip, so that it's clear that that's what we're editing.
2) All the NLA-tracks (and all the strips within them) that occur after the track that the active strip lived in get disabled while you're in tweakmode. This is equivalent to travelling back to an earlier state in a construction history stack.
3) The active NLA track also gets disabled while in tweakmode, since it would otherwise interfere with the correct functioning of the tweaking for the action of interest.
4) The 'real' active action (i.e. the one displaced by the active strip's action) gets put into temp storage, and will be restored after you exit tweakmode.
5) Any strips which also reference the action being tweaked will get highlighted in red shading to indicate that you may be making some changes to the action which you don't really want to make for the other users too.
Please note though, that this is only a rough prototype of this functionality, with some niceties still to come. i.e.:
* NLA-tracks after the active track should still get drawn above the 'tweaking action line', but perhaps with different appearance?
* Various tools will still need awareness of this to prevent corrupting operations from taking place. How to proceed is still undecided...
* When exiting tweak-mode, the strip the action came from still needs some form of syncing with the modified action... there are a few tricky issues here that will need to be solved
* Evaluation code doesn't totally take this into account yet...
---
Also, fixed a number of bugs with various code (notably selection, and also a few drawing bugs)
2009-06-05 05:18:07 +00:00
|
|
|
*/
|
|
|
|
adt->tmpact= adt->action;
|
|
|
|
adt->action= activeStrip->act;
|
2009-06-23 13:25:31 +00:00
|
|
|
adt->actstrip= activeStrip;
|
2009-06-06 05:06:46 +00:00
|
|
|
id_us_plus(&activeStrip->act->id);
|
NLA SoC: Operators for 'tweaking' strip actions (TAB-Key for both)
In this commit, I've introduced the mechanism by which actions already referenced by strips used in the NLA can be edited (or 'tweaked'). To use, simply select a strip you wish to edit, and hit that TAB key to start tweaking that strip's action, and hit TAB again once you're done.
What happens when you enter 'tweak mode':
1) The action of the active strip temporarily becomes the 'active action' of the AnimData block. You are now able to edit this in one of the Animation Editors (DopeSheet/Action, Graph Editors) as per normal (i.e. sliding keyframes around, inserting keyframes, etc.). The 'action-line' will therefore get drawn immediately above the active track containing the active strip, so that it's clear that that's what we're editing.
2) All the NLA-tracks (and all the strips within them) that occur after the track that the active strip lived in get disabled while you're in tweakmode. This is equivalent to travelling back to an earlier state in a construction history stack.
3) The active NLA track also gets disabled while in tweakmode, since it would otherwise interfere with the correct functioning of the tweaking for the action of interest.
4) The 'real' active action (i.e. the one displaced by the active strip's action) gets put into temp storage, and will be restored after you exit tweakmode.
5) Any strips which also reference the action being tweaked will get highlighted in red shading to indicate that you may be making some changes to the action which you don't really want to make for the other users too.
Please note though, that this is only a rough prototype of this functionality, with some niceties still to come. i.e.:
* NLA-tracks after the active track should still get drawn above the 'tweaking action line', but perhaps with different appearance?
* Various tools will still need awareness of this to prevent corrupting operations from taking place. How to proceed is still undecided...
* When exiting tweak-mode, the strip the action came from still needs some form of syncing with the modified action... there are a few tricky issues here that will need to be solved
* Evaluation code doesn't totally take this into account yet...
---
Also, fixed a number of bugs with various code (notably selection, and also a few drawing bugs)
2009-06-05 05:18:07 +00:00
|
|
|
adt->flag |= ADT_NLA_EDIT_ON;
|
|
|
|
|
|
|
|
/* done! */
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Exit tweakmode for this AnimData block */
|
|
|
|
void BKE_nla_tweakmode_exit (AnimData *adt)
|
|
|
|
{
|
2009-06-20 04:02:49 +00:00
|
|
|
NlaStrip *strip;
|
NLA SoC: Operators for 'tweaking' strip actions (TAB-Key for both)
In this commit, I've introduced the mechanism by which actions already referenced by strips used in the NLA can be edited (or 'tweaked'). To use, simply select a strip you wish to edit, and hit that TAB key to start tweaking that strip's action, and hit TAB again once you're done.
What happens when you enter 'tweak mode':
1) The action of the active strip temporarily becomes the 'active action' of the AnimData block. You are now able to edit this in one of the Animation Editors (DopeSheet/Action, Graph Editors) as per normal (i.e. sliding keyframes around, inserting keyframes, etc.). The 'action-line' will therefore get drawn immediately above the active track containing the active strip, so that it's clear that that's what we're editing.
2) All the NLA-tracks (and all the strips within them) that occur after the track that the active strip lived in get disabled while you're in tweakmode. This is equivalent to travelling back to an earlier state in a construction history stack.
3) The active NLA track also gets disabled while in tweakmode, since it would otherwise interfere with the correct functioning of the tweaking for the action of interest.
4) The 'real' active action (i.e. the one displaced by the active strip's action) gets put into temp storage, and will be restored after you exit tweakmode.
5) Any strips which also reference the action being tweaked will get highlighted in red shading to indicate that you may be making some changes to the action which you don't really want to make for the other users too.
Please note though, that this is only a rough prototype of this functionality, with some niceties still to come. i.e.:
* NLA-tracks after the active track should still get drawn above the 'tweaking action line', but perhaps with different appearance?
* Various tools will still need awareness of this to prevent corrupting operations from taking place. How to proceed is still undecided...
* When exiting tweak-mode, the strip the action came from still needs some form of syncing with the modified action... there are a few tricky issues here that will need to be solved
* Evaluation code doesn't totally take this into account yet...
---
Also, fixed a number of bugs with various code (notably selection, and also a few drawing bugs)
2009-06-05 05:18:07 +00:00
|
|
|
NlaTrack *nlt;
|
|
|
|
|
|
|
|
/* verify that data is valid */
|
|
|
|
if ELEM(NULL, adt, adt->nla_tracks.first)
|
|
|
|
return;
|
|
|
|
|
|
|
|
/* hopefully the flag is correct - skip if not on */
|
|
|
|
if ((adt->flag & ADT_NLA_EDIT_ON) == 0)
|
|
|
|
return;
|
|
|
|
|
|
|
|
// TODO: need to sync the user-strip with the new state of the action!
|
|
|
|
|
2009-07-03 01:10:46 +00:00
|
|
|
/* for all Tracks, clear the 'disabled' flag
|
|
|
|
* for all Strips, clear the 'tweak-user' flag
|
2009-06-20 04:02:49 +00:00
|
|
|
*/
|
|
|
|
for (nlt= adt->nla_tracks.first; nlt; nlt= nlt->next) {
|
NLA SoC: Operators for 'tweaking' strip actions (TAB-Key for both)
In this commit, I've introduced the mechanism by which actions already referenced by strips used in the NLA can be edited (or 'tweaked'). To use, simply select a strip you wish to edit, and hit that TAB key to start tweaking that strip's action, and hit TAB again once you're done.
What happens when you enter 'tweak mode':
1) The action of the active strip temporarily becomes the 'active action' of the AnimData block. You are now able to edit this in one of the Animation Editors (DopeSheet/Action, Graph Editors) as per normal (i.e. sliding keyframes around, inserting keyframes, etc.). The 'action-line' will therefore get drawn immediately above the active track containing the active strip, so that it's clear that that's what we're editing.
2) All the NLA-tracks (and all the strips within them) that occur after the track that the active strip lived in get disabled while you're in tweakmode. This is equivalent to travelling back to an earlier state in a construction history stack.
3) The active NLA track also gets disabled while in tweakmode, since it would otherwise interfere with the correct functioning of the tweaking for the action of interest.
4) The 'real' active action (i.e. the one displaced by the active strip's action) gets put into temp storage, and will be restored after you exit tweakmode.
5) Any strips which also reference the action being tweaked will get highlighted in red shading to indicate that you may be making some changes to the action which you don't really want to make for the other users too.
Please note though, that this is only a rough prototype of this functionality, with some niceties still to come. i.e.:
* NLA-tracks after the active track should still get drawn above the 'tweaking action line', but perhaps with different appearance?
* Various tools will still need awareness of this to prevent corrupting operations from taking place. How to proceed is still undecided...
* When exiting tweak-mode, the strip the action came from still needs some form of syncing with the modified action... there are a few tricky issues here that will need to be solved
* Evaluation code doesn't totally take this into account yet...
---
Also, fixed a number of bugs with various code (notably selection, and also a few drawing bugs)
2009-06-05 05:18:07 +00:00
|
|
|
nlt->flag &= ~NLATRACK_DISABLED;
|
2009-06-20 04:02:49 +00:00
|
|
|
|
|
|
|
for (strip= nlt->strips.first; strip; strip= strip->next)
|
|
|
|
strip->flag &= ~NLASTRIP_FLAG_TWEAKUSER;
|
|
|
|
}
|
NLA SoC: Operators for 'tweaking' strip actions (TAB-Key for both)
In this commit, I've introduced the mechanism by which actions already referenced by strips used in the NLA can be edited (or 'tweaked'). To use, simply select a strip you wish to edit, and hit that TAB key to start tweaking that strip's action, and hit TAB again once you're done.
What happens when you enter 'tweak mode':
1) The action of the active strip temporarily becomes the 'active action' of the AnimData block. You are now able to edit this in one of the Animation Editors (DopeSheet/Action, Graph Editors) as per normal (i.e. sliding keyframes around, inserting keyframes, etc.). The 'action-line' will therefore get drawn immediately above the active track containing the active strip, so that it's clear that that's what we're editing.
2) All the NLA-tracks (and all the strips within them) that occur after the track that the active strip lived in get disabled while you're in tweakmode. This is equivalent to travelling back to an earlier state in a construction history stack.
3) The active NLA track also gets disabled while in tweakmode, since it would otherwise interfere with the correct functioning of the tweaking for the action of interest.
4) The 'real' active action (i.e. the one displaced by the active strip's action) gets put into temp storage, and will be restored after you exit tweakmode.
5) Any strips which also reference the action being tweaked will get highlighted in red shading to indicate that you may be making some changes to the action which you don't really want to make for the other users too.
Please note though, that this is only a rough prototype of this functionality, with some niceties still to come. i.e.:
* NLA-tracks after the active track should still get drawn above the 'tweaking action line', but perhaps with different appearance?
* Various tools will still need awareness of this to prevent corrupting operations from taking place. How to proceed is still undecided...
* When exiting tweak-mode, the strip the action came from still needs some form of syncing with the modified action... there are a few tricky issues here that will need to be solved
* Evaluation code doesn't totally take this into account yet...
---
Also, fixed a number of bugs with various code (notably selection, and also a few drawing bugs)
2009-06-05 05:18:07 +00:00
|
|
|
|
|
|
|
/* handle AnimData level changes:
|
2009-06-06 05:06:46 +00:00
|
|
|
* - 'temporary' active action needs its usercount decreased, since we're removing this reference
|
NLA SoC: Operators for 'tweaking' strip actions (TAB-Key for both)
In this commit, I've introduced the mechanism by which actions already referenced by strips used in the NLA can be edited (or 'tweaked'). To use, simply select a strip you wish to edit, and hit that TAB key to start tweaking that strip's action, and hit TAB again once you're done.
What happens when you enter 'tweak mode':
1) The action of the active strip temporarily becomes the 'active action' of the AnimData block. You are now able to edit this in one of the Animation Editors (DopeSheet/Action, Graph Editors) as per normal (i.e. sliding keyframes around, inserting keyframes, etc.). The 'action-line' will therefore get drawn immediately above the active track containing the active strip, so that it's clear that that's what we're editing.
2) All the NLA-tracks (and all the strips within them) that occur after the track that the active strip lived in get disabled while you're in tweakmode. This is equivalent to travelling back to an earlier state in a construction history stack.
3) The active NLA track also gets disabled while in tweakmode, since it would otherwise interfere with the correct functioning of the tweaking for the action of interest.
4) The 'real' active action (i.e. the one displaced by the active strip's action) gets put into temp storage, and will be restored after you exit tweakmode.
5) Any strips which also reference the action being tweaked will get highlighted in red shading to indicate that you may be making some changes to the action which you don't really want to make for the other users too.
Please note though, that this is only a rough prototype of this functionality, with some niceties still to come. i.e.:
* NLA-tracks after the active track should still get drawn above the 'tweaking action line', but perhaps with different appearance?
* Various tools will still need awareness of this to prevent corrupting operations from taking place. How to proceed is still undecided...
* When exiting tweak-mode, the strip the action came from still needs some form of syncing with the modified action... there are a few tricky issues here that will need to be solved
* Evaluation code doesn't totally take this into account yet...
---
Also, fixed a number of bugs with various code (notably selection, and also a few drawing bugs)
2009-06-05 05:18:07 +00:00
|
|
|
* - 'real' active action is restored from storage
|
|
|
|
* - storage pointer gets cleared (to avoid having bad notes hanging around)
|
|
|
|
* - editing-flag for this AnimData block should also get turned off
|
2009-06-23 13:25:31 +00:00
|
|
|
* - clear pointer to active strip
|
NLA SoC: Operators for 'tweaking' strip actions (TAB-Key for both)
In this commit, I've introduced the mechanism by which actions already referenced by strips used in the NLA can be edited (or 'tweaked'). To use, simply select a strip you wish to edit, and hit that TAB key to start tweaking that strip's action, and hit TAB again once you're done.
What happens when you enter 'tweak mode':
1) The action of the active strip temporarily becomes the 'active action' of the AnimData block. You are now able to edit this in one of the Animation Editors (DopeSheet/Action, Graph Editors) as per normal (i.e. sliding keyframes around, inserting keyframes, etc.). The 'action-line' will therefore get drawn immediately above the active track containing the active strip, so that it's clear that that's what we're editing.
2) All the NLA-tracks (and all the strips within them) that occur after the track that the active strip lived in get disabled while you're in tweakmode. This is equivalent to travelling back to an earlier state in a construction history stack.
3) The active NLA track also gets disabled while in tweakmode, since it would otherwise interfere with the correct functioning of the tweaking for the action of interest.
4) The 'real' active action (i.e. the one displaced by the active strip's action) gets put into temp storage, and will be restored after you exit tweakmode.
5) Any strips which also reference the action being tweaked will get highlighted in red shading to indicate that you may be making some changes to the action which you don't really want to make for the other users too.
Please note though, that this is only a rough prototype of this functionality, with some niceties still to come. i.e.:
* NLA-tracks after the active track should still get drawn above the 'tweaking action line', but perhaps with different appearance?
* Various tools will still need awareness of this to prevent corrupting operations from taking place. How to proceed is still undecided...
* When exiting tweak-mode, the strip the action came from still needs some form of syncing with the modified action... there are a few tricky issues here that will need to be solved
* Evaluation code doesn't totally take this into account yet...
---
Also, fixed a number of bugs with various code (notably selection, and also a few drawing bugs)
2009-06-05 05:18:07 +00:00
|
|
|
*/
|
2009-06-06 05:06:46 +00:00
|
|
|
if (adt->action) adt->action->id.us--;
|
NLA SoC: Operators for 'tweaking' strip actions (TAB-Key for both)
In this commit, I've introduced the mechanism by which actions already referenced by strips used in the NLA can be edited (or 'tweaked'). To use, simply select a strip you wish to edit, and hit that TAB key to start tweaking that strip's action, and hit TAB again once you're done.
What happens when you enter 'tweak mode':
1) The action of the active strip temporarily becomes the 'active action' of the AnimData block. You are now able to edit this in one of the Animation Editors (DopeSheet/Action, Graph Editors) as per normal (i.e. sliding keyframes around, inserting keyframes, etc.). The 'action-line' will therefore get drawn immediately above the active track containing the active strip, so that it's clear that that's what we're editing.
2) All the NLA-tracks (and all the strips within them) that occur after the track that the active strip lived in get disabled while you're in tweakmode. This is equivalent to travelling back to an earlier state in a construction history stack.
3) The active NLA track also gets disabled while in tweakmode, since it would otherwise interfere with the correct functioning of the tweaking for the action of interest.
4) The 'real' active action (i.e. the one displaced by the active strip's action) gets put into temp storage, and will be restored after you exit tweakmode.
5) Any strips which also reference the action being tweaked will get highlighted in red shading to indicate that you may be making some changes to the action which you don't really want to make for the other users too.
Please note though, that this is only a rough prototype of this functionality, with some niceties still to come. i.e.:
* NLA-tracks after the active track should still get drawn above the 'tweaking action line', but perhaps with different appearance?
* Various tools will still need awareness of this to prevent corrupting operations from taking place. How to proceed is still undecided...
* When exiting tweak-mode, the strip the action came from still needs some form of syncing with the modified action... there are a few tricky issues here that will need to be solved
* Evaluation code doesn't totally take this into account yet...
---
Also, fixed a number of bugs with various code (notably selection, and also a few drawing bugs)
2009-06-05 05:18:07 +00:00
|
|
|
adt->action= adt->tmpact;
|
|
|
|
adt->tmpact= NULL;
|
2009-06-23 13:25:31 +00:00
|
|
|
adt->actstrip= NULL;
|
NLA SoC: Operators for 'tweaking' strip actions (TAB-Key for both)
In this commit, I've introduced the mechanism by which actions already referenced by strips used in the NLA can be edited (or 'tweaked'). To use, simply select a strip you wish to edit, and hit that TAB key to start tweaking that strip's action, and hit TAB again once you're done.
What happens when you enter 'tweak mode':
1) The action of the active strip temporarily becomes the 'active action' of the AnimData block. You are now able to edit this in one of the Animation Editors (DopeSheet/Action, Graph Editors) as per normal (i.e. sliding keyframes around, inserting keyframes, etc.). The 'action-line' will therefore get drawn immediately above the active track containing the active strip, so that it's clear that that's what we're editing.
2) All the NLA-tracks (and all the strips within them) that occur after the track that the active strip lived in get disabled while you're in tweakmode. This is equivalent to travelling back to an earlier state in a construction history stack.
3) The active NLA track also gets disabled while in tweakmode, since it would otherwise interfere with the correct functioning of the tweaking for the action of interest.
4) The 'real' active action (i.e. the one displaced by the active strip's action) gets put into temp storage, and will be restored after you exit tweakmode.
5) Any strips which also reference the action being tweaked will get highlighted in red shading to indicate that you may be making some changes to the action which you don't really want to make for the other users too.
Please note though, that this is only a rough prototype of this functionality, with some niceties still to come. i.e.:
* NLA-tracks after the active track should still get drawn above the 'tweaking action line', but perhaps with different appearance?
* Various tools will still need awareness of this to prevent corrupting operations from taking place. How to proceed is still undecided...
* When exiting tweak-mode, the strip the action came from still needs some form of syncing with the modified action... there are a few tricky issues here that will need to be solved
* Evaluation code doesn't totally take this into account yet...
---
Also, fixed a number of bugs with various code (notably selection, and also a few drawing bugs)
2009-06-05 05:18:07 +00:00
|
|
|
adt->flag &= ~ADT_NLA_EDIT_ON;
|
|
|
|
}
|
|
|
|
|
2009-05-22 01:16:26 +00:00
|
|
|
/* *************************************************** */
|