diff --git a/src/com/blarg/gdx/tilemap3d/ChunkVertexGenerator.java b/src/ca/blarg/gdx/tilemap3d/ChunkVertexGenerator.java similarity index 97% rename from src/com/blarg/gdx/tilemap3d/ChunkVertexGenerator.java rename to src/ca/blarg/gdx/tilemap3d/ChunkVertexGenerator.java index d5c20ea..23c759f 100644 --- a/src/com/blarg/gdx/tilemap3d/ChunkVertexGenerator.java +++ b/src/ca/blarg/gdx/tilemap3d/ChunkVertexGenerator.java @@ -1,4 +1,4 @@ -package com.blarg.gdx.tilemap3d; +package ca.blarg.gdx.tilemap3d; import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.graphics.Mesh; @@ -7,10 +7,10 @@ import com.badlogic.gdx.graphics.g3d.utils.MeshBuilder; import com.badlogic.gdx.graphics.g3d.utils.MeshPartBuilder; import com.badlogic.gdx.math.Matrix4; import com.badlogic.gdx.math.Vector3; -import com.blarg.gdx.graphics.Vertices; -import com.blarg.gdx.tilemap3d.tilemesh.CubeTileMesh; -import com.blarg.gdx.tilemap3d.tilemesh.TileMesh; -import com.blarg.gdx.tilemap3d.tilemesh.TileMeshCollection; +import ca.blarg.gdx.graphics.Vertices; +import ca.blarg.gdx.tilemap3d.tilemesh.CubeTileMesh; +import ca.blarg.gdx.tilemap3d.tilemesh.TileMesh; +import ca.blarg.gdx.tilemap3d.tilemesh.TileMeshCollection; public class ChunkVertexGenerator { public class GeneratedChunkMeshes { diff --git a/src/com/blarg/gdx/tilemap3d/Tile.java b/src/ca/blarg/gdx/tilemap3d/Tile.java similarity index 98% rename from src/com/blarg/gdx/tilemap3d/Tile.java rename to src/ca/blarg/gdx/tilemap3d/Tile.java index 144fe00..1d66e1b 100644 --- a/src/com/blarg/gdx/tilemap3d/Tile.java +++ b/src/ca/blarg/gdx/tilemap3d/Tile.java @@ -1,10 +1,10 @@ -package com.blarg.gdx.tilemap3d; +package ca.blarg.gdx.tilemap3d; import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.math.Matrix4; import com.badlogic.gdx.math.Vector3; -import com.blarg.gdx.Bitfield; -import com.blarg.gdx.math.MathHelpers; +import ca.blarg.gdx.Bitfield; +import ca.blarg.gdx.math.MathHelpers; public final class Tile { static final Matrix4 faceNorthRotation = new Matrix4().setToRotation(Vector3.Y, 0.0f); diff --git a/src/com/blarg/gdx/tilemap3d/TileChunk.java b/src/ca/blarg/gdx/tilemap3d/TileChunk.java similarity index 99% rename from src/com/blarg/gdx/tilemap3d/TileChunk.java rename to src/ca/blarg/gdx/tilemap3d/TileChunk.java index dc040ed..4bad81e 100644 --- a/src/com/blarg/gdx/tilemap3d/TileChunk.java +++ b/src/ca/blarg/gdx/tilemap3d/TileChunk.java @@ -1,4 +1,4 @@ -package com.blarg.gdx.tilemap3d; +package ca.blarg.gdx.tilemap3d; import com.badlogic.gdx.graphics.GL20; import com.badlogic.gdx.graphics.Mesh; diff --git a/src/com/blarg/gdx/tilemap3d/TileContainer.java b/src/ca/blarg/gdx/tilemap3d/TileContainer.java similarity index 97% rename from src/com/blarg/gdx/tilemap3d/TileContainer.java rename to src/ca/blarg/gdx/tilemap3d/TileContainer.java index 3004d10..68465a6 100644 --- a/src/com/blarg/gdx/tilemap3d/TileContainer.java +++ b/src/ca/blarg/gdx/tilemap3d/TileContainer.java @@ -1,14 +1,15 @@ -package com.blarg.gdx.tilemap3d; +package ca.blarg.gdx.tilemap3d; +import ca.blarg.gdx.tilemap3d.tilemesh.TileMesh; import com.badlogic.gdx.math.Intersector; import com.badlogic.gdx.math.MathUtils; import com.badlogic.gdx.math.Vector3; import com.badlogic.gdx.math.collision.BoundingBox; import com.badlogic.gdx.math.collision.Ray; -import com.blarg.gdx.math.IntersectionTester; -import com.blarg.gdx.math.MathHelpers; -import com.blarg.gdx.tilemap3d.tilemesh.TileMesh; -import com.blarg.gdx.tilemap3d.tilemesh.TileMeshCollection; +import ca.blarg.gdx.math.IntersectionTester; +import ca.blarg.gdx.math.MathHelpers; +import ca.blarg.gdx.tilemap3d.tilemesh.TileMesh; +import ca.blarg.gdx.tilemap3d.tilemesh.TileMeshCollection; public abstract class TileContainer { static final Vector3 tmp1 = new Vector3(); diff --git a/src/com/blarg/gdx/tilemap3d/TileCoord.java b/src/ca/blarg/gdx/tilemap3d/TileCoord.java similarity index 98% rename from src/com/blarg/gdx/tilemap3d/TileCoord.java rename to src/ca/blarg/gdx/tilemap3d/TileCoord.java index 38654cb..62d1478 100644 --- a/src/com/blarg/gdx/tilemap3d/TileCoord.java +++ b/src/ca/blarg/gdx/tilemap3d/TileCoord.java @@ -1,4 +1,4 @@ -package com.blarg.gdx.tilemap3d; +package ca.blarg.gdx.tilemap3d; import com.badlogic.gdx.math.Vector3; diff --git a/src/com/blarg/gdx/tilemap3d/TileMap.java b/src/ca/blarg/gdx/tilemap3d/TileMap.java similarity index 97% rename from src/com/blarg/gdx/tilemap3d/TileMap.java rename to src/ca/blarg/gdx/tilemap3d/TileMap.java index 4ec6c75..97fa2b9 100644 --- a/src/com/blarg/gdx/tilemap3d/TileMap.java +++ b/src/ca/blarg/gdx/tilemap3d/TileMap.java @@ -1,12 +1,12 @@ -package com.blarg.gdx.tilemap3d; +package ca.blarg.gdx.tilemap3d; import com.badlogic.gdx.math.MathUtils; import com.badlogic.gdx.math.Vector3; import com.badlogic.gdx.math.collision.BoundingBox; import com.badlogic.gdx.utils.Disposable; -import com.blarg.gdx.math.IntersectionTester; -import com.blarg.gdx.tilemap3d.lighting.TileMapLighter; -import com.blarg.gdx.tilemap3d.tilemesh.TileMeshCollection; +import ca.blarg.gdx.math.IntersectionTester; +import ca.blarg.gdx.tilemap3d.lighting.TileMapLighter; +import ca.blarg.gdx.tilemap3d.tilemesh.TileMeshCollection; public class TileMap extends TileContainer implements Disposable { final TileChunk[] chunks; diff --git a/src/com/blarg/gdx/tilemap3d/TileMapRenderer.java b/src/ca/blarg/gdx/tilemap3d/TileMapRenderer.java similarity index 97% rename from src/com/blarg/gdx/tilemap3d/TileMapRenderer.java rename to src/ca/blarg/gdx/tilemap3d/TileMapRenderer.java index 1532976..8d1873a 100644 --- a/src/com/blarg/gdx/tilemap3d/TileMapRenderer.java +++ b/src/ca/blarg/gdx/tilemap3d/TileMapRenderer.java @@ -1,4 +1,4 @@ -package com.blarg.gdx.tilemap3d; +package ca.blarg.gdx.tilemap3d; import com.badlogic.gdx.graphics.Camera; import com.badlogic.gdx.graphics.g3d.Environment; diff --git a/src/com/blarg/gdx/tilemap3d/TileMapSweptSphereCollisionChecker.java b/src/ca/blarg/gdx/tilemap3d/TileMapSweptSphereCollisionChecker.java similarity index 91% rename from src/com/blarg/gdx/tilemap3d/TileMapSweptSphereCollisionChecker.java rename to src/ca/blarg/gdx/tilemap3d/TileMapSweptSphereCollisionChecker.java index a41e63f..e244e3b 100644 --- a/src/com/blarg/gdx/tilemap3d/TileMapSweptSphereCollisionChecker.java +++ b/src/ca/blarg/gdx/tilemap3d/TileMapSweptSphereCollisionChecker.java @@ -1,12 +1,13 @@ -package com.blarg.gdx.tilemap3d; +package ca.blarg.gdx.tilemap3d; +import ca.blarg.gdx.tilemap3d.tilemesh.TileMesh; import com.badlogic.gdx.math.Matrix4; import com.badlogic.gdx.math.Vector3; import com.badlogic.gdx.math.collision.BoundingBox; -import com.blarg.gdx.math.SweptSphere; -import com.blarg.gdx.math.SweptSphereCollisionTester; -import com.blarg.gdx.math.SweptSphereWorldCollisionChecker; -import com.blarg.gdx.tilemap3d.tilemesh.TileMesh; +import ca.blarg.gdx.math.SweptSphere; +import ca.blarg.gdx.math.SweptSphereCollisionTester; +import ca.blarg.gdx.math.SweptSphereWorldCollisionChecker; +import ca.blarg.gdx.tilemap3d.tilemesh.TileMesh; public class TileMapSweptSphereCollisionChecker implements SweptSphereWorldCollisionChecker { static final TileCoord min = new TileCoord(); diff --git a/src/com/blarg/gdx/tilemap3d/TileRawDataContainer.java b/src/ca/blarg/gdx/tilemap3d/TileRawDataContainer.java similarity index 84% rename from src/com/blarg/gdx/tilemap3d/TileRawDataContainer.java rename to src/ca/blarg/gdx/tilemap3d/TileRawDataContainer.java index f091feb..dd5df0b 100644 --- a/src/com/blarg/gdx/tilemap3d/TileRawDataContainer.java +++ b/src/ca/blarg/gdx/tilemap3d/TileRawDataContainer.java @@ -1,4 +1,4 @@ -package com.blarg.gdx.tilemap3d; +package ca.blarg.gdx.tilemap3d; public interface TileRawDataContainer { Tile[] getData(); diff --git a/src/com/blarg/gdx/tilemap3d/json/JsonTileMap.java b/src/ca/blarg/gdx/tilemap3d/json/JsonTileMap.java similarity index 87% rename from src/com/blarg/gdx/tilemap3d/json/JsonTileMap.java rename to src/ca/blarg/gdx/tilemap3d/json/JsonTileMap.java index aac393c..9e508c5 100644 --- a/src/com/blarg/gdx/tilemap3d/json/JsonTileMap.java +++ b/src/ca/blarg/gdx/tilemap3d/json/JsonTileMap.java @@ -1,4 +1,4 @@ -package com.blarg.gdx.tilemap3d.json; +package ca.blarg.gdx.tilemap3d.json; import java.util.ArrayList; diff --git a/src/com/blarg/gdx/tilemap3d/json/TileDataSerializer.java b/src/ca/blarg/gdx/tilemap3d/json/TileDataSerializer.java similarity index 92% rename from src/com/blarg/gdx/tilemap3d/json/TileDataSerializer.java rename to src/ca/blarg/gdx/tilemap3d/json/TileDataSerializer.java index 8bc4ea9..e128009 100644 --- a/src/com/blarg/gdx/tilemap3d/json/TileDataSerializer.java +++ b/src/ca/blarg/gdx/tilemap3d/json/TileDataSerializer.java @@ -1,7 +1,7 @@ -package com.blarg.gdx.tilemap3d.json; +package ca.blarg.gdx.tilemap3d.json; -import com.blarg.gdx.tilemap3d.Tile; -import com.blarg.gdx.tilemap3d.TileRawDataContainer; +import ca.blarg.gdx.tilemap3d.Tile; +import ca.blarg.gdx.tilemap3d.TileRawDataContainer; import java.nio.ByteBuffer; diff --git a/src/com/blarg/gdx/tilemap3d/json/TileMapLoader.java b/src/ca/blarg/gdx/tilemap3d/json/TileMapLoader.java similarity index 90% rename from src/com/blarg/gdx/tilemap3d/json/TileMapLoader.java rename to src/ca/blarg/gdx/tilemap3d/json/TileMapLoader.java index 418c7a2..48c5ba0 100644 --- a/src/com/blarg/gdx/tilemap3d/json/TileMapLoader.java +++ b/src/ca/blarg/gdx/tilemap3d/json/TileMapLoader.java @@ -1,15 +1,16 @@ -package com.blarg.gdx.tilemap3d.json; +package ca.blarg.gdx.tilemap3d.json; +import ca.blarg.gdx.tilemap3d.ChunkVertexGenerator; import com.badlogic.gdx.Gdx; import com.badlogic.gdx.files.FileHandle; import com.badlogic.gdx.utils.Base64Coder; import com.badlogic.gdx.utils.Json; -import com.blarg.gdx.Strings; -import com.blarg.gdx.tilemap3d.ChunkVertexGenerator; -import com.blarg.gdx.tilemap3d.TileChunk; -import com.blarg.gdx.tilemap3d.TileMap; -import com.blarg.gdx.tilemap3d.lighting.TileMapLighter; -import com.blarg.gdx.tilemap3d.tilemesh.TileMeshCollection; +import ca.blarg.gdx.Strings; +import ca.blarg.gdx.tilemap3d.ChunkVertexGenerator; +import ca.blarg.gdx.tilemap3d.TileChunk; +import ca.blarg.gdx.tilemap3d.TileMap; +import ca.blarg.gdx.tilemap3d.lighting.TileMapLighter; +import ca.blarg.gdx.tilemap3d.tilemesh.TileMeshCollection; import sun.reflect.generics.reflectiveObjects.NotImplementedException; import java.nio.ByteBuffer; diff --git a/src/com/blarg/gdx/tilemap3d/lighting/BaseTileMapLighter.java b/src/ca/blarg/gdx/tilemap3d/lighting/BaseTileMapLighter.java similarity index 87% rename from src/com/blarg/gdx/tilemap3d/lighting/BaseTileMapLighter.java rename to src/ca/blarg/gdx/tilemap3d/lighting/BaseTileMapLighter.java index 6d92c8f..6a4a1d5 100644 --- a/src/com/blarg/gdx/tilemap3d/lighting/BaseTileMapLighter.java +++ b/src/ca/blarg/gdx/tilemap3d/lighting/BaseTileMapLighter.java @@ -1,9 +1,10 @@ -package com.blarg.gdx.tilemap3d.lighting; +package ca.blarg.gdx.tilemap3d.lighting; -import com.blarg.gdx.Bitfield; -import com.blarg.gdx.tilemap3d.Tile; -import com.blarg.gdx.tilemap3d.TileMap; -import com.blarg.gdx.tilemap3d.tilemesh.TileMesh; +import ca.blarg.gdx.Bitfield; +import ca.blarg.gdx.tilemap3d.TileMap; +import ca.blarg.gdx.tilemap3d.Tile; +import ca.blarg.gdx.tilemap3d.TileMap; +import ca.blarg.gdx.tilemap3d.tilemesh.TileMesh; public abstract class BaseTileMapLighter implements TileMapLighter { protected void resetLightValues(TileMap tileMap) { diff --git a/src/com/blarg/gdx/tilemap3d/lighting/LightSpreadingTileMapLighter.java b/src/ca/blarg/gdx/tilemap3d/lighting/LightSpreadingTileMapLighter.java similarity index 96% rename from src/com/blarg/gdx/tilemap3d/lighting/LightSpreadingTileMapLighter.java rename to src/ca/blarg/gdx/tilemap3d/lighting/LightSpreadingTileMapLighter.java index a5e6b5f..f506291 100644 --- a/src/com/blarg/gdx/tilemap3d/lighting/LightSpreadingTileMapLighter.java +++ b/src/ca/blarg/gdx/tilemap3d/lighting/LightSpreadingTileMapLighter.java @@ -1,8 +1,10 @@ -package com.blarg.gdx.tilemap3d.lighting; +package ca.blarg.gdx.tilemap3d.lighting; -import com.blarg.gdx.tilemap3d.Tile; -import com.blarg.gdx.tilemap3d.TileMap; -import com.blarg.gdx.tilemap3d.tilemesh.TileMesh; +import ca.blarg.gdx.tilemap3d.TileMap; +import ca.blarg.gdx.tilemap3d.tilemesh.TileMesh; +import ca.blarg.gdx.tilemap3d.Tile; +import ca.blarg.gdx.tilemap3d.TileMap; +import ca.blarg.gdx.tilemap3d.tilemesh.TileMesh; public class LightSpreadingTileMapLighter extends BaseTileMapLighter { private boolean doSkyLight; diff --git a/src/com/blarg/gdx/tilemap3d/lighting/LitChunkVertexGenerator.java b/src/ca/blarg/gdx/tilemap3d/lighting/LitChunkVertexGenerator.java similarity index 92% rename from src/com/blarg/gdx/tilemap3d/lighting/LitChunkVertexGenerator.java rename to src/ca/blarg/gdx/tilemap3d/lighting/LitChunkVertexGenerator.java index 7170cef..ef21756 100644 --- a/src/com/blarg/gdx/tilemap3d/lighting/LitChunkVertexGenerator.java +++ b/src/ca/blarg/gdx/tilemap3d/lighting/LitChunkVertexGenerator.java @@ -1,16 +1,21 @@ -package com.blarg.gdx.tilemap3d.lighting; +package ca.blarg.gdx.tilemap3d.lighting; +import ca.blarg.gdx.tilemap3d.ChunkVertexGenerator; +import ca.blarg.gdx.tilemap3d.Tile; +import ca.blarg.gdx.tilemap3d.TileChunk; +import ca.blarg.gdx.tilemap3d.TileCoord; +import ca.blarg.gdx.tilemap3d.tilemesh.TileMesh; import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.graphics.g3d.utils.MeshBuilder; import com.badlogic.gdx.math.Matrix4; import com.badlogic.gdx.math.Vector3; import com.badlogic.gdx.math.collision.BoundingBox; -import com.blarg.gdx.graphics.Vertices; -import com.blarg.gdx.tilemap3d.ChunkVertexGenerator; -import com.blarg.gdx.tilemap3d.Tile; -import com.blarg.gdx.tilemap3d.TileChunk; -import com.blarg.gdx.tilemap3d.TileCoord; -import com.blarg.gdx.tilemap3d.tilemesh.TileMesh; +import ca.blarg.gdx.graphics.Vertices; +import ca.blarg.gdx.tilemap3d.ChunkVertexGenerator; +import ca.blarg.gdx.tilemap3d.Tile; +import ca.blarg.gdx.tilemap3d.TileChunk; +import ca.blarg.gdx.tilemap3d.TileCoord; +import ca.blarg.gdx.tilemap3d.tilemesh.TileMesh; import sun.reflect.generics.reflectiveObjects.NotImplementedException; public class LitChunkVertexGenerator extends ChunkVertexGenerator { diff --git a/src/ca/blarg/gdx/tilemap3d/lighting/SimpleTileMapLighter.java b/src/ca/blarg/gdx/tilemap3d/lighting/SimpleTileMapLighter.java new file mode 100644 index 0000000..3c72f46 --- /dev/null +++ b/src/ca/blarg/gdx/tilemap3d/lighting/SimpleTileMapLighter.java @@ -0,0 +1,19 @@ +package ca.blarg.gdx.tilemap3d.lighting; + +import ca.blarg.gdx.Bitfield; +import ca.blarg.gdx.tilemap3d.TileMap; +import ca.blarg.gdx.tilemap3d.Tile; +import ca.blarg.gdx.tilemap3d.TileMap; +import ca.blarg.gdx.tilemap3d.lighting.TileMapLighter; +import ca.blarg.gdx.tilemap3d.tilemesh.TileMesh; + +public class SimpleTileMapLighter extends BaseTileMapLighter { + public SimpleTileMapLighter() { + } + + @Override + public void light(TileMap tileMap) { + resetLightValues(tileMap); + castSkyLightDown(tileMap); + } +} diff --git a/src/ca/blarg/gdx/tilemap3d/lighting/TileMapLighter.java b/src/ca/blarg/gdx/tilemap3d/lighting/TileMapLighter.java new file mode 100644 index 0000000..b04708d --- /dev/null +++ b/src/ca/blarg/gdx/tilemap3d/lighting/TileMapLighter.java @@ -0,0 +1,8 @@ +package ca.blarg.gdx.tilemap3d.lighting; + +import ca.blarg.gdx.tilemap3d.TileMap; +import ca.blarg.gdx.tilemap3d.TileMap; + +public interface TileMapLighter { + void light(TileMap tileMap); +} diff --git a/src/com/blarg/gdx/tilemap3d/prefabs/TilePrefab.java b/src/ca/blarg/gdx/tilemap3d/prefabs/TilePrefab.java similarity index 96% rename from src/com/blarg/gdx/tilemap3d/prefabs/TilePrefab.java rename to src/ca/blarg/gdx/tilemap3d/prefabs/TilePrefab.java index cf8dee1..782a7cc 100644 --- a/src/com/blarg/gdx/tilemap3d/prefabs/TilePrefab.java +++ b/src/ca/blarg/gdx/tilemap3d/prefabs/TilePrefab.java @@ -1,10 +1,11 @@ -package com.blarg.gdx.tilemap3d.prefabs; +package ca.blarg.gdx.tilemap3d.prefabs; +import ca.blarg.gdx.tilemap3d.TileContainer; import com.badlogic.gdx.math.Vector3; import com.badlogic.gdx.math.collision.BoundingBox; -import com.blarg.gdx.tilemap3d.Tile; -import com.blarg.gdx.tilemap3d.TileContainer; -import com.blarg.gdx.tilemap3d.TileRawDataContainer; +import ca.blarg.gdx.tilemap3d.Tile; +import ca.blarg.gdx.tilemap3d.TileContainer; +import ca.blarg.gdx.tilemap3d.TileRawDataContainer; public class TilePrefab extends TileContainer implements TileRawDataContainer { public enum Rotation { diff --git a/src/com/blarg/gdx/tilemap3d/prefabs/json/JsonTilePrefab.java b/src/ca/blarg/gdx/tilemap3d/prefabs/json/JsonTilePrefab.java similarity index 70% rename from src/com/blarg/gdx/tilemap3d/prefabs/json/JsonTilePrefab.java rename to src/ca/blarg/gdx/tilemap3d/prefabs/json/JsonTilePrefab.java index bc17335..816f39c 100644 --- a/src/com/blarg/gdx/tilemap3d/prefabs/json/JsonTilePrefab.java +++ b/src/ca/blarg/gdx/tilemap3d/prefabs/json/JsonTilePrefab.java @@ -1,4 +1,4 @@ -package com.blarg.gdx.tilemap3d.prefabs.json; +package ca.blarg.gdx.tilemap3d.prefabs.json; public class JsonTilePrefab { public int width; diff --git a/src/com/blarg/gdx/tilemap3d/prefabs/json/TilePrefabLoader.java b/src/ca/blarg/gdx/tilemap3d/prefabs/json/TilePrefabLoader.java similarity index 90% rename from src/com/blarg/gdx/tilemap3d/prefabs/json/TilePrefabLoader.java rename to src/ca/blarg/gdx/tilemap3d/prefabs/json/TilePrefabLoader.java index b360f33..d3bee25 100644 --- a/src/com/blarg/gdx/tilemap3d/prefabs/json/TilePrefabLoader.java +++ b/src/ca/blarg/gdx/tilemap3d/prefabs/json/TilePrefabLoader.java @@ -1,12 +1,12 @@ -package com.blarg.gdx.tilemap3d.prefabs.json; +package ca.blarg.gdx.tilemap3d.prefabs.json; +import ca.blarg.gdx.tilemap3d.prefabs.TilePrefab; import com.badlogic.gdx.Gdx; import com.badlogic.gdx.files.FileHandle; import com.badlogic.gdx.utils.Base64Coder; import com.badlogic.gdx.utils.Json; -import com.blarg.gdx.Strings; -import com.blarg.gdx.tilemap3d.json.TileDataSerializer; -import com.blarg.gdx.tilemap3d.prefabs.TilePrefab; +import ca.blarg.gdx.Strings; +import ca.blarg.gdx.tilemap3d.json.TileDataSerializer; import java.nio.ByteBuffer; diff --git a/src/com/blarg/gdx/tilemap3d/tilemesh/BaseModelTileMesh.java b/src/ca/blarg/gdx/tilemap3d/tilemesh/BaseModelTileMesh.java similarity index 96% rename from src/com/blarg/gdx/tilemap3d/tilemesh/BaseModelTileMesh.java rename to src/ca/blarg/gdx/tilemap3d/tilemesh/BaseModelTileMesh.java index e3ae07c..bf04697 100644 --- a/src/com/blarg/gdx/tilemap3d/tilemesh/BaseModelTileMesh.java +++ b/src/ca/blarg/gdx/tilemap3d/tilemesh/BaseModelTileMesh.java @@ -1,4 +1,4 @@ -package com.blarg.gdx.tilemap3d.tilemesh; +package ca.blarg.gdx.tilemap3d.tilemesh; import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.graphics.VertexAttributes; @@ -11,9 +11,9 @@ import com.badlogic.gdx.math.Vector2; import com.badlogic.gdx.math.Vector3; import com.badlogic.gdx.math.collision.BoundingBox; import com.badlogic.gdx.utils.Array; -import com.blarg.gdx.graphics.Vertices; -import com.blarg.gdx.graphics.atlas.TextureAtlas; -import com.blarg.gdx.math.MathHelpers; +import ca.blarg.gdx.graphics.Vertices; +import ca.blarg.gdx.graphics.atlas.TextureAtlas; +import ca.blarg.gdx.math.MathHelpers; import java.nio.FloatBuffer; import java.nio.ShortBuffer; diff --git a/src/com/blarg/gdx/tilemap3d/tilemesh/CubeTileMesh.java b/src/ca/blarg/gdx/tilemap3d/tilemesh/CubeTileMesh.java similarity index 98% rename from src/com/blarg/gdx/tilemap3d/tilemesh/CubeTileMesh.java rename to src/ca/blarg/gdx/tilemap3d/tilemesh/CubeTileMesh.java index ed47a36..137475c 100644 --- a/src/com/blarg/gdx/tilemap3d/tilemesh/CubeTileMesh.java +++ b/src/ca/blarg/gdx/tilemap3d/tilemesh/CubeTileMesh.java @@ -1,14 +1,14 @@ -package com.blarg.gdx.tilemap3d.tilemesh; +package ca.blarg.gdx.tilemap3d.tilemesh; import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.graphics.VertexAttribute; import com.badlogic.gdx.graphics.g2d.TextureRegion; import com.badlogic.gdx.math.Vector3; import com.badlogic.gdx.math.collision.BoundingBox; -import com.blarg.gdx.Bitfield; -import com.blarg.gdx.graphics.atlas.TextureAtlas; -import com.blarg.gdx.graphics.Vertices; -import com.blarg.gdx.math.MathHelpers; +import ca.blarg.gdx.Bitfield; +import ca.blarg.gdx.graphics.atlas.TextureAtlas; +import ca.blarg.gdx.graphics.Vertices; +import ca.blarg.gdx.math.MathHelpers; public class CubeTileMesh extends TileMesh { static final Vector3 A = new Vector3(-0.5f, -0.5f, -0.5f); diff --git a/src/com/blarg/gdx/tilemap3d/tilemesh/MaterialTileMapping.java b/src/ca/blarg/gdx/tilemap3d/tilemesh/MaterialTileMapping.java similarity index 96% rename from src/com/blarg/gdx/tilemap3d/tilemesh/MaterialTileMapping.java rename to src/ca/blarg/gdx/tilemap3d/tilemesh/MaterialTileMapping.java index 2369edd..21d4140 100644 --- a/src/com/blarg/gdx/tilemap3d/tilemesh/MaterialTileMapping.java +++ b/src/ca/blarg/gdx/tilemap3d/tilemesh/MaterialTileMapping.java @@ -1,8 +1,8 @@ -package com.blarg.gdx.tilemap3d.tilemesh; +package ca.blarg.gdx.tilemap3d.tilemesh; import com.badlogic.gdx.graphics.g2d.TextureRegion; import com.badlogic.gdx.math.Vector2; -import com.blarg.gdx.graphics.atlas.TextureAtlas; +import ca.blarg.gdx.graphics.atlas.TextureAtlas; import java.util.HashMap; import java.util.Map; diff --git a/src/com/blarg/gdx/tilemap3d/tilemesh/ModelTileMesh.java b/src/ca/blarg/gdx/tilemap3d/tilemesh/ModelTileMesh.java similarity index 96% rename from src/com/blarg/gdx/tilemap3d/tilemesh/ModelTileMesh.java rename to src/ca/blarg/gdx/tilemap3d/tilemesh/ModelTileMesh.java index 005f66f..ca860dd 100644 --- a/src/com/blarg/gdx/tilemap3d/tilemesh/ModelTileMesh.java +++ b/src/ca/blarg/gdx/tilemap3d/tilemesh/ModelTileMesh.java @@ -1,4 +1,4 @@ -package com.blarg.gdx.tilemap3d.tilemesh; +package ca.blarg.gdx.tilemap3d.tilemesh; import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.graphics.VertexAttribute; @@ -6,8 +6,8 @@ import com.badlogic.gdx.graphics.g3d.Model; import com.badlogic.gdx.math.Vector3; import com.badlogic.gdx.math.collision.BoundingBox; import com.badlogic.gdx.utils.Array; -import com.blarg.gdx.graphics.Vertices; -import com.blarg.gdx.math.MathHelpers; +import ca.blarg.gdx.graphics.Vertices; +import ca.blarg.gdx.math.MathHelpers; public class ModelTileMesh extends BaseModelTileMesh { static final Vector3 tmpPosition = new Vector3(); diff --git a/src/com/blarg/gdx/tilemap3d/tilemesh/MultiModelTileMesh.java b/src/ca/blarg/gdx/tilemap3d/tilemesh/MultiModelTileMesh.java similarity index 97% rename from src/com/blarg/gdx/tilemap3d/tilemesh/MultiModelTileMesh.java rename to src/ca/blarg/gdx/tilemap3d/tilemesh/MultiModelTileMesh.java index 7043a51..49aa1b0 100644 --- a/src/com/blarg/gdx/tilemap3d/tilemesh/MultiModelTileMesh.java +++ b/src/ca/blarg/gdx/tilemap3d/tilemesh/MultiModelTileMesh.java @@ -1,4 +1,4 @@ -package com.blarg.gdx.tilemap3d.tilemesh; +package ca.blarg.gdx.tilemap3d.tilemesh; import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.graphics.VertexAttribute; @@ -6,8 +6,8 @@ import com.badlogic.gdx.graphics.g3d.Model; import com.badlogic.gdx.math.Vector3; import com.badlogic.gdx.math.collision.BoundingBox; import com.badlogic.gdx.utils.Array; -import com.blarg.gdx.graphics.Vertices; -import com.blarg.gdx.math.MathHelpers; +import ca.blarg.gdx.graphics.Vertices; +import ca.blarg.gdx.math.MathHelpers; public class MultiModelTileMesh extends BaseModelTileMesh { BoundingBox bounds; diff --git a/src/com/blarg/gdx/tilemap3d/tilemesh/TileMesh.java b/src/ca/blarg/gdx/tilemap3d/tilemesh/TileMesh.java similarity index 93% rename from src/com/blarg/gdx/tilemap3d/tilemesh/TileMesh.java rename to src/ca/blarg/gdx/tilemap3d/tilemesh/TileMesh.java index bbfb02e..81d6d2d 100644 --- a/src/com/blarg/gdx/tilemap3d/tilemesh/TileMesh.java +++ b/src/ca/blarg/gdx/tilemap3d/tilemesh/TileMesh.java @@ -1,11 +1,11 @@ -package com.blarg.gdx.tilemap3d.tilemesh; +package ca.blarg.gdx.tilemap3d.tilemesh; import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.math.Vector3; import com.badlogic.gdx.math.collision.BoundingBox; import com.badlogic.gdx.utils.Disposable; -import com.blarg.gdx.Bitfield; -import com.blarg.gdx.graphics.Vertices; +import ca.blarg.gdx.Bitfield; +import ca.blarg.gdx.graphics.Vertices; public abstract class TileMesh implements Disposable { public static final Vector3 OFFSET = new Vector3(0.5f, 0.5f, 0.5f); diff --git a/src/com/blarg/gdx/tilemap3d/tilemesh/TileMeshCollection.java b/src/ca/blarg/gdx/tilemap3d/tilemesh/TileMeshCollection.java similarity index 94% rename from src/com/blarg/gdx/tilemap3d/tilemesh/TileMeshCollection.java rename to src/ca/blarg/gdx/tilemap3d/tilemesh/TileMeshCollection.java index 43ac457..a73c3bd 100644 --- a/src/com/blarg/gdx/tilemap3d/tilemesh/TileMeshCollection.java +++ b/src/ca/blarg/gdx/tilemap3d/tilemesh/TileMeshCollection.java @@ -1,13 +1,14 @@ -package com.blarg.gdx.tilemap3d.tilemesh; +package ca.blarg.gdx.tilemap3d.tilemesh; +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 com.blarg.gdx.Bitfield; -import com.blarg.gdx.graphics.atlas.TextureAtlas; -import com.blarg.gdx.tilemap3d.Tile; +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; diff --git a/src/com/blarg/gdx/tilemap3d/tilemesh/json/JsonCubeTextures.java b/src/ca/blarg/gdx/tilemap3d/tilemesh/json/JsonCubeTextures.java similarity index 75% rename from src/com/blarg/gdx/tilemap3d/tilemesh/json/JsonCubeTextures.java rename to src/ca/blarg/gdx/tilemap3d/tilemesh/json/JsonCubeTextures.java index fdef7f1..7b1ee0c 100644 --- a/src/com/blarg/gdx/tilemap3d/tilemesh/json/JsonCubeTextures.java +++ b/src/ca/blarg/gdx/tilemap3d/tilemesh/json/JsonCubeTextures.java @@ -1,4 +1,4 @@ -package com.blarg.gdx.tilemap3d.tilemesh.json; +package ca.blarg.gdx.tilemap3d.tilemesh.json; public class JsonCubeTextures { public int top; diff --git a/src/com/blarg/gdx/tilemap3d/tilemesh/json/JsonMaterialMapping.java b/src/ca/blarg/gdx/tilemap3d/tilemesh/json/JsonMaterialMapping.java similarity index 76% rename from src/com/blarg/gdx/tilemap3d/tilemesh/json/JsonMaterialMapping.java rename to src/ca/blarg/gdx/tilemap3d/tilemesh/json/JsonMaterialMapping.java index 240c106..bc1fbe4 100644 --- a/src/com/blarg/gdx/tilemap3d/tilemesh/json/JsonMaterialMapping.java +++ b/src/ca/blarg/gdx/tilemap3d/tilemesh/json/JsonMaterialMapping.java @@ -1,4 +1,4 @@ -package com.blarg.gdx.tilemap3d.tilemesh.json; +package ca.blarg.gdx.tilemap3d.tilemesh.json; public class JsonMaterialMapping { public String name; diff --git a/src/com/blarg/gdx/tilemap3d/tilemesh/json/JsonTileDefinition.java b/src/ca/blarg/gdx/tilemap3d/tilemesh/json/JsonTileDefinition.java similarity index 92% rename from src/com/blarg/gdx/tilemap3d/tilemesh/json/JsonTileDefinition.java rename to src/ca/blarg/gdx/tilemap3d/tilemesh/json/JsonTileDefinition.java index c8d419e..3f4b305 100644 --- a/src/com/blarg/gdx/tilemap3d/tilemesh/json/JsonTileDefinition.java +++ b/src/ca/blarg/gdx/tilemap3d/tilemesh/json/JsonTileDefinition.java @@ -1,4 +1,4 @@ -package com.blarg.gdx.tilemap3d.tilemesh.json; +package ca.blarg.gdx.tilemap3d.tilemesh.json; import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.math.Vector3; diff --git a/src/ca/blarg/gdx/tilemap3d/tilemesh/json/JsonTileMeshCollection.java b/src/ca/blarg/gdx/tilemap3d/tilemesh/json/JsonTileMeshCollection.java new file mode 100644 index 0000000..55ab660 --- /dev/null +++ b/src/ca/blarg/gdx/tilemap3d/tilemesh/json/JsonTileMeshCollection.java @@ -0,0 +1,11 @@ +package ca.blarg.gdx.tilemap3d.tilemesh.json; + +import ca.blarg.gdx.tilemap3d.tilemesh.json.JsonMaterialMapping; +import ca.blarg.gdx.tilemap3d.tilemesh.json.JsonTileDefinition; + +import java.util.ArrayList; + +public class JsonTileMeshCollection { + public ArrayList materials; + public ArrayList tiles; +} diff --git a/src/com/blarg/gdx/tilemap3d/tilemesh/json/JsonTileSubModels.java b/src/ca/blarg/gdx/tilemap3d/tilemesh/json/JsonTileSubModels.java similarity index 82% rename from src/com/blarg/gdx/tilemap3d/tilemesh/json/JsonTileSubModels.java rename to src/ca/blarg/gdx/tilemap3d/tilemesh/json/JsonTileSubModels.java index ce4b0a9..03c561f 100644 --- a/src/com/blarg/gdx/tilemap3d/tilemesh/json/JsonTileSubModels.java +++ b/src/ca/blarg/gdx/tilemap3d/tilemesh/json/JsonTileSubModels.java @@ -1,4 +1,4 @@ -package com.blarg.gdx.tilemap3d.tilemesh.json; +package ca.blarg.gdx.tilemap3d.tilemesh.json; import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.math.Vector3; diff --git a/src/com/blarg/gdx/tilemap3d/tilemesh/json/TileMeshCollectionLoader.java b/src/ca/blarg/gdx/tilemap3d/tilemesh/json/TileMeshCollectionLoader.java similarity index 93% rename from src/com/blarg/gdx/tilemap3d/tilemesh/json/TileMeshCollectionLoader.java rename to src/ca/blarg/gdx/tilemap3d/tilemesh/json/TileMeshCollectionLoader.java index 87c20af..41aa3cd 100644 --- a/src/com/blarg/gdx/tilemap3d/tilemesh/json/TileMeshCollectionLoader.java +++ b/src/ca/blarg/gdx/tilemap3d/tilemesh/json/TileMeshCollectionLoader.java @@ -1,4 +1,4 @@ -package com.blarg.gdx.tilemap3d.tilemesh.json; +package ca.blarg.gdx.tilemap3d.tilemesh.json; import com.badlogic.gdx.Gdx; import com.badlogic.gdx.assets.loaders.ModelLoader; @@ -10,16 +10,16 @@ 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 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 ca.blarg.gdx.Bitfield; +import ca.blarg.gdx.graphics.atlas.TextureAtlas; +import ca.blarg.gdx.io.FileHelpers; +import ca.blarg.gdx.tilemap3d.tilemesh.MaterialTileMapping; +import ca.blarg.gdx.tilemap3d.tilemesh.TileMesh; +import ca.blarg.gdx.tilemap3d.tilemesh.TileMeshCollection; +import ca.blarg.gdx.tilemap3d.tilemesh.json.JsonMaterialMapping; +import ca.blarg.gdx.tilemap3d.tilemesh.json.JsonTileDefinition; +import ca.blarg.gdx.tilemap3d.tilemesh.json.JsonTileMeshCollection; +import ca.blarg.gdx.tilemap3d.tilemesh.json.JsonTileSubModels; import sun.reflect.generics.reflectiveObjects.NotImplementedException; import java.util.HashMap; diff --git a/src/com/blarg/gdx/tilemap3d/lighting/SimpleTileMapLighter.java b/src/com/blarg/gdx/tilemap3d/lighting/SimpleTileMapLighter.java deleted file mode 100644 index 17ee7a0..0000000 --- a/src/com/blarg/gdx/tilemap3d/lighting/SimpleTileMapLighter.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.blarg.gdx.tilemap3d.lighting; - -import com.blarg.gdx.Bitfield; -import com.blarg.gdx.tilemap3d.Tile; -import com.blarg.gdx.tilemap3d.TileMap; -import com.blarg.gdx.tilemap3d.lighting.TileMapLighter; -import com.blarg.gdx.tilemap3d.tilemesh.TileMesh; - -public class SimpleTileMapLighter extends BaseTileMapLighter { - public SimpleTileMapLighter() { - } - - @Override - public void light(TileMap tileMap) { - resetLightValues(tileMap); - castSkyLightDown(tileMap); - } -} diff --git a/src/com/blarg/gdx/tilemap3d/lighting/TileMapLighter.java b/src/com/blarg/gdx/tilemap3d/lighting/TileMapLighter.java deleted file mode 100644 index 9747199..0000000 --- a/src/com/blarg/gdx/tilemap3d/lighting/TileMapLighter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.blarg.gdx.tilemap3d.lighting; - -import com.blarg.gdx.tilemap3d.TileMap; - -public interface TileMapLighter { - void light(TileMap tileMap); -} diff --git a/src/com/blarg/gdx/tilemap3d/tilemesh/json/JsonTileMeshCollection.java b/src/com/blarg/gdx/tilemap3d/tilemesh/json/JsonTileMeshCollection.java deleted file mode 100644 index 75fc0d2..0000000 --- a/src/com/blarg/gdx/tilemap3d/tilemesh/json/JsonTileMeshCollection.java +++ /dev/null @@ -1,11 +0,0 @@ -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 materials; - public ArrayList tiles; -}