Style and logic error.

This commit is contained in:
Tobias Loose
2013-12-05 23:33:43 +01:00
parent 8bb58ca3b1
commit 96aeaffa1b
+4 -4
View File
@@ -25,7 +25,7 @@ public:
void finish() void finish()
{ {
value = start_value + delta_value; value = start_value + delta_value;
time_acc = 0; duration = 0; time_acc = duration;
} }
void update(float dt) void update(float dt)
@@ -75,15 +75,15 @@ public:
void updateValue() void updateValue()
{ {
float time_tmp = time_acc * 2 / duration; float time_tmp = (time_acc * 2) / duration;
if (time_tmp < 1) if (time_tmp < 1)
{ {
value = delta_value/2*time_tmp*time_tmp + start_value; value = delta_value * 0.5 * time_tmp * time_tmp + start_value;
} }
else else
{ {
time_tmp -= 1; time_tmp -= 1;
value = -delta_value/2 * (time_tmp*(time_tmp-2) - 1) + start_value; value = - delta_value * 0.5 * (time_tmp * (time_tmp - 2) - 1) + start_value;
} }
} }
}; };