From be7412073a5e0b6641f125f29d254315f50bc95c Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Fri, 1 Aug 2014 18:03:20 -0400
Subject: tests for grouper

---
 .../assets/javascripts/rectangles/models/wall.js   | 37 +++++++++++++++-------
 1 file changed, 25 insertions(+), 12 deletions(-)

(limited to 'public/assets/javascripts/rectangles/models/wall.js')

diff --git a/public/assets/javascripts/rectangles/models/wall.js b/public/assets/javascripts/rectangles/models/wall.js
index 027d5f5..f2b8bca 100644
--- a/public/assets/javascripts/rectangles/models/wall.js
+++ b/public/assets/javascripts/rectangles/models/wall.js
@@ -1,21 +1,31 @@
-window.Wall = (function(){
+(function(){
 
+	var vec2, Rect, sort
+	if ('window' in this) {
+		vec2 = window.vec2
+		Rect = window.Rect
+		sort = window.sort
+	}
+	else {
+		vec2 = require('./vec2')
+		Rect = require('./rect')
+		UidGenerator = require('../util/uid')
+	}
+	var wall_uid = new UidGenerator({})
+	
 	var Wall = function(opt){
 		this.id = opt.id
-		this.uid = Uid()
-		this.room = opt.room
-		this.rect = opt.rect || new Rect (0,0,0,0)
-		this.rect.sides = opt.side
+		this.uid = wall_uid
+		this.vec = opt.vec
 		this.side = opt.side
 		this.mx = []
- 		this.els = []
  		if (opt.el) {
  			this.mx.push(opt.el)
  		}
 	}
 	
 	Wall.prototype.toString = function(){
-		return this.rect.toString()
+		return this.vec.toString()
 	}
 
 	Wall.prototype.reset = function(){
@@ -25,7 +35,7 @@ window.Wall = (function(){
 		this.mx.forEach(function(mx){
 			mx.destroy && mx.destroy()
 		})
-		this.room = this.rect = this.mx = this.els = null
+		this.room = this.vec = this.mx = null
 	}
 	
 	Wall.prototype.bind = function(){
@@ -146,8 +156,6 @@ window.Wall = (function(){
 		if (shouldFlip) {
 			sortedWalls = sortedWalls.reverse()
 		}
-		
-console.log(sortedWalls.map(function(z){return useX ? z.x : z.z}).join(" "))
 
 		var len = sortedWalls.length
 		
@@ -184,7 +192,6 @@ console.log(sortedWalls.map(function(z){return useX ? z.x : z.z}).join(" "))
 
 			mx.el.style.backgroundImage = "url(" + dataUrl + ")"
 		})
-		window.zz += 1
 	}
 	
 	Wall.prototype.siblings = function(){
@@ -222,6 +229,12 @@ console.log(sortedWalls.map(function(z){return useX ? z.x : z.z}).join(" "))
 		})
 	}
 	
-	return Wall
+	if ('window' in this) {
+		window.Wall = Wall
+	}
+	else {
+		module.exports = Wall
+	}
+
 
 })()
-- 
cgit v1.2.3-70-g09d2


From e2e1565f5cd3154c0f515dbe3d88c9943dd0580e Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Mon, 4 Aug 2014 17:41:04 -0400
Subject: group walls and render using 'wireframe' look

---
 .../javascripts/rectangles/engine/rooms/builder.js |   2 +-
 .../javascripts/rectangles/engine/rooms/grouper.js | 147 +++++++++++++++++++++
 .../assets/javascripts/rectangles/models/wall.js   |  39 +++---
 .../assets/javascripts/rectangles/util/colors.js   |   3 +-
 public/assets/javascripts/rectangles/util/sort.js  |  33 ++++-
 server/index.js                                    |   2 +-
 test/06-test-grouper.js                            | 129 +++++++++++++++++-
 views/partials/scripts.ejs                         |   1 +
 8 files changed, 325 insertions(+), 31 deletions(-)
 create mode 100644 public/assets/javascripts/rectangles/engine/rooms/grouper.js

(limited to 'public/assets/javascripts/rectangles/models/wall.js')

diff --git a/public/assets/javascripts/rectangles/engine/rooms/builder.js b/public/assets/javascripts/rectangles/engine/rooms/builder.js
index 1f21636..6b2e65a 100644
--- a/public/assets/javascripts/rectangles/engine/rooms/builder.js
+++ b/public/assets/javascripts/rectangles/engine/rooms/builder.js
@@ -43,7 +43,7 @@
 			if (window.scene) {
 				base.clear()
 				base.build()
-				Rooms.grouper.group()
+				Rooms.grouper.build()
 			}
 		}
 		
diff --git a/public/assets/javascripts/rectangles/engine/rooms/grouper.js b/public/assets/javascripts/rectangles/engine/rooms/grouper.js
new file mode 100644
index 0000000..532146d
--- /dev/null
+++ b/public/assets/javascripts/rectangles/engine/rooms/grouper.js
@@ -0,0 +1,147 @@
+(function(){
+
+	var Rooms, UidGenerator, Wall, sort
+	if ('window' in this) {
+		Rooms = window.Rooms
+		UidGenerator = window.UidGenerator
+		Wall = window.Wall
+		sort = window.sort
+	}
+	else {
+		Rooms = require('./_rooms')
+		UidGenerator = require('../../util/uid')
+		Wall = require('../../models/wall')
+		sort = require('../../util/sort')
+		FRONT = 0x1, BACK = 0x2, LEFT = 0x4, RIGHT = 0x8, FLOOR = 0x10, CEILING = 0x20
+		PI = Math.PI
+		HALF_PI = PI/2
+		TOP = CEILING, BOTTOM = FLOOR
+		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
+		}
+	}
+
+	Rooms.grouper = new function(){
+
+		var base = this
+
+		base.list = {}
+		
+		base.uid = new UidGenerator(base.list)
+		
+		base.build = function (){
+			var walls = []
+			var collections = base.collect()
+			base.cull(collections)
+			base.group(walls, collections, FRONT)
+			base.group(walls, collections, BACK)
+			base.group(walls, collections, LEFT)
+			base.group(walls, collections, RIGHT)
+			Rooms.walls = walls
+			base.bind()
+		}
+		base.collect = function(){			
+			var collections = {}
+			collections[FRONT] = []
+			collections[BACK] = []
+			collections[LEFT] = []
+			collections[RIGHT] = []
+			
+			Rooms.forEach(function(room){
+				room.mx_walls.forEach(function(mx){
+					var side = mx.side || mx.half_side
+					collections[side].push(mx)
+				})
+			})
+			
+			base.cull(collections)
+			
+			return collections
+		}
+		base.cull = function(collections){
+			[FRONT, BACK, LEFT, RIGHT].forEach(function(side){
+				var collection = collections[side]
+				var useX = side & FRONT_BACK
+				var useA = side & (FRONT | RIGHT)
+				var last_mx
+				
+				collection.sort( useX ? sort.compare_zx : sort.compare_xz )
+				collection.forEach(function(mx){
+					if (last_mx && last_mx.rect.eq(mx.rect)) {
+//							console.log( mx.y - mx.height/2 )
+//							console.log( last_mx.y - last_mx.height/2 )
+//  							console.log(last_mx.y, mx.y)
+// 							console.log(last_mx.height, mx.height)
+// 							console.log(Rooms.list[ last_mx.rect.id ].height, Rooms.list[ mx.rect.id ].height)
+//							console.log("___")
+// 							last_mx.height += mx.height/2
+// 							last_mx.y += mx.height/4
+						if (last_mx.rect.id == mx.rect.id) {
+							last_mx.height += mx.height/2
+							last_mx.y += mx.height/4
+						}
+						last_mx.side = side
+
+						mx.culled = true
+						scene.remove(mx)
+						return
+					}
+					last_mx = mx
+				})
+			})
+			return collections
+		}
+		base.group = function(walls, collections, side){
+			var collection = collections[side]
+			var wall
+			var useX = side & FRONT_BACK
+			var useA = side & (FRONT | RIGHT)
+
+			// collection.sort( useX ? sort.compare_zx : sort.compare_xz )
+			
+			collection.forEach(function(mx){
+				if (mx.culled) return
+				var coplanar = wall && wall.edge == mx.rect[useX ? 'y': 'x'][useA ? 'a': 'b']
+				
+				if (wall && coplanar) {
+					if (useX && wall.vec.b == mx.rect.x.a) {
+						wall.vec.b = mx.rect.x.b
+						wall.mx.push(mx)
+						return
+					}
+					else if (! useX && wall.vec.b == mx.rect.y.a) {
+						wall.vec.b = mx.rect.y.b
+						wall.mx.push(mx)
+						return
+					}
+				}
+				wall = new Wall ({
+					id: base.uid(),
+					side: side,
+					vec: mx.rect[ useX ? 'x' : 'y' ].clone(),
+					edge: mx.rect[useX ? 'y' : 'x' ][ useA ? 'a' : 'b' ],
+					el: mx,
+				})
+				walls.push(wall)
+			})
+
+			return walls
+		}
+		
+		base.bind = function(){
+			Rooms.walls.forEach(function(wall){
+				wall.bind()
+				wall.randomize_colors()
+			})
+		}
+
+	}
+
+})()
diff --git a/public/assets/javascripts/rectangles/models/wall.js b/public/assets/javascripts/rectangles/models/wall.js
index f2b8bca..41d7235 100644
--- a/public/assets/javascripts/rectangles/models/wall.js
+++ b/public/assets/javascripts/rectangles/models/wall.js
@@ -17,6 +17,7 @@
 		this.id = opt.id
 		this.uid = wall_uid
 		this.vec = opt.vec
