mirrors
/
non
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Clean up fade drawing issue.

This commit is contained in:
Jonathan Moore Liles 2008-04-15 09:01:21 -05:00
parent b3a3be6e55
commit 9c2329eb78
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Timeline/Region.C
View File

@ -518,6 +518,8 @@ Region::draw_fade ( const Fade &fade, Fade::fade_dir_e dir, bool line, int X, in
for ( int i = 0; i < width; ++i, ts += tsx ) for ( int i = 0; i < width; ++i, ts += tsx )
fl_vertex( i / (float)width, 1.0f - fade.gain( ts ) ); fl_vertex( i / (float)width, 1.0f - fade.gain( ts ) );
fl_vertex( 1.0, 0.0 );
if ( line ) if ( line )
fl_end_line(); fl_end_line();
else else

4
Timeline/Region.H
View File

@ -76,11 +76,11 @@ public:
g = fi; g = fi;
break; break;
case Sigmoid: case Sigmoid:
// g = sin( fi * M_PI / 2 );
g = (1.0f - cos( fi * M_PI )) / 2.0f; g = (1.0f - cos( fi * M_PI )) / 2.0f;
break; break;
case Logarithmic: case Logarithmic:
g = pow( 0.1f, (1.0f - fi) * 5.0f ); /* FIXME: this is wrong */
g = pow( 0.1f, (1.0f - fi) * 3.0f );
break; break;
case Parabolic: case Parabolic:
g = 1.0f - (1.0f - fi) * (1.0f - fi); g = 1.0f - (1.0f - fi) * (1.0f - fi);