From 76e2cfe04381f6820da93797097a0d7f6b592b67 Mon Sep 17 00:00:00 2001
From: gered <gered@blarg.ca>
Date: Wed, 17 Jul 2013 19:27:26 -0400
Subject: [PATCH] move tile mesh related classes into the new package

---
 src/com/blarg/gdx/tilemap3d/ChunkVertexGenerator.java |  4 ++--
 .../gdx/tilemap3d/PositionAndSkyTileMapLighter.java   |  2 ++
 src/com/blarg/gdx/tilemap3d/SimpleTileMapLighter.java |  1 +
 src/com/blarg/gdx/tilemap3d/TileMap.java              |  1 +
 .../gdx/tilemap3d/{ => tilemesh}/CubeTileMesh.java    |  2 +-
 .../tilemap3d/{ => tilemesh}/MaterialTileMapping.java |  2 +-
 .../gdx/tilemap3d/{ => tilemesh}/ModelTileMesh.java   |  4 +---
 .../blarg/gdx/tilemap3d/{ => tilemesh}/TileMesh.java  |  2 +-
 .../tilemap3d/{ => tilemesh}/TileMeshCollection.java  | 11 +++++++----
 9 files changed, 17 insertions(+), 12 deletions(-)
 rename src/com/blarg/gdx/tilemap3d/{ => tilemesh}/CubeTileMesh.java (99%)
 rename src/com/blarg/gdx/tilemap3d/{ => tilemesh}/MaterialTileMapping.java (98%)
 rename src/com/blarg/gdx/tilemap3d/{ => tilemesh}/ModelTileMesh.java (98%)
 rename src/com/blarg/gdx/tilemap3d/{ => tilemesh}/TileMesh.java (97%)
 rename src/com/blarg/gdx/tilemap3d/{ => tilemesh}/TileMeshCollection.java (90%)

