Merge branch 'master' of https://github.com/mapbox/llmr-native
Conflicts: src/map/transform.cpp
This commit is contained in:
@@ -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) {
|
||||
|
||||
Reference in New Issue
Block a user