diff options
author | Jérémy Zurcher <jeremy@asynk.ch> | 2014-12-30 21:44:12 +0100 |
---|---|---|
committer | Jérémy Zurcher <jeremy@asynk.ch> | 2014-12-30 21:44:12 +0100 |
commit | 2c58bbf094d26f755eb43ee83fad0c17854224c0 (patch) | |
tree | 9ba8999f146a870399ae7ef01a6682ccbe93be8f /core/src/ch/asynk/tankontank/game/Hud.java | |
parent | da40130331b292b6b4a143959fe111a9312d8f9d (diff) | |
download | RustAndDust-2c58bbf094d26f755eb43ee83fad0c17854224c0.zip RustAndDust-2c58bbf094d26f755eb43ee83fad0c17854224c0.tar.gz |
extract ui.atlas from hud.atlas
Diffstat (limited to 'core/src/ch/asynk/tankontank/game/Hud.java')
-rw-r--r-- | core/src/ch/asynk/tankontank/game/Hud.java | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/core/src/ch/asynk/tankontank/game/Hud.java b/core/src/ch/asynk/tankontank/game/Hud.java index 6b7b8a6..c72ae91 100644 --- a/core/src/ch/asynk/tankontank/game/Hud.java +++ b/core/src/ch/asynk/tankontank/game/Hud.java @@ -50,16 +50,17 @@ public class Hud implements Disposable, Animation this.game = game; this.ctrl = ctrl; - TextureAtlas atlas = game.factory.hudAtlas; - fontB = new BitmapFont(Gdx.files.internal("skin/veteran.fnt"), atlas.findRegion("veteran-black")); - fontW = new BitmapFont(Gdx.files.internal("skin/veteran.fnt"), atlas.findRegion("veteran-white")); - playerInfo = new PlayerInfo(ctrl, fontW, atlas); - actionButtons = new ActionButtons(ctrl, atlas); + TextureAtlas hudAtlas = game.factory.hudAtlas; + TextureAtlas uiAtlas = game.manager.get("data/ui.atlas", TextureAtlas.class); + fontB = new BitmapFont(Gdx.files.internal("skin/veteran.fnt"), uiAtlas.findRegion("veteran-black")); + fontW = new BitmapFont(Gdx.files.internal("skin/veteran.fnt"), uiAtlas.findRegion("veteran-white")); + playerInfo = new PlayerInfo(ctrl, fontW, uiAtlas, hudAtlas); + actionButtons = new ActionButtons(ctrl, uiAtlas, hudAtlas); actionButtons.hide(); - msg = new Msg(fontB, atlas); - okCancel = new OkCancel(fontB, atlas); - stats = new Statistics(fontB, atlas); - engagement = new Engagement(fontB, atlas); + msg = new Msg(fontB, uiAtlas); + okCancel = new OkCancel(fontB, uiAtlas); + stats = new Statistics(fontB, uiAtlas); + engagement = new Engagement(fontB, uiAtlas, hudAtlas); } @Override |