diff options
| author | Jérémy Zurcher <jeremy@asynk.ch> | 2014-10-04 18:54:17 +0200 |
|---|---|---|
| committer | Jérémy Zurcher <jeremy@asynk.ch> | 2014-10-04 18:54:17 +0200 |
| commit | 1b93697fe08dcd863a10186c04e350c6e285e27f (patch) | |
| tree | 872a93d1c92e520ce280724566c0bd27e20cc3ce /core/src/ch | |
| parent | a8ac789fbc6efde89e99ba2fbcb7546af4ca1c19 (diff) | |
| download | RustAndDust-1b93697fe08dcd863a10186c04e350c6e285e27f.zip RustAndDust-1b93697fe08dcd863a10186c04e350c6e285e27f.tar.gz | |
regroup all images in 1 atlas data/assets.*
Diffstat (limited to 'core/src/ch')
| -rw-r--r-- | core/src/ch/asynk/tankontank/TankOnTank.java | 4 | ||||
| -rw-r--r-- | core/src/ch/asynk/tankontank/game/GameFactory.java | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/core/src/ch/asynk/tankontank/TankOnTank.java b/core/src/ch/asynk/tankontank/TankOnTank.java index a9933bb..3ab9c74 100644 --- a/core/src/ch/asynk/tankontank/TankOnTank.java +++ b/core/src/ch/asynk/tankontank/TankOnTank.java @@ -32,7 +32,7 @@ public class TankOnTank extends Game Gdx.app.debug("TankOnTank", " load assets : " + (Gdx.app.getJavaHeap()/1024.0f) + "KB"); manager.load("data/map_a.png", Texture.class); manager.load("data/map_b.png", Texture.class); - manager.load("data/pawns.atlas", TextureAtlas.class); + manager.load("data/assets.atlas", TextureAtlas.class); } public void unloadAssets() @@ -41,7 +41,7 @@ public class TankOnTank extends Game Gdx.app.debug("TankOnTank", "diagnostics:\n" + manager.getDiagnostics() ); manager.unload("data/map_a.png"); manager.unload("data/map_b.png"); - manager.unload("data/pawns.atlas"); + manager.unload("data/assets.atlas"); Gdx.app.debug("TankOnTank", "diagnostics:\n" + manager.getDiagnostics() ); } diff --git a/core/src/ch/asynk/tankontank/game/GameFactory.java b/core/src/ch/asynk/tankontank/game/GameFactory.java index fbc81be..110cbda 100644 --- a/core/src/ch/asynk/tankontank/game/GameFactory.java +++ b/core/src/ch/asynk/tankontank/game/GameFactory.java @@ -17,7 +17,7 @@ public class GameFactory implements Board.TileBuilder, Disposable public GameFactory(AssetManager manager) { - pawnAtlas = manager.get("data/pawns.atlas", TextureAtlas.class); + pawnAtlas = manager.get("data/assets.atlas", TextureAtlas.class); } @Override |