diff --git a/core/src/ru/deadsoftware/cavedroid/misc/Assets.java b/core/src/ru/deadsoftware/cavedroid/misc/Assets.java
index e2abcdfd61ceb82dfe547dfeffe9a23243f396d0..93a5f86ea4a9509bfcd40f09f240db06a05ccb64 100644 (file)
public static final JsonReader jsonReader = new JsonReader();
private static final GlyphLayout glyphLayout = new GlyphLayout();
-
- static BitmapFont minecraftFont;
+ static final BitmapFont minecraftFont = new BitmapFont(Gdx.files.internal("font.fnt"), true);
public static final Sprite[][] playerSprite = new Sprite[2][4];
public static final Sprite[][] pigSprite = new Sprite[2][2];
- public static Sprite fallingSandSprite;
- public static Sprite fallingGravelSprite;
public static final HashMap<String, TextureRegion> textureRegions = new HashMap<>();
public static final ArrayMap<String, Rectangle> guiMap = new ArrayMap<>();
+ public static final Sprite sandSprite = flippedSprite(new Texture((Gdx.files.internal("textures/blocks/sand.png"))));
+ public static final Sprite gravelSprite = flippedSprite(new Texture((Gdx.files.internal("textures/blocks/gravel.png"))));
private static TextureRegion flippedRegion(Texture texture, int x, int y, int width, int height) {
return new TextureRegion(texture, x, y + height, width, -height);
pigSprite[1][1] = flippedSprite(new TextureRegion(pigTex, 16, 26, 12, 12));
}
- private static void loadFallingBlocks() {
- fallingSandSprite = flippedSprite(new Texture((Gdx.files.internal("textures/blocks/sand.png"))));
- fallingGravelSprite = flippedSprite(new Texture((Gdx.files.internal("textures/blocks/gravel.png"))));
- }
-
/**
* Loads texture names and sizes from <b>json/texture_regions.json</b>, cuts them to TextureRegions
* and puts to {@link #textureRegions} HashMap
textureRegions.put(file.name(), flippedRegion(texture, 0, 0, texture.getWidth(), texture.getHeight()));
} else {
for (JsonValue key = file.child(); key != null; key = key.next()) {
- int x = key.has("x") ? key.getInt("x") : 0;
- int y = key.has("y") ? key.getInt("y") : 0;
- int w = key.has("w") ? key.getInt("w") : texture.getWidth();
- int h = key.has("h") ? key.getInt("h") : texture.getHeight();
+ int x = getIntFromJson(key, "x", 0);
+ int y = getIntFromJson(key, "y", 0);
+ int w = getIntFromJson(key, "w", texture.getWidth());
+ int h = getIntFromJson(key, "h", texture.getHeight());
textureRegions.put(key.name(), flippedRegion(texture, x, y, w, h));
}
}
}
public static void load() {
- minecraftFont = new BitmapFont(Gdx.files.internal("font.fnt"), true);
minecraftFont.getData().setScale(.375f);
loadPlayer();
loadPig();
- loadFallingBlocks();
loadJSON();
}
return (int) glyphLayout.height;
}
+ public static int getIntFromJson(JsonValue json, String name, int defaultValue) {
+ return json.has(name) ? json.getInt(name) : defaultValue;
+ }
+
+ public static String getStringFromJson(JsonValue json, String name, String defaultValue) {
+ return json.has(name) ? json.getString(name) : defaultValue;
+ }
+
+ public static boolean getBooleanFromJson(JsonValue json, String name, boolean defaultValue) {
+ return json.has(name) ? json.getBoolean(name) : defaultValue;
+ }
+
}