Conflicts:
	src/map/transform.cpp
This commit is contained in:
Konstantin Käfer
2014-02-07 16:10:00 +01:00
5 changed files with 32 additions and 8 deletions

View File

@@ -32,9 +32,14 @@ void Transform::cancelAnimations() {
animations.clear();
}
void Transform::moveBy(double dx, double dy) {
x += cos(angle) * dx + sin(angle) * dy;
y += cos(angle) * dy + sin(-angle) * dx;
void Transform::moveBy(double dx, double dy, double duration) {
if (duration == 0) {
x += cos(angle) * dx + sin(angle) * dy;
y += cos(angle) * dy + sin(-angle) * dx;
} else {
animations.emplace_front(x, x + cos(angle) * dx + sin(angle) * dy, x, duration);
animations.emplace_front(y, y + cos(angle) * dy + sin(-angle) * dx, y, duration);
}
}
void Transform::scaleBy(double ds, double cx, double cy, double duration) {