From c174695c9f7cecb9f4b48ecee01b858e5442709b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maty=C3=A1=C5=A1=20Latner?= <matyas.latner@nic.cz>
Date: Mon, 23 Feb 2015 16:38:06 +0100
Subject: [PATCH] #1 Refaktor of asset paths
---
.../sfx/{ => mainmenu}/mainmenu_close.mp3 | Bin
.../sfx/{ => mainmenu}/mainmenu_open.mp3 | Bin
.../universal/gfx}/background_wooden.png | Bin
.../game/games/robbery/RobberyScreen.java | 20 +++++++++---------
.../game/games/robbery/RuleScreen.java | 4 ++--
.../cz/nic/tablexia/loader/CommonAssets.java | 10 ---------
.../application/ApplicationSoundManager.java | 2 +-
.../ApplicationTextureManager.java | 4 ++++
.../screen/preferences/PreferencesScreen.java | 4 ++--
.../screen/statistics/StatisticsScreen.java | 18 +++++++---------
10 files changed, 27 insertions(+), 35 deletions(-)
rename android/assets/common/application/sfx/{ => mainmenu}/mainmenu_close.mp3 (100%)
rename android/assets/common/application/sfx/{ => mainmenu}/mainmenu_open.mp3 (100%)
rename android/assets/{CZ/application/gfx/common => common/universal/gfx}/background_wooden.png (100%)
delete mode 100644 core/src/cz/nic/tablexia/loader/CommonAssets.java
diff --git a/android/assets/common/application/sfx/mainmenu_close.mp3 b/android/assets/common/application/sfx/mainmenu/mainmenu_close.mp3
similarity index 100%
rename from android/assets/common/application/sfx/mainmenu_close.mp3
rename to android/assets/common/application/sfx/mainmenu/mainmenu_close.mp3
diff --git a/android/assets/common/application/sfx/mainmenu_open.mp3 b/android/assets/common/application/sfx/mainmenu/mainmenu_open.mp3
similarity index 100%
rename from android/assets/common/application/sfx/mainmenu_open.mp3
rename to android/assets/common/application/sfx/mainmenu/mainmenu_open.mp3
diff --git a/android/assets/CZ/application/gfx/common/background_wooden.png b/android/assets/common/universal/gfx/background_wooden.png
similarity index 100%
rename from android/assets/CZ/application/gfx/common/background_wooden.png
rename to android/assets/common/universal/gfx/background_wooden.png
diff --git a/core/src/cz/nic/tablexia/game/games/robbery/RobberyScreen.java b/core/src/cz/nic/tablexia/game/games/robbery/RobberyScreen.java
index 8df059034..d2775547c 100644
--- a/core/src/cz/nic/tablexia/game/games/robbery/RobberyScreen.java
+++ b/core/src/cz/nic/tablexia/game/games/robbery/RobberyScreen.java
@@ -1,13 +1,5 @@
package cz.nic.tablexia.game.games.robbery;
-import static com.badlogic.gdx.scenes.scene2d.actions.Actions.alpha;
-import static com.badlogic.gdx.scenes.scene2d.actions.Actions.fadeIn;
-import static com.badlogic.gdx.scenes.scene2d.actions.Actions.fadeOut;
-import static com.badlogic.gdx.scenes.scene2d.actions.Actions.run;
-import static com.badlogic.gdx.scenes.scene2d.actions.Actions.sequence;
-
-import java.util.List;
-
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.InputMultiplexer;
import com.badlogic.gdx.InputProcessor;
@@ -18,6 +10,8 @@ import com.badlogic.gdx.graphics.g2d.Batch;
import com.badlogic.gdx.math.Interpolation;
import com.badlogic.gdx.scenes.scene2d.Actor;
+import java.util.List;
+
import cz.nic.tablexia.game.common.RandomAccess;
import cz.nic.tablexia.game.difficulty.GameDifficulty;
import cz.nic.tablexia.game.games.robbery.assets.RobberyAssets;
@@ -25,9 +19,15 @@ import cz.nic.tablexia.game.games.robbery.creature.CreatureFactory;
import cz.nic.tablexia.game.games.robbery.rules.GameRule;
import cz.nic.tablexia.game.games.robbery.rules.GameRulesDefinition;
import cz.nic.tablexia.graphics.ColorTexture;
-import cz.nic.tablexia.loader.CommonAssets;
+import cz.nic.tablexia.loader.application.ApplicationTextureManager;
import cz.nic.tablexia.screen.AbstractTablexiaScreen;
+import static com.badlogic.gdx.scenes.scene2d.actions.Actions.alpha;
+import static com.badlogic.gdx.scenes.scene2d.actions.Actions.fadeIn;
+import static com.badlogic.gdx.scenes.scene2d.actions.Actions.fadeOut;
+import static com.badlogic.gdx.scenes.scene2d.actions.Actions.run;
+import static com.badlogic.gdx.scenes.scene2d.actions.Actions.sequence;
+
public class RobberyScreen extends AbstractTablexiaScreen<GameRule> {
private static int CREATURES_COUNT = 50;
@@ -52,7 +52,7 @@ public class RobberyScreen extends AbstractTablexiaScreen<GameRule> {
@Override
protected void prepareScreenTextureAssetNames(List<String> textureFileNames) {
- textureFileNames.add(CommonAssets.WOODEN_BACKGOURND);
+ textureFileNames.add(ApplicationTextureManager.UniversalAssets.BACKGROUND_WOODEN);
textureFileNames.add(RobberyAssets.SCREEN_RULEMESSAGE_PAPER_S1);
textureFileNames.add(RobberyAssets.SCREEN_BANK_S1);
diff --git a/core/src/cz/nic/tablexia/game/games/robbery/RuleScreen.java b/core/src/cz/nic/tablexia/game/games/robbery/RuleScreen.java
index 2ae1eab7a..e247cb525 100644
--- a/core/src/cz/nic/tablexia/game/games/robbery/RuleScreen.java
+++ b/core/src/cz/nic/tablexia/game/games/robbery/RuleScreen.java
@@ -13,7 +13,7 @@ import com.badlogic.gdx.scenes.scene2d.ui.Label.LabelStyle;
import cz.nic.tablexia.game.games.robbery.assets.RobberyAssets;
import cz.nic.tablexia.loader.application.ApplicationFontManager;
-import cz.nic.tablexia.loader.CommonAssets;
+import cz.nic.tablexia.loader.application.ApplicationTextureManager;
import cz.nic.tablexia.screen.AbstractTablexiaScreen;
public class RuleScreen extends AbstractTablexiaScreen<Void> {
@@ -34,7 +34,7 @@ public class RuleScreen extends AbstractTablexiaScreen<Void> {
private Texture backgroundTexture;
public RuleBackground() {
- backgroundTexture = RobberyScreen.getRobberyTexture(CommonAssets.WOODEN_BACKGOURND);
+ backgroundTexture = RobberyScreen.getRobberyTexture(ApplicationTextureManager.UniversalAssets.BACKGROUND_WOODEN);
backgroundTexture.setFilter(TextureFilter.Linear, TextureFilter.Linear);
}
diff --git a/core/src/cz/nic/tablexia/loader/CommonAssets.java b/core/src/cz/nic/tablexia/loader/CommonAssets.java
deleted file mode 100644
index ba4d6385c..000000000
--- a/core/src/cz/nic/tablexia/loader/CommonAssets.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package cz.nic.tablexia.loader;
-
-public class CommonAssets {
-
- private static final String APPLICATION_PATH = "application/";
- private static final String COMMON_PATH = APPLICATION_PATH + "gfx/common/";
-
- public static final String WOODEN_BACKGOURND = COMMON_PATH + "background_wooden.png";
-
-}
diff --git a/core/src/cz/nic/tablexia/loader/application/ApplicationSoundManager.java b/core/src/cz/nic/tablexia/loader/application/ApplicationSoundManager.java
index 058e2149e..4e1b713bf 100644
--- a/core/src/cz/nic/tablexia/loader/application/ApplicationSoundManager.java
+++ b/core/src/cz/nic/tablexia/loader/application/ApplicationSoundManager.java
@@ -25,7 +25,7 @@ public class ApplicationSoundManager extends TablexiaSoundManager implements IAp
private static final String APPLICATION_PATH = "application/";
- private static final String MAINMENU_PATH = APPLICATION_PATH + "sfx/";
+ private static final String MAINMENU_PATH = APPLICATION_PATH + "sfx/mainmenu/";
public static final String MAINMENU_OPEN = MAINMENU_PATH + "mainmenu_open.mp3";
public static final String MAINMENU_CLOSE = MAINMENU_PATH + "mainmenu_close.mp3";
diff --git a/core/src/cz/nic/tablexia/loader/application/ApplicationTextureManager.java b/core/src/cz/nic/tablexia/loader/application/ApplicationTextureManager.java
index 0349fdffa..1bbfe46c7 100644
--- a/core/src/cz/nic/tablexia/loader/application/ApplicationTextureManager.java
+++ b/core/src/cz/nic/tablexia/loader/application/ApplicationTextureManager.java
@@ -23,6 +23,10 @@ public class ApplicationTextureManager extends TablexiaTextureManager implements
instance = null;
}
+ public static final class UniversalAssets {
+ public static final String BACKGROUND_WOODEN = "universal/gfx/background_wooden.png";
+ }
+
private static final String APPLICATION_PATH = "application/";
private static final String MAINMENU_PATH = APPLICATION_PATH + "gfx/mainmenu/";
diff --git a/core/src/cz/nic/tablexia/screen/preferences/PreferencesScreen.java b/core/src/cz/nic/tablexia/screen/preferences/PreferencesScreen.java
index 8e0db245b..c84f33ec2 100644
--- a/core/src/cz/nic/tablexia/screen/preferences/PreferencesScreen.java
+++ b/core/src/cz/nic/tablexia/screen/preferences/PreferencesScreen.java
@@ -16,12 +16,12 @@ import com.badlogic.gdx.scenes.scene2d.utils.TextureRegionDrawable;
import cz.nic.tablexia.TablexiaSettings;
import cz.nic.tablexia.graphics.ColorTexture;
import cz.nic.tablexia.loader.application.ApplicationFontManager;
-import cz.nic.tablexia.loader.CommonAssets;
+import cz.nic.tablexia.loader.application.ApplicationTextureManager;
import cz.nic.tablexia.screen.AbstractTablexiaScreen;
public class PreferencesScreen extends AbstractTablexiaScreen<Void> {
- private static final String BACKGROUND_TEXTURE = CommonAssets.WOODEN_BACKGOURND;
+ private static final String BACKGROUND_TEXTURE = ApplicationTextureManager.UniversalAssets.BACKGROUND_WOODEN;
public static final String TEXT_RESOURCES_FILE = "text/application/preferences";
public static final String LANGUAGE_LABEL_KEY = "language_label";
diff --git a/core/src/cz/nic/tablexia/screen/statistics/StatisticsScreen.java b/core/src/cz/nic/tablexia/screen/statistics/StatisticsScreen.java
index 82078ec11..570bc6e63 100644
--- a/core/src/cz/nic/tablexia/screen/statistics/StatisticsScreen.java
+++ b/core/src/cz/nic/tablexia/screen/statistics/StatisticsScreen.java
@@ -1,7 +1,5 @@
package cz.nic.tablexia.screen.statistics;
-import java.util.List;
-
import com.badlogic.gdx.graphics.Color;
import com.badlogic.gdx.graphics.g2d.BitmapFont;
import com.badlogic.gdx.graphics.g2d.TextureRegion;
@@ -10,26 +8,26 @@ import com.badlogic.gdx.scenes.scene2d.ui.Label;
import com.badlogic.gdx.scenes.scene2d.ui.Label.LabelStyle;
import com.badlogic.gdx.scenes.scene2d.utils.TextureRegionDrawable;
+import java.util.List;
+
import cz.nic.tablexia.TablexiaSettings;
import cz.nic.tablexia.loader.application.ApplicationFontManager;
-import cz.nic.tablexia.loader.CommonAssets;
+import cz.nic.tablexia.loader.application.ApplicationTextureManager;
import cz.nic.tablexia.screen.AbstractTablexiaScreen;
public class StatisticsScreen extends AbstractTablexiaScreen<Void> {
-
- private static final String BACKGROUND_TEXTURE = CommonAssets.WOODEN_BACKGOURND;
-
- private Container<Label> backgroundLayout;
+
+ private Container<Label> backgroundLayout;
@Override
protected void prepareScreenTextureAssetNames(List<String> textureFileNames) {
- textureFileNames.add(BACKGROUND_TEXTURE);
+ textureFileNames.add(ApplicationTextureManager.UniversalAssets.BACKGROUND_WOODEN);
}
@Override
protected void screenLoaded() {
backgroundLayout = new Container<Label>();
- backgroundLayout.setBackground(new TextureRegionDrawable(new TextureRegion(getTexture(BACKGROUND_TEXTURE))));
+ backgroundLayout.setBackground(new TextureRegionDrawable(new TextureRegion(getTexture(ApplicationTextureManager.UniversalAssets.BACKGROUND_WOODEN))));
Label label = new Label(getClass().getSimpleName(), new LabelStyle(ApplicationFontManager.getInstance().get(ApplicationFontManager.FONT_ROBOTO_REGULAR, BitmapFont.class), Color.WHITE));
label.setPosition(getStage().getWidth() / 2, getStage().getHeight() / 2);
@@ -44,4 +42,4 @@ public class StatisticsScreen extends AbstractTablexiaScreen<Void> {
backgroundLayout.setBounds(0, 0, getStage().getWidth(), getStage().getHeight());
}
-}
+}
\ No newline at end of file
--
GitLab