+		this.edge = opt.edge
 		this.side = opt.side
 		this.mx = []
  		if (opt.el) {
@@ -148,20 +149,18 @@
 		var ctx = canvas.getContext('2d')
 		var useX = this.side & FRONT_BACK
 		var shouldFlip = this.side & (LEFT | BACK)
+		var mx = this.mx
 
-		var sortedWalls = this.siblings().reduce(function(a,w){
-			return a.concat(w.mx)
-		}, []).sort( useX ? sort.compare_x : sort.compare_z )
-
-		if (shouldFlip) {
-			sortedWalls = sortedWalls.reverse()
+		// console.log( sidesToString(this.side), mx.length )
+		if (! shouldFlip) {
+			mx = mx.reverse()
 		}
 
-		var len = sortedWalls.length
+		var len = this.mx.length
 		
 		zz = window.zz || 0
 
-		sortedWalls.forEach(function(mx, i){
+		mx.forEach(function(mx, i){
 			if (mx.outlined) return
 			mx.outlined = true
 			canvas.width = mx.width
@@ -170,10 +169,10 @@
 			ctx.fillRect(0, 0, canvas.width, canvas.height)
 			ctx.fillStyle = "rgba(0,0,0,1.0)"
 
-			// all walls except top-half walls get bottom lines
+			// all walls get bottom lines
 			ctx.fillRect(0, 0, canvas.width, 1)
 			
-			// all walls except bottom-half walls get top lines
+			// all walls get top lines
 			ctx.fillRect(0, canvas.height-1, canvas.width, 1)
 			
 			// walls on initial sides get left lines
@@ -185,7 +184,6 @@
 			// walls on terminal sides get right lines....
 			// if their right edge lines up with the rect edge
 			if (i == len-1) {
-				// ctx.fillStyle = "rgba(255,0,0,1.0)"
 				ctx.fillRect(canvas.width-1, 0, 1, canvas.height)
 			}
 			var dataUrl = canvas.toDataURL()
@@ -195,21 +193,18 @@
 	}
 	
 	Wall.prototype.siblings = function(){
-		var base = this
-		var match = base.side | base.half_side
-		var walls = Rooms.list[this.room].walls.filter(function(w){
-			return (w.side | w.half_side) & match && w.$walls
-		})
-		return walls
+		return this
+// 		var base = this
+// 		var match = base.side | base.half_side
+// 		var walls = Rooms.list[this.room].walls.filter(function(w){
+// 			return (w.side | w.half_side) & match && w.$walls
+// 		})
+// 		return walls
 	}
 
 	Wall.prototype.randomize_colors = function(){
 		var color = window.grayColors[ this.side | this.half_side ]
-		var siblings = this.siblings()
-		siblings.forEach(function(w, i){
-			if (! w.$walls) return
-			w.color(color)
-		})
+		this.color(color)
 	}
 
 	Wall.prototype.stroke_colors = function(){
diff --git a/public/assets/javascripts/rectangles/util/colors.js b/public/assets/javascripts/rectangles/util/colors.js
index 95827cc..16d34dd 100644
--- a/public/assets/javascripts/rectangles/util/colors.js
+++ b/public/assets/javascripts/rectangles/util/colors.js
@@ -58,7 +58,8 @@
 		select.blur()
 	})
 
-	window.colors = color_palettes[select ? select.value : 'alphaQuad']
+	window.colors = color_palettes[select ? select.value : 'colors']
+//	window.colors = color_palettes[select ? select.value : 'alphaQuad']
 	window.grayColors = {}
 	_.zip([FRONT, LEFT, BACK, RIGHT], color_palettes.alphaQuad).map(function(pair){
 		window.grayColors[pair[0]] = pair[1]
diff --git a/public/assets/javascripts/rectangles/util/sort.js b/public/assets/javascripts/rectangles/util/sort.js
index 7aa40a2..cf8d6b1 100644
--- a/public/assets/javascripts/rectangles/util/sort.js
+++ b/public/assets/javascripts/rectangles/util/sort.js
@@ -95,9 +95,38 @@
 		return a.x < b.x ? -1 : a.x == b.x ? 0 : 1
 	}
 	sort.compare_z = function (a,b){
-		return a.z > b.z ? -1 : a.z == b.z ? 0 : 1
+		return a.z < b.z ? -1 : a.z == b.z ? 0 : 1
 	}
-	
+	sort.compare_xz = function(a,b){
+		if (a.x < b.x) {
+			return -1
+		}
+		if (a.x > b.x) {
+			return 1
+		}
+		if (a.z < b.z) {
+			return -1
+		}
+		if (a.z > b.z) {
+			return 1
+		}
+		return 0
+	}
+	sort.compare_zx = function(a,b){
+		if (a.z < b.z) {
+			return -1
+		}
+		if (a.z > b.z) {
+			return 1
+		}
+		if (a.x < b.x) {
+			return -1
+		}
+		if (a.x > b.x) {
+			return 1
+		}
+		return 0
+	}	
 	if ("window" in this) {
 		window.sort = sort
 	}
diff --git a/server/index.js b/server/index.js
index 71cd862..ad437ff 100644
--- a/server/index.js
+++ b/server/index.js
@@ -50,7 +50,7 @@ site.setup = function(){
 	app.use(express.session({
 			key: 'vvalls.sid',
 			secret: 'flibbertigibbet',
-			cookie: { domain: '.' + config.hostName, maxAge: 432000000 },
+			cookie: { domain: '.' + config.hostName, maxAge: 43200000000 },
 			store: SessionStore
 	}));
 	app.use(bodyParser());
diff --git a/test/06-test-grouper.js b/test/06-test-grouper.js
index 1707e4c..41ed0b0 100644
--- a/test/06-test-grouper.js
+++ b/test/06-test-grouper.js
@@ -29,10 +29,12 @@ 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 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 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 })
 
@@ -118,4 +120,123 @@ describe('grouper(rect,east)', function(){
   })
 })
 
+describe('grouper(rect,corner)', function(){
+  reset()
+  Rooms.add( rect_room )
+  Rooms.add( corner_room )
+  rebuild()
+
+  var collections = Rooms.grouper.collect()
+
+  describe('#group(rect,corner)', 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)
+    var right_walls = Rooms.grouper.group([], collections, RIGHT)
+
+    it("left has 2 walls", function(){
+      assert.equal(2, left_walls.length)
+    })
+    it("right has 2 walls", function(){
+      assert.equal(2, right_walls.length)
+    })
+    it("front has 2 walls", function(){
+      assert.equal(2, front_walls.length)
+    })
+    it("back has 2 walls", function(){
+      assert.equal(2, back_walls.length)
+    })
+    it("front/right walls are one narrow, one wide", function(){
+      assert.equal(4, front_walls[0].vec.length())
+      assert.equal(2, front_walls[1].vec.length())
+      assert.equal(2, right_walls[0].vec.length())
+      assert.equal(4, right_walls[1].vec.length())
+    })
+    it("back/left walls are one wide, one narrow", function(){
+      assert.equal(2, back_walls[0].vec.length())
+      assert.equal(4, back_walls[1].vec.length())
+      assert.equal(4, left_walls[0].vec.length())
+      assert.equal(2, left_walls[1].vec.length())
+    })
+  })
+})
+
+describe('grouper(rect,corner,peninsula)', function(){
+  reset()
+  Rooms.add( rect_room )
+  Rooms.add( corner_room )
+  Rooms.add( peninsula_room )
+  rebuild()
+
+  var collections = Rooms.grouper.collect()
+
+  describe('#collect(rect,corner,peninsula)', function(){
+    it("should find an appropriate number of wall segments", function(){
+      assert.equal(3, collections[FRONT].length)
+      assert.equal(4, collections[BACK].length)
+      assert.equal(5, collections[LEFT].length)
+      assert.equal(5, collections[RIGHT].length)
+    })
+  })
+
+  describe('#group(rect,corner,peninsula)', 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)
+    var right_walls = Rooms.grouper.group([], collections, RIGHT)
+
+    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("front has 2 walls", function(){
+      assert.equal(2, front_walls.length)
+    })
+    it("back has 4 walls", function(){
+      assert.equal(4, back_walls.length)
+    })
+  })
+})
+
+
+describe('grouper(rect,corner,peninsula_taller)', function(){
+  reset()
+  Rooms.add( rect_room )
+  Rooms.add( corner_room )
+  Rooms.add( peninsula_taller )
+  rebuild()
+
+  var collections = Rooms.grouper.collect()
+
+  describe('#collect(rect,corner,peninsula_taller)', function(){
+    it("should find an appropriate number of wall segments", function(){
+      assert.equal(5, collections[FRONT].length)
+      assert.equal(4, collections[BACK].length)
+      assert.equal(6, collections[LEFT].length)
+      assert.equal(6, collections[RIGHT].length)
+    })
+  })
+
+  describe('#group(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)
+    var right_walls = Rooms.grouper.group([], collections, RIGHT)
+
+    it("left has 4 walls", function(){
+      assert.equal(4, left_walls.length)
+    })
+    it("right has 5 walls", function(){
+      assert.equal(5, right_walls.length)
+    })
+    it("front has 3 walls", function(){
+      assert.equal(3, front_walls.length)
+    })
+    it("back has 4 walls", function(){
+      assert.equal(4, back_walls.length)
+    })
+  })
+})
 
diff --git a/views/partials/scripts.ejs b/views/partials/scripts.ejs
index 0133ad0..915027d 100644
--- a/views/partials/scripts.ejs
+++ b/views/partials/scripts.ejs
@@ -38,6 +38,7 @@
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/rooms/_rooms.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/rooms/builder.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/rooms/clipper.js"></script>
+<script type="text/javascript" src="/assets/javascripts/rectangles/engine/rooms/grouper.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/rooms/mover.js"></script>
 
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/scenery/_scenery.js"></script>
-- 
cgit v1.2.3-70-g09d2


From a8307b74bd429227fe1f2a06d8fac5d61530608f Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Tue, 5 Aug 2014 14:31:56 -0400
Subject: test bounds

---
 .../javascripts/rectangles/engine/rooms/builder.js |  2 +-
 .../javascripts/rectangles/engine/rooms/grouper.js | 34 +++++++------
 .../rectangles/engine/scenery/_scenery.js          | 20 +++++---
 .../javascripts/rectangles/engine/scenery/move.js  |  2 +-
 .../rectangles/engine/scenery/types/_object.js     |  4 +-
 .../assets/javascripts/rectangles/models/wall.js   | 59 ++++++++++++----------
 test/06-test-grouper.js                            | 46 +++++++++++++++++
 7 files changed, 115 insertions(+), 52 deletions(-)

(limited to 'public/assets/javascripts/rectangles/models/wall.js')

diff --git a/public/assets/javascripts/rectangles/engine/rooms/builder.js b/public/assets/javascripts/rectangles/engine/rooms/builder.js
index 6b2e65a..f321f71 100644
--- a/public/assets/javascripts/rectangles/engine/rooms/builder.js
+++ b/public/assets/javascripts/rectangles/engine/rooms/builder.js
@@ -293,7 +293,7 @@
 			el.side = 0
 			el.rect = null
 			el.destroy = function(){
-				this.el = this.rect = null
+				this.el = this.rect = this.face = null
 			}
 
 			// possible if walls are opaque
diff --git a/public/assets/javascripts/rectangles/engine/rooms/grouper.js b/public/assets/javascripts/rectangles/engine/rooms/grouper.js
index 532146d..ba081e3 100644
--- a/public/assets/javascripts/rectangles/engine/rooms/grouper.js
+++ b/public/assets/javascripts/rectangles/engine/rooms/grouper.js
@@ -1,7 +1,9 @@
 (function(){
 
-	var Rooms, UidGenerator, Wall, sort
+	var vec2, Rect, Rooms, UidGenerator, Wall, sort
 	if ('window' in this) {
+		vec2 = window.vec2
+		Rect = window.Rect
 		Rooms = window.Rooms
 		UidGenerator = window.UidGenerator
 		Wall = window.Wall
@@ -10,6 +12,8 @@
 	else {
 		Rooms = require('./_rooms')
 		UidGenerator = require('../../util/uid')
+		vec2 = require('../../models/vec2')
+		Rect = require('../../models/rect')
 		Wall = require('../../models/wall')
 		sort = require('../../util/sort')
 		FRONT = 0x1, BACK = 0x2, LEFT = 0x4, RIGHT = 0x8, FLOOR = 0x10, CEILING = 0x20
@@ -71,28 +75,25 @@
 				var useX = side & FRONT_BACK
 				var useA = side & (FRONT | RIGHT)
 				var last_mx
+				var widthVec, heightVec
 				
 				collection.sort( useX ? sort.compare_zx : sort.compare_xz )
 				collection.forEach(function(mx){
 					if (last_mx && last_mx.rect.eq(mx.rect)) {
-//							console.log( mx.y - mx.height/2 )
-//							console.log( last_mx.y - last_mx.height/2 )
-//  							console.log(last_mx.y, mx.y)
-// 							console.log(last_mx.height, mx.height)
-// 							console.log(Rooms.list[ last_mx.rect.id ].height, Rooms.list[ mx.rect.id ].height)
-//							console.log("___")
-// 							last_mx.height += mx.height/2
-// 							last_mx.y += mx.height/4
 						if (last_mx.rect.id == mx.rect.id) {
 							last_mx.height += mx.height/2
 							last_mx.y += mx.height/4
+							last_mx.face.y.b += mx.height/2
 						}
 						last_mx.side = side
-
 						mx.culled = true
+						mx.destroy()
 						scene.remove(mx)
 						return
 					}
+					widthVec = mx.rect[useX ? 'x' : 'y'].clone()
+					heightVec = new vec2( mx.y - mx.height/2, mx.y + mx.height/2 )
+					mx.face = new Rect( widthVec, heightVec )
 					last_mx = mx
 				})
 			})
@@ -114,20 +115,23 @@
 					if (useX && wall.vec.b == mx.rect.x.a) {
 						wall.vec.b = mx.rect.x.b
 						wall.mx.push(mx)
+						wall.faces.push(mx.face)
 						return
 					}
 					else if (! useX && wall.vec.b == mx.rect.y.a) {
 						wall.vec.b = mx.rect.y.b
 						wall.mx.push(mx)
+						wall.faces.push(mx.face)
 						return
 					}
 				}
 				wall = new Wall ({
-					id: base.uid(),
-					side: side,
-					vec: mx.rect[ useX ? 'x' : 'y' ].clone(),
-					edge: mx.rect[useX ? 'y' : 'x' ][ useA ? 'a' : 'b' ],
-					el: mx,
+					id:    base.uid(),
+					side:  side,
+					mx:    [ mx ],
+					faces: [ mx.face ],
+					vec:   mx.rect[ useX ? 'x' : 'y' ].clone(),
+					edge:  mx.rect[ useX ? 'y' : 'x' ][ useA ? 'a' : 'b' ],
 				})
 				walls.push(wall)
 			})
diff --git a/public/assets/javascripts/rectangles/engine/scenery/_scenery.js b/public/assets/javascripts/rectangles/engine/scenery/_scenery.js
index fe5f037..137c74a 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/_scenery.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/_scenery.js
@@ -12,25 +12,29 @@ var Scenery = new function(){
 		base.resize.init()
 	}
 
