testing wallbuilding with some broken testcases..

2 files changed, 134 insertions, 20 deletions

diff --git a/test/03-test-clipping.js b/test/03-test-clipper.js
index 20dadb3..923a8a5 100644
--- a/test/03-test-clipping.js
+++ b/test/03-test-clipper.js
@@ -41,9 +41,8 @@ describe('clipper', function(){
   describe('#cull_rects(rect, east)', function(){
     Rooms.clipper.reset_rects()
     var regions = Rooms.clipper.clip_rects()
-    var culled = Rooms.clipper.cull_rects()
-    var culled_dupes = culled.filter(function(r){ return r.dupe })
-    var culled_regions = culled.filter(function(r){ return ! r.dupe })
+    var culled = Rooms.clipper.cull_rects_iterative()
+    var culled_dupes = regions.filter(function(r){ return r.dupe })
 
     it('clipper returns 4 rects', function(){
       assert.equal(4, regions.length)
@@ -51,8 +50,8 @@ describe('clipper', function(){
     it('culling marks 1 duplicate', function(){
       assert.equal(1, culled_dupes.length)
     })
-    it('culling marks 3 non-duplicate', function(){
-      assert.equal(3, culled_regions.length)
+    it('culling returns 3 non-duplicate', function(){
+      assert.equal(3, culled.length)
     })
   })
 
@@ -66,9 +65,8 @@ describe('clipper', function(){
   describe('#cull_rects(rect, corner)', function(){
     Rooms.clipper.reset_rects()
     var regions = Rooms.clipper.clip_rects()
-    var culled = Rooms.clipper.cull_rects()
-    var culled_dupes = culled.filter(function(r){ return r.dupe })
-    var culled_regions = culled.filter(function(r){ return ! r.dupe })
+    var culled = Rooms.clipper.cull_rects_iterative()
+    var culled_dupes = regions.filter(function(r){ return r.dupe })
 
     it('clipper returns 8 rects', function(){
       assert.equal(8, regions.length)
@@ -76,8 +74,8 @@ describe('clipper', function(){
     it('culling marks 1 duplicate', function(){
       assert.equal(1, culled_dupes.length)
     })
-    it('culling marks 7 non-duplicate', function(){
-      assert.equal(7, culled_regions.length)
+    it('culling returns 7 non-duplicate', function(){
+      assert.equal(7, culled.length)
     })
   })
 
@@ -95,17 +93,16 @@ describe('clipper', function(){
     Rooms.clipper.reset_rects()
     var regions = Rooms.clipper.clip_rects()
     var culled = Rooms.clipper.cull_rects()
-    var culled_dupes = culled.filter(function(r){ return r.dupe })
-    var culled_regions = culled.filter(function(r){ return ! r.dupe })
+    var culled_dupes = regions.filter(function(r){ return r.dupe })
 
     it('clipper returns 16 rects', function(){
       assert.equal(16, regions.length)
     })
-    it('culling marks 2 duplicate', function(){
-      assert.equal(2, culled_dupes.length)
+    it('culling marks 3 duplicate', function(){
+      assert.equal(3, culled_dupes.length)
     })
-    it('culling marks 14 non-duplicate', function(){
-      assert.equal(14, culled_regions.length)
+    it('culling returns 13 non-duplicate', function(){
+      assert.equal(13, regions.length)
     })
   })
 */
@@ -115,8 +112,7 @@ describe('clipper', function(){
     Rooms.clipper.reset_rects()
     var regions = Rooms.clipper.clip_rects()
     var culled = Rooms.clipper.cull_rects_iterative()
-    var culled_dupes = culled.filter(function(r){ return r.dupe })
-    var culled_regions = culled.filter(function(r){ return ! r.dupe })
+    var culled_dupes = regions.filter(function(r){ return r.dupe })
 
     it('clipper returns 16 rects', function(){
       assert.equal(16, regions.length)
@@ -124,8 +120,8 @@ describe('clipper', function(){
     it('culling marks 3 duplicate', function(){
       assert.equal(3, culled_dupes.length)
     })
-    it('culling marks 14 non-duplicate', function(){
-      assert.equal(13, culled_regions.length)
+    it('culling returns 14 non-duplicate', function(){
+      assert.equal(13, culled.length)
     })
   })
 
diff --git a/test/04-test-builder.js b/test/04-test-builder.js
new file mode 100644
index 0000000..f1c0f71
--- /dev/null
+++ b/test/04-test-builder.js
@@ -0,0 +1,118 @@
+var assert = require("assert")
+var vec = require("../public/assets/javascripts/rectangles/models/vec2.js")
+var Rect = require("../public/assets/javascripts/rectangles/models/rect.js")
+var Room = require("../public/assets/javascripts/rectangles/models/room.js")
+var Rooms = require("../public/assets/javascripts/rectangles/engine/rooms/_rooms.js")
+var Clipper = require("../public/assets/javascripts/rectangles/engine/rooms/clipper.js")
+var Builder = require("../public/assets/javascripts/rectangles/engine/rooms/builder.js")
+var FRONT = 0x1, BACK = 0x2, LEFT = 0x4, RIGHT = 0x8, FLOOR = 0x10, CEILING = 0x20
+var ALL = FRONT | BACK | LEFT | RIGHT
+function sidesToString(sides){
+  var s = ""
+  if (sides & FRONT) s += "front "
+  if (sides & BACK)  s += "back "
+  if (sides & LEFT)  s += "left "
+  if (sides & RIGHT) s += "right "
+  if (sides & TOP)  s += "top "
+  if (sides & BOTTOM) s += "bottom "
+  return s
+}
+function bitcount(v) {
+  v = v - ((v >>> 1) & 0x55555555);
+  v = (v & 0x33333333) + ((v >>> 2) & 0x33333333);
+  return ((v + (v >>> 4) & 0xF0F0F0F) * 0x1010101) >>> 24;
+}
+
+var rect      = new Rect( new vec(1,5), new vec(1,5) )
+var east      = new Rect( new vec(2,6), new vec(1,5) )
+var corner    = new Rect( new vec(3,7), new vec(3,7) )
+var peninsula = new Rect( new vec(4,6), new vec(6,8) )
+
+function report(a) {
+  console.log( a.join("\n") )
+}
+function reportSides(walls) {
+  console.log(walls.map(function(w){ return sidesToString(w.side) }).join("\n"))
+}
+function reset(){
+  Rooms.list = {}
+  Rooms.regions = []
+}
+function rebuild(){
+  Rooms.clipper.reset_rects()
+  var regions = Rooms.clipper.clip_rects()
+  var culled = Rooms.clipper.cull_rects_iterative()
+  return culled
+}
+
+describe('builder', function(){
+
+  reset()
+  var rect_room = Rooms.add_with_rect( rect )
+  rebuild()
+
+  describe('#build_walls(rect)', function(){
+    var walls = Rooms.builder.build_walls(rect_room.regions[0])
+
+    it("should return 4 walls", function(){
+      assert.equal(4, walls.length)
+    })
+    it("should have one side per wall", function(){
+      assert.equal(1, bitcount(walls[0].side))
+      assert.equal(1, bitcount(walls[1].side))
+      assert.equal(1, bitcount(walls[2].side))
+      assert.equal(1, bitcount(walls[3].side))
+    })
+  })
+
+  describe('#build_floors(rect)', function(){
+    var floors = Rooms.builder.build_floors(rect_room)
+    it("should make 2 floors", function(){
+      assert.equal(2, floors.length)
+    })
+  })
+
+  //
+
+  reset()
+  var rect_room = Rooms.add_with_rect( rect )
+  var rect_east = Rooms.add_with_rect( east )
+  var regions = rebuild()
+
+console.log("\n\n")
+console.log(regions.join("\n"))
+console.log("\n\n")
+
+  describe('#build_walls(rect, east)', function(){
+
+    var walls = regions.map(Rooms.builder.build_walls.bind(Rooms.builder))
+    walls.map(function(w){ reportSides(w); console.log("--") })
+
+    it("should return 3 walls", function(){
+      assert.equal(4, walls.length)
+    })
+    it("should have one side per wall", function(){
+      assert.equal(1, bitcount(walls[0].side))
+      assert.equal(1, bitcount(walls[1].side))
+      assert.equal(1, bitcount(walls[2].side))
+      assert.equal(1, bitcount(walls[3].side))
+    })
+  })
+
+  describe('#build_floors(rect, east)', function(){
+    var floors = Rooms.builder.build_floors(rect_room)
+    it("should make 2 floors", function(){
+      assert.equal(2, floors.length)
+    })
+    // reportSides(floors)
+  })
+
+
+
+
+
+  // Rooms.add_with_rect( corner )
+  // Rooms.add_with_rect( peninsula )
+
+})
+