diff --git a/src/main/java/ca/blarg/gdx/graphics/atlas/json/TextureAtlasDesc.java b/src/main/java/ca/blarg/gdx/graphics/atlas/json/TextureAtlasJsonLoader.java similarity index 85% rename from src/main/java/ca/blarg/gdx/graphics/atlas/json/TextureAtlasDesc.java rename to src/main/java/ca/blarg/gdx/graphics/atlas/json/TextureAtlasJsonLoader.java index 01e0e6e..ebd18ab 100644 --- a/src/main/java/ca/blarg/gdx/graphics/atlas/json/TextureAtlasDesc.java +++ b/src/main/java/ca/blarg/gdx/graphics/atlas/json/TextureAtlasJsonLoader.java @@ -8,17 +8,17 @@ import com.badlogic.gdx.files.FileHandle; import com.badlogic.gdx.graphics.Texture; import com.badlogic.gdx.utils.Json; -public class TextureAtlasDesc { - public JsonTextureAtlasDefinition load(FileHandle file) { +public class TextureAtlasJsonLoader { + public static JsonTextureAtlasDefinition load(FileHandle file) { Json json = new Json(); return json.fromJson(JsonTextureAtlasDefinition.class, file); } - public TextureAtlas create(JsonTextureAtlasDefinition definition) { + public static TextureAtlas create(JsonTextureAtlasDefinition definition) { return create(definition, null); } - public TextureAtlas create(JsonTextureAtlasDefinition definition, AssetManager assetManager) { + public static TextureAtlas create(JsonTextureAtlasDefinition definition, AssetManager assetManager) { if (definition.texture == null) throw new RuntimeException("No texture specified."); if (definition.tiles == null || definition.tiles.size() == 0) diff --git a/src/main/java/ca/blarg/gdx/graphics/atlas/json/TextureAtlasLoader.java b/src/main/java/ca/blarg/gdx/graphics/atlas/json/TextureAtlasLoader.java index 8b76b67..02ff22b 100644 --- a/src/main/java/ca/blarg/gdx/graphics/atlas/json/TextureAtlasLoader.java +++ b/src/main/java/ca/blarg/gdx/graphics/atlas/json/TextureAtlasLoader.java @@ -15,16 +15,14 @@ import com.badlogic.gdx.utils.Array; public class TextureAtlasLoader extends AsynchronousAssetLoader { public TextureAtlasLoader(FileHandleResolver resolver) { super(resolver); - desc = new TextureAtlasDesc(); } - final TextureAtlasDesc desc; JsonTextureAtlasDefinition definition; TextureAtlas atlas; @Override public Array getDependencies(String fileName, FileHandle file, TextureAtlasParameter parameter) { - definition = desc.load(file); + definition = TextureAtlasJsonLoader.load(file); Array deps = new Array(); deps.add(new AssetDescriptor(definition.texture, Texture.class)); return deps; @@ -32,7 +30,7 @@ public class TextureAtlasLoader extends AsynchronousAssetLoader