massively refactor TileMeshCollectionJsonLoader
This commit is contained in:
parent
98e08b3fcd
commit
5fba85923b
|
|
@ -1,231 +1,30 @@
|
|||
package ca.blarg.gdx.tilemap3d.json.tilemesh;
|
||||
|
||||
import ca.blarg.gdx.Bitfield;
|
||||
import ca.blarg.gdx.graphics.atlas.TextureAtlas;
|
||||
import ca.blarg.gdx.io.FileHelpers;
|
||||
import ca.blarg.gdx.tilemap3d.tilemesh.CollisionShapes;
|
||||
import ca.blarg.gdx.tilemap3d.tilemesh.MaterialTileMapping;
|
||||
import ca.blarg.gdx.tilemap3d.tilemesh.TileMesh;
|
||||
import ca.blarg.gdx.tilemap3d.tilemesh.TileMeshCollection;
|
||||
import com.badlogic.gdx.Gdx;
|
||||
import com.badlogic.gdx.assets.loaders.ModelLoader;
|
||||
import com.badlogic.gdx.assets.AssetManager;
|
||||
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;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
public final class TileMeshCollectionJsonLoader {
|
||||
public static TileMeshCollection load(String configFile, TextureAtlas atlas) {
|
||||
return load(Gdx.files.internal(configFile), atlas);
|
||||
public static JsonTileMeshCollection load(FileHandle file) {
|
||||
Json json = new Json();
|
||||
return json.fromJson(JsonTileMeshCollection.class, file);
|
||||
}
|
||||
|
||||
public static TileMeshCollection load(FileHandle configFile, TextureAtlas atlas) {
|
||||
String path = FileHelpers.getPath(configFile);
|
||||
|
||||
if (atlas == null)
|
||||
throw new IllegalArgumentException();
|
||||
|
||||
Json json = new Json();
|
||||
JsonTileMeshCollection config = json.fromJson(JsonTileMeshCollection.class, configFile);
|
||||
public static TileMeshCollection create(JsonTileMeshCollection definition, AssetManager assetManager) {
|
||||
if (definition.tiles == null || definition.tiles.size() == 0)
|
||||
throw new RuntimeException("No tiles defined.");
|
||||
if (definition.textureAtlas == null)
|
||||
throw new RuntimeException("No texture atlas defined.");
|
||||
|
||||
TextureAtlas atlas = assetManager.get(definition.textureAtlas, TextureAtlas.class);
|
||||
TileMeshCollection collection = new TileMeshCollection(atlas);
|
||||
|
||||
if (config.tiles == null)
|
||||
throw new RuntimeException("Missing tiles section.");
|
||||
|
||||
MaterialTileMapping materialMapping = null;
|
||||
if (config.materials != null) {
|
||||
materialMapping = new MaterialTileMapping();
|
||||
for (int i = 0; i < config.materials.size(); ++i) {
|
||||
JsonMaterialMapping mapping = config.materials.get(i);
|
||||
materialMapping.add(
|
||||
mapping.name, atlas.get(mapping.tile),
|
||||
mapping.minU, mapping.maxU, mapping.minV, mapping.maxV
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
Map<String, Model> models = new HashMap<String, Model>();
|
||||
ModelLoader loader = new G3dModelLoader(new JsonReader());
|
||||
|
||||
for (int i = 0; i < config.tiles.size(); ++i) {
|
||||
JsonTileMesh tileDef = config.tiles.get(i);
|
||||
|
||||
if (!tileDef.cube && tileDef.model == null && tileDef.models == null)
|
||||
throw new RuntimeException("One of cube, model, or models must be specified for each tile.");
|
||||
if (tileDef.model != null && materialMapping == null)
|
||||
throw new RuntimeException("Missing materials section but using models to define tiles.");
|
||||
if (tileDef.collisionModel != null && tileDef.collisionShape != null)
|
||||
throw new RuntimeException("collisionModel and collisionShape cannot both be set.");
|
||||
|
||||
boolean isCube = tileDef.cube;
|
||||
TextureRegion texture = null;
|
||||
TextureRegion topTexture = null;
|
||||
TextureRegion bottomTexture = null;
|
||||
TextureRegion frontTexture = null;
|
||||
TextureRegion backTexture = null;
|
||||
TextureRegion leftTexture = null;
|
||||
TextureRegion rightTexture = null;
|
||||
byte faces = 0;
|
||||
Model model = null;
|
||||
Model collisionModel;
|
||||
byte opaqueSides = 0;
|
||||
byte lightValue;
|
||||
boolean alpha;
|
||||
float translucency;
|
||||
Color color = new Color(Color.WHITE);
|
||||
Vector3 scaleToSize = null;
|
||||
Vector3 positionOffset = null;
|
||||
Vector3 collisionPositionOffset = null;
|
||||
|
||||
if (tileDef.opaqueSides != null) {
|
||||
if (tileDef.opaqueSides.contains("ALL"))
|
||||
opaqueSides = TileMesh.SIDE_ALL;
|
||||
else {
|
||||
if (tileDef.opaqueSides.contains("TOP"))
|
||||
opaqueSides = Bitfield.set(TileMesh.SIDE_TOP, opaqueSides);
|
||||
if (tileDef.opaqueSides.contains("BOTTOM"))
|
||||
opaqueSides = Bitfield.set(TileMesh.SIDE_BOTTOM, opaqueSides);
|
||||
if (tileDef.opaqueSides.contains("FRONT"))
|
||||
opaqueSides = Bitfield.set(TileMesh.SIDE_FRONT, opaqueSides);
|
||||
if (tileDef.opaqueSides.contains("BACK"))
|
||||
opaqueSides = Bitfield.set(TileMesh.SIDE_BACK, opaqueSides);
|
||||
if (tileDef.opaqueSides.contains("LEFT"))
|
||||
opaqueSides = Bitfield.set(TileMesh.SIDE_LEFT, opaqueSides);
|
||||
if (tileDef.opaqueSides.contains("RIGHT"))
|
||||
opaqueSides = Bitfield.set(TileMesh.SIDE_RIGHT, opaqueSides);
|
||||
}
|
||||
}
|
||||
|
||||
lightValue = (byte)tileDef.light;
|
||||
alpha = tileDef.alpha;
|
||||
translucency = tileDef.translucency;
|
||||
if (tileDef.color != null)
|
||||
color.set(tileDef.color);
|
||||
if (tileDef.scaleToSize != null)
|
||||
scaleToSize = new Vector3(tileDef.scaleToSize);
|
||||
if (tileDef.positionOffset != null)
|
||||
positionOffset = new Vector3(tileDef.positionOffset);
|
||||
if (tileDef.collisionPositionOffset != null)
|
||||
collisionPositionOffset = new Vector3(tileDef.collisionPositionOffset);
|
||||
|
||||
if (isCube) {
|
||||
if (tileDef.textures != null) {
|
||||
if (tileDef.textures.top >= 0)
|
||||
topTexture = atlas.get(tileDef.textures.top);
|
||||
if (tileDef.textures.bottom >= 0)
|
||||
bottomTexture = atlas.get(tileDef.textures.bottom);
|
||||
if (tileDef.textures.front >= 0)
|
||||
frontTexture = atlas.get(tileDef.textures.front);
|
||||
if (tileDef.textures.back >= 0)
|
||||
backTexture = atlas.get(tileDef.textures.back);
|
||||
if (tileDef.textures.left >= 0)
|
||||
leftTexture = atlas.get(tileDef.textures.left);
|
||||
if (tileDef.textures.right >= 0)
|
||||
rightTexture = atlas.get(tileDef.textures.right);
|
||||
} else if (tileDef.texture >= 0) {
|
||||
texture = atlas.get(tileDef.texture);
|
||||
if (tileDef.faces != null) {
|
||||
if (tileDef.faces.contains("ALL"))
|
||||
faces = TileMesh.SIDE_ALL;
|
||||
else {
|
||||
if (tileDef.faces.contains("TOP"))
|
||||
faces = Bitfield.set(TileMesh.SIDE_TOP, opaqueSides);
|
||||
if (tileDef.faces.contains("BOTTOM"))
|
||||
faces = Bitfield.set(TileMesh.SIDE_BOTTOM, opaqueSides);
|
||||
if (tileDef.faces.contains("FRONT"))
|
||||
faces = Bitfield.set(TileMesh.SIDE_FRONT, opaqueSides);
|
||||
if (tileDef.faces.contains("BACK"))
|
||||
faces = Bitfield.set(TileMesh.SIDE_BACK, opaqueSides);
|
||||
if (tileDef.faces.contains("LEFT"))
|
||||
faces = Bitfield.set(TileMesh.SIDE_LEFT, opaqueSides);
|
||||
if (tileDef.faces.contains("RIGHT"))
|
||||
faces = Bitfield.set(TileMesh.SIDE_RIGHT, opaqueSides);
|
||||
}
|
||||
}
|
||||
} else
|
||||
throw new RuntimeException("No cube texture specified.");
|
||||
|
||||
if (texture != null)
|
||||
collection.addCube(texture, faces, opaqueSides, lightValue, alpha, translucency, color);
|
||||
else
|
||||
collection.addCube(topTexture, bottomTexture, frontTexture, backTexture, leftTexture, rightTexture, opaqueSides, lightValue, alpha, translucency, color);
|
||||
|
||||
} else if (tileDef.model != null) {
|
||||
model = models.get(tileDef.model);
|
||||
if (model == null) {
|
||||
model = loader.loadModel(FileHelpers.open(configFile.type(), path + tileDef.model));
|
||||
models.put(tileDef.model, model);
|
||||
}
|
||||
|
||||
collisionModel = model; // default is to use the same model
|
||||
|
||||
if (tileDef.collisionModel != null) {
|
||||
//override with a specific collision model
|
||||
collisionModel = models.get(tileDef.collisionModel);
|
||||
if (collisionModel == null) {
|
||||
collisionModel = loader.loadModel(FileHelpers.open(configFile.type(), path + tileDef.collisionModel));
|
||||
models.put(tileDef.collisionModel, collisionModel);
|
||||
}
|
||||
}
|
||||
if (tileDef.collisionShape != null) {
|
||||
collisionModel = CollisionShapes.get(tileDef.collisionShape);
|
||||
if (collisionModel == null)
|
||||
throw new RuntimeException("collisionShape not recognized.");
|
||||
}
|
||||
|
||||
collection.add(model, collisionModel, materialMapping, opaqueSides, lightValue, alpha, translucency, color, scaleToSize, positionOffset, collisionPositionOffset);
|
||||
|
||||
} else if (tileDef.models != null) {
|
||||
int numModels = tileDef.models.size();
|
||||
Model[] submodels = new Model[numModels];
|
||||
Color[] colors = new Color[numModels];
|
||||
Vector3[] scaleToSizes = new Vector3[numModels];
|
||||
Vector3[] positionOffsets = new Vector3[numModels];
|
||||
|
||||
for (int j = 0; j < numModels; ++j) {
|
||||
JsonTileSubModels subModelDef = tileDef.models.get(j);
|
||||
|
||||
submodels[j] = models.get(subModelDef.submodel);
|
||||
if (model == null) {
|
||||
submodels[j] = loader.loadModel(FileHelpers.open(configFile.type(), path + subModelDef.submodel));
|
||||
models.put(subModelDef.submodel, submodels[j]);
|
||||
}
|
||||
|
||||
if (subModelDef.color == null)
|
||||
colors[j] = new Color(Color.WHITE);
|
||||
else
|
||||
colors[j] = new Color(subModelDef.color);
|
||||
|
||||
scaleToSizes[j] = subModelDef.scaleToSize;
|
||||
positionOffsets[j] = subModelDef.positionOffset;
|
||||
}
|
||||
|
||||
collisionModel = null;
|
||||
|
||||
if (tileDef.collisionModel != null) {
|
||||
//override with a specific collision model
|
||||
collisionModel = models.get(tileDef.collisionModel);
|
||||
if (collisionModel == null) {
|
||||
collisionModel = loader.loadModel(FileHelpers.open(configFile.type(), path + tileDef.collisionModel));
|
||||
models.put(tileDef.collisionModel, collisionModel);
|
||||
}
|
||||
}
|
||||
if (tileDef.collisionShape != null) {
|
||||
collisionModel = CollisionShapes.get(tileDef.collisionShape);
|
||||
if (collisionModel == null)
|
||||
throw new RuntimeException("collisionShape not recognized.");
|
||||
}
|
||||
|
||||
collection.add(submodels, colors, scaleToSizes, positionOffsets, collisionModel, materialMapping, opaqueSides, lightValue, alpha, translucency, color, scaleToSize, positionOffset, collisionPositionOffset);
|
||||
}
|
||||
for (String tileMeshFile : definition.tiles) {
|
||||
TileMesh mesh = assetManager.get(tileMeshFile, TileMesh.class);
|
||||
collection.addMesh(mesh);
|
||||
}
|
||||
|
||||
return collection;
|
||||
|
|
|
|||
|
|
@ -1,14 +1,13 @@
|
|||
package ca.blarg.gdx.tilemap3d.tilemesh;
|
||||
|
||||
import ca.blarg.gdx.Bitfield;
|
||||
import ca.blarg.gdx.graphics.atlas.TextureAtlas;
|
||||
import ca.blarg.gdx.tilemap3d.Tile;
|
||||
import com.badlogic.gdx.graphics.Color;
|
||||
import com.badlogic.gdx.graphics.g2d.TextureRegion;
|
||||
import com.badlogic.gdx.graphics.g3d.Model;
|
||||
import com.badlogic.gdx.math.Vector3;
|
||||
import com.badlogic.gdx.utils.Array;
|
||||
import ca.blarg.gdx.Bitfield;
|
||||
import ca.blarg.gdx.graphics.atlas.TextureAtlas;
|
||||
import ca.blarg.gdx.tilemap3d.Tile;
|
||||
|
||||
public class TileMeshCollection {
|
||||
public final TextureAtlas atlas;
|
||||
|
|
@ -30,7 +29,7 @@ public class TileMeshCollection {
|
|||
addMesh(null);
|
||||
}
|
||||
|
||||
private int addMesh(TileMesh mesh) {
|
||||
public int addMesh(TileMesh mesh) {
|
||||
meshes.add(mesh);
|
||||
return meshes.size - 1;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue