Merge branch 'walls' of github.com:okfocus/vvalls into walls

3 files changed, 54 insertions, 22 deletions

diff --git a/test/06-test-grouper.js b/test/06-test-grouper.js
index 0f14217..184a3d7 100644
--- a/test/06-test-grouper.js
+++ b/test/06-test-grouper.js
@@ -194,8 +194,8 @@ describe('grouper(rect,corner,peninsula)', function(){
     it("left has 3 walls", function(){
       assert.equal(3, left_walls.length)
     })
-    it("right has 4 walls", function(){
-      assert.equal(4, right_walls.length)
+    it("right has 3 walls", function(){
+      assert.equal(3, right_walls.length)
     })
     it("front has 2 walls", function(){
       assert.equal(2, front_walls.length)
@@ -229,14 +229,15 @@ describe('grouper(rect,corner,peninsula_taller)', function(){
     var front_walls = Rooms.grouper.group([], collections, FRONT)
     var back_walls = Rooms.grouper.group([], collections, BACK)
     var left_walls = Rooms.grouper.group([], collections, LEFT)
+    Rooms.grouper.debug = true
     var right_walls = Rooms.grouper.group([], collections, RIGHT)
+    Rooms.grouper.debug = false
 
-    it("left has 4 walls", function(){
-      assert.equal(4, left_walls.length)
+    it("left has 3 walls", function(){
+      assert.equal(3, left_walls.length)
     })
-    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.surface +"" }))
+    it("right has 3 walls", function(){
+      assert.equal(3, right_walls.length)
     })
     it("front has 3 walls", function(){
       assert.equal(3, front_walls.length)
diff --git a/test/07-test-surface.js b/test/07-test-surface.js
index 8f69e77..b2e4769 100644
--- a/test/07-test-surface.js
+++ b/test/07-test-surface.js
@@ -9,6 +9,36 @@ var Surface = require("../public/assets/javascripts/rectangles/models/surface.js
 
 describe('basic surface', function(){
   var surface = new Surface ()
+  surface.add( new Rect( new vec2(1, 5), new vec2(0, 4) ) )
+
+  var small = new vec2(2, 2)
+  var oblong = new vec2(4, 1)
+
+  // describe placement
+  // describe dragging up (clamp at top edge)
+  // describe dragging down (clamp at bottom edge)
+  // describe dragging left (clamp at left edge)
+  // describe dragging right (clamp at right edge)
+})
+
+describe('two-level 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, 5), new vec2(0, 6) ) )
+
+  var small = new vec2(2, 2)
+  var oblong = new vec2(4, 1)
+
+  // describe placement/centering
+  // describe dragging up (clamp at top edge)
+  // describe dragging down (clamp at bottom edge)
+  // describe dragging left (clamp at left edge)
+  // describe dragging right (clamp at right edge)
+  // describe dragging up and right (clamp at top edge, then pop into peninsula space)
+})
+
+describe('door 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) ) )
@@ -43,11 +73,11 @@ describe('basic surface', function(){
   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)
+//      console.log(bounds)
     })
     it("places a small element on the right", function(){
       var bounds = surface.place(small, new vec2(4,6))
-      console.log(bounds)
+//      console.log(bounds)
     })
   })
 
diff --git a/test/09-test-undo.js b/test/09-test-undo.js
index 84b5d09..60fbbb6 100644
--- a/test/09-test-undo.js
+++ b/test/09-test-undo.js
@@ -1,5 +1,6 @@
 var assert = require("assert")
-var UndoStack = require("../public/assets/javascripts/rectangles/util/undo.js")
+var UndoStack = require("../public/assets/javascripts/rectangles/util/undostack.js")
+UndoStack.debug = false
 
 describe('undo', function(){
   
@@ -9,11 +10,11 @@ describe('undo', function(){
   
     UndoStack.register({
       type: "demo",
-      undo: function(action){
-        state = action.prev
+      undo: function(myState){
+        state = myState
       },
-      redo: function(action){
-        state = action.next
+      redo: function(myState){
+        state = myState
       },
     })
 
@@ -33,22 +34,22 @@ describe('undo', function(){
 
       UndoStack.push({
         type: "demo",
-        prev: state,
-        next: "one"
+        undo: state,
+        redo: "one"
       })
       state = "one"
 
       UndoStack.push({
         type: "demo",
-        prev: state,
-        next: "two"
+        undo: state,
+        redo: "two"
       })
       state = "two"
 
       UndoStack.push({
         type: "demo",
-        prev: state,
-        next: "three"
+        undo: state,
+        redo: "three"
       })
       state = "three"
     
@@ -122,8 +123,8 @@ describe('undo', function(){
 
       UndoStack.push({
         type: "demo",
-        prev: state,
-        next: "four"
+        undo: state,
+        redo: "four"
       })
       state = "four"