the TextureAtlas json definition will now itself contain material mapping info

This commit is contained in:
Gered 2014-04-15 17:20:35 -04:00
parent 4b392a4e28
commit fc4aebc03f
2 changed files with 7 additions and 13 deletions

View file

@ -1,16 +1,10 @@
package ca.blarg.gdx.assets.textureatlas; package ca.blarg.gdx.assets.textureatlas;
import java.util.ArrayList;
public class JsonMaterialMapping { public class JsonMaterialMapping {
public class Material { public String name;
public String name; public int tile;
public int tile; public float minU;
public float minU; public float maxU;
public float maxU; public float minV;
public float minV; public float maxV;
public float maxV;
}
public ArrayList<Material> materials;
} }

View file

@ -4,7 +4,7 @@ import java.util.ArrayList;
public class JsonTextureAtlasDefinition { public class JsonTextureAtlasDefinition {
public String texture; public String texture;
public String materialMapping; public ArrayList<JsonMaterialMapping> materialMapping;
public ArrayList<JsonTextureAtlasTile> tiles; public ArrayList<JsonTextureAtlasTile> tiles;
public ArrayList<JsonTextureAtlasAnimation> animations; public ArrayList<JsonTextureAtlasAnimation> animations;
} }