diff --git a/src/com/blarg/gdx/tilemap3d/ChunkVertexGenerator.java b/src/com/blarg/gdx/tilemap3d/ChunkVertexGenerator.java
index 163b6f2..b34a8d1 100644
--- a/src/com/blarg/gdx/tilemap3d/ChunkVertexGenerator.java
+++ b/src/com/blarg/gdx/tilemap3d/ChunkVertexGenerator.java
@@ -6,8 +6,8 @@ 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 java.nio.FloatBuffer;
+import com.blarg.gdx.tilemap3d.tilemesh.CubeTileMesh;
+import com.blarg.gdx.tilemap3d.tilemesh.TileMesh;
 
 public class ChunkVertexGenerator {
 	protected final MeshBuilder.VertexInfo vertex = new MeshPartBuilder.VertexInfo();
diff --git a/src/com/blarg/gdx/tilemap3d/PositionAndSkyTileMapLighter.java b/src/com/blarg/gdx/tilemap3d/PositionAndSkyTileMapLighter.java
index 381fbde..0f111b8 100644
--- a/src/com/blarg/gdx/tilemap3d/PositionAndSkyTileMapLighter.java
+++ b/src/com/blarg/gdx/tilemap3d/PositionAndSkyTileMapLighter.java
@@ -1,5 +1,7 @@
 package com.blarg.gdx.tilemap3d;
 
+import com.blarg.gdx.tilemap3d.tilemesh.TileMesh;
+
 public class PositionAndSkyTileMapLighter extends SimpleTileMapLighter {
 	public PositionAndSkyTileMapLighter() {
 	}
diff --git a/src/com/blarg/gdx/tilemap3d/SimpleTileMapLighter.java b/src/com/blarg/gdx/tilemap3d/SimpleTileMapLighter.java
index 4249383..b895361 100644
--- a/src/com/blarg/gdx/tilemap3d/SimpleTileMapLighter.java
+++ b/src/com/blarg/gdx/tilemap3d/SimpleTileMapLighter.java
@@ -1,6 +1,7 @@
 package com.blarg.gdx.tilemap3d;
 
 import com.blarg.gdx.Bitfield;
+import com.blarg.gdx.tilemap3d.tilemesh.TileMesh;
 
 public class SimpleTileMapLighter implements TileMapLighter {
 	public SimpleTileMapLighter() {
diff --git a/src/com/blarg/gdx/tilemap3d/TileMap.java b/src/com/blarg/gdx/tilemap3d/TileMap.java
index 28b9861..c42b0cb 100644
--- a/src/com/blarg/gdx/tilemap3d/TileMap.java
+++ b/src/com/blarg/gdx/tilemap3d/TileMap.java
@@ -5,6 +5,7 @@ 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.tilemesh.TileMeshCollection;
 
 public class TileMap extends TileContainer implements Disposable {
 	final TileChunk[] chunks;
diff --git a/src/com/blarg/gdx/tilemap3d/CubeTileMesh.java b/src/com/blarg/gdx/tilemap3d/tilemesh/CubeTileMesh.java
similarity index 99%
rename from src/com/blarg/gdx/tilemap3d/CubeTileMesh.java
rename to src/com/blarg/gdx/tilemap3d/tilemesh/CubeTileMesh.java
index 255e930..971c3ab 100644
--- a/src/com/blarg/gdx/tilemap3d/CubeTileMesh.java
+++ b/src/com/blarg/gdx/tilemap3d/tilemesh/CubeTileMesh.java
@@ -1,4 +1,4 @@
-package com.blarg.gdx.tilemap3d;
+package com.blarg.gdx.tilemap3d.tilemesh;
 
 import com.badlogic.gdx.graphics.Color;
 import com.badlogic.gdx.graphics.VertexAttribute;
diff --git a/src/com/blarg/gdx/tilemap3d/MaterialTileMapping.java b/src/com/blarg/gdx/tilemap3d/tilemesh/MaterialTileMapping.java
similarity index 98%
rename from src/com/blarg/gdx/tilemap3d/MaterialTileMapping.java
rename to src/com/blarg/gdx/tilemap3d/tilemesh/MaterialTileMapping.java
index 5821982..1315e4b 100644
--- a/src/com/blarg/gdx/tilemap3d/MaterialTileMapping.java
+++ b/src/com/blarg/gdx/tilemap3d/tilemesh/MaterialTileMapping.java
@@ -1,4 +1,4 @@
-package com.blarg.gdx.tilemap3d;
+package com.blarg.gdx.tilemap3d.tilemesh;
 
 import com.badlogic.gdx.graphics.g2d.TextureRegion;
 import com.badlogic.gdx.math.Vector2;
diff --git a/src/com/blarg/gdx/tilemap3d/ModelTileMesh.java b/src/com/blarg/gdx/tilemap3d/tilemesh/ModelTileMesh.java
similarity index 98%
rename from src/com/blarg/gdx/tilemap3d/ModelTileMesh.java
rename to src/com/blarg/gdx/tilemap3d/tilemesh/ModelTileMesh.java
index cb256e5..7dfb16e 100644
--- a/src/com/blarg/gdx/tilemap3d/ModelTileMesh.java
+++ b/src/com/blarg/gdx/tilemap3d/tilemesh/ModelTileMesh.java
@@ -1,9 +1,8 @@
-package com.blarg.gdx.tilemap3d;
+package com.blarg.gdx.tilemap3d.tilemesh;
 
 import com.badlogic.gdx.graphics.Color;
 import com.badlogic.gdx.graphics.VertexAttribute;
 import com.badlogic.gdx.graphics.VertexAttributes;
-import com.badlogic.gdx.graphics.g2d.TextureRegion;
 import com.badlogic.gdx.graphics.g3d.Model;
 import com.badlogic.gdx.graphics.g3d.model.MeshPart;
 import com.badlogic.gdx.graphics.g3d.model.Node;
@@ -19,7 +18,6 @@ import com.blarg.gdx.math.MathHelpers;
 
 import java.nio.FloatBuffer;
 import java.nio.ShortBuffer;
-import java.util.Map;
 
 public class ModelTileMesh extends TileMesh {
 	static final Vector3 tmpPosition = new Vector3();
diff --git a/src/com/blarg/gdx/tilemap3d/TileMesh.java b/src/com/blarg/gdx/tilemap3d/tilemesh/TileMesh.java
similarity index 97%
rename from src/com/blarg/gdx/tilemap3d/TileMesh.java
rename to src/com/blarg/gdx/tilemap3d/tilemesh/TileMesh.java
index f843d9a..bbfb02e 100644
--- a/src/com/blarg/gdx/tilemap3d/TileMesh.java
+++ b/src/com/blarg/gdx/tilemap3d/tilemesh/TileMesh.java
@@ -1,4 +1,4 @@
-package com.blarg.gdx.tilemap3d;
+package com.blarg.gdx.tilemap3d.tilemesh;
 
 import com.badlogic.gdx.graphics.Color;
 import com.badlogic.gdx.math.Vector3;
diff --git a/src/com/blarg/gdx/tilemap3d/TileMeshCollection.java b/src/com/blarg/gdx/tilemap3d/tilemesh/TileMeshCollection.java
similarity index 90%
rename from src/com/blarg/gdx/tilemap3d/TileMeshCollection.java
rename to src/com/blarg/gdx/tilemap3d/tilemesh/TileMeshCollection.java
index 35202f2..c132886 100644
--- a/src/com/blarg/gdx/tilemap3d/TileMeshCollection.java
+++ b/src/com/blarg/gdx/tilemap3d/tilemesh/TileMeshCollection.java
@@ -1,4 +1,4 @@
-package com.blarg.gdx.tilemap3d;
+package com.blarg.gdx.tilemap3d.tilemesh;
 
 import com.badlogic.gdx.graphics.Color;
 import com.badlogic.gdx.graphics.g2d.TextureRegion;
@@ -7,11 +7,14 @@ import com.badlogic.gdx.math.Vector3;
 import com.badlogic.gdx.utils.Array;
 import com.blarg.gdx.Bitfield;
 import com.blarg.gdx.graphics.TextureAtlas;
-
-import java.util.Map;
+import com.blarg.gdx.tilemap3d.Tile;
+import com.blarg.gdx.tilemap3d.tilemesh.CubeTileMesh;
+import com.blarg.gdx.tilemap3d.tilemesh.MaterialTileMapping;
+import com.blarg.gdx.tilemap3d.tilemesh.ModelTileMesh;
+import com.blarg.gdx.tilemap3d.tilemesh.TileMesh;
 
 public class TileMeshCollection {
-	TextureAtlas atlas;
+	public final TextureAtlas atlas;
 	Array<TileMesh> meshes;
 
 	public TileMeshCollection(TextureAtlas atlas) {