-	base.add = function(wall, media, id){
+	base.add = function(opt){
 		var scene_media
 		switch (media.type) {
 			case 'image':
-				scene_media = new Scenery.types.image ({ media: media, wall: wall, id: id })
+				scene_media = new Scenery.types.image (opt)
 				break
 			
 			case 'video':
 			case 'youtube':
 			case 'vimeo':
-				scene_media = new Scenery.types.video ({ media: media, wall: wall, id: id })
+				scene_media = new Scenery.types.video (opt)
 				break
 		}
 		base.list[scene_media.id] = scene_media
 		return scene_media
 	}
 	
-	base.addNextToWall = function(wall){
-		base.add(wall, base.nextMedia)
+	base.addNextToWall = function(wall, mx){
+		base.add({
+			wall: wall,
+			media: base.nextMedia,
+			mx: mx
+		})
 		base.nextMedia = null
 	}
 	
@@ -64,7 +68,11 @@ var Scenery = new function(){
 	base.deserialize = function(scenery_data){
 		scenery_data.forEach(function(data){
 			var wall = Rooms.walls[data.wall_id]
-			var scene_media = base.add(wall, data.media, data.id)
+			var scene_media = base.add({
+				wall: wall,
+				media: data.media,
+				id: data.id
+			})
 			scene_media.deserialize(data)
 		})
 	}
diff --git a/public/assets/javascripts/rectangles/engine/scenery/move.js b/public/assets/javascripts/rectangles/engine/scenery/move.js
index 94a4e52..cc5b014 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/move.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/move.js
@@ -69,7 +69,7 @@ Scenery.move = function(base){
 	
 	function switch_wall (e, new_wall, cursor){
 		if (! dragging) return
-		if (new_wall.uid == base.wall.uid) return
+		if (new_wall.id == base.wall.id) return
 		if (! new_wall.fits(base.media, base.scale)) return
 
 		var old_wall_side = base.wall.side
diff --git a/public/assets/javascripts/rectangles/engine/scenery/types/_object.js b/public/assets/javascripts/rectangles/engine/scenery/types/_object.js
index 7202ce0..aa1fefb 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/types/_object.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/types/_object.js
@@ -12,7 +12,7 @@ Scenery.types.base = Fiber.extend(function(base){
 			this.scale = this.media.scale
 
 			if (opt.wall) {
-				this.set_wall(opt.wall)
+				this.set_wall(opt.wall, opt.mx)
 			}
 		},
 		
@@ -60,7 +60,7 @@ Scenery.types.base = Fiber.extend(function(base){
 			}
 		},
 
-		set_wall: function(wall){
+		set_wall: function(wall, mx){
 			this.wall = wall || this.wall
 			this.bounds = this.wall.bounds_for(this.media, this.scale)
 			this.center = this.wall.center()
diff --git a/public/assets/javascripts/rectangles/models/wall.js b/public/assets/javascripts/rectangles/models/wall.js
index 41d7235..bbe6b97 100644
--- a/public/assets/javascripts/rectangles/models/wall.js
+++ b/public/assets/javascripts/rectangles/models/wall.js
@@ -11,18 +11,14 @@
 		Rect = require('./rect')
 		UidGenerator = require('../util/uid')
 	}
-	var wall_uid = new UidGenerator({})
 	
 	var Wall = function(opt){
 		this.id = opt.id
-		this.uid = wall_uid
 		this.vec = opt.vec
 		this.edge = opt.edge
 		this.side = opt.side
-		this.mx = []
- 		if (opt.el) {
- 			this.mx.push(opt.el)
- 		}
+		this.faces = opt.faces
+		this.mx = opt.mx
 	}
 	
 	Wall.prototype.toString = function(){
@@ -42,27 +38,30 @@
 	Wall.prototype.bind = function(){
 		var base = this
 		base.$walls = $( this.mx.map(function(mx){ return mx.el }) )
-		base.$walls.bind({
-			mouseover: function(){
-			},
-			mouseenter: function(e){
-				Scenery.mouse.mouseenter(e, base)
-			},
-			mousemove: function(e){
-			},
-			mousedown: function(){
-				// base.randomize_colors()
-				// console.log(sidesToString(base.side))
-				if (Scenery.nextMedia) {
-					Scenery.addNextToWall(base)
-				}
-				else if (Scenery.nextWallpaper) {
-					base.wallpaper()
-				}
-				else {
-					app.controller.hideExtras()
+		
+		this.mx.forEach(function(mx){
+			$(mx.el).bind({
+				mouseover: function(){
+				},
+				mouseenter: function(e){
+					Scenery.mouse.mouseenter(e, base, mx)
+				},
+				mousemove: function(e){
+				},
+				mousedown: function(){
+					// base.randomize_colors()
+					// console.log(sidesToString(base.side))
+					if (Scenery.nextMedia) {
+						Scenery.addNextToWall(base, mx)
+					}
+					else if (Scenery.nextWallpaper) {
+						base.wallpaper()
+					}
+					else {
+						app.controller.hideExtras()
+					}
 				}
-			}
+			})
 		})
 		this.outline()
 	}
@@ -77,6 +76,12 @@
 		                 new vec2( halfHeight, Rooms.list[this.room].height - halfHeight ) )
 	}
 	
+	Wall.prototype.bounds_for_mx = function(img, scale, mx) {
+		// 
+	}
+	Wall.prototype.fits_mx = function(img, scale, mx) {
+	}
+	
 	Wall.prototype.fits = function(img, scale){
 		if (this.side & FRONT_BACK && this.rect.x.length() < img.width * scale) {
 			return false
@@ -165,7 +170,7 @@
 			mx.outlined = true
 			canvas.width = mx.width
 			canvas.height = mx.height
-			ctx.fillStyle = "rgba(255,255,255,0.9)"
+			ctx.fillStyle = "rgba(255,255,255,0.95)"
 			ctx.fillRect(0, 0, canvas.width, canvas.height)
 			ctx.fillStyle = "rgba(0,0,0,1.0)"
 
diff --git a/test/06-test-grouper.js b/test/06-test-grouper.js
index 41ed0b0..5388875 100644
--- a/test/06-test-grouper.js
+++ b/test/06-test-grouper.js
@@ -29,6 +29,9 @@ 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 })
@@ -38,6 +41,9 @@ 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 report(a) {
   console.log( a.join("\n") )
 }
@@ -230,6 +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+"" }))
     })
     it("front has 3 walls", function(){
       assert.equal(3, front_walls.length)
@@ -240,3 +247,42 @@ describe('grouper(rect,corner,peninsula_taller)', function(){
   })
 })
 
+describe('grouper(room,hallway)', function(){
+  reset()
+  Rooms.add( big_room )
+  Rooms.add( hallway )
+  rebuild()
+
+  var collections = Rooms.grouper.collect()
+
+  describe('#collect(room,hallway)', function(){
+    it("should find an appropriate number of wall segments", function(){
+      assert.equal(3, collections[FRONT].length)
+      assert.equal(4, collections[BACK].length)
+      assert.equal(3, collections[LEFT].length)
+      assert.equal(3, collections[RIGHT].length)
+    })
+  })
+
+  describe('#group(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)
+    var right_walls = Rooms.grouper.group([], collections, RIGHT)
+
+    it("left has 2 walls", function(){
+      assert.equal(2, left_walls.length)
+    })
+    it("right has 2 walls", function(){
+      assert.equal(2, right_walls.length)
+    })
+    it("front has 1 wall", function(){
+      assert.equal(1, front_walls.length)
+    })
+    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+"" }))
+    })
+  })
+})
+
-- 
cgit v1.2.3-70-g09d2


From 50ad04ca01da10f87bf907fdf3c185a1d68be506 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Wed, 6 Aug 2014 17:41:12 -0400
Subject: surface stuff

---
 .../javascripts/rectangles/engine/rooms/grouper.js |  20 ++--
 .../assets/javascripts/rectangles/models/rect.js   |   3 +
 .../javascripts/rectangles/models/surface.js       | 111 +++++++++++++++++++++
 .../assets/javascripts/rectangles/models/wall.js   |   2 +-
 test/06-test-grouper.js                            |   4 +-
 test/07-test-bounds.js                             |  67 -------------
 test/07-test-surface.js                            |  60 +++++++++++
 views/partials/scripts.ejs                         |   3 +-
 8 files changed, 190 insertions(+), 80 deletions(-)
 create mode 100644 public/assets/javascripts/rectangles/models/surface.js
 delete mode 100644 test/07-test-bounds.js
 create mode 100644 test/07-test-surface.js

(limited to 'public/assets/javascripts/rectangles/models/wall.js')

diff --git a/public/assets/javascripts/rectangles/engine/rooms/grouper.js b/public/assets/javascripts/rectangles/engine/rooms/grouper.js
index ba081e3..4ad3bd8 100644
--- a/public/assets/javascripts/rectangles/engine/rooms/grouper.js
+++ b/public/assets/javascripts/rectangles/engine/rooms/grouper.js
@@ -1,9 +1,10 @@
 (function(){
 
-	var vec2, Rect, Rooms, UidGenerator, Wall, sort
+	var vec2, Rect, Rooms, UidGenerator, Wall, Surface, sort
 	if ('window' in this) {
 		vec2 = window.vec2
 		Rect = window.Rect
+		Surface = window.Surface
 		Rooms = window.Rooms
 		UidGenerator = window.UidGenerator
 		Wall = window.Wall
@@ -15,6 +16,7 @@
 		vec2 = require('../../models/vec2')
 		Rect = require('../../models/rect')
 		Wall = require('../../models/wall')
+		Surface = require('../../models/surface')
 		sort = require('../../util/sort')
 		FRONT = 0x1, BACK = 0x2, LEFT = 0x4, RIGHT = 0x8, FLOOR = 0x10, CEILING = 0x20
 		PI = Math.PI
@@ -115,23 +117,23 @@
 					if (useX && wall.vec.b == mx.rect.x.a) {
 						wall.vec.b = mx.rect.x.b
 						wall.mx.push(mx)
-						wall.faces.push(mx.face)
+						wall.surface.add(mx.face)
 						return
 					}
 					else if (! useX && wall.vec.b == mx.rect.y.a) {
 						wall.vec.b = mx.rect.y.b
 						wall.mx.push(mx)
-						wall.faces.push(mx.face)
+						wall.surface.add(mx.face)
 						return
 					}
 				}
 				wall = new Wall ({
-					id:    base.uid(),
-					side:  side,
-					mx:    [ mx ],
-					faces: [ mx.face ],
-					vec:   mx.rect[ useX ? 'x' : 'y' ].clone(),
-					edge:  mx.rect[ useX ? 'y' : 'x' ][ useA ? 'a' : 'b' ],
+					id:      base.uid(),
+					side:    side,
+					mx:      [ mx ],
+					surface: new Surface( mx.face ),
+					vec:     mx.rect[ useX ? 'x' : 'y' ].clone(),
+					edge:    mx.rect[ useX ? 'y' : 'x' ][ useA ? 'a' : 'b' ],
 				})
 				walls.push(wall)
 			})
diff --git a/public/assets/javascripts/rectangles/models/rect.js b/public/assets/javascripts/rectangles/models/rect.js
index 590440a..500ee6d 100644
--- a/public/assets/javascripts/rectangles/models/rect.js
+++ b/public/assets/javascripts/rectangles/models/rect.js
@@ -107,6 +107,9 @@
 	Rect.prototype.eq = function(r){
 		return this.x.eq(r.x) && this.y.eq(r.y)
 	}
+	Rect.prototype.fits = function(v){
+		return this.x.length() >= v.a && this.y.length() >= v.b
+	}
 	Rect.prototype.nearEdge = function (x, y, r) {
 		var edges = 0
 		if (x < this.x.a+r) {
diff --git a/public/assets/javascripts/rectangles/models/surface.js b/public/assets/javascripts/rectangles/models/surface.js
new file mode 100644
index 0000000..448722b
--- /dev/null
+++ b/public/assets/javascripts/rectangles/models/surface.js
@@ -0,0 +1,111 @@
+(function(){
+
+	var vec2, Rect
+	if ('window' in this) {
+		vec2 = window.vec2
+		Rect = window.Rect
+	}
+	else {
+		vec2 = require('./vec2')
+		Rect = require('./rect')
+	}
+	
+	var Surface = function (face){
+		this.width = 0
+		this.height = 0
+		this.faces = []
+		if (face) {
+			this.add(face)
+		}
+	}
+	Surface.prototype.add = function(rect){
+		this.faces.push(rect)
+		this.width += rect.width()
+		this.height = Math.max(this.height, rect.height())
+	}
+	Surface.prototype.fits_scale = function(v, scale){
+		v = v.clone().mul(scale)
+		return this.fits(v)
+	}
+	Surface.prototype.fits = function(v){
+		var faces = this.faces
+		var scratch
+		if (this.width < v.a || this.height < v.b) {
+			return null
+		}
+		for (var i = 0; i < faces.length; i++) {
+			if (faces[i].fits(v)) {
+				return faces[i]
+			}
+		}
+		scratch = new Rect (0,0,0,0)
+		for (var i = 0; i < faces.length; i++) {
+			if (faces[i].y.length() < v.b) {
+				continue
+			}
+			scratch.x.a = faces[i].x.a
+			scratch.x.b = faces[i].x.b
+			scratch.y.a = faces[i].y.a
+			scratch.y.b = faces[i].y.b
+			SEARCH: for (var j = i+1; j < faces.length; j++) {
+				if (faces[j].y.a > scratch.y.a) {
+					scratch.y.a = faces[j].y.a
+				}
+				if (faces[j].y.b < scratch.y.b) {
+					scratch.y.b = faces[j].y.b
+				}
+				if (scratch.y.b <= scratch.y.a || scratch.y.length() < v.b) {
+					break SEARCH
+				}
+				scratch.x.b = faces[j].x.b
+				if (scratch.fits(v)) {
+					return scratch
+				}
+			}
+		}
+		return null
+	}
+	Surface.prototype.place = function(v, index){
+		var face, faces = this.faces
+	}
+	Surface.prototype.bounds = function(index){
+		var bounds = faces[index].clone()
+		var height = faces[index].height()
+
+		for (var i = index-1; i > 0; i--) {
+			var face = faces[i]
+			if (face.y.length() < height) {
+				continue
+			}
+			if (face.y.a > bounds.y.a) {
+				continue
+			}
+			if (face.y.b < bounds.y.b) {
+				continue
+			}
+			bounds.x.a = bounds.x.a
+		}
+		
+		for (var i = index+1; i < faces.length; i++) {
+			var face = faces[i]
+			if (face.y.length() < height) {
+				continue
+			}
+			if (face.y.a > bounds.y.a) {
+				continue
+			}
+			if (face.y.b < bounds.y.b) {
+				continue
+			}
+			bounds.x.b = bounds.x.b
+		}
+		return bounds
+	}
+	
+	if ('window' in this) {
+		window.Surface = Surface
+	}
+	else {
+		module.exports = Surface
+	}
+})()
diff --git a/public/assets/javascripts/rectangles/models/wall.js b/public/assets/javascripts/rectangles/models/wall.js
index bbe6b97..fdc91fd 100644
--- a/public/assets/javascripts/rectangles/models/wall.js
+++ b/public/assets/javascripts/rectangles/models/wall.js
@@ -17,7 +17,7 @@
 		this.vec = opt.vec
 		this.edge = opt.edge
 		this.side = opt.side
-		this.faces = opt.faces
+		this.surface = opt.surface
 		this.mx = opt.mx
 	}
 	
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(){
+    })
+  })
+
+})
+
diff --git a/views/partials/scripts.ejs b/views/partials/scripts.ejs
index 915027d..acb3bff 100644
--- a/views/partials/scripts.ejs
+++ b/views/partials/scripts.ejs
@@ -31,6 +31,7 @@
 <script type="text/javascript" src="/assets/javascripts/rectangles/models/vec3.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/models/mat4.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/models/rect.js"></script>
