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

remove support for loading via json file without an AssetManager

Browse source
This commit is contained in:
Gered 2014-04-15 12:46:46 -04:00
parent f54ecc4e35
commit 2346855d36
2 changed files with 14 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,9 +1,7 @@
package ca.blarg.gdx.tilemap3d.json.tilemesh;
import ca.blarg.gdx.graphics.atlas.TextureAtlas;
import ca.blarg.gdx.loaders.textureatlas.TextureAtlasJsonLoader;
import ca.blarg.gdx.tilemap3d.tilemesh.MaterialTileMapping;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.assets.AssetManager;
import com.badlogic.gdx.files.FileHandle;
import com.badlogic.gdx.utils.Json;
@ -14,19 +12,11 @@ public class MaterialTileMappingJsonLoader {
return json.fromJson(JsonMaterialMapping.class, file);
}
public static MaterialTileMapping create(JsonMaterialMapping definition) {
return create(definition, null);
}
public static MaterialTileMapping create(JsonMaterialMapping definition, AssetManager assetManager) {
if (definition.materials == null || definition.materials.size() == 0)
throw new RuntimeException("No material mappings defined.");
TextureAtlas atlas;
if (assetManager != null)
atlas = assetManager.get(definition.textureAtlas, TextureAtlas.class);
else
atlas = TextureAtlasJsonLoader.loadAndCreate(Gdx.files.internal(definition.textureAtlas));
TextureAtlas atlas = assetManager.get(definition.textureAtlas, TextureAtlas.class);
MaterialTileMapping materialMapping = new MaterialTileMapping();
for (int i = 0; i < definition.materials.size(); ++i) {
@ -40,11 +30,6 @@ public class MaterialTileMappingJsonLoader {
return materialMapping;
}
public static MaterialTileMapping loadAndCreate(FileHandle file) {
JsonMaterialMapping definition = load(file);
return create(definition);
}
public static MaterialTileMapping loadAndCreate(FileHandle file, AssetManager assetManager) {
JsonMaterialMapping definition = load(file);
return create(definition, assetManager);

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

@ -2,19 +2,14 @@ package ca.blarg.gdx.tilemap3d.json.tilemesh;
import ca.blarg.gdx.Bitfield;
import ca.blarg.gdx.graphics.atlas.TextureAtlas;
import ca.blarg.gdx.loaders.textureatlas.TextureAtlasJsonLoader;
import ca.blarg.gdx.tilemap3d.tilemesh.*;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.assets.AssetManager;
import com.badlogic.gdx.assets.loaders.ModelLoader;
import com.badlogic.gdx.files.FileHandle;
import com.badlogic.gdx.graphics.Color;
import com.badlogic.gdx.graphics.g2d.TextureRegion;
import com.badlogic.gdx.graphics.g3d.Model;
import com.badlogic.gdx.graphics.g3d.loader.G3dModelLoader;
import com.badlogic.gdx.math.Vector3;
import com.badlogic.gdx.utils.Json;
import com.badlogic.gdx.utils.JsonReader;
public class TileMeshJsonLoader {
public static JsonTileMesh load(FileHandle file) {
@ -22,10 +17,6 @@ public class TileMeshJsonLoader {
return json.fromJson(JsonTileMesh.class, file);
}
public static TileMesh create(JsonTileMesh definition) {
return create(definition, null);
}
public static TileMesh create(JsonTileMesh definition, AssetManager assetManager) {
if (!definition.cube && definition.model == null && definition.models == null)
throw new RuntimeException("One of cube, model or models must be specified for each tile.");
@ -36,23 +27,12 @@ public class TileMeshJsonLoader {
if (definition.collisionModel != null && definition.collisionShape != null)
throw new RuntimeException("collisionModel and collisionShape cannot both be set.");
ModelLoader loader = null;
if (assetManager == null)
loader = new G3dModelLoader(new JsonReader());
MaterialTileMapping materials = null;
TextureAtlas atlas = null;
if (assetManager != null) {
if (definition.materials != null)
materials = assetManager.get(definition.materials, MaterialTileMapping.class);
else if (definition.textureAtlas != null)
atlas = assetManager.get(definition.textureAtlas, TextureAtlas.class);
} else {
if (definition.materials != null)
materials = MaterialTileMappingJsonLoader.loadAndCreate(Gdx.files.internal(definition.materials));
else if (definition.textureAtlas != null)
atlas = TextureAtlasJsonLoader.loadAndCreate(Gdx.files.internal(definition.textureAtlas));
}
if (definition.materials != null)
materials = assetManager.get(definition.materials, MaterialTileMapping.class);
else if (definition.textureAtlas != null)
atlas = assetManager.get(definition.textureAtlas, TextureAtlas.class);
boolean isCube = definition.cube;
TextureRegion texture = null;
@ -149,19 +129,12 @@ public class TileMeshJsonLoader {
return new CubeTileMesh(topTexture, bottomTexture, frontTexture, backTexture, leftTexture, rightTexture, faces, opaqueSides, lightValue, alpha, translucency, color);
} else if (definition.model != null) {
if (assetManager != null)
model = assetManager.get(definition.model, Model.class);
else
model = loader.loadModel(Gdx.files.internal(definition.model));
model = assetManager.get(definition.model, Model.class);
collisionModel = model; // default is to use the same model
if (definition.collisionModel != null) {
// override with a specific collision model
if (assetManager != null)
collisionModel = assetManager.get(definition.collisionModel, Model.class);
else
collisionModel = loader.loadModel(Gdx.files.internal(definition.collisionModel));
collisionModel = assetManager.get(definition.collisionModel, Model.class);
} else if (definition.collisionShape != null) {
collisionModel = CollisionShapes.get(definition.collisionShape);
@ -180,11 +153,7 @@ public class TileMeshJsonLoader {
for (int j = 0; j < numModels; ++j) {
JsonTileMesh.SubModels subModelDef = definition.models.get(j);
if (assetManager != null)
submodels[j] = assetManager.get(subModelDef.submodel, Model.class);
else
submodels[j] = loader.loadModel(Gdx.files.internal(subModelDef.submodel));
submodels[j] = assetManager.get(subModelDef.submodel, Model.class);
if (subModelDef.color == null)
colors[j] = new Color(Color.WHITE);
@ -199,10 +168,7 @@ public class TileMeshJsonLoader {
if (definition.collisionModel != null) {
//override with a specific collision model
if (assetManager != null)
collisionModel = assetManager.get(definition.collisionModel, Model.class);
else
collisionModel = loader.loadModel(Gdx.files.internal(definition.collisionModel));
collisionModel = assetManager.get(definition.collisionModel, Model.class);
}
if (definition.collisionShape != null) {
collisionModel = CollisionShapes.get(definition.collisionShape);
@ -215,4 +181,9 @@ public class TileMeshJsonLoader {
} else
throw new RuntimeException("Unrecognized tile mesh type.");
}
public static TileMesh loadAndCreate(FileHandle file, AssetManager assetManager) {
JsonTileMesh definition = load(file);
return create(definition, assetManager);
}
}