reorganize JSON loading sources using more standardized package naming

This commit is contained in:
Gered 2013-10-05 19:16:22 -04:00
parent 554c2c8bb8
commit 6d152b95a8
10 changed files with 26 additions and 16 deletions

View file

@ -1,4 +1,4 @@
package com.blarg.gdx.tilemap3d.serialization;
package com.blarg.gdx.tilemap3d.json;
import java.util.ArrayList;

View file

@ -1,4 +1,4 @@
package com.blarg.gdx.tilemap3d.serialization;
package com.blarg.gdx.tilemap3d.json;
import com.blarg.gdx.tilemap3d.Tile;
import com.blarg.gdx.tilemap3d.TileRawDataContainer;

View file

@ -1,4 +1,4 @@
package com.blarg.gdx.tilemap3d.serialization;
package com.blarg.gdx.tilemap3d.json;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.files.FileHandle;

View file

@ -1,8 +0,0 @@
package com.blarg.gdx.tilemap3d.tilemesh;
import java.util.ArrayList;
public class JsonTileMeshCollection {
public ArrayList<JsonMaterialMapping> materials;
public ArrayList<JsonTileDefinition> tiles;
}

View file

@ -1,4 +1,4 @@
package com.blarg.gdx.tilemap3d.tilemesh;
package com.blarg.gdx.tilemap3d.tilemesh.json;
public class JsonCubeTextures {
public int top;

View file

@ -1,4 +1,4 @@
package com.blarg.gdx.tilemap3d.tilemesh;
package com.blarg.gdx.tilemap3d.tilemesh.json;
public class JsonMaterialMapping {
public String name;

View file

@ -1,4 +1,4 @@
package com.blarg.gdx.tilemap3d.tilemesh;
package com.blarg.gdx.tilemap3d.tilemesh.json;
import com.badlogic.gdx.graphics.Color;
import com.badlogic.gdx.math.Vector3;

View file

@ -0,0 +1,11 @@
package com.blarg.gdx.tilemap3d.tilemesh.json;
import com.blarg.gdx.tilemap3d.tilemesh.json.JsonMaterialMapping;
import com.blarg.gdx.tilemap3d.tilemesh.json.JsonTileDefinition;
import java.util.ArrayList;
public class JsonTileMeshCollection {
public ArrayList<JsonMaterialMapping> materials;
public ArrayList<JsonTileDefinition> tiles;
}

View file

@ -1,4 +1,4 @@
package com.blarg.gdx.tilemap3d.tilemesh;
package com.blarg.gdx.tilemap3d.tilemesh.json;
import com.badlogic.gdx.graphics.Color;
import com.badlogic.gdx.math.Vector3;

View file

@ -1,4 +1,4 @@
package com.blarg.gdx.tilemap3d.tilemesh;
package com.blarg.gdx.tilemap3d.tilemesh.json;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.assets.loaders.ModelLoader;
@ -13,6 +13,13 @@ import com.badlogic.gdx.utils.JsonReader;
import com.blarg.gdx.Bitfield;
import com.blarg.gdx.graphics.atlas.TextureAtlas;
import com.blarg.gdx.io.FileHelpers;
import com.blarg.gdx.tilemap3d.tilemesh.MaterialTileMapping;
import com.blarg.gdx.tilemap3d.tilemesh.TileMesh;
import com.blarg.gdx.tilemap3d.tilemesh.TileMeshCollection;
import com.blarg.gdx.tilemap3d.tilemesh.json.JsonMaterialMapping;
import com.blarg.gdx.tilemap3d.tilemesh.json.JsonTileDefinition;
import com.blarg.gdx.tilemap3d.tilemesh.json.JsonTileMeshCollection;
import com.blarg.gdx.tilemap3d.tilemesh.json.JsonTileSubModels;
import sun.reflect.generics.reflectiveObjects.NotImplementedException;
import java.util.HashMap;