+<script type="text/javascript" src="/assets/javascripts/rectangles/models/surface.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/models/tree.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/models/room.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/models/wall.js"></script>
@@ -99,4 +100,4 @@
 
 <!-- external dependencies -->
 <script src="http://www.youtube.com/player_api"></script>
-<script src="http://a.vimeocdn.com/js/froogaloop2.min.js"></script>
\ No newline at end of file
+<script src="http://a.vimeocdn.com/js/froogaloop2.min.js"></script>
-- 
cgit v1.2.3-70-g09d2


From 410607684c7273a61f937635b41397208e245473 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Thu, 14 Aug 2014 13:57:42 -0400
Subject: autosave

---
 .../javascripts/rectangles/engine/scenery/move.js  |  8 ++-
 .../rectangles/engine/scenery/resize.js            |  3 +
 .../javascripts/rectangles/engine/scenery/undo.js  | 18 ++++++
 .../assets/javascripts/rectangles/models/wall.js   |  3 +
 .../assets/javascripts/rectangles/util/minotaur.js | 67 ++++++++++++----------
 .../javascripts/ui/builder/BuilderSettings.js      |  3 +
 .../assets/javascripts/ui/editor/EditorSettings.js | 10 +++-
 public/assets/javascripts/ui/editor/MediaEditor.js |  1 +
 public/assets/javascripts/ui/lib/FormView.js       | 28 +++++++--
 public/assets/javascripts/ui/lib/View.js           | 17 +++---
 views/partials/scripts.ejs                         |  1 +
 11 files changed, 111 insertions(+), 48 deletions(-)

(limited to 'public/assets/javascripts/rectangles/models/wall.js')

diff --git a/public/assets/javascripts/rectangles/engine/scenery/move.js b/public/assets/javascripts/rectangles/engine/scenery/move.js
index c3f78d7..edeb24b 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/move.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/move.js
@@ -30,6 +30,9 @@ Scenery.move = function(base){
         redo: { id: base.id },
       })
 
+      // TODO: watch individual scenery object here
+      Minotaur.watch( app.router.editorView.settings )
+
 			Scenery.remove(base.id)
 			return
 		}
@@ -81,7 +84,10 @@ Scenery.move = function(base){
       undo: oldState,
       redo: base.serialize(),
     })
-    
+
+    // TODO: watch individual scenery object here
+    Minotaur.watch( app.router.editorView.settings )
+
     oldState = null
 	}
 	
diff --git a/public/assets/javascripts/rectangles/engine/scenery/resize.js b/public/assets/javascripts/rectangles/engine/scenery/resize.js
index c5c754a..6b2e52c 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/resize.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/resize.js
@@ -200,6 +200,9 @@ Scenery.resize = new function(){
       redo: obj.serialize(),
     })
 
+    // TODO: watch individual scenery object here
+    Minotaur.watch( app.router.editorView.settings )
+
 		document.body.classList.remove("dragging")
 	}
 
diff --git a/public/assets/javascripts/rectangles/engine/scenery/undo.js b/public/assets/javascripts/rectangles/engine/scenery/undo.js
index 7798550..54ab755 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/undo.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/undo.js
@@ -4,9 +4,15 @@
 			type: "create-scenery",
       undo: function(state){
         Scenery.remove(state.id)
+
+        // TODO: watch individual scenery object here
+        Minotaur.watch( app.router.editorView.settings )
       },
       redo: function(state){
         Scenery.deserialize([ state ])
+
+        // TODO: watch individual scenery object here
+        Minotaur.watch( app.router.editorView.settings )
       },
 		},
 		{
@@ -19,6 +25,9 @@
         if (editor.permissions.resize) {
           Scenery.resize.show(scenery)
         }
+
+        // TODO: watch individual scenery object here
+        Minotaur.watch( app.router.editorView.settings )
       },
       redo: function(state){
         var scenery = Scenery.find(state.id)
@@ -30,15 +39,24 @@
           Scenery.resize.rotate_dots()
           Scenery.resize.move_dots()
         }
+
+        // TODO: watch individual scenery object here
+        Minotaur.watch( app.router.editorView.settings )
       },
 		},
 		{
 			type: "destroy-scenery",
       undo: function(state){
         Scenery.deserialize([ state ])
+
+        // TODO: watch individual scenery object here
+        Minotaur.watch( app.router.editorView.settings )
       },
       redo: function(state){
         Scenery.remove(state.id)
+
+        // TODO: watch individual scenery object here
+        Minotaur.watch( app.router.editorView.settings )
       },
 		},
 		
diff --git a/public/assets/javascripts/rectangles/models/wall.js b/public/assets/javascripts/rectangles/models/wall.js
index 6e2c728..fa09444 100644
--- a/public/assets/javascripts/rectangles/models/wall.js
+++ b/public/assets/javascripts/rectangles/models/wall.js
@@ -50,6 +50,9 @@ window.Wall = (function(){
 					  undo: { id: scenery.id },
             redo: scenery.serialize(),
 					})
