summaryrefslogtreecommitdiff
path: root/coreengine/animation.c
diff options
context:
space:
mode:
authorlouis <louis.braun@gmx.de>2016-07-30 17:31:34 +0200
committerlouis <louis.braun@gmx.de>2016-07-30 17:31:34 +0200
commit88982c3230e0ce91ce343ca2747ce246c3ea795f (patch)
treec01fd20725629b084548c4fc2a0c6833c06a8865 /coreengine/animation.c
parent6acc22e5c2c1e28022286064f9bb9216e9942768 (diff)
downloadvdr-plugin-skindesigner-88982c3230e0ce91ce343ca2747ce246c3ea795f.tar.gz
vdr-plugin-skindesigner-88982c3230e0ce91ce343ca2747ce246c3ea795f.tar.bz2
cleanups
Diffstat (limited to 'coreengine/animation.c')
-rw-r--r--coreengine/animation.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/coreengine/animation.c b/coreengine/animation.c
index cab87a3..65fb587 100644
--- a/coreengine/animation.c
+++ b/coreengine/animation.c
@@ -290,13 +290,13 @@ cShifter::cShifter(cShiftable *shiftable) {
shifttime = 0;
x = 0.0f;
y = 0.0f;
- stepXLinear = 0;
- stepYLinear = 0;
+ stepXLinear = 0.0f;
+ stepYLinear = 0.0f;
stepsFast = 0;
- stepXFast = 0;
- stepXSlow = 0;
- stepYFast = 0;
- stepYSlow = 0;
+ stepXFast = 0.0f;
+ stepXSlow = 0.0f;
+ stepYFast = 0.0f;
+ stepYSlow = 0.0f;
Init();
}
@@ -317,14 +317,14 @@ void cShifter::Init(void) {
stepYFast = (float)(end.Y() - start.Y()) * distanceFast / 100.0f / (float)stepsFast;
stepYSlow = (float)(end.Y() - start.Y()) * (100.0f - distanceFast) / 100.0f / (float)(steps-stepsFast);
} else if (start.Y() == end.Y()) {
- stepXLinear = (end.X() - start.X()) / steps;
+ stepXLinear = (float)(end.X() - start.X()) / (float)steps;
stepXFast = (float)(end.X() - start.X()) * distanceFast / 100.0f / (float)stepsFast;
stepXSlow = (float)(end.X() - start.X()) * (100.0f - distanceFast) / 100.0f / (float)(steps-stepsFast);
} else {
- stepXLinear = (end.X() - start.X()) / steps;
+ stepXLinear = (float)(end.X() - start.X()) / (float)steps;
stepXFast = (float)(end.X() - start.X()) * distanceFast / 100.0f / (float)stepsFast;
stepXSlow = (float)(end.X() - start.X()) * (100.0f - distanceFast) / 100.0f / (float)(steps-stepsFast);
- stepYLinear = (end.Y() - start.Y()) / steps;
+ stepYLinear = (float)(end.Y() - start.Y()) / (float)steps;
stepYFast = (float)(end.Y() - start.Y()) * distanceFast / 100.0f / (float)stepsFast;
stepYSlow = (float)(end.Y() - start.Y()) * (100.0f - distanceFast) / 100.0f / (float)(steps-stepsFast);
}