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

this is not a dependency anymore as it's loaded inline with the rest of the TextureAtlas's info

Browse source
This commit is contained in:
Gered 2014-04-15 17:21:13 -04:00
parent fc4aebc03f
commit fe3611da0f
1 changed files with 0 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,6 +1,5 @@
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;
@ -24,11 +23,7 @@ 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;
} }