merge

2 files changed, 27 insertions, 19 deletions

diff --git a/public/assets/javascripts/rectangles/models/floor.js b/public/assets/javascripts/rectangles/models/floor.js
index 7ed52a1..9838232 100644
--- a/public/assets/javascripts/rectangles/models/floor.js
+++ b/public/assets/javascripts/rectangles/models/floor.js
@@ -15,6 +15,7 @@
 	var Floor = function(opt){
 		this.id = opt.id
 		this.side = opt.side
+		this.ceiling = opt.side & CEILING
 		this.mx = opt.mx
 	}
 	
@@ -114,8 +115,6 @@
 	  this.background.x = background.x || this.background.x
 	  this.background.y = background.y || this.background.y
 	  this.background.scale = background.scale || this.background.scale || 1
-	  
-		var shouldFlip = this.side & (CEILING)
 
 		var mx, dx, dy
 		var w = Math.round( this.backgroundImage.naturalWidth * this.background.scale )
@@ -125,7 +124,7 @@
       
       var region = mx.rect
       
-      if (shouldFlip) {
+      if (this.ceiling) {
         dx = Math.round( this.background.x - region.x.a )
         dy = Math.round( this.background.y - region.y.a )
       }
diff --git a/public/assets/javascripts/rectangles/models/wall.js b/public/assets/javascripts/rectangles/models/wall.js
index 7ff9015..542c99a 100644
--- a/public/assets/javascripts/rectangles/models/wall.js
+++ b/public/assets/javascripts/rectangles/models/wall.js
@@ -213,7 +213,7 @@
 		this.$walls.css("background-color", color)
 	}
 	
-	Wall.prototype.wallpaper = function(background){
+	Wall.prototype.wallpaper = function(background, img){
 	  if (! background) {
 	    background = { src: "none" }
 	  }
@@ -235,7 +235,7 @@
 		  return
 		}
 		
-		var img = new Image ()
+		img = img || new Image ()
 		img.onload = function(){
 		  this.backgroundImage = img
 		  this.wallpaperLoad(this.background.src)
@@ -260,24 +260,34 @@
 	  this.background.y = background.y || this.background.y
 	  this.background.scale = background.scale || this.background.scale || 1
 	  
-		var useX = this.side & FRONT_BACK
-		var shouldFlip = this.side & (LEFT | BACK)
-
 		var mx, dx, dy
 		var w = Math.round( this.backgroundImage.naturalWidth * this.background.scale )
 		var h = Math.round( this.backgroundImage.naturalHeight * this.background.scale )
 
 		this.surface.faces.forEach(function(face, i){
-      
-      if (shouldFlip) {
-        mx = this.mx[this.mx.length-1-i]
-        dx = Math.round( this.background.x + face.x.a )
-        dy = Math.round( this.background.y + face.y.b )
-      }
-      else {
-        mx = this.mx[i]
-        dx = Math.round( this.background.x - face.x.b )
-        dy = Math.round( this.background.y + face.y.b )
+      // this.mx[i].el.innerHTML = sidesToString(this.side)
+
+      switch (this.side) {
+      	case LEFT:
+					mx = this.mx[this.mx.length-1-i]
+					dx = Math.round( this.background.x + face.x.a )
+					dy = Math.round( this.background.y + face.y.b )
+					break
+				case RIGHT:
+					mx = this.mx[this.mx.length-1-i]
+					dx = Math.round( this.background.x + face.x.b )
+					dy = Math.round( this.background.y + face.y.b )
+					break
+				case FRONT:
+					mx = this.mx[this.mx.length-1-i]
+					dx = Math.round( this.background.x + face.x.b )
+					dy = Math.round( this.background.y + face.y.b )
+					break
+				case BACK:
+					mx = this.mx[i]
+					dx = Math.round( this.background.x - face.x.a )
+					dy = Math.round( this.background.y + face.y.b )
+					break
       }
       
       mx.el.style.backgroundPosition = dx + 'px ' + dy + 'px'
@@ -286,7 +296,6 @@
 	}
 	
 	Wall.prototype.outline = function(wallColor, outlineColor){
-		var useX = this.side & FRONT_BACK
 		var mx = this.mx
 
 		var len = this.mx.length