From 9c2329eb7856247c29013784769f542e836a2987 Mon Sep 17 00:00:00 2001 From: Jonathan Moore Liles Date: Tue, 15 Apr 2008 09:01:21 -0500 Subject: [PATCH] Clean up fade drawing issue. --- Timeline/Region.C | 2 ++ Timeline/Region.H | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Timeline/Region.C b/Timeline/Region.C index 207f244..0398a17 100644 --- a/Timeline/Region.C +++ b/Timeline/Region.C @@ -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 diff --git a/Timeline/Region.H b/Timeline/Region.H index dc96d3d..a92f300 100644 --- a/Timeline/Region.H +++ b/Timeline/Region.H @@ -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);