make Slot public for testing

src/org/oscim/renderer/TextureAtlas.java

@@ -65,8 +65,8 @@ import android.graphics.Bitmap;
 
 public class TextureAtlas {
 	/** Allocated slots */
-	Slot mSlots;
+	public Slot mSlots;
-	Rect mRects;
+	private Rect mRects;
 
 	/** Width (in pixels) of the underlying texture */
 	final int mWidth;
@@ -86,8 +86,8 @@ public class TextureAtlas {
 	/** Atlas data */
 	Bitmap mData;
 
-	class Slot extends Inlist<Slot> {
+	public static class Slot extends Inlist<Slot> {
-		int x, y, w;
+		public int x, y, w;
 
 		public Slot(int x, int y, int w) {
 			this.x = x;
@@ -161,6 +161,7 @@ public class TextureAtlas {
 		Slot curSlot = new Slot(r.x, r.y + height, width);
 		mSlots = Inlist.prependRelative(mSlots, curSlot, bestSlot);
 
+		// split
 		for (prev = curSlot; prev.next != null;) {
 			slot = prev.next;
 

src/org/oscim/renderer/overlays/AtlasTest.java

@@ -8,8 +8,12 @@ import org.oscim.graphics.Paint.Cap;
 import org.oscim.renderer.GLRenderer.Matrices;
 import org.oscim.renderer.TextureAtlas;
 import org.oscim.renderer.TextureAtlas.Rect;
+import org.oscim.renderer.TextureAtlas.Slot;
 import org.oscim.renderer.layer.LineLayer;
+import org.oscim.renderer.layer.TextItem;
+import org.oscim.renderer.layer.TextLayer;
 import org.oscim.theme.renderinstruction.Line;
+import org.oscim.theme.renderinstruction.Text;
 import org.oscim.view.MapView;
 
 import android.util.Log;
@@ -23,11 +27,19 @@ public class AtlasTest extends BasicOverlay {
 
 		LineLayer ll = layers.getLineLayer(0);
 		ll.line = new Line(Color.BLUE, 3, Cap.BUTT);
-		ll.width = 1.5f;
+		ll.width = 1f;
 
 		LineLayer ll2 = layers.getLineLayer(1);
 		ll2.line = new Line(Color.RED, 3, Cap.BUTT);
-		ll2.width = 1.5f;
+		ll2.width = 1f;
+
+		LineLayer ll3 = layers.getLineLayer(2);
+		ll3.line = new Line(Color.GREEN, 3, Cap.BUTT);
+		ll3.width = 1f;
+
+		TextLayer tl = new TextLayer();
+		Text t = Text.createText(20, 0, Color.BLACK, 0, false);
+		layers.textureLayers = tl;
 
 		float[] points = new float[10];
 
@@ -39,36 +51,65 @@ public class AtlasTest extends BasicOverlay {
 				Log.d("...", "no space left");
 				continue;
 			}
+			r.x += 1;
+			r.y += 1;
+
 			points[0] = r.x;
 			points[1] = r.y;
-			points[2] = r.x + r.w;
+			points[2] = r.x + (r.w - 2);
 			points[3] = r.y;
-			points[4] = r.x + r.w;
+			points[4] = r.x + (r.w - 2);
-			points[5] = r.y + r.h;
+			points[5] = r.y + (r.h - 2);
 			points[6] = r.x;
-			points[7] = r.y + r.h;
+			points[7] = r.y + (r.h - 2);
 			points[8] = r.x;
 			points[9] = r.y;
 			ll.addLine(points, 10, false);
 
-			r.x += 2;
+			r.x += 1;
-			r.y += 2;
+			r.y += 1;
 			points[0] = r.x;
 			points[1] = r.y;
-			points[2] = r.x + w;
+			points[2] = r.x + (w - 4);
 			points[3] = r.y;
-			points[4] = r.x + w;
+			points[4] = r.x + (w - 4);
-			points[5] = r.y + h;
+			points[5] = r.y + (h - 4);
 			points[6] = r.x;
-			points[7] = r.y + h;
+			points[7] = r.y + (h - 4);
 			points[8] = r.x;
 			points[9] = r.y;
 
 			Log.d("...", "add region: " + Arrays.toString(points));
-
 			ll2.addLine(points, 10, false);
 
+			TextItem ti = TextItem.pool.get();
+			ti.set(r.x + r.w / 2, r.y + r.h / 2, "" + i, t);
+
+			ti.x1 = 0;
+			ti.y1 = 1; // (short) (size / 2);
+			ti.x2 = 1; // (short) size;
+			ti.y2 = 1;
+			tl.addText(ti);
 		}
+
+		for (Slot s = mAtlas.mSlots; s != null; s = s.next) {
+			points[0] = s.x;
+			points[1] = s.y;
+			points[2] = s.x + s.w;
+			points[3] = s.y;
+			points[4] = s.x + s.w;
+			points[5] = 2048;
+			points[6] = s.x;
+			points[7] = 2048;
+			points[8] = s.x;
+			points[9] = s.y;
+
+			ll3.addLine(points, 10, false);
+		}
+
+		tl.prepare();
+		TextItem.pool.releaseAll(tl.labels);
+
 		this.newData = true;
 	}
 
@@ -80,7 +121,7 @@ public class AtlasTest extends BasicOverlay {
 
 		if (initial) {
 			mMapPosition.copy(pos);
-			initial = false;
+			this.initial = false;
 		}
 	}
 }