diff --git a/src/main/java/ca/blarg/gdx/assets/textureatlas/JsonTextureAtlasDefinition.java b/src/main/java/ca/blarg/gdx/assets/textureatlas/JsonTextureAtlas.java similarity index 86% rename from src/main/java/ca/blarg/gdx/assets/textureatlas/JsonTextureAtlasDefinition.java rename to src/main/java/ca/blarg/gdx/assets/textureatlas/JsonTextureAtlas.java index 7e9c911..d75bb2c 100644 --- a/src/main/java/ca/blarg/gdx/assets/textureatlas/JsonTextureAtlasDefinition.java +++ b/src/main/java/ca/blarg/gdx/assets/textureatlas/JsonTextureAtlas.java @@ -2,7 +2,7 @@ package ca.blarg.gdx.assets.textureatlas; import java.util.ArrayList; -public class JsonTextureAtlasDefinition { +public class JsonTextureAtlas { public String texture; public ArrayList materialMapping; public ArrayList tiles; diff --git a/src/main/java/ca/blarg/gdx/assets/textureatlas/TextureAtlasJsonLoader.java b/src/main/java/ca/blarg/gdx/assets/textureatlas/TextureAtlasJsonLoader.java index 47b8cda..c43a7f4 100644 --- a/src/main/java/ca/blarg/gdx/assets/textureatlas/TextureAtlasJsonLoader.java +++ b/src/main/java/ca/blarg/gdx/assets/textureatlas/TextureAtlasJsonLoader.java @@ -9,12 +9,12 @@ import com.badlogic.gdx.graphics.Texture; import com.badlogic.gdx.utils.Json; class TextureAtlasJsonLoader { - public static JsonTextureAtlasDefinition load(FileHandle file) { + public static JsonTextureAtlas load(FileHandle file) { Json json = new Json(); - return json.fromJson(JsonTextureAtlasDefinition.class, file); + return json.fromJson(JsonTextureAtlas.class, file); } - public static TextureAtlas create(FileHandle file, JsonTextureAtlasDefinition definition, AssetManager assetManager) { + public static TextureAtlas create(FileHandle file, JsonTextureAtlas definition, AssetManager assetManager) { if (definition.texture == null) throw new AssetLoadingException(file.path(), "No texture specified."); if (definition.tiles == null || definition.tiles.size() == 0) diff --git a/src/main/java/ca/blarg/gdx/assets/textureatlas/TextureAtlasLoader.java b/src/main/java/ca/blarg/gdx/assets/textureatlas/TextureAtlasLoader.java index de2e0f7..c5dbcb0 100644 --- a/src/main/java/ca/blarg/gdx/assets/textureatlas/TextureAtlasLoader.java +++ b/src/main/java/ca/blarg/gdx/assets/textureatlas/TextureAtlasLoader.java @@ -16,7 +16,7 @@ public class TextureAtlasLoader extends AsynchronousAssetLoader