Commit cce4d7a1 authored by terencehill's avatar terencehill

Use the formula with exp, as it's more mathematically correct

parent a16bfaa1
......@@ -418,13 +418,12 @@ void ListBox_draw(entity me)
}
if(me.scrollPos != me.scrollPosTarget)
{
float PI = 3.1415926535897932384626433832795028841971693993751058209749445923;
float exp_factor = 0.65;
float exp_factor = 0.16;
if(me.pressed == 1)
exp_factor = 0.45; // scroll faster while dragging the scrollbar
exp_factor = 0.06; // scroll faster while dragging the scrollbar
// this formula works with whatever framerate
float f = sin(PI / 2 * pow(frametime, exp_factor));
me.scrollPos = me.scrollPos * (1 - f) + me.scrollPosTarget * f;
float f = exp(-frametime / exp_factor);
me.scrollPos = me.scrollPos * f + me.scrollPosTarget * (1 - f);
if(fabs(me.scrollPos - me.scrollPosTarget) < 0.001)
me.scrollPos = me.scrollPosTarget;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment