group walls and render using 'wireframe' look

1 files changed, 17 insertions, 22 deletions

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(){