surface stuff

3 files changed, 62 insertions, 69 deletions

diff --git a/test/06-test-grouper.js b/test/06-test-grouper.js
index 5388875..0f14217 100644
--- a/test/06-test-grouper.js
+++ b/test/06-test-grouper.js
@@ -236,7 +236,7 @@ describe('grouper(rect,corner,peninsula_taller)', function(){
     })
     it("right has 5 walls", function(){
       assert.equal(5, right_walls.length)
-      // console.log(right_walls.map(function(m){ return m.vec + " " + m.edge + " " + m.faces+"" }))
+      // console.log(right_walls.map(function(m){ return m.vec + " " + m.edge + " " + m.surface +"" }))
     })
     it("front has 3 walls", function(){
       assert.equal(3, front_walls.length)
@@ -281,7 +281,7 @@ describe('grouper(room,hallway)', function(){
     })
     it("back has 2 walls", function(){
       assert.equal(2, back_walls.length)
-      // console.log(back_walls.map(function(m){ return m.vec + " " + m.edge + " " + m.faces+"" }))
+      // console.log(back_walls.map(function(m){ return m.vec + " " + m.edge + " " + m.surface +"" }))
     })
   })
 })
diff --git a/test/07-test-bounds.js b/test/07-test-bounds.js
deleted file mode 100644
index 20afbfa..0000000
--- a/test/07-test-bounds.js
+++ /dev/null
@@ -1,67 +0,0 @@
-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 Grouper = require("../public/assets/javascripts/rectangles/engine/rooms/grouper.js")
-var FRONT = 0x1, BACK = 0x2, LEFT = 0x4, RIGHT = 0x8, FLOOR = 0x10, CEILING = 0x20
-var ALL = FRONT | BACK | LEFT | RIGHT
-
-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) )
-var big_rect  = new Rect( new vec(1,5), new vec(1,5) )
-var hall_rect = new Rect( new vec(3,4), new vec(4,8) )
-
-var rect_room         = new Room({ id: "rect", rect: rect, height: 2 })
-var east_room         = new Room({ id: "east", rect: east, height: 2 })
-var corner_room       = new Room({ id: "corner", rect: corner, height: 2 })
-var peninsula_room    = new Room({ id: "peninsula", rect: peninsula, height: 2 })
-var peninsula_taller  = new Room({ id: "peninsula", rect: peninsula, height: 3 })
-var peninsula_shorter = new Room({ id: "peninsula", rect: peninsula, height: 1 })
-
-var taller_room = new Room({ id: "taller", rect: rect, height: 3 })
-
-var big_room = new Room({ id: "big_room", rect: big_rect, height: 4 })
-var hallway  = new Room({ id: "hallway", rect: hall_rect, height: 2 })
-
-function reset(){
-  Rooms.forEach(function(room){
-    room.reset()
-  })
-  Rooms.list = {}
-  Rooms.regions = []
-}
-function rebuild(){
-  Rooms.clipper.solve_rects()
-  Rooms.builder.build()
-}
-
-describe('wall', function(){
-  reset()
-  Rooms.add( big_room )
-  Rooms.add( hallway )
-  rebuild()
-
-  var collections = Rooms.grouper.collect()
-  var front_walls = Rooms.grouper.group([], collections, FRONT)
-  var back_walls = Rooms.grouper.group([], collections, BACK)
-  var left_walls = Rooms.grouper.group([], collections, LEFT)
-  var right_walls = Rooms.grouper.group([], collections, RIGHT)
-
-  console.log(back_walls.map(function(m){ return m.vec + " " + m.edge + " " + m.faces+"" }))
-  var u_wall = back_walls[0]
-
-  describe('#fits()', function(){
-    it("", function(){
-    })
-  })
-  describe('#bounds_for()', function(){
-    it("", function(){
-    })
-  })
-})
-
diff --git a/test/07-test-surface.js b/test/07-test-surface.js
new file mode 100644
index 0000000..8f69e77
--- /dev/null
+++ b/test/07-test-surface.js
@@ -0,0 +1,60 @@
+var assert = require("assert")
+var vec2 = require("../public/assets/javascripts/rectangles/models/vec2.js")
+var Rect = require("../public/assets/javascripts/rectangles/models/rect.js")
+var Surface = require("../public/assets/javascripts/rectangles/models/surface.js")
+
+// [[1 3] [0 4]] front back left right
+// [[3 4] [2 4]] front back left right
+// [[4 5] [0 4]] front back left right
+
+describe('basic surface', function(){
+  var surface = new Surface ()
+  surface.add( new Rect( new vec2(1, 3), new vec2(0, 4) ) )
+  surface.add( new Rect( new vec2(3, 4), new vec2(2, 4) ) )
+  surface.add( new Rect( new vec2(4, 6), new vec2(0, 4) ) )
+
+  var small = new vec2(2, 2)
+  var large = new vec2(10, 10)
+  var oblong = new vec2(4, 1)
+
+  describe('#fits()', function(){
+    it("fits something small", function(){
+      assert.equal(true,  !! surface.fits(small))
+    })
+    it("doesn't fit something large", function(){
+      assert.equal(false, !! surface.fits(large))
+    })
+    it("fits something oblong", function(){
+      assert.equal(true,  !! surface.fits(oblong))
+    })
+  })
+  describe('#fits_scale()', function(){
+    it("fits something large, scaled down", function(){
+      assert.equal(true,  !! surface.fits_scale(large, 0.1))
+    })
+    it("doesn't fit something small, scaled up", function(){
+      assert.equal(false, !! surface.fits_scale(small, 10))
+    })
+    it("doesn't fit something oblong, scaled up", function(){
+      assert.equal(false, !! surface.fits_scale(oblong, 10))
+    })
+  })
+
+  describe('#place()', function(){
+    it("fits a small element on the top left", function(){
+      var bounds = surface.place(small, new vec2(1,3))
+      console.log(bounds)
+    })
+    it("places a small element on the right", function(){
+      var bounds = surface.place(small, new vec2(4,6))
+      console.log(bounds)
+    })
+  })
+
+  describe('#clamp()', function(){
+    it("", function(){
+    })
+  })
+
+})
+