+					
+					// TODO: watch individual scenery object here
+					Minotaur.watch( app.router.editorView.settings )
 				}
 				else if (Scenery.nextWallpaper) {
 					base.wallpaper()
diff --git a/public/assets/javascripts/rectangles/util/minotaur.js b/public/assets/javascripts/rectangles/util/minotaur.js
index 6eb36ec..039a053 100644
--- a/public/assets/javascripts/rectangles/util/minotaur.js
+++ b/public/assets/javascripts/rectangles/util/minotaur.js
@@ -1,54 +1,59 @@
 (function(){
 
   var Monitor = function () {
-    var base = this;
-    base.$el = $("#minotaur");
-    base.timeout = null;
-    base.delay = 500;
-    base.objects = {};
+    var base = this
+    base.$el = $("#minotaur")
+    base.timeout = null
+    base.delay = 500
+    base.objects = {}
     
     base.init = function () {
-      base.$el.addClass('saved');
-      base.$el.click(base.save);
+      base.$el.removeClass()
+      base.$el.click(base.save)
     }
 
     base.watch = function (object) {
-      base.objects[object.type] = base.objects[object.type] || {};
-      base.objects[object.type][object.id] = object;
-      base.clear();
-      base.timeout = setTimeout(base.save, base.delay);
+      base.objects[object.type] = base.objects[object.type] || {}
+      base.objects[object.type][object._id] = object
+      base.clear()
+      base.timeout = setTimeout(base.save, base.delay)
+    }
+    
+    base.unwatch = function (object) {
+      if (base.objects[object.type] && base.objects[object.type][object._id]) {
+        delete base.objects[object.type][object._id]
+      }
     }
     
     base.clear = function () {
-      if (base.timeout) clearTimeout(base.timeout);
-      base.timeout = false;
+      if (base.timeout) clearTimeout(base.timeout)
+      base.timeout = false
     }
     
     base.save = function () {
-      var saving = false;
-      base.clear();
+      var saving = false
+      base.clear()
       
       for (var type in base.objects) {
         for (var id in base.objects[type]) {
-          if (base.timeout)
-            return;
-          var obj = base.objects[type][id];
-          if (obj) obj.save(function(){
-            base.$el.removeClass('unsaved saving').addClass('saved');
-            saving = true;
-          });
-          base.objects[type][id] = false;
+          var obj = base.objects[type][id]
+          if (obj) {
+            obj.save(null, function(){ base.hide() }, function(){})
+          }
+          delete base.objects[type][id]
+          saving = true
         }
       }
 
-      if (saving) {
-        base.$el.removeClass('unsaved saved').addClass('saving');
-      }
-      else {
-        base.$el.removeClass('unsaved saving').addClass('saved');
-      }
-      
-      base.objects = {};
+      saving ? base.show() : base.hide()
+    }
+    
+    base.show = function () {
+      base.$el.removeClass().addClass('saving')
+    }
+    
+    base.hide = function () {
+      base.$el.removeClass()
     }
     
     base.init();
diff --git a/public/assets/javascripts/ui/builder/BuilderSettings.js b/public/assets/javascripts/ui/builder/BuilderSettings.js
index c551f95..0091454 100644
--- a/public/assets/javascripts/ui/builder/BuilderSettings.js
+++ b/public/assets/javascripts/ui/builder/BuilderSettings.js
@@ -122,6 +122,9 @@ var BuilderSettings = FormView.extend({
 		this.$name.val(data.name)
 		this.action = this.updateAction
 		
+		Minotaur.unwatch(this)
+		Minotaur.hide()
+
 		window.history.pushState(null, document.title, "/layout/" + data.slug)
 	},
 
diff --git a/public/assets/javascripts/ui/editor/EditorSettings.js b/public/assets/javascripts/ui/editor/EditorSettings.js
index d6a79fb..9d75f66 100644
--- a/public/assets/javascripts/ui/editor/EditorSettings.js
+++ b/public/assets/javascripts/ui/editor/EditorSettings.js
@@ -5,7 +5,7 @@ var EditorSettings = FormView.extend({
 	createAction: "/api/project/new",
 	updateAction: "/api/project/edit",
 	destroyAction: "/api/project/destroy",
-
+  
 	events: {
 		"keydown": 'stopPropagation',
 		"keydown [name=name]": 'enterSubmit',
@@ -32,7 +32,10 @@ var EditorSettings = FormView.extend({
 		data.rooms && Rooms.deserialize(data.rooms)
 		data.startPosition && scene.camera.move(data.startPosition)
 		
-		if (! data.isNew) {
+		if (data.isNew) {
+		  this.$name.val( "Room " + moment().format("DD/MM/YYYY ha") )
+		}
+		else {
 			// console.log(data)
 			
 			this.$id.val( data._id )
@@ -130,6 +133,9 @@ var EditorSettings = FormView.extend({
 		this.$name.val(data.name)
 		this.action = this.updateAction
 		
+		Minotaur.unwatch(this)
+		Minotaur.hide()
+		
 		window.history.pushState(null, document.title, "/project/" + data.slug + "/edit")
 	},
 
diff --git a/public/assets/javascripts/ui/editor/MediaEditor.js b/public/assets/javascripts/ui/editor/MediaEditor.js
index e3a8f2e..cc924da 100644
--- a/public/assets/javascripts/ui/editor/MediaEditor.js
+++ b/public/assets/javascripts/ui/editor/MediaEditor.js
@@ -4,6 +4,7 @@ var MediaEditor = FormView.extend({
 		
 	events: {
 		"keydown": 'stopPropagation',
+		"focus [name]": "clearMinotaur",
 		"click [data-role=play-media]": "togglePaused",
 		"mousedown [name=keyframe]": "stopPropagation",
 		"mousedown": "stopPropagation",
diff --git a/public/assets/javascripts/ui/lib/FormView.js b/public/assets/javascripts/ui/lib/FormView.js
index 219952d..ab33bc0 100644
--- a/public/assets/javascripts/ui/lib/FormView.js
+++ b/public/assets/javascripts/ui/lib/FormView.js
@@ -54,15 +54,20 @@ var FormView = View.extend({
 		return fd
 	},
 	
-	save: function(e){
-		e.preventDefault()
+	save: function(e, successCallback, errorCallback){
+		e && e.preventDefault()
 
 		this.$errors.hide().css("opacity", 0.0);
 		
 		if (this.validate) {
 			var errors = this.validate()
 			if (errors && errors.length) {
-				this.showErrors(errors)
+				if (errorCallback) {
+				  errorCallback(errors)
+				}
+				else {
+          this.showErrors(errors)
+				}
 				return
 			}
 		}
@@ -74,18 +79,29 @@ var FormView = View.extend({
 			dataType: "json",
 			processData: false,
 			contentType: false,
-		});
+		})
+		
 		request.done($.proxy(function (response) {
 			if (response.error) {
 				var errors = []
 				for (var key in response.error.errors) {
 					errors.push(response.error.errors[key].message);
 				}
-				this.showErrors(errors)
+				if (errorCallback) {
+				  errorCallback(errors)
+				}
+				else {
+          this.showErrors(errors)
+				}
 				return
 			}
 			else {
-				this.success && this.success(response)
+				if (successCallback) {
+				  successCallback(response)
+				}
+				if (this.success) {
+				  this.success(response)
+				}
 			}
 		}, this));
 	}
diff --git a/public/assets/javascripts/ui/lib/View.js b/public/assets/javascripts/ui/lib/View.js
index 999a0e5..d94e6db 100644
--- a/public/assets/javascripts/ui/lib/View.js
+++ b/public/assets/javascripts/ui/lib/View.js
@@ -1,13 +1,14 @@
 var View = (function($, _){
 
 	var View = function(options) {
-		this.cid = _.uniqueId('view');
+		this._id = _.uniqueId('view')
+		this.type = "view"
 		options || (options = {});
-		_.extend(this, _.pick(options, viewOptions));
-		this._ensureElement();
-		this.initialize.apply(this, arguments);
-		this.delegateEvents();
-	};
+		_.extend(this, _.pick(options, viewOptions))
+		this._ensureElement()
+		this.initialize.apply(this, arguments)
+		this.delegateEvents()
+	}
 
 	var delegateEventSplitter = /^(\S+)\s*(.*)$/;
 
@@ -58,7 +59,7 @@ var View = (function($, _){
 				var match = key.match(delegateEventSplitter);
 				var eventName = match[1], selector = match[2];
 				method = _.bind(method, this);
-				eventName += '.delegateEvents' + this.cid;
+				eventName += '.delegateEvents' + this._id;
 				if (selector === '') {
 					this.$el.on(eventName, method);
 				} else {
@@ -70,7 +71,7 @@ var View = (function($, _){
 
 		// Clears all callbacks previously bound to the view with `delegateEvents`.
 		undelegateEvents: function() {
-			this.$el.off('.delegateEvents' + this.cid);
+			this.$el.off('.delegateEvents' + this._id);
 			return this;
 		},
 
diff --git a/views/partials/scripts.ejs b/views/partials/scripts.ejs
index dfb3a83..4839de8 100644
--- a/views/partials/scripts.ejs
+++ b/views/partials/scripts.ejs
@@ -30,6 +30,7 @@
 <script type="text/javascript" src="/assets/javascripts/rectangles/util/mouse.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/util/keys.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/util/undostack.js"></script>
+<script type="text/javascript" src="/assets/javascripts/rectangles/util/minotaur.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/models/vec2.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/models/vec3.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/models/mat4.js"></script>
-- 
cgit v1.2.3-70-g09d2


From 8ed5bf2ceba8e85be9c911f8b33483242e979ab7 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Thu, 14 Aug 2014 17:45:08 -0400
Subject: fix last wrinkle in grouper

---
 .../javascripts/rectangles/engine/rooms/grouper.js | 73 +++++++++++++---------
 .../rectangles/engine/scenery/_scenery.js          |  4 +-
 .../rectangles/engine/scenery/types/_object.js     |  4 +-
 .../rectangles/engine/scenery/types/image.js       |  8 ++-
 .../rectangles/engine/scenery/types/video.js       |  8 ++-
 .../assets/javascripts/rectangles/models/wall.js   | 19 +++---
 test/06-test-grouper.js                            | 15 ++---
 test/09-test-undo.js                               |  2 +-
 8 files changed, 79 insertions(+), 54 deletions(-)

(limited to 'public/assets/javascripts/rectangles/models/wall.js')

diff --git a/public/assets/javascripts/rectangles/engine/rooms/grouper.js b/public/assets/javascripts/rectangles/engine/rooms/grouper.js
index 4ad3bd8..cde9fbb 100644
--- a/public/assets/javascripts/rectangles/engine/rooms/grouper.js
+++ b/public/assets/javascripts/rectangles/engine/rooms/grouper.js
@@ -1,6 +1,6 @@
 (function(){
 
-	var vec2, Rect, Rooms, UidGenerator, Wall, Surface, sort
+	var vec2, Rect, Rooms, UidGenerator, Wall, Surface, sort, _
 	if ('window' in this) {
 		vec2 = window.vec2
 		Rect = window.Rect
@@ -9,6 +9,7 @@
 		UidGenerator = window.UidGenerator
 		Wall = window.Wall
 		sort = window.sort
+		_ = window._
 	}
 	else {
 		Rooms = require('./_rooms')
@@ -18,6 +19,7 @@
 		Wall = require('../../models/wall')
 		Surface = require('../../models/surface')
 		sort = require('../../util/sort')
+		_ = require('lodash')
 		FRONT = 0x1, BACK = 0x2, LEFT = 0x4, RIGHT = 0x8, FLOOR = 0x10, CEILING = 0x20
 		PI = Math.PI
 		HALF_PI = PI/2
@@ -82,6 +84,7 @@
 				collection.sort( useX ? sort.compare_zx : sort.compare_xz )
 				collection.forEach(function(mx){
 					if (last_mx && last_mx.rect.eq(mx.rect)) {
+					  // culls half-walls
 						if (last_mx.rect.id == mx.rect.id) {
 							last_mx.height += mx.height/2
 							last_mx.y += mx.height/4
@@ -103,41 +106,53 @@
 		}
 		base.group = function(walls, collections, side){
 			var collection = collections[side]
-			var wall
 			var useX = side & FRONT_BACK
-			var useA = side & (FRONT | RIGHT)
+			var useA = side & (FRONT | LEFT)
 
 			// collection.sort( useX ? sort.compare_zx : sort.compare_xz )
 			
+			var planes = {}
+						
 			collection.forEach(function(mx){
 				if (mx.culled) return
-				var coplanar = wall && wall.edge == mx.rect[useX ? 'y': 'x'][useA ? 'a': 'b']
-				
-				if (wall && coplanar) {
-					if (useX && wall.vec.b == mx.rect.x.a) {
-						wall.vec.b = mx.rect.x.b
-						wall.mx.push(mx)
-						wall.surface.add(mx.face)
-						return
-					}
-					else if (! useX && wall.vec.b == mx.rect.y.a) {
-						wall.vec.b = mx.rect.y.b
-						wall.mx.push(mx)
-						wall.surface.add(mx.face)
-						return
-					}
-				}
-				wall = new Wall ({
-					id:      base.uid(),
-					side:    side,
-					mx:      [ mx ],
-					surface: new Surface( mx.face ),
-					vec:     mx.rect[ useX ? 'x' : 'y' ].clone(),
-					edge:    mx.rect[ useX ? 'y' : 'x' ][ useA ? 'a' : 'b' ],
-				})
-				walls.push(wall)
+				var edge = mx.rect[useX ? 'y': 'x'][ useA ? 'a': 'b']
+				planes[edge] = planes[edge] || []
+				planes[edge].push(mx)
 			})
-
+			
+			var edges = _.keys(planes)
+			edges.forEach(function(edge){
+			
+				var wall
+				
+				planes[edge].forEach(function(mx){        
+				  
+          if (wall) {
+            if (useX && wall.vec.b == mx.rect.x.a) {
+              wall.vec.b = mx.rect.x.b
+              wall.mx.push(mx)
+              wall.surface.add(mx.face)
+              return
+            }
+            else if (! useX && wall.vec.b == mx.rect.y.a) {
+              wall.vec.b = mx.rect.y.b
+              wall.mx.push(mx)
+              wall.surface.add(mx.face)
+              return
+            }
+          }
+          wall = new Wall ({
+            id:      base.uid(),
+            side:    side,
+            mx:      [ mx ],
+            surface: new Surface( mx.face ),
+            vec:     mx.rect[ useX ? 'x' : 'y' ].clone(),
+            edge:    mx.rect[ useX ? 'y' : 'x' ][ useA ? 'a' : 'b' ],
+          })
+          walls.push(wall)
+        })
+      })
+      
 			return walls
 		}
 		
diff --git a/public/assets/javascripts/rectangles/engine/scenery/_scenery.js b/public/assets/javascripts/rectangles/engine/scenery/_scenery.js
index c43ef14..b4a38f8 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/_scenery.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/_scenery.js
@@ -14,7 +14,7 @@ var Scenery = new function(){
 
 	base.add = function(opt){
 		var scene_media
-		switch (media.type) {
+		switch (opt.media.type) {
 			case 'image':
 				scene_media = new Scenery.types.image (opt)
 				break
@@ -74,11 +74,11 @@ var Scenery = new function(){
 		scenery_data.forEach(function(data){
 			var wall = Rooms.walls[data.wall_id]
 			var scene_media = base.add({
+			  data: data,
 				wall: wall,
 				media: data.media,
 				id: data.id
 			})
-			scene_media.deserialize(data)
 		})
 	}
 
diff --git a/public/assets/javascripts/rectangles/engine/scenery/types/_object.js b/public/assets/javascripts/rectangles/engine/scenery/types/_object.js
index 46bc0e7..3a2dcc2 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/types/_object.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/types/_object.js
@@ -62,8 +62,8 @@ Scenery.types.base = Fiber.extend(function(base){
 
 		set_wall: function(wall, mx){
 			this.wall = wall || this.wall
-			this.bounds = this.wall.bounds_for(this.media, this.scale)
-			this.center = this.wall.center()
+			// this.bounds = this.wall.bounds_for(this.media, this.scale)
+			// this.center = this.wall.center()
 		},
 		
 		set_scale: function(scale){
diff --git a/public/assets/javascripts/rectangles/engine/scenery/types/image.js b/public/assets/javascripts/rectangles/engine/scenery/types/image.js
index 99c1810..576242e 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/types/image.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/types/image.js
@@ -10,7 +10,13 @@ Scenery.types.image = Scenery.types.base.extend(function(base){
 			this.build()
 			this.bind()
 			this.set_wall()
-			this.recenter()
+			
+			if (opt.data) {
+        this.deserialize(opt.data)
+      }
+      else {
+        this.recenter()
+      }
 		},
 
 		build: function(){
diff --git a/public/assets/javascripts/rectangles/engine/scenery/types/video.js b/public/assets/javascripts/rectangles/engine/scenery/types/video.js
index a8df875..0bd5c06 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/types/video.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/types/video.js
@@ -10,7 +10,13 @@ Scenery.types.video = Scenery.types.base.extend(function(base){
 			this.build()
 			this.bind()
 			this.set_wall()
-			this.recenter()
+			
+			if (opt.data) {
+        this.deserialize(opt.data)
+      }
+      else {
+        this.recenter()
+      }
 		},
 
 		build: function(){
diff --git a/public/assets/javascripts/rectangles/models/wall.js b/public/assets/javascripts/rectangles/models/wall.js
index b66d5f5..460963b 100644
--- a/public/assets/javascripts/rectangles/models/wall.js
+++ b/public/assets/javascripts/rectangles/models/wall.js
@@ -144,18 +144,15 @@
 	Wall.prototype.wallpaper = function(){
 		var useX = this.side & FRONT_BACK
 		var shouldFlip = this.side & (LEFT | BACK)
-		this.siblings().forEach(function(w){
-			w.mx.forEach(function(mx){
-				
-				var partitionOffset = useX ? mx.x : mx.z
-				if (shouldFlip) partitionOffset *= -1
-				partitionOffset += mx.width/2
-				var floorOffset = mx.y + mx.height/2
+		this.mx.forEach(function(mx){
+      var partitionOffset = useX ? mx.x : mx.z
+      if (shouldFlip) partitionOffset *= -1
+      partitionOffset += mx.width/2
+      var floorOffset = mx.y + mx.height/2
 
-				mx.el.style.backgroundImage = Scenery.nextWallpaper
-				mx.el.style.backgroundPosition = (~~partitionOffset) + "px " + (~~floorOffset) + "px"
-			})
-		})
+      mx.el.style.backgroundImage = Scenery.nextWallpaper
+      mx.el.style.backgroundPosition = (~~partitionOffset) + "px " + (~~floorOffset) + "px"
+    })
 	}
 	
 	Wall.prototype.outline = function(){
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/09-test-undo.js b/test/09-test-undo.js
index dbca90e..60fbbb6 100644
--- a/test/09-test-undo.js
+++ b/test/09-test-undo.js
@@ -1,5 +1,5 @@
 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(){
-- 
cgit v1.2.3-70-g09d2


From a48beac4e7e93f78ef7229b0b1e4776dc04cac92 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Wed, 20 Aug 2014 18:55:11 -0400
Subject: converting between position and mx coordinates

---
 .../rectangles/engine/scenery/_scenery.js          |   4 +-
 .../rectangles/engine/scenery/types/_object.js     |  16 ++-
 .../assets/javascripts/rectangles/models/wall.js   | 122 +++++++++++++--------
 3 files changed, 92 insertions(+), 50 deletions(-)

(limited to 'public/assets/javascripts/rectangles/models/wall.js')

diff --git a/public/assets/javascripts/rectangles/engine/scenery/_scenery.js b/public/assets/javascripts/rectangles/engine/scenery/_scenery.js
index b4a38f8..5d36b4f 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/_scenery.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/_scenery.js
@@ -29,11 +29,11 @@ var Scenery = new function(){
 		return scene_media
 	}
 	
-	base.addNextToWall = function(wall, mx){
+	base.addNextToWall = function(wall, index){
 		base.add({
 			wall: wall,
 			media: base.nextMedia,
-			mx: mx
+			index: index || 0,
 		})
 		base.nextMedia = null
 		return media
diff --git a/public/assets/javascripts/rectangles/engine/scenery/types/_object.js b/public/assets/javascripts/rectangles/engine/scenery/types/_object.js
index 6bd5863..70d1d26 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/types/_object.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/types/_object.js
@@ -10,9 +10,17 @@ Scenery.types.base = Fiber.extend(function(base){
 			this.media = opt.media
 			this.dimensions = new vec2(this.media.width, this.media.height)
 			this.scale = this.media.scale
+			
+			this.scaleDimensions = this.dimensions.clone().mul(this.media.scale)
+			this.position = new vec2(0,0)
+			if (opt.data && opt.data.position) {
+			  // position is the coordinate of one of the corners with respect to a
+			  // wall surface
+			  // subtract x/z offset of wall
+			}
 
 			if (opt.wall) {
-				this.set_wall(opt.wall, opt.mx)
+				this.set_wall(opt.wall, index)
 			}
 		},
 		
@@ -60,7 +68,7 @@ Scenery.types.base = Fiber.extend(function(base){
 			}
 		},
 
-		set_wall: function(wall, mx){
+		set_wall: function(wall, index){
 			this.wall = wall || this.wall
 			// this.bounds = this.wall.bounds_for(this.media, this.scale)
 			// this.center = this.wall.center()
@@ -83,8 +91,8 @@ Scenery.types.base = Fiber.extend(function(base){
 		serialize: function(){
 			var data = {
 				id: this.id,
-				wall_id: this.wall.id,
-				side: this.wall.side,
+				wall_id: this.wall && this.wall.id,
+				side: this.wall && this.wall.side,
 				dimensions: this.dimensions.serialize(),
 				position: app.position(this.mx),
 				media: this.media,
diff --git a/public/assets/javascripts/rectangles/models/wall.js b/public/assets/javascripts/rectangles/models/wall.js
index 460963b..3afe49a 100644
--- a/public/assets/javascripts/rectangles/models/wall.js
+++ b/public/assets/javascripts/rectangles/models/wall.js
@@ -39,7 +39,7 @@
 		var base = this
 		base.$walls = $( this.mx.map(function(mx){ return mx.el }) )
 		
-		this.mx.forEach(function(mx){
+		this.mx.forEach(function(mx, index){
 			$(mx.el).bind({
 				mouseover: function(){
 				},
@@ -52,7 +52,7 @@
 					// base.randomize_colors()
 					// console.log(sidesToString(base.side))
 					if (Scenery.nextMedia) {
-					var scenery = Scenery.addNextToWall(base)
+            var scenery = Scenery.addNextToWall(base, index)
 					
   					UndoStack.push({
   					  type: 'create-scenery',
@@ -74,6 +74,64 @@
 		})
 		this.outline()
 	}
+
+
+  // wall
+  // side: corresponds to the orientation of this wall
+  // vec: equivalent to the bounds of the Surface
+  // edge: the coordinate of the normal of this surface
+  // 			 var useX = side & FRONT_BACK
+  //			 var useA = side & (FRONT | LEFT)
+  //       mx.rect[useX ? 'y': 'x'][ useA ? 'a': 'b']
+  // surface: an ordered set of contiguous wall regions
+
+	Wall.prototype.positionToMx = function(position, dimension) {
+		switch (this.side) {
+			case FRONT:
+				x = this.vec.a + position.a + dimension.a / 2
+				z = this.edge + painting_distance_from_wall
+				break
+			case BACK:
+				x = this.vec.a + position.a + dimension.a / 2
+				z = this.edge - painting_distance_from_wall
+				break
+			case LEFT:
+				x = this.edge + painting_distance_from_wall
+				z = this.vec.a + position.a + dimension.a / 2
+				break
+			case RIGHT:
+				x = this.edge - painting_distance_from_wall
+ 				z = this.vec.a + position.a + dimension.a / 2
+				break
+		}
+		return {
+		  x: x,
+		  y: position.b + dimension.b / 2
+		  z: z,
+		}
+	}
+	Wall.prototype.mxToPosition = function(mx) {
+	  var position = new vec2(0,0)
+	  switch (this.side) {
+	    case FRONT:
+	      position.a = mx.x - mx.width / 2 - this.vec.a
+	      position.b = mx.y - mx.height / 2
+	      break
+	    case BACK:
+	      position.a = mx.x - mx.width / 2 - this.vec.a
+	      position.b = mx.y - mx.height / 2
+	      break
+	    case LEFT:
+	      position.a = mx.z - mx.width / 2 - this.vec.a
+	      position.b = mx.y - mx.height / 2
+	      break
+	    case RIGHT:
+	      position.a = mx.z - mx.width / 2 - this.vec.a
+	      position.b = mx.y - mx.height / 2
+	      break
+	  }
+	  return position
+	}
 	
 	Wall.prototype.bounds_for = function(img, scale) {
 		scale = scale || 1
@@ -85,12 +143,6 @@
 		                 new vec2( halfHeight, Rooms.list[this.room].height - halfHeight ) )
 	}
 	
-	Wall.prototype.bounds_for_mx = function(img, scale, mx) {
-		// 
-	}
-	Wall.prototype.fits_mx = function(img, scale, mx) {
-	}
-	
 	Wall.prototype.fits = function(img, scale){
 		if (this.side & FRONT_BACK && this.rect.x.length() < img.width * scale) {
 			return false
@@ -103,37 +155,25 @@
 	
 	Wall.prototype.center = function(offset){
 	
-		offset = offset || 0
-
-		var major_axis, minor_axis
-		if (this.side & FRONT_BACK) {
-			major_axis = this.rect.x
-			minor_axis = this.rect.y
-		}
-		else {
-			major_axis = this.rect.y
-			minor_axis = this.rect.x
-		}
-		
 		switch (this.side) {
 			case FRONT:
-				x = major_axis.midpoint()
-				z = minor_axis.a + painting_distance_from_wall + offset
+				x = this.vec.midpoint()
+				z = this.edge + painting_distance_from_wall
 				break
 			case BACK:
-				x = major_axis.midpoint()
-				z = minor_axis.b - painting_distance_from_wall + offset
+				x = this.vec.midpoint()
+				z = this.edge - painting_distance_from_wall
 				break
 			case LEFT:
-				x = minor_axis.a + painting_distance_from_wall + offset
-				z = major_axis.midpoint()
+				x = this.edge + painting_distance_from_wall
+				z = this.vec.midpoint()
 				break
 			case RIGHT:
-				x = minor_axis.b - painting_distance_from_wall + offset
- 				z = major_axis.midpoint()
+				x = this.edge - painting_distance_from_wall
+ 				z = this.vec.midpoint()
 				break
 		}
-		
+
 		return new vec2 (x, z)
 	}
 	
@@ -156,8 +196,6 @@
 	}
 	
 	Wall.prototype.outline = function(){
-		var canvas = document.createElement("canvas")
-		var ctx = canvas.getContext('2d')
 		var useX = this.side & FRONT_BACK
 		var shouldFlip = this.side & (LEFT | BACK)
 		var mx = this.mx
@@ -169,37 +207,33 @@
 
 		var len = this.mx.length
 		
+    var backgroundColor = "rgba(255,255,255,0.95)"
+    var borderColor = "rgba(0,0,0,1.0)"
+
 		zz = window.zz || 0
 
 		mx.forEach(function(mx, i){
 			if (mx.outlined) return
 			mx.outlined = true
-			canvas.width = mx.width
-			canvas.height = mx.height
-			ctx.fillStyle = "rgba(255,255,255,0.95)"
-			ctx.fillRect(0, 0, canvas.width, canvas.height)
-			ctx.fillStyle = "rgba(0,0,0,1.0)"
+      mx.el.style.backgroundColor = backgroundColor
 
 			// all walls get bottom lines
-			ctx.fillRect(0, 0, canvas.width, 1)
+			mx.el.style.borderBottom = "1px solid " + borderColor
 			
 			// all walls get top lines
-			ctx.fillRect(0, canvas.height-1, canvas.width, 1)
+			mx.el.style.borderTop = "1px solid " + borderColor
 			
 			// walls on initial sides get left lines
 			// if their left edge lines up with the rect edge
 			if (i == 0) {
- 				ctx.fillRect(0, 0, 1, canvas.height)
+        mx.el.style.borderLeft = "1px solid " + borderColor
 			}
 			
 			// walls on terminal sides get right lines....
 			// if their right edge lines up with the rect edge
 			if (i == len-1) {
-				ctx.fillRect(canvas.width-1, 0, 1, canvas.height)
+        mx.el.style.borderRight = "1px solid " + borderColor
 			}
-			var dataUrl = canvas.toDataURL()
-
-			mx.el.style.backgroundImage = "url(" + dataUrl + ")"
 		})
 	}
 	
@@ -215,7 +249,7 @@
 
 	Wall.prototype.randomize_colors = function(){
 		var color = window.grayColors[ this.side | this.half_side ]
-		this.color(color)
+		// this.color(color)
 	}
 
 	Wall.prototype.stroke_colors = function(){
-- 
cgit v1.2.3-70-g09d2


From 978634c1c323240f36548468703a9512710c60e7 Mon Sep 17 00:00:00 2001
From: Julie Lala <jules@okfoc.us>
Date: Fri, 22 Aug 2014 12:11:40 -0400
Subject: wall placement

---
 .../rectangles/engine/scenery/_scenery.js          | 14 +++---
 .../javascripts/rectangles/engine/scenery/move.js  | 14 +++---
 .../rectangles/engine/scenery/types/_object.js     | 58 +++++++++++-----------
 .../rectangles/engine/scenery/types/image.js       |  5 +-
 .../rectangles/engine/scenery/types/video.js       |  4 +-
 .../assets/javascripts/rectangles/models/wall.js   | 40 +++++++++------
 public/assets/javascripts/rectangles/util/mouse.js |  8 +--
 7 files changed, 76 insertions(+), 67 deletions(-)

(limited to 'public/assets/javascripts/rectangles/models/wall.js')

diff --git a/public/assets/javascripts/rectangles/engine/scenery/_scenery.js b/public/assets/javascripts/rectangles/engine/scenery/_scenery.js
index 5d36b4f..58592d4 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/_scenery.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/_scenery.js
@@ -29,14 +29,14 @@ var Scenery = new function(){
 		return scene_media
 	}
 	
-	base.addNextToWall = function(wall, index){
-		base.add({
-			wall: wall,
-			media: base.nextMedia,
-			index: index || 0,
-		})
+	base.addNextToWall = function(opt){
+		opt.media = base.nextMedia
+		opt.index = opt.index || 0
+		var scene_media = base.add(opt)
+		
+		// test if scenery was placed here
 		base.nextMedia = null
-		return media
+		return scene_media
 	}
 
 	base.find = function(id){
diff --git a/public/assets/javascripts/rectangles/engine/scenery/move.js b/public/assets/javascripts/rectangles/engine/scenery/move.js
index f2d37d8..47e155b 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/move.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/move.js
@@ -91,21 +91,21 @@ Scenery.move = function(base){
     oldState = null
 	}
 	
-	function switch_wall (e, new_wall, cursor){
+	function switch_wall (e, target, cursor){
 		if (! dragging) return
-		if (new_wall.id == base.wall.id) return
-		if (! new_wall.fits(base.media, base.scale)) return
+		if (target.wall.id == base.wall.id) return
+		if (! target.wall.fits(base.media, base.scale)) return
 
 		var old_wall_side = base.wall.side
-		var wall_group = old_wall_side | new_wall.side
+		var wall_group = old_wall_side | target.wall.side
 
-		base.set_wall(new_wall)
+		base.set_wall(target)
 
 		bounds = base.bounds
 		x = base.center.a
 		z = base.center.b
 		
-		if (old_wall_side !== new_wall.side && wall_group !== FRONT_BACK && wall_group !== LEFT_RIGHT) {
+		if (old_wall_side !== target.wall.side && wall_group !== FRONT_BACK && wall_group !== LEFT_RIGHT) {
 			switch (old_wall_side) {
 				case FRONT:
 					z = bounds.x.a
@@ -127,7 +127,7 @@ Scenery.move = function(base){
 		base.mx.move({
 			x: x,
 			z: z,
-			rotationY: wall_rotation[ new_wall.side ]
+			rotationY: wall_rotation[ target.wall.side ]
 		})
 
 		if (editor.permissions.resize) {
diff --git a/public/assets/javascripts/rectangles/engine/scenery/types/_object.js b/public/assets/javascripts/rectangles/engine/scenery/types/_object.js
index 70d1d26..7b716f6 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/types/_object.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/types/_object.js
@@ -8,20 +8,36 @@ Scenery.types.base = Fiber.extend(function(base){
 			this.id = opt.id || Scenery.uid("scenery")
 			this.move = new Scenery.move (this)
 			this.media = opt.media
-			this.dimensions = new vec2(this.media.width, this.media.height)
-			this.scale = this.media.scale
+			this.naturalDimensions = new vec2(this.media.width, this.media.height)
 			
-			this.scaleDimensions = this.dimensions.clone().mul(this.media.scale)
+			this.set_scale( opt.scale || this.media.scale || 1.0 )
 			this.position = new vec2(0,0)
-			if (opt.data && opt.data.position) {
-			  // position is the coordinate of one of the corners with respect to a
-			  // wall surface
-			  // subtract x/z offset of wall
-			}
+		},
 
-			if (opt.wall) {
-				this.set_wall(opt.wall, index)
+		set_wall: function(opt){
+			this.wall = opt.wall || this.wall
+			this.bounds = this.wall.surface.bounds_at_index_with_dimensions(opt.index || 0, this.dimensions)
+		},
+		
+		set_scale: function(scale){
+			this.scale = scale || 1.0
+			if (this.mx) {
+				this.mx.scale = this.mx.ops.scale = this.scale
 			}
+			this.dimensions = this.naturalDimensions.clone().mul(this.scale)
+		},
+		
+		recenter: function () {
+			var center = this.bounds.center()
+			center.a -= this.dimensions.a / 2
+			center.b -= this.dimensions.b / 2
+			console.log(center+"")
+			var mx_position = this.wall.positionToMx( center, this.dimensions )
+			console.log(mx_position)
+			console.log(this.wall.surface.faces.join("\n"))
+			// also supply scale?
+			this.mx.move(mx_position)
+			this.position.assign(center)
 		},
 		
 		bind: function(){
@@ -49,6 +65,7 @@ Scenery.types.base = Fiber.extend(function(base){
 			this.move = null
 			this.media = null
 			this.dimensions = null
+			this.naturalDimensions = null
 			this.wall = null
 			this.bounds = null
 			this.center = null
@@ -68,26 +85,6 @@ Scenery.types.base = Fiber.extend(function(base){
 			}
 		},
 
-		set_wall: function(wall, index){
-			this.wall = wall || this.wall
-			// this.bounds = this.wall.bounds_for(this.media, this.scale)
-			// this.center = this.wall.center()
-		},
-		
-		set_scale: function(scale){
-			this.scale = this.mx.scale = this.mx.ops.scale = scale || 1.0
-		},
-		
-		recenter: function(){
-			this.mx.move({
-				x: this.center.a,
-				y: Rooms.list[this.wall.room].height/2 - 20,
-				z: this.center.b,
-				scale: this.scale,
-				rotationY: wall_rotation[ this.wall.side ],
-			})
-		},
-		
 		serialize: function(){
 			var data = {
 				id: this.id,
@@ -95,6 +92,7 @@ Scenery.types.base = Fiber.extend(function(base){
 				side: this.wall && this.wall.side,
 				dimensions: this.dimensions.serialize(),
 				position: app.position(this.mx),
+				scale: this.scale,
 				media: this.media,
 			}
 			return data
diff --git a/public/assets/javascripts/rectangles/engine/scenery/types/image.js b/public/assets/javascripts/rectangles/engine/scenery/types/image.js
index 576242e..1582e0f 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/types/image.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/types/image.js
@@ -4,17 +4,18 @@ Scenery.types.image = Scenery.types.base.extend(function(base){
 	var exports = {
 	
 		init: function(opt){
+			opt.scale = opt.scale || 300 / max(300, opt.media.width)
+
 			base.init.call(this, opt)
-			this.scale = 300 / max(300, this.media.width)
 
 			this.build()
 			this.bind()
-			this.set_wall()
 			
 			if (opt.data) {
         this.deserialize(opt.data)
       }
       else {
+      	this.set_wall(opt)
         this.recenter()
       }
 		},
diff --git a/public/assets/javascripts/rectangles/engine/scenery/types/video.js b/public/assets/javascripts/rectangles/engine/scenery/types/video.js
index 0bd5c06..e8bc7f7 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/types/video.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/types/video.js
@@ -4,12 +4,12 @@ Scenery.types.video = Scenery.types.base.extend(function(base){
 	var exports = {
 	
 		init: function(opt){
+			opt.scale = opt.scale || 300 / max(300, opt.media.width)
+			
 			base.init.call(this, opt)
-			this.scale = this.media.scale = 300 / max(300, this.media.width)
 
 			this.build()
 			this.bind()
-			this.set_wall()
 			
 			if (opt.data) {
         this.deserialize(opt.data)
diff --git a/public/assets/javascripts/rectangles/models/wall.js b/public/assets/javascripts/rectangles/models/wall.js
index 3afe49a..a8bcbd8 100644
--- a/public/assets/javascripts/rectangles/models/wall.js
+++ b/public/assets/javascripts/rectangles/models/wall.js
@@ -44,7 +44,10 @@
 				mouseover: function(){
 				},
 				mouseenter: function(e){
-					Scenery.mouse.mouseenter(e, base, mx)
+					Scenery.mouse.mouseenter(e, {
+						wall: base,
+						index: index,
+					})
 				},
 				mousemove: function(e){
 				},
@@ -52,7 +55,13 @@
 					// base.randomize_colors()
 					// console.log(sidesToString(base.side))
 					if (Scenery.nextMedia) {
-            var scenery = Scenery.addNextToWall(base, index)
+            var scenery = Scenery.addNextToWall({
+            	wall: base,
+            	index: index
+            })
+            
+            // scenery was not placed
+            if (! scenery) return
 					
   					UndoStack.push({
   					  type: 'create-scenery',
@@ -80,53 +89,55 @@
   // side: corresponds to the orientation of this wall
   // vec: equivalent to the bounds of the Surface
   // edge: the coordinate of the normal of this surface
-  // 			 var useX = side & FRONT_BACK
+  // 			 var useX = side & LEFT_RIGHT
   //			 var useA = side & (FRONT | LEFT)
-  //       mx.rect[useX ? 'y': 'x'][ useA ? 'a': 'b']
-  // surface: an ordered set of contiguous wall regions
+  //       edge = mx.rect[useX ? 'x': 'y'][ useA ? 'a': 'b']
+  // surface: an ordered set of contiguous wall regions, corresponding to mx objects
 
 	Wall.prototype.positionToMx = function(position, dimension) {
+		var x, z
 		switch (this.side) {
 			case FRONT:
-				x = this.vec.a + position.a + dimension.a / 2
+				x = position.a + dimension.a / 2
 				z = this.edge + painting_distance_from_wall
 				break
 			case BACK:
-				x = this.vec.a + position.a + dimension.a / 2
+				x = position.a + dimension.a / 2
 				z = this.edge - painting_distance_from_wall
 				break
 			case LEFT:
 				x = this.edge + painting_distance_from_wall
-				z = this.vec.a + position.a + dimension.a / 2
+				z = position.a + dimension.a / 2
 				break
 			case RIGHT:
 				x = this.edge - painting_distance_from_wall
- 				z = this.vec.a + position.a + dimension.a / 2
+ 				z = position.a + dimension.a / 2
 				break
 		}
 		return {
 		  x: x,
-		  y: position.b + dimension.b / 2
+		  y: position.b + dimension.b / 2,
 		  z: z,
+		  rotationY: wall_rotation[ this.side ],
 		}
 	}
 	Wall.prototype.mxToPosition = function(mx) {
 	  var position = new vec2(0,0)
 	  switch (this.side) {
 	    case FRONT:
-	      position.a = mx.x - mx.width / 2 - this.vec.a
+	      position.a = mx.x - mx.width / 2
 	      position.b = mx.y - mx.height / 2
 	      break
 	    case BACK:
-	      position.a = mx.x - mx.width / 2 - this.vec.a
+	      position.a = mx.x - mx.width / 2
 	      position.b = mx.y - mx.height / 2
 	      break
 	    case LEFT:
-	      position.a = mx.z - mx.width / 2 - this.vec.a
+	      position.a = mx.z - mx.width / 2
 	      position.b = mx.y - mx.height / 2
 	      break
 	    case RIGHT:
-	      position.a = mx.z - mx.width / 2 - this.vec.a
+	      position.a = mx.z - mx.width / 2
 	      position.b = mx.y - mx.height / 2
 	      break
 	  }
@@ -200,7 +211,6 @@
 		var shouldFlip = this.side & (LEFT | BACK)
 		var mx = this.mx
 
-		// console.log( sidesToString(this.side), mx.length )
 		if (! shouldFlip) {
 			mx = mx.reverse()
 		}
diff --git a/public/assets/javascripts/rectangles/util/mouse.js b/public/assets/javascripts/rectangles/util/mouse.js
index fea3376..34d3f5e 100644
--- a/public/assets/javascripts/rectangles/util/mouse.js
+++ b/public/assets/javascripts/rectangles/util/mouse.js
@@ -138,15 +138,15 @@ function mouse (opt) {
 			base.tube("move", e, base.cursor)
 		}
 	}
-	base.mouseenter = function(e, el){
+	base.mouseenter = function(e, target, index){
 		if (! base.down) return
 		if (opt.use_offset && ! offset) return
-		base.tube("enter", e, el, base.cursor)
+		base.tube("enter", e, target, base.cursor)
 	}
-	base.mouseleave = function(e, el){
+	base.mouseleave = function(e, target){
 		if (! base.down) return
 		if (opt.use_offset && ! offset) return
-		base.tube("leave", e, el, base.cursor)
+		base.tube("leave", e, target, base.cursor)
 	}
 	base.mouseup = function(e){		
 		var pos, new_cursor
-- 
cgit v1.2.3-70-g09d2


From 4ec4b0e42c06b63962658ae8b886ee9466d09a21 Mon Sep 17 00:00:00 2001
From: Julie Lala <jules@okfoc.us>
Date: Fri, 22 Aug 2014 12:54:27 -0400
Subject: reject image if it doesnt fit

---
 .../assets/javascripts/mx/primitives/mx.image.js   |  3 ++-
 .../rectangles/engine/scenery/_scenery.js          | 14 +++++++----
 .../rectangles/engine/scenery/types/_object.js     |  5 +---
 .../rectangles/engine/scenery/types/image.js       | 11 ++++++++-
 .../javascripts/rectangles/models/surface.js       |  3 ---
 .../assets/javascripts/rectangles/models/wall.js   | 25 +++++++++-----------
 public/assets/javascripts/ui/editor/MediaViewer.js | 27 ++++++++++++++--------
 7 files changed, 51 insertions(+), 37 deletions(-)

(limited to 'public/assets/javascripts/rectangles/models/wall.js')

diff --git a/public/assets/javascripts/mx/primitives/mx.image.js b/public/assets/javascripts/mx/primitives/mx.image.js
index a640620..575e9c0 100644
--- a/public/assets/javascripts/mx/primitives/mx.image.js
+++ b/public/assets/javascripts/mx/primitives/mx.image.js
@@ -10,7 +10,7 @@ MX.Image = MX.Object3D.extend({
 		this.z = ops.z || 0
 		this.scale = ops.scale || 1
 		this.backface = ops.backface || false
-		
+			
 		ops.className && this.el.classList.add(ops.className)
 		this.backface && this.el.classList.add("backface-visible")		
 		this.el.classList.add("image")
@@ -27,6 +27,7 @@ MX.Image = MX.Object3D.extend({
 
     var image = new Image()
     image.onload = function(){
+    	if (! layer.ops) return
       layer.scale = layer.ops.scale || 1
       layer.width = layer.ops.width || image.naturalWidth
       layer.height = layer.ops.height || image.naturalHeight
diff --git a/public/assets/javascripts/rectangles/engine/scenery/_scenery.js b/public/assets/javascripts/rectangles/engine/scenery/_scenery.js
index 58592d4..119391d 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/_scenery.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/_scenery.js
@@ -35,8 +35,14 @@ var Scenery = new function(){
 		var scene_media = base.add(opt)
 		
 		// test if scenery was placed here
-		base.nextMedia = null
-		return scene_media
+		if (! scene_media.bounds) {
+			base.remove( scene_media.id )
+			return null
+		}
+		else {
+			base.nextMedia = null
+			return scene_media
+		}
 	}
 
 	base.find = function(id){
@@ -44,9 +50,9 @@ var Scenery = new function(){
 	}
 		
 	base.remove = function(id){
-		var media = base.list[id]
+		var scene_media = base.list[id]
 		delete base.list[id]
-		media && media.destroy()
+		scene_media && scene_media.destroy()
 	}
 
 	base.uid = new UidGenerator(base.list)
diff --git a/public/assets/javascripts/rectangles/engine/scenery/types/_object.js b/public/assets/javascripts/rectangles/engine/scenery/types/_object.js
index 7b716f6..effee2a 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/types/_object.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/types/_object.js
@@ -28,14 +28,11 @@ Scenery.types.base = Fiber.extend(function(base){
 		},
 		
 		recenter: function () {
+			if (! this.bounds) return
 			var center = this.bounds.center()
 			center.a -= this.dimensions.a / 2
 			center.b -= this.dimensions.b / 2
-			console.log(center+"")
 			var mx_position = this.wall.positionToMx( center, this.dimensions )
-			console.log(mx_position)
-			console.log(this.wall.surface.faces.join("\n"))
-			// also supply scale?
 			this.mx.move(mx_position)
 			this.position.assign(center)
 		},
diff --git a/public/assets/javascripts/rectangles/engine/scenery/types/image.js b/public/assets/javascripts/rectangles/engine/scenery/types/image.js
index 1582e0f..3bee827 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/types/image.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/types/image.js
@@ -12,11 +12,20 @@ Scenery.types.image = Scenery.types.base.extend(function(base){
 			this.bind()
 			
 			if (opt.data) {
+        console.log(opt.wall)
+        // console.log(opt.data.position)
+        if (opt.wall) {
+        	var position = opt.wall.mxToPosition(opt.data.position)
+        	console.log(position.a)
+        	opt.index = opt.wall.surface.index_for_x( position.a, 0 )
+					console.log(opt.index)
+        }
+      	this.set_wall(opt)
         this.deserialize(opt.data)
       }
       else {
       	this.set_wall(opt)
-        this.recenter()
+        this.bounds && this.recenter()
       }
 		},
 
diff --git a/public/assets/javascripts/rectangles/models/surface.js b/public/assets/javascripts/rectangles/models/surface.js
index a700fd4..9c45eaf 100644
--- a/public/assets/javascripts/rectangles/models/surface.js
+++ b/public/assets/javascripts/rectangles/models/surface.js
@@ -150,9 +150,6 @@
 	
 	Surface.prototype.index_for_x = function(x, min_i){
     min_i = min_i || 0
-		if (x < 0 || x > this.width) {
-			return -1
-		}
 		for (var i = min_i; i < this.faces.length; i++) {
 			if (this.faces[i].x.contains(x)) {
 				return i
diff --git a/public/assets/javascripts/rectangles/models/wall.js b/public/assets/javascripts/rectangles/models/wall.js
index a8bcbd8..f6742ad 100644
--- a/public/assets/javascripts/rectangles/models/wall.js
+++ b/public/assets/javascripts/rectangles/models/wall.js
@@ -51,9 +51,7 @@
 				},
 				mousemove: function(e){
 				},
-				mousedown: function(){
-					// base.randomize_colors()
-					// console.log(sidesToString(base.side))
+				mousedown: function(e){
 					if (Scenery.nextMedia) {
             var scenery = Scenery.addNextToWall({
             	wall: base,
@@ -61,7 +59,10 @@
             })
             
             // scenery was not placed
-            if (! scenery) return
+            if (! scenery) {	
+            	e.stopPropagation()
+            	return
+            }
 					
   					UndoStack.push({
   					  type: 'create-scenery',
@@ -125,22 +126,18 @@
 	  var position = new vec2(0,0)
 	  switch (this.side) {
 	    case FRONT:
-	      position.a = mx.x - mx.width / 2
-	      position.b = mx.y - mx.height / 2
-	      break
 	    case BACK:
-	      position.a = mx.x - mx.width / 2
-	      position.b = mx.y - mx.height / 2
+	      position.a = mx.x
+	      position.b = mx.y
 	      break
 	    case LEFT:
-	      position.a = mx.z - mx.width / 2
-	      position.b = mx.y - mx.height / 2
-	      break
 	    case RIGHT:
-	      position.a = mx.z - mx.width / 2
-	      position.b = mx.y - mx.height / 2
+	      position.a = mx.z
+	      position.b = mx.y
 	      break
 	  }
+// 	  if (mx.width)  { position.a -= mx.width  / 2 }
+// 	  if (mx.height) { position.b -= mx.height / 2 }
 	  return position
 	}
 	
diff --git a/public/assets/javascripts/ui/editor/MediaViewer.js b/public/assets/javascripts/ui/editor/MediaViewer.js
index 5540023..40bfe80 100644
--- a/public/assets/javascripts/ui/editor/MediaViewer.js
+++ b/public/assets/javascripts/ui/editor/MediaViewer.js
@@ -133,7 +133,9 @@ var MediaViewer = ModalView.extend({
 		var $floatingImg = $('.floatingImg');
 		
 		Scenery.nextMedia = media
-		console.log(media.type)
+
+// 		console.log(media.type)
+
 		switch (media.type) {
 			case "video":
 				$floatingImg.attr('src', '/assets/img/playbutton.png')
@@ -150,18 +152,23 @@ var MediaViewer = ModalView.extend({
 		function _followCursor(e) {
 			$floatingImg.parent().css({
 				top: (e.pageY - (height / 2)) + 'px',
-				left: (e.pageX - (width / 2)) + 'px'
+				left: (e.pageX - (width / 2)) + 'px',
 			});
 		}
-		$(window).on('mousemove', _followCursor);
-		$(window).one('click', function () {
+		function _hideCursor (e) {
+			if (Scenery.nextMedia) {
+				return
+			}
 			var $floatingImg = $('.floatingImg')
-			$floatingImg.attr('src', '');
-			$(window).off('mousemove', _followCursor);
-			$floatingImg.parent().removeClass('edit');
-		});
-		$ants.addClass('edit');
-		_followCursor(e);
+			$floatingImg.attr('src', '')
+			$(window).off('mousemove', _followCursor)
+			$(window).off('mousedown', _hideCursor)
+			$floatingImg.parent().removeClass('edit')
+		}
+		$(window).on('mousemove', _followCursor)
+		$(window).on('mousedown', _hideCursor)
+		$ants.addClass('edit')
+		_followCursor(e)
 	},
 
 })
-- 
cgit v1.2.3-70-g09d2


From 41349226e763751311d3b0135086505a77f5472a Mon Sep 17 00:00:00 2001
From: Julie Lala <jules@okfoc.us>
Date: Fri, 22 Aug 2014 13:27:06 -0400
Subject: drag and clamp

---
 .../rectangles/engine/scenery/_scenery.js          |  6 ++++++
 .../javascripts/rectangles/engine/scenery/move.js  | 24 +++++++++++++++++-----
 .../rectangles/engine/scenery/types/image.js       |  6 +++---
 .../javascripts/rectangles/models/surface.js       |  2 --
 .../assets/javascripts/rectangles/models/wall.js   |  6 +++++-
 5 files changed, 33 insertions(+), 11 deletions(-)

(limited to 'public/assets/javascripts/rectangles/models/wall.js')

diff --git a/public/assets/javascripts/rectangles/engine/scenery/_scenery.js b/public/assets/javascripts/rectangles/engine/scenery/_scenery.js
index 119391d..1e2e83a 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/_scenery.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/_scenery.js
@@ -54,6 +54,12 @@ var Scenery = new function(){
 		delete base.list[id]
 		scene_media && scene_media.destroy()
 	}
+	
+	base.removeAll = function(){
+		base.forEach(function(scene_media){
+			base.remove(scene_media.id)
+		})
+	}
 
 	base.uid = new UidGenerator(base.list)
 	
diff --git a/public/assets/javascripts/rectangles/engine/scenery/move.js b/public/assets/javascripts/rectangles/engine/scenery/move.js
index 47e155b..991d1d4 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/move.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/move.js
@@ -1,7 +1,7 @@
 
 Scenery.move = function(base){
 
-	var x, y, z, bounds
+	var x, y, z, position, dimension, bounds
 	var dragging = false
 	var oldState
 
@@ -48,7 +48,11 @@ Scenery.move = function(base){
 		x = base.mx.x
 		y = base.mx.y
 		z = base.mx.z
+		
 		bounds = base.bounds
+		dimension = base.dimensions
+		position = base.wall.mxToPosition( base.mx, dimension )
+		
 		oldState = base.serialize()
 		document.body.classList.add("dragging")
 	}
@@ -56,18 +60,28 @@ Scenery.move = function(base){
 	function drag (e, cursor){
 		if (! dragging) return
 
-		base.mx.y = bounds.y.clamp( y - cursor.y.magnitude()*cursor_amp )
+		var flipX = base.wall.side & (FRONT | RIGHT)
+
+		var delta = cursor.delta()
+		delta.mul( cursor_amp ) // this should be proportional to your distance from the wall
+		if (flipX) { delta.a *= -1 }
+		delta.b *= -1
+
+		var new_bounds = base.wall.surface.translate( bounds, dimension, position, delta )
+		if (new_bounds) bounds = new_bounds
+		if (flipX) { delta.a *= -1 }
+
+		base.mx.y = position.b + delta.b + dimension.b / 2
 		switch (base.wall.side) {
 			case FRONT:
 			case BACK:
-				base.mx.x = bounds.x.clamp( x + cos(wall_rotation[base.wall.side]) * cursor.x.magnitude()*cursor_amp )
+				base.mx.x = position.a + delta.a * cos(wall_rotation[base.wall.side]) + dimension.a / 2
 				break
 			case LEFT:
 			case RIGHT:
-				base.mx.z = bounds.x.clamp( z + sin(wall_rotation[base.wall.side]) * cursor.x.magnitude()*cursor_amp )
+				base.mx.z = position.a + delta.a * sin(wall_rotation[base.wall.side]) + dimension.a / 2
 				break
 		}
-		
 		if (editor.permissions.resize) {
 			Scenery.resize.move_dots()
 		}
diff --git a/public/assets/javascripts/rectangles/engine/scenery/types/image.js b/public/assets/javascripts/rectangles/engine/scenery/types/image.js
index 3bee827..cab6a94 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/types/image.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/types/image.js
@@ -12,13 +12,13 @@ Scenery.types.image = Scenery.types.base.extend(function(base){
 			this.bind()
 			
 			if (opt.data) {
-        console.log(opt.wall)
+        // console.log(opt.wall)
         // console.log(opt.data.position)
         if (opt.wall) {
         	var position = opt.wall.mxToPosition(opt.data.position)
-        	console.log(position.a)
+        	// console.log(position.a)
         	opt.index = opt.wall.surface.index_for_x( position.a, 0 )
-					console.log(opt.index)
+					// console.log(opt.index)
         }
       	this.set_wall(opt)
         this.deserialize(opt.data)
diff --git a/public/assets/javascripts/rectangles/models/surface.js b/public/assets/javascripts/rectangles/models/surface.js
index 9c45eaf..5b411c0 100644
--- a/public/assets/javascripts/rectangles/models/surface.js
+++ b/public/assets/javascripts/rectangles/models/surface.js
@@ -97,8 +97,6 @@
 		}
 		
 		var top_edge = position.b + dimension.b + delta.b - bounds.y.b
-// console.log(position.b, 0, delta.b, bounds.y.a, bottom_edge)
-// console.log(position.b, dimension.b, delta.b, bounds.y.b, top_edge)
 		if (top_edge > 0) {
 			delta.b -= top_edge
 		}
diff --git a/public/assets/javascripts/rectangles/models/wall.js b/public/assets/javascripts/rectangles/models/wall.js
index f6742ad..8723c3c 100644
--- a/public/assets/javascripts/rectangles/models/wall.js
+++ b/public/assets/javascripts/rectangles/models/wall.js
@@ -122,7 +122,7 @@
 		  rotationY: wall_rotation[ this.side ],
 		}
 	}
-	Wall.prototype.mxToPosition = function(mx) {
+	Wall.prototype.mxToPosition = function(mx, dimension) {
 	  var position = new vec2(0,0)
 	  switch (this.side) {
 	    case FRONT:
@@ -136,6 +136,10 @@
 	      position.b = mx.y
 	      break
 	  }
+	  if (dimension) {
+	  	position.a -= dimension.a / 2
+	  	position.b -= dimension.b / 2
+	  }
 // 	  if (mx.width)  { position.a -= mx.width  / 2 }
 // 	  if (mx.height) { position.b -= mx.height / 2 }
 	  return position
-- 
cgit v1.2.3-70-g09d2