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

make all of these private classes, forcing use of libgdx's AssetManager

Browse source
This commit is contained in:
Gered 2014-04-15 15:09:14 -04:00
parent 5080a4f41d
commit 69e6c7f9af
5 changed files with 5 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/ca/blarg/gdx/tilemap3d/json/prefabs/TilePrefabJsonLoader.java
View file

@ -10,7 +10,7 @@ import com.badlogic.gdx.utils.Json;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
public class TilePrefabJsonLoader { class TilePrefabJsonLoader {
public static JsonTilePrefab load(FileHandle file) { public static JsonTilePrefab load(FileHandle file) {
Json json = new Json(); Json json = new Json();
return json.fromJson(JsonTilePrefab.class, file); return json.fromJson(JsonTilePrefab.class, file);

2
src/main/java/ca/blarg/gdx/tilemap3d/json/tilemap/TileMapJsonLoader.java
View file

@ -16,7 +16,7 @@ import com.badlogic.gdx.utils.Json;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
public class TileMapJsonLoader { class TileMapJsonLoader {
public static JsonTileMap load(FileHandle file) { public static JsonTileMap load(FileHandle file) {
Json json = new Json(); Json json = new Json();
return json.fromJson(JsonTileMap.class, file); return json.fromJson(JsonTileMap.class, file);

7
src/main/java/ca/blarg/gdx/tilemap3d/json/tilemesh/MaterialTileMappingJsonLoader.java
View file

@ -6,7 +6,7 @@ import com.badlogic.gdx.assets.AssetManager;
import com.badlogic.gdx.files.FileHandle; import com.badlogic.gdx.files.FileHandle;
import com.badlogic.gdx.utils.Json; import com.badlogic.gdx.utils.Json;
public class MaterialTileMappingJsonLoader { class MaterialTileMappingJsonLoader {
public static JsonMaterialMapping load(FileHandle file) { public static JsonMaterialMapping load(FileHandle file) {
Json json = new Json(); Json json = new Json();
return json.fromJson(JsonMaterialMapping.class, file); return json.fromJson(JsonMaterialMapping.class, file);
@ -29,9 +29,4 @@ public class MaterialTileMappingJsonLoader {
return materialMapping; return materialMapping;
} }
public static MaterialTileMapping loadAndCreate(FileHandle file, AssetManager assetManager) {
JsonMaterialMapping definition = load(file);
return create(definition, assetManager);
}
} }

2
src/main/java/ca/blarg/gdx/tilemap3d/json/tilemesh/TileMeshCollectionJsonLoader.java
View file

@ -7,7 +7,7 @@ import com.badlogic.gdx.assets.AssetManager;
import com.badlogic.gdx.files.FileHandle; import com.badlogic.gdx.files.FileHandle;
import com.badlogic.gdx.utils.Json; import com.badlogic.gdx.utils.Json;
public final class TileMeshCollectionJsonLoader { class TileMeshCollectionJsonLoader {
public static JsonTileMeshCollection load(FileHandle file) { public static JsonTileMeshCollection load(FileHandle file) {
Json json = new Json(); Json json = new Json();
return json.fromJson(JsonTileMeshCollection.class, file); return json.fromJson(JsonTileMeshCollection.class, file);

7
src/main/java/ca/blarg/gdx/tilemap3d/json/tilemesh/TileMeshJsonLoader.java
View file

@ -11,7 +11,7 @@ import com.badlogic.gdx.graphics.g3d.Model;
import com.badlogic.gdx.math.Vector3; import com.badlogic.gdx.math.Vector3;
import com.badlogic.gdx.utils.Json; import com.badlogic.gdx.utils.Json;
public class TileMeshJsonLoader { class TileMeshJsonLoader {
public static JsonTileMesh load(FileHandle file) { public static JsonTileMesh load(FileHandle file) {
Json json = new Json(); Json json = new Json();
return json.fromJson(JsonTileMesh.class, file); return json.fromJson(JsonTileMesh.class, file);
@ -181,9 +181,4 @@ public class TileMeshJsonLoader {
} else } else
throw new RuntimeException("Unrecognized tile mesh type."); throw new RuntimeException("Unrecognized tile mesh type.");
} }
public static TileMesh loadAndCreate(FileHandle file, AssetManager assetManager) {
JsonTileMesh definition = load(file);
return create(definition, assetManager);
}
} }