summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorJérémy Zurcher <jeremy@asynk.ch>2015-01-05 17:42:31 +0100
committerJérémy Zurcher <jeremy@asynk.ch>2015-01-05 17:42:31 +0100
commit7f166ba58df0d9fd979c770bb2113e0e9d5544a4 (patch)
tree72cd1cc777e3ca7c9de683a0cb5e73c1c264c793 /core
parent193a659889cee33036b9f0f06b94e9036291d201 (diff)
downloadRustAndDust-7f166ba58df0d9fd979c770bb2113e0e9d5544a4.zip
RustAndDust-7f166ba58df0d9fd979c770bb2113e0e9d5544a4.tar.gz
GameCamera: updateViewport() calls clampPosition only
Diffstat (limited to 'core')
-rw-r--r--core/src/ch/asynk/tankontank/screens/GameCamera.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/core/src/ch/asynk/tankontank/screens/GameCamera.java b/core/src/ch/asynk/tankontank/screens/GameCamera.java
index 5393177..c76243b 100644
--- a/core/src/ch/asynk/tankontank/screens/GameCamera.java
+++ b/core/src/ch/asynk/tankontank/screens/GameCamera.java
@@ -59,7 +59,7 @@ public class GameCamera extends OrthographicCamera
this.widthFactor = (viewportWidth / screenWidth);
this.heightFactor = (viewportHeight / screenHeight);
- clampZoom();
+ clampPosition();
update(true);
hudMatrix.set(combined);
hudMatrix.setToOrtho2D(0, 0, window.width, window.height);
@@ -117,7 +117,6 @@ public class GameCamera extends OrthographicCamera
public void clampZoom()
{
zoom = MathUtils.clamp(zoom, zoomIn, zoomOut);
- clampPosition();
}
public void clampPosition()