griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

F-Curve Modifiers - Envelope: Bugfixes

Browse Source 
* Envelope modifier now works correctly. Previously, the mapping was being done in the wrong order.
* Extra controls for modifiers now only draw when the F-Curve is the active one, so the view will be less cluttered in other cases.
This commit is contained in:
Joshua Leung
2009-03-22 09:54:13 +00:00
parent b995f4329a
commit 7c86a10aba
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/blenkernel/intern/fcurve.c
View File

@@ -1464,10 +1464,11 @@ static void fcm_envelope_evaluate (FCurve *fcu, FModifier *fcm, float *cvalue, f
}
/* adjust *cvalue
* NOTE: env->min/max are relative to env->midval, and can be either +ve OR -ve, so we add...
* - fac is the ratio of how the current y-value corresponds to the reference range
* - thus, the new value is found by mapping the old range to the new!
*/
fac= (*cvalue - min) / (max - min);
*cvalue= (env->midval + env->min) + (fac * (env->max - env->min));
fac= (*cvalue - (env->midval + env->min)) / (env->max - env->min);
*cvalue= min + fac*(max - min);
}
static FModifierTypeInfo FMI_ENVELOPE = {

11
source/blender/editors/space_graph/graph_draw.c
View File

@@ -95,7 +95,7 @@ extern void gl_round_box(int mode, float minx, float miny, float maxx, float max
/* Envelope -------------- */
// TODO: draw a shaded poly showing the region of influence too?
// TODO: draw a shaded poly showing the region of influence too!!!
static void draw_fcurve_modifier_controls_envelope (FCurve *fcu, FModifier *fcm, View2D *v2d)
{
FMod_Envelope *env= (FMod_Envelope *)fcm->data;
@@ -104,7 +104,6 @@ static void draw_fcurve_modifier_controls_envelope (FCurve *fcu, FModifier *fcm,
int i;
/* draw two black lines showing the standard reference levels */
// TODO: how to make these more distinctive?
glColor3f(0.0f, 0.0f, 0.0f);
setlinestyle(5);
@@ -117,7 +116,6 @@ static void draw_fcurve_modifier_controls_envelope (FCurve *fcu, FModifier *fcm,
glEnd(); // GL_LINES
setlinestyle(0);
/* set size of vertices (non-adjustable for now) */
glPointSize(2.0f);
@@ -821,11 +819,14 @@ void graph_draw_curves (bAnimContext *ac, SpaceIpo *sipo, ARegion *ar, View2DGri
/* 2) draw handles and vertices as appropriate based on active */
if ( ((fcm) && (fcm->type != FMODIFIER_TYPE_CYCLES)) || (fcu->modifiers.first && !fcm) ) {
/* draw controls for the 'active' modifier (if applicable)
/* draw controls for the 'active' modifier
* - there may not be an 'active' modifier on this curve to draw
* - this curve may not be active, so modifier controls shouldn't get drawn either
*
* NOTE: cycles modifier is currently an exception where the original points can still be edited, so
* this branch is skipped... (TODO: set up the generic system for this so that we don't need special hacks like this)
*/
if (fcm) {
if ((fcu->flag & FCURVE_ACTIVE) && (fcm)) {
switch (fcm->type) {
case FMODIFIER_TYPE_ENVELOPE: /* envelope */
draw_fcurve_modifier_controls_envelope(fcu, fcm, &ar->v2d);