tmaq
/
tornavis
1
0
Fork 0
Code Issues 2 Pull Requests 29 Packages Projects 24 Releases Wiki Activity

NLA SoC: Evaluation bugfixes 

* Strip scaling was being evaluated in the wrong way, resulting in scaled strips not being played too fast (for lengthened strips) or too slow (shortened strips)

* Also, verified that the 'reversed' option works correctly (no changes needed to be made here)
This commit is contained in:
Joshua Leung 2009-06-11 02:14:56 +00:00
parent 867e129135
commit 64f94a670e
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source/blender/blenkernel/intern/anim_sys.c
View File

@ -591,23 +591,23 @@ static float nlastrip_get_frame (NlaStrip *strip, float cframe, short invert)
float length, actlength, repeat, scale;
/* get number of repeats */
if (strip->repeat == 0.0f) strip->repeat = 1.0f;
if (IS_EQ(strip->repeat, 0.0f)) strip->repeat = 1.0f;
repeat = strip->repeat;
/* scaling */
if (strip->scale == 0.0f) strip->scale= 1.0f;
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 (actlength == 0.0f) actlength = 1.0f;
if (IS_EQ(actlength, 0.0f)) actlength = 1.0f;
/* length of strip */
length = repeat * scale * actlength;
length = strip->end - strip->start;
if (IS_EQ(length, 0.0f)) length= actlength * scale * repeat;
/* reversed = play strip backwards */
if (strip->flag & NLASTRIP_FLAG_REVERSE) {
// FIXME: verify these
/* invert = convert action-strip time to global time */
if (invert)
return length*(strip->actend - cframe)/(repeat*actlength) + strip->start;
@ -651,7 +651,7 @@ void nlastrip_evaluate_controls (NlaStrip *strip, float ctime)
{
/* firstly, analytically generate values for influence and time (if applicable) */
if ((strip->flag & NLASTRIP_FLAG_USR_TIME) == 0)
strip->strip_time= nlastrip_get_frame(strip, ctime, 1); /* last arg '1' means current time to 'strip'/action time */
strip->strip_time= nlastrip_get_frame(strip, ctime, 0);
if ((strip->flag & NLASTRIP_FLAG_USR_INFLUENCE) == 0)
strip->influence= nlastrip_get_influence(strip, ctime);