tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[core] #509 - Adding min / max checks to parameters and refactoring to utilize clamp function

Browse Source
This commit is contained in:
Brad Leege
2016-02-03 18:31:14 -06:00
parent 932012e931
commit 511c01c6ca
1 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/mbgl/map/transform_state.cpp
View File

@@ -161,14 +161,9 @@ double TransformState::getScale() const {
}
void TransformState::setMinZoom(const double minZoom) {
double zoom = minZoom;
if (minZoom > 25.5) {
zoom = 25.5;
if (minZoom <= getMaxZoom()) {
min_scale = zoomScale(util::clamp(minZoom, 0.0, 25.5));
}
if (minZoom < 0) {
zoom = 0.0;
}
min_scale = zoomScale(zoom);
}
double TransformState::getMinZoom() const {
@@ -181,14 +176,9 @@ double TransformState::getMinZoom() const {
}
void TransformState::setMaxZoom(const double maxZoom) {
double zoom = maxZoom;
if (maxZoom > 25.5) {
zoom = 25.5;
if (maxZoom >= getMinZoom()) {
max_scale = zoomScale(util::clamp(maxZoom, 0.0, 25.5));
}
if (maxZoom < 0) {
zoom = 0.0;
}
max_scale = zoomScale(zoom);
}
double TransformState::getMaxZoom() const {