summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJérémy Zurcher <jeremy@asynk.ch>2014-09-13 23:53:11 +0200
committerJérémy Zurcher <jeremy@asynk.ch>2014-09-13 23:53:11 +0200
commitad9f6c40ebaf5de440cf81df705133ca0305df72 (patch)
treec77ddc6f51f334c4b2330150834e39a127c5bef3
parent482f92f1347774c8e411d2916bd205f80f8e548f (diff)
downloadRustAndDust-ad9f6c40ebaf5de440cf81df705133ca0305df72.zip
RustAndDust-ad9f6c40ebaf5de440cf81df705133ca0305df72.tar.gz
set initial zoom to 1, reduce loading delay
-rw-r--r--core/src/ch/asynk/tankontank/screens/GameScreen.java2
-rw-r--r--core/src/ch/asynk/tankontank/screens/LoadScreen.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/core/src/ch/asynk/tankontank/screens/GameScreen.java b/core/src/ch/asynk/tankontank/screens/GameScreen.java
index c416043..1206950 100644
--- a/core/src/ch/asynk/tankontank/screens/GameScreen.java
+++ b/core/src/ch/asynk/tankontank/screens/GameScreen.java
@@ -27,7 +27,7 @@ import ch.asynk.tankontank.actors.HexMap;
public class GameScreen extends AbstractScreen
{
- static private final float ZOOM_MAX = 0.2f;
+ static private final float ZOOM_MAX = 0.1f;
static private final float ZOOM_GESTURE_FACTOR = 300.f;
static private final float ZOOM_SCROLL_FACTOR = 10.0f;
diff --git a/core/src/ch/asynk/tankontank/screens/LoadScreen.java b/core/src/ch/asynk/tankontank/screens/LoadScreen.java
index b98eaf1..5cef26a 100644
--- a/core/src/ch/asynk/tankontank/screens/LoadScreen.java
+++ b/core/src/ch/asynk/tankontank/screens/LoadScreen.java
@@ -44,7 +44,7 @@ public class LoadScreen extends AbstractScreen
if (game.manager.update()) {
delay += delta;
- if (delay >= 1.0f) {
+ if (delay >= 0.2f) {
Gdx.app.debug("LoadScreen", "assets loaded : " + (Gdx.app.getJavaHeap()/1024.0f) + "KB");
game.setScreen(new GameScreen(game));
dispose();