Browse Source

Clean up fade drawing issue.

tags/non-daw-v1.1.0
Jonathan Moore Liles 17 years ago
parent
commit
9c2329eb78
2 changed files with 4 additions and 2 deletions
  1. +2
    -0
      Timeline/Region.C
  2. +2
    -2
      Timeline/Region.H

+ 2
- 0
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 )
fl_vertex( i / (float)width, 1.0f - fade.gain( ts ) );

fl_vertex( 1.0, 0.0 );

if ( line )
fl_end_line();
else


+ 2
- 2
Timeline/Region.H View File

@@ -76,11 +76,11 @@ public:
g = fi;
break;
case Sigmoid:
// g = sin( fi * M_PI / 2 );
g = (1.0f - cos( fi * M_PI )) / 2.0f;
break;
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;
case Parabolic:
g = 1.0f - (1.0f - fi) * (1.0f - fi);


Loading…
Cancel
Save