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

refactor the path/filename combining stuff

Browse source
This commit is contained in:
Gered 2014-04-16 13:23:23 -04:00
parent 9aaf622a14
commit ff8016d53c
2 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/main/java/ca/blarg/gdx/assets/AssetLoadingUtils.java Normal file
View file

@ -0,0 +1,16 @@
package ca.blarg.gdx.assets;
import ca.blarg.gdx.Strings;
import ca.blarg.gdx.io.FileHelpers;
public class AssetLoadingUtils {
public static String addPathIfNone(String filename, String path) {
if (Strings.isNullOrEmpty(filename))
return filename;
if (FileHelpers.hasPath(filename))
return filename;
else
return FileHelpers.combine(path, filename);
}
}

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

@ -1,9 +1,9 @@
package ca.blarg.gdx.assets.textureatlas; package ca.blarg.gdx.assets.textureatlas;
import ca.blarg.gdx.assets.AssetLoadingException; import ca.blarg.gdx.assets.AssetLoadingException;
import ca.blarg.gdx.assets.AssetLoadingUtils;
import ca.blarg.gdx.graphics.atlas.CustomGridTextureAtlas; import ca.blarg.gdx.graphics.atlas.CustomGridTextureAtlas;
import ca.blarg.gdx.graphics.atlas.TextureAtlas; import ca.blarg.gdx.graphics.atlas.TextureAtlas;
import ca.blarg.gdx.io.FileHelpers;
import com.badlogic.gdx.assets.AssetManager; import com.badlogic.gdx.assets.AssetManager;
import com.badlogic.gdx.files.FileHandle; import com.badlogic.gdx.files.FileHandle;
import com.badlogic.gdx.graphics.Texture; import com.badlogic.gdx.graphics.Texture;
@ -14,8 +14,7 @@ class TextureAtlasJsonLoader {
Json json = new Json(); Json json = new Json();
JsonTextureAtlas definition = json.fromJson(JsonTextureAtlas.class, file); JsonTextureAtlas definition = json.fromJson(JsonTextureAtlas.class, file);
if (!FileHelpers.hasPath(definition.texture)) definition.texture = AssetLoadingUtils.addPathIfNone(definition.texture, file.parent().path());
definition.texture = FileHelpers.combine(file.parent().path(), definition.texture);
return definition; return definition;
} }