gered/gdx-toolbox
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

add TextureAtlas asset loading support for a MaterialTileMapping reference

Browse source
This commit is contained in:
Gered 2014-04-15 16:56:37 -04:00
parent de6f7ecc77
commit 7aa79d4652
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/main/java/ca/blarg/gdx/assets/textureatlas/TextureAtlasJsonLoader.java
View file

@ -2,6 +2,7 @@ package ca.blarg.gdx.assets.textureatlas;
import ca.blarg.gdx.assets.AssetLoadingException; import ca.blarg.gdx.assets.AssetLoadingException;
import ca.blarg.gdx.graphics.atlas.CustomGridTextureAtlas; import ca.blarg.gdx.graphics.atlas.CustomGridTextureAtlas;
import ca.blarg.gdx.graphics.atlas.MaterialTileMapping;
import ca.blarg.gdx.graphics.atlas.TextureAtlas; import ca.blarg.gdx.graphics.atlas.TextureAtlas;
import com.badlogic.gdx.assets.AssetManager; import com.badlogic.gdx.assets.AssetManager;
import com.badlogic.gdx.files.FileHandle; import com.badlogic.gdx.files.FileHandle;
@ -21,8 +22,11 @@ class TextureAtlasJsonLoader {
throw new AssetLoadingException(file.path(), "No tiles defined."); throw new AssetLoadingException(file.path(), "No tiles defined.");
Texture texture = assetManager.get(definition.texture, Texture.class); Texture texture = assetManager.get(definition.texture, Texture.class);
MaterialTileMapping materialTileMapping = null;
if (definition.materialMapping != null)
materialTileMapping = assetManager.get(definition.materialMapping, MaterialTileMapping.class);
CustomGridTextureAtlas atlas = new CustomGridTextureAtlas(texture); CustomGridTextureAtlas atlas = new CustomGridTextureAtlas(texture, materialTileMapping);
for (int i = 0; i < definition.tiles.size(); ++i) { for (int i = 0; i < definition.tiles.size(); ++i) {
JsonTextureAtlasTile tile = definition.tiles.get(i); JsonTextureAtlasTile tile = definition.tiles.get(i);
// TODO: parameter value error checking // TODO: parameter value error checking

5
src/main/java/ca/blarg/gdx/assets/textureatlas/TextureAtlasLoader.java
View file

@ -1,5 +1,6 @@
package ca.blarg.gdx.assets.textureatlas; package ca.blarg.gdx.assets.textureatlas;
import ca.blarg.gdx.graphics.atlas.MaterialTileMapping;
import ca.blarg.gdx.graphics.atlas.TextureAtlas; import ca.blarg.gdx.graphics.atlas.TextureAtlas;
import com.badlogic.gdx.assets.AssetDescriptor; import com.badlogic.gdx.assets.AssetDescriptor;
import com.badlogic.gdx.assets.AssetLoaderParameters; import com.badlogic.gdx.assets.AssetLoaderParameters;
@ -23,7 +24,11 @@ public class TextureAtlasLoader extends AsynchronousAssetLoader<TextureAtlas, Te
public Array<AssetDescriptor> getDependencies(String fileName, FileHandle file, TextureAtlasParameter parameter) { public Array<AssetDescriptor> getDependencies(String fileName, FileHandle file, TextureAtlasParameter parameter) {
definition = TextureAtlasJsonLoader.load(file); definition = TextureAtlasJsonLoader.load(file);
Array<AssetDescriptor> deps = new Array<AssetDescriptor>(); Array<AssetDescriptor> deps = new Array<AssetDescriptor>();
deps.add(new AssetDescriptor(definition.texture, Texture.class)); deps.add(new AssetDescriptor(definition.texture, Texture.class));
if (definition.materialMapping != null)
deps.add(new AssetDescriptor(definition.materialMapping, MaterialTileMapping.class));
return deps; return deps;
} }