From 5d567454d7d2f4f7e885720d310d42063eeba4dd Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Tue, 30 Sep 2014 18:12:39 -0400
Subject: undo fix

---
 public/assets/javascripts/rectangles/engine/rooms/_walls.js | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'public/assets/javascripts/rectangles/engine/rooms/_walls.js')

diff --git a/public/assets/javascripts/rectangles/engine/rooms/_walls.js b/public/assets/javascripts/rectangles/engine/rooms/_walls.js
index 82ccb87..f0cd558 100644
--- a/public/assets/javascripts/rectangles/engine/rooms/_walls.js
+++ b/public/assets/javascripts/rectangles/engine/rooms/_walls.js
@@ -46,6 +46,10 @@
 		  }
 		}
 		
+		base.find = function(id){
+		  return base.lookup[id]
+		}
+		
 		base.assign = function(list){
 		  base.list = list
 		  base.lookup = {}
-- 
cgit v1.2.3-70-g09d2


From 816c603b03f037fecde9168daccaa5bd344d4c0d Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Tue, 7 Oct 2014 16:37:26 -0400
Subject: nomenclature for addressing floors, ceilings

---
 .../javascripts/rectangles/engine/rooms/_walls.js  |  11 ++
 .../javascripts/rectangles/engine/rooms/clipper.js |   2 +-
 .../javascripts/rectangles/engine/rooms/grouper.js |  19 +++
 .../assets/javascripts/rectangles/models/floor.js  | 146 +++++++++++++++++++++
 .../assets/javascripts/rectangles/models/room.js   |   2 +-
 .../assets/javascripts/rectangles/models/wall.js   |   6 +-
 .../javascripts/rectangles/util/constants.js       |   3 +-
 public/assets/javascripts/ui/editor/TextEditor.js  |   5 +-
 views/partials/scripts.ejs                         |   1 +
 9 files changed, 186 insertions(+), 9 deletions(-)
 create mode 100644 public/assets/javascripts/rectangles/models/floor.js

(limited to 'public/assets/javascripts/rectangles/engine/rooms/_walls.js')

diff --git a/public/assets/javascripts/rectangles/engine/rooms/_walls.js b/public/assets/javascripts/rectangles/engine/rooms/_walls.js
index f0cd558..b3611c8 100644
--- a/public/assets/javascripts/rectangles/engine/rooms/_walls.js
+++ b/public/assets/javascripts/rectangles/engine/rooms/_walls.js
@@ -35,6 +35,7 @@
 		var base = this
 		
 		base.list = []
+		base.floors = []
 		base.lookup = {}
 		base.colors = {}
 
@@ -57,11 +58,21 @@
 		    base.lookup[wall.id] = wall
 		  })
 		}
+
+		base.assignFloors = function(floors){
+		  base.floors = floors
+		  floors.forEach(function(floor){
+		    base.lookup[floor.id] = floor
+		  })
+		}
 		
 		base.bind = function(){
 			base.list.forEach(function(wall){
 				wall.bind()
 			})
+			base.floors.forEach(function(floor){
+			  floor.bind()
+			})
 		}
 
 		base.count = function(){
diff --git a/public/assets/javascripts/rectangles/engine/rooms/clipper.js b/public/assets/javascripts/rectangles/engine/rooms/clipper.js
index 33e3a84..0382758 100644
--- a/public/assets/javascripts/rectangles/engine/rooms/clipper.js
+++ b/public/assets/javascripts/rectangles/engine/rooms/clipper.js
@@ -49,7 +49,7 @@
 				Rooms.regions = regions = []
 				return
 			}
-		
+		  
 			base.reset_rects()
 			base.clip_rects()
 			var culled = base.cull_rects_iterative()
diff --git a/public/assets/javascripts/rectangles/engine/rooms/grouper.js b/public/assets/javascripts/rectangles/engine/rooms/grouper.js
index 663d29d..ec776a2 100644
--- a/public/assets/javascripts/rectangles/engine/rooms/grouper.js
+++ b/public/assets/javascripts/rectangles/engine/rooms/grouper.js
@@ -48,13 +48,16 @@
 		
 		base.build = function (){
 			var walls = []
+			var floors = []
 			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)
+			base.groupFloors(floors, collections)
 			Walls.assign( walls )
+			Walls.assignFloors( floors )
 			Walls.bind()
 		}
 		base.collect = function(){			
@@ -63,12 +66,16 @@
 			collections[BACK] = []
 			collections[LEFT] = []
 			collections[RIGHT] = []
+			collections[FLOOR] = []
+			collections[CEILING] = []
 			
 			Rooms.forEach(function(room){
 				room.mx_walls.forEach(function(mx){
 					var side = mx.side || mx.half_side
 					collections[side].push(mx)
 				})
+				collections[FLOOR] = collections[FLOOR].concat( room.mx_floor )
+				collections[CEILING] = collections[CEILING].concat( room.mx_ceiling )
 			})
 			
 			base.cull(collections)
@@ -161,6 +168,18 @@
       
 			return walls
 		}
+		base.groupFloors = function(floors, collections){
+		  var floor = new Floor ({
+		    id: 'floor',
+		    mx: collections[FLOOR]
+		  })
+		  var ceiling = new Floor ({
+		    id: 'ceiling',
+		    mx: collections[CEILING]
+		  })
+		  floors.push(floor)
+		  floors.push(ceiling)
+		}
 
 	}
 
diff --git a/public/assets/javascripts/rectangles/models/floor.js b/public/assets/javascripts/rectangles/models/floor.js
new file mode 100644
index 0000000..ee264c7
--- /dev/null
+++ b/public/assets/javascripts/rectangles/models/floor.js
@@ -0,0 +1,146 @@
+(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 Floor = function(opt){
+		this.id = opt.id
+		this.side = opt.side
+		this.mx = opt.mx
+	}
+	
+	Floor.prototype.serialize = function(){
+	  return {
+	    id: this.id,
+	    background: this.background,
+	  }
+	}
+	
+	Floor.prototype.deserialize = function(data){
+	  this.wallpaper( data.background )
+	}
+
+	Floor.prototype.bind = function(){
+		var base = this
+		base.$els = $( this.mx.map(function(mx){ return mx.el }) )
+		console.log("HELLO")
+		this.mx.forEach(function(mx, index){
+			$(mx.el).bind({
+				mousedown: function(e){
+				  console.log("clicked on", base.id)
+					if (Scenery.nextWallpaper) {
+					  var oldState = base.serialize()
+						base.wallpaper(Scenery.nextWallpaper)
+						Scenery.nextWallpaper = null
+
+  					UndoStack.push({
+  					  type: 'update-wallpaper',
+  					  undo: oldState,
+              redo: base.serialize(),
+  					})
+
+            // TODO: watch individual scenery object here
+            Minotaur.watch( app.router.editorView.settings )
+          }
+				}
+			})
+		})
+
+    // flip the mx order
+		var shouldFlip = this.side & (CEILING)
+		if (! shouldFlip) {
+			this.mx.reverse()
+		}
+	}
+
+	Floor.prototype.color = function(color){
+		this.$els.css("background-color", color)
+	}
+	
+	Floor.prototype.wallpaper = function(background){
+	  if (! background) {
+	    background = { src: "none" }
+	  }
+	  else if (typeof background == "string") {
+	    background = { src: background }
+	  }
+	  else if (! background.src) {
+	    background = { src: "none" }
+	  }
+    background.x = background.x || 0
+    background.y = background.y || 0
+    background.scale = background.scale || 1
+
+		this.background = background
+		this.background.src = this.background.src.replace("url(","").replace(")","")
+
+		if (this.background.src == "none") {
+		  this.wallpaperLoad(this.background.src)
+		  return
+		}
+		
+		var img = new Image ()
+		img.onload = function(){
+		  this.backgroundImage = img
+		  this.wallpaperLoad(this.background.src)
+		  this.wallpaperPosition(background)
+		}.bind(this)
+		img.src = this.background.src
+		img.complete && img.onload()
+	}
+	
+	Floor.prototype.wallpaperLoad = function(url){
+	  if (url !== "none") {
+	    url = "url(" + url + ")"
+	  }
+		this.mx.forEach(function(mx){
+      mx.el.style.backgroundImage = url
+    })
+	}
+
+	Floor.prototype.wallpaperPosition = function(background){
+	  if (this.background.src == "none") { return }
+	  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 )
+		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 )
+      }
+      
+      mx.el.style.backgroundPosition = dx + 'px ' + dy + 'px'
+      mx.el.style.backgroundSize = w + 'px ' + h + 'px'
+    }.bind(this))
+	}
+
+	if ('window' in this) {
+		window.Floor = Floor
+	}
+	else {
+		module.exports = Floor
+	}
+})()
diff --git a/public/assets/javascripts/rectangles/models/room.js b/public/assets/javascripts/rectangles/models/room.js
index 0f09325..1a4606c 100644
--- a/public/assets/javascripts/rectangles/models/room.js
+++ b/public/assets/javascripts/rectangles/models/room.js
@@ -154,7 +154,7 @@
 			}
 //    if (bitcount(wall_collision) > 1) {
 //  				collision |= wall_collision
-// 			}
+// 		}
 		})
 		return collision
 	}
diff --git a/public/assets/javascripts/rectangles/models/wall.js b/public/assets/javascripts/rectangles/models/wall.js
index 820fb5f..8174de7 100644
--- a/public/assets/javascripts/rectangles/models/wall.js
+++ b/public/assets/javascripts/rectangles/models/wall.js
@@ -19,7 +19,7 @@
 		this.side = opt.side
 		this.surface = opt.surface
 		this.mx = opt.mx
-		this.background = ""
+		this.background = { src: "none" }
 	}
 	
 	Wall.prototype.toString = function(){
@@ -127,8 +127,6 @@
 		if (! shouldFlip) {
 			this.mx.reverse()
 		}
-
-		// this.outline(wallColor, outlineColor)
 	}
 	
 	Wall.prototype.serialize = function(){
@@ -283,10 +281,8 @@
       mx.el.style.backgroundPosition = dx + 'px ' + dy + 'px'
       mx.el.style.backgroundSize = w + 'px ' + h + 'px'
     }.bind(this))
-    bbb = this
 	}
 	
-
 	Wall.prototype.outline = function(wallColor, outlineColor){
 		var useX = this.side & FRONT_BACK
 		var mx = this.mx
diff --git a/public/assets/javascripts/rectangles/util/constants.js b/public/assets/javascripts/rectangles/util/constants.js
index 4c6b3cc..198cc41 100644
--- a/public/assets/javascripts/rectangles/util/constants.js
+++ b/public/assets/javascripts/rectangles/util/constants.js
@@ -1,5 +1,6 @@
 var FRONT = 0x1, BACK = 0x2, LEFT = 0x4, RIGHT = 0x8, FLOOR = 0x10, CEILING = 0x20
-		FRONT_BACK = FRONT | BACK, LEFT_RIGHT = LEFT | RIGHT, FLOOR_CEILING = FLOOR | CEILING
+var FRONT_BACK = FRONT | BACK, LEFT_RIGHT = LEFT | RIGHT, FLOOR_CEILING = FLOOR | CEILING
+var WALL_SIDES = FRONT | BACK | LEFT | RIGHT
 
 var TOP = CEILING, BOTTOM = FLOOR,
 		TOP_LEFT = TOP | LEFT,
diff --git a/public/assets/javascripts/ui/editor/TextEditor.js b/public/assets/javascripts/ui/editor/TextEditor.js
index 1e35c12..0aa5aad 100644
--- a/public/assets/javascripts/ui/editor/TextEditor.js
+++ b/public/assets/javascripts/ui/editor/TextEditor.js
@@ -39,12 +39,15 @@ var TextEditor = FormView.extend({
         scale: 0.5,
         font: { family: 'Lato', size: 12, align: 'left' },
       }
-      
       this.createMode(true)
     }
+    else {
+      $("[data-role='toggle-text-editor']").removeClass("inuse")
+    }
   },
 
 	hide: function(scenery){
+	  Scenery.nextMedia = null
 		if (this.scenery) {
 			this.unbind()
 		}
diff --git a/views/partials/scripts.ejs b/views/partials/scripts.ejs
index f768160..21bed03 100644
--- a/views/partials/scripts.ejs
+++ b/views/partials/scripts.ejs
@@ -46,6 +46,7 @@
 <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>
+<script type="text/javascript" src="/assets/javascripts/rectangles/models/floor.js"></script>
 
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/rooms/_rooms.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/rooms/_walls.js"></script>
-- 
cgit v1.2.3-70-g09d2


From 8a0f5258f0d03cf121d6fde49c5c7731c2212154 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Tue, 7 Oct 2014 17:03:37 -0400
Subject: storing floor/ceiling wallpaper

---
 .../assets/javascripts/rectangles/engine/rooms/_walls.js | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

(limited to 'public/assets/javascripts/rectangles/engine/rooms/_walls.js')

diff --git a/public/assets/javascripts/rectangles/engine/rooms/_walls.js b/public/assets/javascripts/rectangles/engine/rooms/_walls.js
index b3611c8..7438cd4 100644
--- a/public/assets/javascripts/rectangles/engine/rooms/_walls.js
+++ b/public/assets/javascripts/rectangles/engine/rooms/_walls.js
@@ -80,16 +80,20 @@
 		}
 	
 		base.forEach = function(f){
-			return base.list.forEach(f)
+			return base.values().forEach(f)
 		}
 	
 		base.map = function(f){
-			return base.list.map(f)
+			return base.values().map(f)
+		}
+	
+		base.values = function(){
+			return _.values(base.lookup)
 		}
 		
 		base.serialize = function(){
 		  var data = []
-			base.list.forEach(function(wall){
+			base.forEach(function(wall){
 			  data.push(wall.serialize())
 			})
 			return data
@@ -108,7 +112,7 @@
       var outlineColor = rgb_string(Walls.colors.outline)
       var floorColor = rgb_string(Walls.colors.floor)
       var ceilingColor = rgb_string(Walls.colors.ceiling)
-      Walls.forEach(function(wall){
+      Walls.list.forEach(function(wall){
         wall.outline(wallColor, outlineColor)
       })
       Rooms.forEach(function(room){
@@ -122,7 +126,7 @@
       wall: function(rgb){
         var rgbaColor = rgba_string(rgb, app.defaults.wallOpacity)
         Walls.colors.wall = rgb
-        Walls.forEach(function(wall){
+        Walls.list.forEach(function(wall){
           wall.outline(rgbaColor, null)
         })
       },
@@ -130,7 +134,7 @@
       outline: function(rgb){
         var rgbColor = rgb_string(rgb)
         Walls.colors.outline = rgb
-        Walls.forEach(function(wall){
+        Walls.list.forEach(function(wall){
           wall.outline(null, rgbColor)
         })
       },
-- 
cgit v1.2.3-70-g09d2


From c60434bc4655d0e020ca75fc7c5fddf53ac58ede Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Tue, 7 Oct 2014 18:29:08 -0400
Subject: invert logo if background is dark, match body bg to wall color

---
 .../rectangles/engine/map/ui_minimap.js            |  2 ++
 .../javascripts/rectangles/engine/rooms/_walls.js  |  9 +++++++++
 public/assets/stylesheets/app.css                  | 23 +++++++++++++++++++++-
 3 files changed, 33 insertions(+), 1 deletion(-)

(limited to 'public/assets/javascripts/rectangles/engine/rooms/_walls.js')

diff --git a/public/assets/javascripts/rectangles/engine/map/ui_minimap.js b/public/assets/javascripts/rectangles/engine/map/ui_minimap.js
index fabbdb9..d7280b9 100644
--- a/public/assets/javascripts/rectangles/engine/map/ui_minimap.js
+++ b/public/assets/javascripts/rectangles/engine/map/ui_minimap.js
@@ -7,6 +7,7 @@ Map.UI.Minimap = function(map){
 
 	base.creating = base.dragging = base.resizing = false
 
+/*
 	base.mouse = new mouse({
 		el: map.el,
 		down: down,
@@ -15,6 +16,7 @@ Map.UI.Minimap = function(map){
 		up: up,
 		rightclick: rightclick,
 	})
+*/
 
 	base.wheel = new wheel({
 		el: map.el,
diff --git a/public/assets/javascripts/rectangles/engine/rooms/_walls.js b/public/assets/javascripts/rectangles/engine/rooms/_walls.js
index 7438cd4..5ff53fe 100644
--- a/public/assets/javascripts/rectangles/engine/rooms/_walls.js
+++ b/public/assets/javascripts/rectangles/engine/rooms/_walls.js
@@ -125,6 +125,15 @@
     
       wall: function(rgb){
         var rgbaColor = rgba_string(rgb, app.defaults.wallOpacity)
+        var rgbColor = rgb_string(rgb)
+        
+        var rgb_max = Math.max.apply(0, rgb)
+        var rgb_min = Math.min.apply(255, rgb)
+        var luminance = (rgb_max + rgb_min ) / 2
+
+        $("#header").toggleClass("black", luminance < 128)
+        $("body").css("background-color", rgbColor)
+        
         Walls.colors.wall = rgb
         Walls.list.forEach(function(wall){
           wall.outline(rgbaColor, null)
diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index cef90a9..b4d176f 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -71,6 +71,27 @@ a{
 	left: 0;
 	z-index: 6;
 }
+#header.black .logo:hover {
+  background: white;
+}
+#header.black .logo:hover path {
+  fill: black;
+}
+#header.black path {
+  fill: white;
+}
+#header.black .topLinks a {
+  color: white;
+}
+#header.black .topLinks a:hover {
+  color: black;
+  background-color: white;
+}
+#header.black a#help-button:hover {
+  background-color: transparent;
+  text-shadow: 0 0 3px #fff, 0 0 3px #fff, 0 0 3px #fff, 0 0 3px #fff, 0 0 3px #fff;
+}
+
 #help-button {
   display: none;
 	border-right:0px!important;
@@ -1566,7 +1587,7 @@ input[type="range"]::-webkit-slider-thumb {
   bottom: 10px;
   right: 10px;
   font-size: 12px;
-  -webkit-transform: translateY(450px);
+  -webkit-transform: translateY(500px);
   -webkit-transition: -webkit-transform 0.2s ease-in-out;
   transform: translateY(450px);
   transition: -webkit-transform 0.2s ease-in-out;
-- 
cgit v1.2.3-70-g09d2


From 1f66850f5ec5a2e664ee8eaafbe25c46dad34102 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Wed, 8 Oct 2014 12:11:18 -0400
Subject: generate masks for thumbnails

---
 .../javascripts/rectangles/engine/map/draw.js      | 64 ++++++++++++++--------
 .../javascripts/rectangles/engine/rooms/_walls.js  |  4 ++
 .../assets/javascripts/rectangles/models/wall.js   |  2 +-
 .../javascripts/ui/builder/BuilderSettings.js      |  4 +-
 .../assets/javascripts/ui/editor/EditorSettings.js |  4 +-
 .../javascripts/ui/editor/WallpaperPicker.js       |  7 +--
 6 files changed, 54 insertions(+), 31 deletions(-)

(limited to 'public/assets/javascripts/rectangles/engine/rooms/_walls.js')

diff --git a/public/assets/javascripts/rectangles/engine/map/draw.js b/public/assets/javascripts/rectangles/engine/map/draw.js
index 3e185d2..07e2d9f 100644
--- a/public/assets/javascripts/rectangles/engine/map/draw.js
+++ b/public/assets/javascripts/rectangles/engine/map/draw.js
@@ -10,7 +10,7 @@ Map.Draw = function(map, opt){
 	draw.animate = function(){
 		ctx.save()
 		draw.clear()
-		// draw.ruler()
+		draw.fill("rgba(255,255,255,0.98)")
 
 		if (opt.minimap) {
 			ctx.translate( map.dimensions.a * 1/2, map.dimensions.b * 1/2)
@@ -19,7 +19,7 @@ Map.Draw = function(map, opt){
 			ctx.scale( -1, 1 )
 
 			draw.coords()
-			draw.regions(Rooms.regions, [ "#fff" ])
+			draw.regions(Rooms.regions, [ "#fff" ], "#000")
 			draw.camera(scene.camera)
 		}
 		
@@ -29,7 +29,7 @@ Map.Draw = function(map, opt){
 			ctx.translate( map.center.a,  map.center.b )
 			ctx.scale( -1, 1 )
 
-			draw.regions(Rooms.regions, [ "#f8f8f8" ])
+			draw.regions(Rooms.regions, [ "#f8f8f8" ], "#000")
 			draw.mouse(map.ui.mouse.cursor)
 			draw.coords()
 			scene && draw.camera(scene.camera)
@@ -39,7 +39,12 @@ Map.Draw = function(map, opt){
 	}
 
 	draw.render = function(){
-		ctx.save()
+		// change the ctx temporarily
+		var canvas = document.createElement("canvas")
+		ctx = canvas.getContext('2d')
+		canvas.width = map.canvas.width
+		canvas.height = map.canvas.height
+		
 		draw.clear()
 
 		ctx.translate( map.dimensions.a * 1/2, map.dimensions.b * 1/2)
@@ -47,37 +52,52 @@ Map.Draw = function(map, opt){
 		ctx.translate( map.center.a,  map.center.b )
 		ctx.scale( -1, 1 )
 
-		draw.regions(Rooms.regions, ["#fff"])
-		draw.mouse(map.ui.mouse.cursor)
-		scene && draw.camera(scene.camera)
-
+		draw.regions(Rooms.regions, ["#fff"], null)
+		
 		ctx.restore()
+		
+		// invert opacity
+		var pixelData = ctx.getImageData(0, 0, canvas.width, canvas.height)
+		var pixels = pixelData.data
+		for (var i = 0, k, _len = pixels.length; i < _len; i++) {
+		  k = i*4
+		  if (pixels[k+3] == 0) {
+		    pixels[k] = pixels[k+1] = pixels[k+2] = pixels[k+3] = 255
+		  }
+		  else {
+		    pixels[k] = pixels[k+1] = pixels[k+2] = 255
+		    pixels[k+3] = 0
+		  }
+		}
+		ctx.putImageData(pixelData, 0, 0)
+
+		// reset the ctx
+		ctx = map.canvas.getContext("2d")
+		
+		return canvas
 	}
 
 	draw.clear = function(){
-		ctx.fillStyle = "rgba(255,255,255,0.98)"
 		ctx.clearRect(0, 0, map.dimensions.a, map.dimensions.b)
-		ctx.fillRect(0, 0, map.dimensions.a, map.dimensions.b)
 	}
 
-	draw.ruler = function (){
-		ctx.strokeStyle = "rgba(80,80,80,0.5)"
-		ctx.lineWidth = 1
-		var len = 5
-		for (var i = 0.5; i < map.dimensions.a; i += 10) {
-			line(i, 0, i, len)
-			line(0, i, len, i)
-		}
+	draw.fill = function(fillStyle){
+		ctx.fillStyle = fillStyle
+		ctx.fillRect(0, 0, map.dimensions.a, map.dimensions.b)
 	}
 
-	draw.regions = function(regions, colors){
+	draw.regions = function(regions, colors, stroke){
+	  if (stroke) {
+			ctx.strokeStyle = "#000"
+			ctx.lineWidth = (1 / map.zoom)
+		}
 		for (var i = 0; i < regions.length; i++) {
 			if (regions[i].dupe) continue
 			ctx.fillStyle = colors[i % colors.length]
-			ctx.strokeStyle = "#000"
-			ctx.lineWidth = (1 / map.zoom)
 			fill_region(regions[i])
-			stroke_sides(regions[i])
+      if (stroke) {
+        stroke_sides(regions[i])
+      }
 		}
 	}
 
diff --git a/public/assets/javascripts/rectangles/engine/rooms/_walls.js b/public/assets/javascripts/rectangles/engine/rooms/_walls.js
index 5ff53fe..71ddde9 100644
--- a/public/assets/javascripts/rectangles/engine/rooms/_walls.js
+++ b/public/assets/javascripts/rectangles/engine/rooms/_walls.js
@@ -103,6 +103,10 @@
 			walls_data.forEach(function(wall_data){
 			  if (! wall_data) { return }
 			  var wall = base.lookup[ wall_data.id ]
+			  if (! wall) {
+			    console.log(wall_data);
+			    return
+			  }
 			  wall.deserialize( wall_data )
 			})
     },
diff --git a/public/assets/javascripts/rectangles/models/wall.js b/public/assets/javascripts/rectangles/models/wall.js
index 8174de7..fcb2f5e 100644
--- a/public/assets/javascripts/rectangles/models/wall.js
+++ b/public/assets/javascripts/rectangles/models/wall.js
@@ -13,7 +13,7 @@
 	}
 	
 	var Wall = function(opt){
-		this.id = [ opt.side, opt.edge, opt.vec.a ].join("_")
+		this.id = [ opt.side|0, opt.edge|0, opt.vec.a|0 ].join("_")
 		this.vec = opt.vec
 		this.edge = opt.edge
 		this.side = opt.side
diff --git a/public/assets/javascripts/ui/builder/BuilderSettings.js b/public/assets/javascripts/ui/builder/BuilderSettings.js
index 94eed29..99bceed 100644
--- a/public/assets/javascripts/ui/builder/BuilderSettings.js
+++ b/public/assets/javascripts/ui/builder/BuilderSettings.js
@@ -107,7 +107,7 @@ var BuilderSettings = FormView.extend({
 	},
 	
 	serialize: function(){
-		map.draw.render()
+		var thumbnail = map.canvas.render()
 		var fd = new FormData()
 		fd.append( "_csrf", this.$csrf.val() )
 		fd.append( "_id", this.$id.val() )
@@ -115,7 +115,7 @@ var BuilderSettings = FormView.extend({
 		fd.append( "privacy", this.$privacy.filter(":checked").val() == "private" )
 		fd.append( "rooms", JSON.stringify( Rooms.serialize() ) )
 		fd.append( "startPosition", JSON.stringify( app.position(scene.camera) ) )
-		fd.append( "thumbnail", dataUriToBlob(map.canvas.toDataURL()) )
+		fd.append( "thumbnail", dataUriToBlob(thumbnail.toDataURL()) )
 		return fd
 	},
 
diff --git a/public/assets/javascripts/ui/editor/EditorSettings.js b/public/assets/javascripts/ui/editor/EditorSettings.js
index fd251b7..0c08369 100644
--- a/public/assets/javascripts/ui/editor/EditorSettings.js
+++ b/public/assets/javascripts/ui/editor/EditorSettings.js
@@ -146,7 +146,6 @@ var EditorSettings = FormView.extend({
 	},
 	
 	serialize: function(){
-		map.draw.render()
 		var fd = new FormData()
 		fd.append( "_csrf", this.$csrf.val() )
 		fd.append( "_id", this.$id.val() )
@@ -160,7 +159,8 @@ var EditorSettings = FormView.extend({
 		fd.append( "startPosition", JSON.stringify( app.position(scene.camera) ) )
 		
 		if (this.thumbnailIsStale()) {
-      fd.append( "thumbnail", dataUriToBlob(map.canvas.toDataURL()) )
+      var thumbnail = map.draw.render()
+      fd.append( "thumbnail", dataUriToBlob(thumbnail.toDataURL()) )
     }
 		return fd
 	},
diff --git a/public/assets/javascripts/ui/editor/WallpaperPicker.js b/public/assets/javascripts/ui/editor/WallpaperPicker.js
index 140076d..6bf2542 100644
--- a/public/assets/javascripts/ui/editor/WallpaperPicker.js
+++ b/public/assets/javascripts/ui/editor/WallpaperPicker.js
@@ -133,7 +133,7 @@ var WallpaperPicker = UploadView.extend({
 	
 	wall: null,
 	pickWall: function(wall){
-    if (wall.background.src == "none") {
+    if (! wall.background || wall.background.src == "none") {
       return;
     }
     this.wall = wall
@@ -148,16 +148,16 @@ var WallpaperPicker = UploadView.extend({
 	
 	initializePositionCursor: function(){
 	  var base = this
-	  var dx = 0, dy = 0, dragging = false
+	  var dx = 0, dy = 0, dragging = false, delta
 	  var x = 0, y = 0, s = 1
     var mymouse = new mouse({
       el: this.$position[0],
       down: function(e, cursor){
         if (! base.wall) return
+        dragging = true
         s = parseFloat( base.$scale.val() )
         x = base.wall.background.x
         y = base.wall.background.y
-        dragging = true
       },
       drag: function(e, cursor){
         if (! dragging) return
@@ -172,7 +172,6 @@ var WallpaperPicker = UploadView.extend({
         })
       },
       up: function(e, cursor, new_cursor){
-        delta.zero()
         dragging = false
       },
     })
-- 
cgit v1.2.3-70-g09d2


From 0ec3787487db41dd5f5b904b70f61fac3b7da491 Mon Sep 17 00:00:00 2001
From: Julie Lala <jules@okfoc.us>
Date: Thu, 9 Oct 2014 23:16:50 -0400
Subject: some css, set bg to white when noclipping into void

---
 public/assets/javascripts/rectangles/engine/rooms/_walls.js |  2 +-
 public/assets/javascripts/rectangles/engine/rooms/mover.js  | 13 ++++---------
 public/assets/stylesheets/app.css                           |  3 +++
 public/assets/stylesheets/staff.css                         |  9 ++++++---
 server/lib/views/index.js                                   |  4 ++--
 views/docs.ejs                                              |  2 --
 views/home.ejs                                              |  2 +-
 7 files changed, 17 insertions(+), 18 deletions(-)

(limited to 'public/assets/javascripts/rectangles/engine/rooms/_walls.js')

diff --git a/public/assets/javascripts/rectangles/engine/rooms/_walls.js b/public/assets/javascripts/rectangles/engine/rooms/_walls.js
index 71ddde9..7ff472d 100644
--- a/public/assets/javascripts/rectangles/engine/rooms/_walls.js
+++ b/public/assets/javascripts/rectangles/engine/rooms/_walls.js
@@ -137,7 +137,7 @@
 
         $("#header").toggleClass("black", luminance < 128)
         $("body").css("background-color", rgbColor)
-        
+                
         Walls.colors.wall = rgb
         Walls.list.forEach(function(wall){
           wall.outline(rgbaColor, null)
diff --git a/public/assets/javascripts/rectangles/engine/rooms/mover.js b/public/assets/javascripts/rectangles/engine/rooms/mover.js
index 5c7b4af..98f80c5 100644
--- a/public/assets/javascripts/rectangles/engine/rooms/mover.js
+++ b/public/assets/javascripts/rectangles/engine/rooms/mover.js
@@ -21,13 +21,6 @@ Rooms.mover = new function(){
 	base.update = function(pos){
 		var radius = scene.camera.radius
 		
-		if (base.noclip) {
-			cam.x = pos.x
-			cam.y = pos.y
-			cam.z = pos.z
-			return
-		}
-		
 		cam.y = pos.y
 
 		// if we were in a room already..
@@ -42,14 +35,15 @@ Rooms.mover = new function(){
 			// check if we've breached one of the walls.. clamp position if so
 			var collision = base.room.collidesDisc(pos.x, pos.z, radius)
 
-			if (collision) {
+			if (collision && ! base.noclip) {
 				cam.x = (collision & LEFT_RIGHT) ? base.room.rect.x.clampDisc(pos.x, radius) : pos.x
 				cam.z = (collision & FRONT_BACK) ? base.room.rect.y.clampDisc(pos.z, radius) : pos.z
 				return
 			}
 
 			// in this case, we appear to have left the room..
-			$(".face.active").removeClass("active")
+			// $(".face.active").removeClass("active")
+			$("body").css("background-color", "transparent")
 			base.room = null
 		}
 
@@ -65,6 +59,7 @@ Rooms.mover = new function(){
 		// did we actually enter a room?
 		if (intersects.length) {
 			base.room = intersects[0]
+			$("body").css("background-color", rgb_string( Walls.colors.wall ))
       app.tube("change-room", { room: base.room })
 		}
 
diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index 6aab60c..a15ea39 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -482,6 +482,9 @@ iframe.embed {
 	width: 100%;
 	border-top: 1px solid;
 }
+.page h1:nth-child(2) {
+	margin-top: 40px;
+}
 
 .page p {
 	margin: 20px;
diff --git a/public/assets/stylesheets/staff.css b/public/assets/stylesheets/staff.css
index aa21f9b..c75a9b1 100644
--- a/public/assets/stylesheets/staff.css
+++ b/public/assets/stylesheets/staff.css
@@ -28,15 +28,16 @@ nav {
   text-align: left;
 }
 nav a {
-  padding-left: 20px;
+  margin-left: 20px;
 }
 hr {
   border: 1px solid #bbb;
-  margin: 5px auto 10px;
+  margin: 10px auto 10px;
+  background: transparent;
 }
 .body {
   width: 80%;
-  margin: 0 auto;
+  margin: 40px auto;
 }
 .json {
   display: none;
@@ -63,6 +64,8 @@ hr {
 .staff {
   font-size: 15px;
 }
+.staff .body a {
+}
 .staff .editLinks a {
   color: #00f;
 }
diff --git a/server/lib/views/index.js b/server/lib/views/index.js
index 1b547ef..fe2c988 100644
--- a/server/lib/views/index.js
+++ b/server/lib/views/index.js
@@ -86,7 +86,7 @@ views.home = function (req, res) {
         projects = projects.map(function(project){
           project = project.toObject()
           project.date = moment(project.updated_at).format("M/DD/YYYY")
-          if (project.colors.wall && project.colors.wall[0] == project.colors.wall[1] && project.colors.wall[1] == project.colors.wall[2] && project.colors.wall[2] > 238) {
+          if (! project.colors || project.colors.wall && project.colors.wall[0] == project.colors.wall[1] && project.colors.wall[1] == project.colors.wall[2] && project.colors.wall[2] > 238) {
             project.color = [238,238,238]
           } else {
             project.color = project.colors.wall
@@ -151,7 +151,7 @@ views.profile = function (req, res) {
         projects = projects.map(function(project){
           project = project.toObject()
           project.date = moment(project.updated_at).format("M/DD/YYYY")
-          if (project.colors.wall && project.colors.wall[0] == project.colors.wall[1] && project.colors.wall[1] == project.colors.wall[2] && project.colors.wall[2] > 238) {
+          if (! project.colors || project.colors.wall && project.colors.wall[0] == project.colors.wall[1] && project.colors.wall[1] == project.colors.wall[2] && project.colors.wall[2] > 238) {
             project.color = [238,238,238]
           } else {
             project.color = project.colors.wall
diff --git a/views/docs.ejs b/views/docs.ejs
index 5662133..665190d 100644
--- a/views/docs.ejs
+++ b/views/docs.ejs
@@ -8,8 +8,6 @@
 <div class="rapper page docs">
 	[[ include partials/header ]]
 
-	<br clear="all">
-	
 	[[ if (! isNew) { ]]
 		<h1>[[- doc.displayName ]]</h1>
 
diff --git a/views/home.ejs b/views/home.ejs
index e02ab0c..16b00e7 100755
--- a/views/home.ejs
+++ b/views/home.ejs
@@ -10,7 +10,7 @@
 	</script>
 </head>
 <body class="loading">
-	<div class="rapper page">
+	<div class="rapper page home">
 	[[ include partials/header ]]
 
 	<div class="hero" style="background-image:url(https://s3.amazonaws.com/luckyplop/6450f5b88c5c043a4551eff8902b1728f813bd66.jpg)">
-- 
cgit v1.2.3-70-g09d2


From 4263bc016e828f7407b446e27bdf64d898758627 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Fri, 10 Oct 2014 20:54:14 -0400
Subject: refactor layout-parsing calls into Rooms.rebuild

---
 public/assets/javascripts/rectangles/_env.js          |  5 +++--
 .../javascripts/rectangles/engine/map/ui_editor.js    |  2 +-
 .../javascripts/rectangles/engine/rooms/_rooms.js     | 19 +++++++++++++++----
 .../javascripts/rectangles/engine/rooms/_walls.js     | 12 +++++++++++-
 .../javascripts/rectangles/engine/rooms/builder.js    |  5 +----
 .../javascripts/rectangles/engine/rooms/clipper.js    |  1 -
 .../javascripts/rectangles/engine/scenery/undo.js     | 12 ++++++------
 public/assets/javascripts/ui/builder/BuilderInfo.js   | 10 +++++-----
 public/assets/javascripts/ui/builder/BuilderView.js   |  5 -----
 public/assets/javascripts/ui/editor/EditorSettings.js |  7 +------
 10 files changed, 43 insertions(+), 35 deletions(-)

(limited to 'public/assets/javascripts/rectangles/engine/rooms/_walls.js')

diff --git a/public/assets/javascripts/rectangles/_env.js b/public/assets/javascripts/rectangles/_env.js
index 4b14a21..ecde3ca 100644
--- a/public/assets/javascripts/rectangles/_env.js
+++ b/public/assets/javascripts/rectangles/_env.js
@@ -17,14 +17,15 @@ environment.init = function(){
 		scene.camera.radius = 20
 	}
 	
-	app.movements.gravity(true)
-	
 	Rooms.init()
+	Walls.init()
 	Scenery.init()
 	
 	scene.update()
 	environment.update()
 	
+	app.movements.gravity(true)
+
 	var minimap_el = document.querySelector("#minimap .el")
 	if (minimap_el) {
 		window.minimap = new Map ({
diff --git a/public/assets/javascripts/rectangles/engine/map/ui_editor.js b/public/assets/javascripts/rectangles/engine/map/ui_editor.js
index 02218ed..3c3347b 100644
--- a/public/assets/javascripts/rectangles/engine/map/ui_editor.js
+++ b/public/assets/javascripts/rectangles/engine/map/ui_editor.js
@@ -213,7 +213,7 @@ Map.UI.Editor = function(map){
           undo: wheelState,
           redo: intersects[0].copy()
         })
-        Rooms.clipper.update()
+        Rooms.rebuild()
         wheelState = null
 			}, 500)
 		}
diff --git a/public/assets/javascripts/rectangles/engine/rooms/_rooms.js b/public/assets/javascripts/rectangles/engine/rooms/_rooms.js
index 3603f0c..b901a25 100644
--- a/public/assets/javascripts/rectangles/engine/rooms/_rooms.js
+++ b/public/assets/javascripts/rectangles/engine/rooms/_rooms.js
@@ -59,18 +59,19 @@
 				height: 500
 			})
 			base.add(room)
+			Rooms.rebuild()
 			return room
 		}
 	
 		base.remove = function(room){
 			delete base.list[room.id]
-			Rooms.clipper.update()
+      Rooms.rebuild()
 		}
 	
 		base.removeAll = function(){
 			base.list = {}
 			base.regions = []
-			Rooms.clipper.update()
+      Rooms.rebuild()
 		}
 	
 		base.count = function(){
@@ -88,6 +89,16 @@
 		base.values = function(){
 			return _.values(base.list)
 		}
+		
+		base.rebuild = function(walls_data){
+      walls_data = walls_data || Walls.serialize()
+      Rooms.clipper.update()
+      Rooms.builder.rebuild()
+      Rooms.grouper.build()
+      Walls.paint()
+      Walls.deserialize(walls_data)
+      app.tube("rooms-built")
+		}
 	
 		base.serialize = function(){
 			var rooms = base.map(function(room){
@@ -96,7 +107,7 @@
 			return rooms
 		}
 	
-		base.deserialize = function(rooms_data){
+		base.deserialize = function(rooms_data, walls_data){
 			rooms_data.forEach(function(data){
 			  if (! data || ! data.rect) return
 				var rect = new Rect(data.rect.x[0], data.rect.y[0], data.rect.x[1], data.rect.y[1])
@@ -107,7 +118,7 @@
 				})
 				base.add(room)
 			})
-			Rooms.clipper.update()
+      Rooms.rebuild(walls_data)
 		}
 		
 		base.report = function(){
diff --git a/public/assets/javascripts/rectangles/engine/rooms/_walls.js b/public/assets/javascripts/rectangles/engine/rooms/_walls.js
index 7ff472d..80d30c6 100644
--- a/public/assets/javascripts/rectangles/engine/rooms/_walls.js
+++ b/public/assets/javascripts/rectangles/engine/rooms/_walls.js
@@ -38,6 +38,15 @@
 		base.floors = []
 		base.lookup = {}
 		base.colors = {}
+		
+		base.init = function(){
+      base.colors = {
+        wall: app.defaults.colors.wall.slice(),
+        outline: app.defaults.colors.outline.slice(),
+        floor: app.defaults.colors.floor.slice(),
+        ceiling: app.defaults.colors.ceiling.slice(),
+      }
+    }
 
 		base.first = function(){
 		  for (var i in base.list) {
@@ -90,7 +99,7 @@
 		base.values = function(){
 			return _.values(base.lookup)
 		}
-		
+
 		base.serialize = function(){
 		  var data = []
 			base.forEach(function(wall){
@@ -118,6 +127,7 @@
       var ceilingColor = rgb_string(Walls.colors.ceiling)
       Walls.list.forEach(function(wall){
         wall.outline(wallColor, outlineColor)
+        // TODO: SET WALLPAPER HERE
       })
       Rooms.forEach(function(room){
         room.setFloorColor(floorColor)
diff --git a/public/assets/javascripts/rectangles/engine/rooms/builder.js b/public/assets/javascripts/rectangles/engine/rooms/builder.js
index 6a89158..4619eb1 100644
--- a/public/assets/javascripts/rectangles/engine/rooms/builder.js
+++ b/public/assets/javascripts/rectangles/engine/rooms/builder.js
@@ -32,19 +32,16 @@
 		var els = []
 
 		base.init = function(){
-			base.bind()
+			// base.bind()
 		}
 
 		base.bind = function(){
-			app.on("clip", base.rebuild.bind(base))
 		}
 
 		base.rebuild = function(){
 			if (window.scene) {
 				base.clear()
 				base.build()
-				Rooms.grouper.build()
-				app.tube("rooms-built")
 			}
 		}
 
diff --git a/public/assets/javascripts/rectangles/engine/rooms/clipper.js b/public/assets/javascripts/rectangles/engine/rooms/clipper.js
index 0382758..df83cc8 100644
--- a/public/assets/javascripts/rectangles/engine/rooms/clipper.js
+++ b/public/assets/javascripts/rectangles/engine/rooms/clipper.js
@@ -38,7 +38,6 @@
 
 		base.update = function(){
 			base.solve_rects()
-			app.tube("clip")
 		}
 	
 		var regions
diff --git a/public/assets/javascripts/rectangles/engine/scenery/undo.js b/public/assets/javascripts/rectangles/engine/scenery/undo.js
index 57a0886..bee8c49 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/undo.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/undo.js
@@ -69,11 +69,11 @@
       type: "create-room",
       undo: function(room){
         Rooms.remove(room)
-        Rooms.clipper.update()
+        Rooms.rebuild()
       },
       redo: function(room){
         Rooms.add(new Room(room))
-        Rooms.clipper.update()
+        Rooms.rebuild()
         app.tube("builder-pick-room", room)
       },
     },
@@ -83,14 +83,14 @@
         var room = Rooms.list[state.id]
         room.rect.assign( state.rect )
         room.height = state.height
-        Rooms.clipper.update()
+        Rooms.rebuild()
         app.tube("builder-pick-room", room)
       },
       redo: function(state){
         var room = Rooms.list[state.id]
         room.rect.assign( state.rect )
         room.height = state.height
-        Rooms.clipper.update()
+        Rooms.rebuild()
         app.tube("builder-pick-room", room)
       },
     },
@@ -98,12 +98,12 @@
       type: "destroy-room",
       undo: function(room){
         Rooms.add(new Room(room))
-        Rooms.clipper.update()
+        Rooms.rebuild()
         app.tube("builder-pick-room", room)
       },
       redo: function(room){
         Rooms.remove(room)
-        Rooms.clipper.update()
+        Rooms.rebuild()
       },
     },
     
diff --git a/public/assets/javascripts/ui/builder/BuilderInfo.js b/public/assets/javascripts/ui/builder/BuilderInfo.js
index f7753a3..0bf2338 100644
--- a/public/assets/javascripts/ui/builder/BuilderInfo.js
+++ b/public/assets/javascripts/ui/builder/BuilderInfo.js
@@ -67,27 +67,27 @@ var BuilderInfo = View.extend({
 	changeWidth: function(e){
 		e.stopPropagation()
 		this.room.rect.x.setLength( this.$width.unitVal() )
-		Rooms.clipper.update()
+    Rooms.rebuild()
 	},
 	changeDepth: function(e){
 		e.stopPropagation()
 		this.room.rect.y.setLength( this.$depth.unitVal() )
-		Rooms.clipper.update()
+    Rooms.rebuild()
 	},
 	changeHeight: function(e){
 		e.stopPropagation()
 		this.room.height = this.$height.unitVal()
-		Rooms.clipper.update()
+    Rooms.rebuild()
 	},
 	changeX: function(e){
 		e.stopPropagation()
 		this.room.rect.x.setPosition( this.$x.unitVal() )
-		Rooms.clipper.update()
+    Rooms.rebuild()
 	},
 	changeY: function(e){
 		e.stopPropagation()
 		this.room.rect.y.setPosition( this.$y.unitVal() )
-		Rooms.clipper.update()
+    Rooms.rebuild()
 	},
 	changeUnits: function(){
 		app.units = this.$units.val()
diff --git a/public/assets/javascripts/ui/builder/BuilderView.js b/public/assets/javascripts/ui/builder/BuilderView.js
index 81dce52..a89111f 100644
--- a/public/assets/javascripts/ui/builder/BuilderView.js
+++ b/public/assets/javascripts/ui/builder/BuilderView.js
@@ -12,11 +12,6 @@ var BuilderView = View.extend({
 		this.toolbar = new BuilderToolbar ({ parent: this })
 		this.settings = new BuilderSettings ({ parent: this })
 		this.lightControl = new LightControl ({ parent: this })
-
-		app.on("rooms-built", function(){
-		  Walls.paint()
-		})
-
 	},
 
 	load: function(name){
diff --git a/public/assets/javascripts/ui/editor/EditorSettings.js b/public/assets/javascripts/ui/editor/EditorSettings.js
index 45a2e43..89040e1 100644
--- a/public/assets/javascripts/ui/editor/EditorSettings.js
+++ b/public/assets/javascripts/ui/editor/EditorSettings.js
@@ -32,8 +32,7 @@ var EditorSettings = FormView.extend({
 		this.action = data.isNew ? this.createAction : this.updateAction
     this.parent.data = data
     
-		data.rooms && Rooms.deserialize(data.rooms)
-		data.walls && Walls.deserialize(data.walls)
+		data.rooms && Rooms.deserialize(data.rooms, data.walls)
 		data.startPosition && scene.camera.move(data.startPosition)
 
     if (data.colors && data.colors.wall) {
@@ -66,10 +65,6 @@ var EditorSettings = FormView.extend({
 			
 			data.media && Scenery.deserialize(data.media)
 		}
-
-    app.on("rooms-built", function(){
-		  Walls.paint()
-		})
 	},
 	
 	showCollaborators: function(e){
-- 
cgit v1.2.3-70-g09d2


From bc63a639bbd224adfc8012b100c1b277e2774afb Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Fri, 10 Oct 2014 21:07:50 -0400
Subject: z

---
 public/assets/javascripts/rectangles/engine/rooms/_walls.js | 1 -
 public/assets/stylesheets/app.css                           | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

(limited to 'public/assets/javascripts/rectangles/engine/rooms/_walls.js')

diff --git a/public/assets/javascripts/rectangles/engine/rooms/_walls.js b/public/assets/javascripts/rectangles/engine/rooms/_walls.js
index 80d30c6..0da3b9a 100644
--- a/public/assets/javascripts/rectangles/engine/rooms/_walls.js
+++ b/public/assets/javascripts/rectangles/engine/rooms/_walls.js
@@ -113,7 +113,6 @@
 			  if (! wall_data) { return }
 			  var wall = base.lookup[ wall_data.id ]
 			  if (! wall) {
-			    console.log(wall_data);
 			    return
 			  }
 			  wall.deserialize( wall_data )
diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index 4bae1de..509deb5 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -1505,7 +1505,7 @@ border-left: 1px solid black;
 .wallpaper .wallpaperRemove {
   cursor: pointer;
   border-top: 1px solid black;
-  padding: 4px 0 0 0;
+  padding: 0;
 }
 .wallpaper .wallpaperRemove img {
   width: 18px;
-- 
cgit v1.2.3-70-g09d2


From 527a65ca570891ff473dbdac36d41b1be60196f1 Mon Sep 17 00:00:00 2001
From: Julie Lala <jules@okfoc.us>
Date: Tue, 14 Oct 2014 19:16:45 -0400
Subject: load more on media drawer and some other stuff

---
 .../javascripts/mx/extensions/mx.movements.js      |  3 +-
 .../javascripts/rectangles/engine/map/draw.js      |  6 +--
 .../javascripts/rectangles/engine/rooms/_walls.js  | 19 +++++----
 .../javascripts/rectangles/engine/rooms/mover.js   |  2 +
 .../javascripts/rectangles/util/constants.js       |  3 +-
 public/assets/javascripts/rectangles/util/wheel.js |  6 ++-
 .../assets/javascripts/ui/builder/BuilderInfo.js   |  2 +-
 .../assets/javascripts/ui/editor/EditorSettings.js |  1 +
 public/assets/javascripts/ui/editor/EditorView.js  |  1 +
 public/assets/javascripts/ui/editor/MediaUpload.js |  4 +-
 public/assets/javascripts/ui/editor/MediaViewer.js | 33 +++++++++++----
 public/assets/javascripts/ui/editor/TextEditor.js  |  5 +--
 public/assets/stylesheets/app.css                  | 49 +++++++++++++---------
 server/lib/api/media.js                            | 13 ++++--
 server/lib/api/projects.js                         |  2 +
 server/lib/schemas/Project.js                      |  1 +
 views/controls/editor/media-drawer.ejs             | 28 +++++++------
 17 files changed, 116 insertions(+), 62 deletions(-)

(limited to 'public/assets/javascripts/rectangles/engine/rooms/_walls.js')

diff --git a/public/assets/javascripts/mx/extensions/mx.movements.js b/public/assets/javascripts/mx/extensions/mx.movements.js
index 2b7e671..268a1c7 100644
--- a/public/assets/javascripts/mx/extensions/mx.movements.js
+++ b/public/assets/javascripts/mx/extensions/mx.movements.js
@@ -223,8 +223,7 @@ MX.Movements = function (cam) {
 		},
 		
 		mousewheel: function (e, deltaY, deltaX) {
-			console.log(deltaX != 0 && deltaY != 0)
-			cam.rotationY += -deltaX / 20
+			cam.rotationY += deltaX / 20
 
 			pos.x += deltaY * Math.cos(cam.rotationY + Math.PI / 2) * 10
 			pos.z += deltaY * Math.sin(cam.rotationY + Math.PI / 2) * 10
diff --git a/public/assets/javascripts/rectangles/engine/map/draw.js b/public/assets/javascripts/rectangles/engine/map/draw.js
index 7eb6e7c..eceda3c 100644
--- a/public/assets/javascripts/rectangles/engine/map/draw.js
+++ b/public/assets/javascripts/rectangles/engine/map/draw.js
@@ -177,11 +177,11 @@ Map.Draw = function(map, opt){
 		ctx.lineWidth = 1/map.zoom
 		
 		var sides = map.sides()
-		var quant = sides.clone().quantize(200)
-		for (var x = quant.x.a - 200; x <= quant.x.b; x += 200) {
+		var quant = sides.clone().quantize(MAP_GRID_SIZE)
+		for (var x = quant.x.a - MAP_GRID_SIZE; x <= quant.x.b; x += MAP_GRID_SIZE) {
 			line(x, sides.y.a, x, sides.y.b)
 		}
-		for (var y = quant.y.a - 200; y <= quant.y.b; y += 200) {
+		for (var y = quant.y.a - MAP_GRID_SIZE; y <= quant.y.b; y += MAP_GRID_SIZE) {
 			line(sides.x.a, y, sides.x.b, y)
 		}
 	}
diff --git a/public/assets/javascripts/rectangles/engine/rooms/_walls.js b/public/assets/javascripts/rectangles/engine/rooms/_walls.js
index 0da3b9a..119a659 100644
--- a/public/assets/javascripts/rectangles/engine/rooms/_walls.js
+++ b/public/assets/javascripts/rectangles/engine/rooms/_walls.js
@@ -134,19 +134,24 @@
       })
 		}
 		
+		base.luminance = function(rgb){
+			rgb = rgb || Walls.colors.wall
+			var rgb_max = Math.max.apply(0, rgb)
+			var rgb_min = Math.min.apply(255, rgb)
+			return (rgb_max + rgb_min ) / 2
+		}
+		
     base.setColor = {
     
       wall: function(rgb){
         var rgbaColor = rgba_string(rgb, app.defaults.wallOpacity)
         var rgbColor = rgb_string(rgb)
+        				
+				if (Rooms.mover.room) {
+					$("#header").toggleClass("black", base.luminance() < 100)
+					$("body").css("background-color", rgbColor)
+				}
         
-        var rgb_max = Math.max.apply(0, rgb)
-        var rgb_min = Math.min.apply(255, rgb)
-        var luminance = (rgb_max + rgb_min ) / 2
-
-        $("#header").toggleClass("black", luminance < 128)
-        $("body").css("background-color", rgbColor)
-                
         Walls.colors.wall = rgb
         Walls.list.forEach(function(wall){
           wall.outline(rgbaColor, null)
diff --git a/public/assets/javascripts/rectangles/engine/rooms/mover.js b/public/assets/javascripts/rectangles/engine/rooms/mover.js
index 98f80c5..a2d2223 100644
--- a/public/assets/javascripts/rectangles/engine/rooms/mover.js
+++ b/public/assets/javascripts/rectangles/engine/rooms/mover.js
@@ -43,6 +43,7 @@ Rooms.mover = new function(){
 
 			// in this case, we appear to have left the room..
 			// $(".face.active").removeClass("active")
+			$("#header").removeClass("black")
 			$("body").css("background-color", "transparent")
 			base.room = null
 		}
@@ -59,6 +60,7 @@ Rooms.mover = new function(){
 		// did we actually enter a room?
 		if (intersects.length) {
 			base.room = intersects[0]
+			$("#header").toggleClass("black", Walls.luminance() < 100)
 			$("body").css("background-color", rgb_string( Walls.colors.wall ))
       app.tube("change-room", { room: base.room })
 		}
diff --git a/public/assets/javascripts/rectangles/util/constants.js b/public/assets/javascripts/rectangles/util/constants.js
index a38325e..3bc314c 100644
--- a/public/assets/javascripts/rectangles/util/constants.js
+++ b/public/assets/javascripts/rectangles/util/constants.js
@@ -21,7 +21,8 @@ var height_min = 200,
 		side_max = 5000,
 		resize_margin = 8,
 		cursor_amp = 1.5,
-		DEFAULT_PICTURE_WIDTH = 400
+		DEFAULT_PICTURE_WIDTH = 350,
+		MAP_GRID_SIZE = 360          // 10 feet
 
 var painting_distance_from_wall = 10,
 		dot_distance_from_picture = 3
diff --git a/public/assets/javascripts/rectangles/util/wheel.js b/public/assets/javascripts/rectangles/util/wheel.js
index 64aaa64..712d470 100644
--- a/public/assets/javascripts/rectangles/util/wheel.js
+++ b/public/assets/javascripts/rectangles/util/wheel.js
@@ -38,7 +38,11 @@ function wheel (opt) {
 		var deltaX = 0, deltaY = 0;
 		
 		// WebKit
-		if ( event.wheelDeltaY ) {
+		if ( event.deltaY ) {
+			deltaY -= event.deltaY * opt.ratio
+			deltaX -= event.deltaX * opt.ratio
+		}
+		else if ( event.wheelDeltaY ) {
 			deltaY -= event.wheelDeltaY * opt.ratio
 			deltaX -= event.wheelDeltaX * opt.ratio
 		}
diff --git a/public/assets/javascripts/ui/builder/BuilderInfo.js b/public/assets/javascripts/ui/builder/BuilderInfo.js
index 196eca6..67834e7 100644
--- a/public/assets/javascripts/ui/builder/BuilderInfo.js
+++ b/public/assets/javascripts/ui/builder/BuilderInfo.js
@@ -34,7 +34,7 @@ var BuilderInfo = View.extend({
 	},
 	
 	load: function(data){
-		this.$viewHeight.unitVal( data.viewHeight || app.defaults.viewHeight )
+		this.$viewHeight.unitVal( window.viewHeight = data.viewHeight || app.defaults.viewHeight )
 		this.$units.val( "ft" )
 		this.$unitName.html( "ft" )
 	},
diff --git a/public/assets/javascripts/ui/editor/EditorSettings.js b/public/assets/javascripts/ui/editor/EditorSettings.js
index 89040e1..e2cb53c 100644
--- a/public/assets/javascripts/ui/editor/EditorSettings.js
+++ b/public/assets/javascripts/ui/editor/EditorSettings.js
@@ -148,6 +148,7 @@ var EditorSettings = FormView.extend({
 		fd.append( "name", this.$name.val() )
 		fd.append( "description", this.$description.val() )
 		fd.append( "privacy", this.$privacy.filter(":checked").val() == "private" )
+		fd.append( "viewHeight", window.viewHeight )
 		fd.append( "rooms", JSON.stringify( Rooms.serialize() ) )
  		fd.append( "walls", JSON.stringify( Walls.serialize() ) )
  		fd.append( "colors", JSON.stringify( Walls.colors ) )
diff --git a/public/assets/javascripts/ui/editor/EditorView.js b/public/assets/javascripts/ui/editor/EditorView.js
index 6aff601..ccd6c63 100644
--- a/public/assets/javascripts/ui/editor/EditorView.js
+++ b/public/assets/javascripts/ui/editor/EditorView.js
@@ -41,6 +41,7 @@ var EditorView = View.extend({
 		$("#map").hide()
 
 		this.settings.load(data)
+		this.info.load(data)
 	},
 	
 	readyLayout: function(data){
diff --git a/public/assets/javascripts/ui/editor/MediaUpload.js b/public/assets/javascripts/ui/editor/MediaUpload.js
index fddfefc..9799f99 100644
--- a/public/assets/javascripts/ui/editor/MediaUpload.js
+++ b/public/assets/javascripts/ui/editor/MediaUpload.js
@@ -55,9 +55,7 @@ var MediaUpload = UploadView.extend({
 	
 	add: function(media){
 		console.log(media)
-		this.parent.mediaViewer.add(media, this.parent.mediaViewer.$myMedia)
-    this.parent.mediaViewer.$deleteMedia.show()
-    this.parent.mediaViewer.$noMedia.hide()
+		this.parent.mediaViewer.addUploadedMedia(media)
 	},
 	
 	beforeUpload: function(){
diff --git a/public/assets/javascripts/ui/editor/MediaViewer.js b/public/assets/javascripts/ui/editor/MediaViewer.js
index c18fb49..2e76bec 100644
--- a/public/assets/javascripts/ui/editor/MediaViewer.js
+++ b/public/assets/javascripts/ui/editor/MediaViewer.js
@@ -4,23 +4,29 @@ var MediaViewer = ModalView.extend({
 	destroyAction: "/api/media/destroy",
 	usesFileUpload: true,
 	loaded: false,
-	
+	perPage: 12,
+	offset: 0,
+
 	events: {
 	  'mousedown': "stopPropagation",
 		'click .foundToggle': "foundToggle",
 		'click .userToggle': "userToggle",
 		'click #deleteMedia': "deleteArmed",
 		'click .mediaContainer': "pick",
+		'click .viewMore': "load",
 	},
 	
 	initialize: function(opt){
 		this.__super__.initialize.call(this)
 		this.parent = opt.parent
 		this.$myMedia = this.$(".myMedia")
+		this.$myMediaContainer = this.$(".myMedia > .container")
 		this.$userToggle = this.$(".userToggle")
 		this.$foundMedia = this.$(".foundMedia")
+		this.$foundMediaContainer = this.$(".foundMedia > .container")
 		this.$foundToggle = this.$(".foundToggle")
 		this.$deleteMedia = this.$("#deleteMedia")
+		this.$viewMore = this.$(".viewMore")
 		this.$noMedia = this.$(".noMedia")
   },
 
@@ -55,7 +61,7 @@ var MediaViewer = ModalView.extend({
 	},
 
 	load: function(){
-		$.get("/api/media/user", this.populate.bind(this))
+		$.get("/api/media/user", { offset: this.offset, limit: this.perPage }, this.populate.bind(this))
 	},
 	
 	loadTrending: function(){
@@ -85,7 +91,7 @@ var MediaViewer = ModalView.extend({
           width: img.naturalWidth,
           height: img.naturalHeight,
         }
-        this.add(media, this.$foundMedia)
+        this.add(media, this.$foundMediaContainer)
 		  }.bind(this)
 		  img.src = url
 		  if (img.complete && ! loaded) { img.onload() }
@@ -100,22 +106,34 @@ var MediaViewer = ModalView.extend({
   },
 
 	populate: function(data){
-		this.loaded = true
 		if (data && data.length) {
+			if (data.length < this.perPage) {
+				this.$viewMore.hide()
+			}
 		  data.forEach(function(media){
-		    this.add(media, this.$myMedia)
+		    this.add(media, this.$myMediaContainer)
+		    this.offset += 1
 		  }.bind(this))
 		  this.$noMedia.hide()
       this.$deleteMedia.show()
 		}
 		else {
+			this.$viewMore.hide()
 		  this.$noMedia.show()
 		  this.$deleteMedia.hide()
 		}
+		this.loaded = true
 		this.__super__.show.call(this)
 	},
 	
-	add: function(media, $container){
+	addUploadedMedia: function(media){
+    this.parent.mediaViewer.$deleteMedia.show()
+    this.parent.mediaViewer.$noMedia.hide()
+    this.add(media, this.$myMedia, true) // prepend
+		this.offset += 1
+	},
+	
+	add: function(media, $container, prepend){
 		var image = new Image ()
 		var $span = $("<span>")
 		$span.addClass("mediaContainer")
@@ -142,7 +160,8 @@ var MediaViewer = ModalView.extend({
 		$span.data("media", media)
 		$span.append(image)
 
-		$container.prepend($span)
+		if (prepend) $container.prepend($span)
+		else $container.append($span)
 	},
 
 	deleteIsArmed: false,
diff --git a/public/assets/javascripts/ui/editor/TextEditor.js b/public/assets/javascripts/ui/editor/TextEditor.js
index c8879b3..b559ba5 100644
--- a/public/assets/javascripts/ui/editor/TextEditor.js
+++ b/public/assets/javascripts/ui/editor/TextEditor.js
@@ -28,16 +28,15 @@ var TextEditor = FormView.extend({
 	},
 
   toggle: function(state){
-    $("#keyhint").fadeOut(200)
-    
     this.$el.toggleClass("active", state)
     if (state) {
+			$("#keyhint").fadeOut(200)
       Scenery.nextMedia = {
         type: 'text',
         width: 600,
         height: 450,
         scale: 0.5,
-        font: { family: 'Lato', size: 12, align: 'left' },
+        font: { family: 'Lato', size: 24, align: 'left', color: "#000" },
       }
       this.createMode(true)
     }
diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index 849c994..eec671a 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -414,6 +414,17 @@ iframe.embed {
 	border-top: 1px solid black;
 }
 
+.mediaDrawer .viewMore {
+	clear: both;
+	float: none;
+	text-decoration: none;
+	font-size: 22px;
+	display: block;
+	text-align: center;
+	padding: 40px;
+	border: 0;
+	border-top: 1px solid black;
+}
 
 .holder {
 	display: table-cell;
@@ -2152,7 +2163,7 @@ form li textarea {
 	right: 20px;
 	top: 20px;
 	z-index: 20;
-	background: #f9f9f9;
+	background: white;
 	width: 75px;
 	color: black;
 	border: 1px solid black;
@@ -2511,22 +2522,22 @@ a[data-role="forgot-password"] {
 	padding: 50px 0;
 	}
 	.page .viewMore.btn {
-	text-decoration: none;
-	font-size: 18px;
-	padding: 18px 0;
-}
-.footer a, .footer span {
-margin: 9px;
-}
-#keyhint {
-	display:none;
-}
-.projectList .projectItem {
-	width:100%;
-	margin: 20px 0;
-}
-.projectList .room {
-width: 100%;
-height: 260px;
-}
+		text-decoration: none;
+		font-size: 18px;
+		padding: 18px 0;
+	}
+	.footer a, .footer span {
+	margin: 9px;
+	}
+	#keyhint {
+		display:none;
+	}
+	.projectList .projectItem {
+		width:100%;
+		margin: 20px 0;
+	}
+	.projectList .room {
+	width: 100%;
+	height: 260px;
+	}
 }
\ No newline at end of file
diff --git a/server/lib/api/media.js b/server/lib/api/media.js
index 1eb08c1..643ba92 100644
--- a/server/lib/api/media.js
+++ b/server/lib/api/media.js
@@ -10,13 +10,20 @@ var _ = require('lodash'),
 var media = {
 
 	user: function(req, res){
+	  var offset = Number(req.query.offset) || 0
+	  var limit = Math.min( Number(req.query.limit), 50 ) || 20
 	  var query = { user_id: req.user._id }
 	  if (req.query.tag) {
 	    query.tag = req.query.tag
 	  }
-		Media.find(query, function(err, media){
-			res.json(media || [])
-		})
+	  console.log(offset, limit)
+		Media.find(query)
+			.sort({'created_at': -1})
+			.skip(offset)
+			.limit(limit)
+		  .exec(function(err, media){
+				res.json(media || [])
+			})
 	},
 	
 	create: function(req, res){
diff --git a/server/lib/api/projects.js b/server/lib/api/projects.js
index 47e0458..e357285 100644
--- a/server/lib/api/projects.js
+++ b/server/lib/api/projects.js
@@ -36,6 +36,7 @@ var projects = {
 		data.name = util.sanitize(data.name)
 		data.slug = util.slugify(data.name) + "-" + (+new Date)
 		data.description = util.sanitize(data.description)
+		data.viewHeight = Number(data.viewHeight || 0)
 		data.rooms = JSON.parse(data.rooms)
 		data.walls = JSON.parse(data.walls)
 		data.media = JSON.parse(data.media)
@@ -94,6 +95,7 @@ var projects = {
           data.slug = util.slugify(data.name) + "-" + (+new Date)
         }
         data.description = util.sanitize(data.description)
+        data.viewHeight = Number(data.viewHeight || 0)
         data.updated_at = new Date ()
 
 				_.extend(doc, data)
diff --git a/server/lib/schemas/Project.js b/server/lib/schemas/Project.js
index dd50da6..f7b8de0 100644
--- a/server/lib/schemas/Project.js
+++ b/server/lib/schemas/Project.js
@@ -32,6 +32,7 @@ var ProjectSchema = new mongoose.Schema({
 	media: [mongoose.Schema.Types.Mixed],
 	colors: mongoose.Schema.Types.Mixed,
 	startPosition: mongoose.Schema.Types.Mixed,
+	viewHeight: { type: Number },
 	user_id: { type: mongoose.Schema.ObjectId, index: true },
 	created_at: { type: Date },
 	updated_at: { type: Date },
diff --git a/views/controls/editor/media-drawer.ejs b/views/controls/editor/media-drawer.ejs
index d800426..5cc659e 100644
--- a/views/controls/editor/media-drawer.ejs
+++ b/views/controls/editor/media-drawer.ejs
@@ -1,14 +1,3 @@
-<span class="fileUpload">
-	<input type="hidden" name="_csrf" value="[[- token ]]">
-	<form>
-		<span class="ion-ios7-upload-outline upload-icon"></span><br>
-		Upload File
-		<input type="file" accept="image/*" class="file" multiple>
-	</form>
-	<small>~ or ~</small><br>
-	<input type="text" placeholder="Enter Vimeo or YouTube or image link" class="url">
-</span>
-
 <div class="ants">
 	<div class="leftborder"></div>
 	<img class="floatingImg">
@@ -16,13 +5,28 @@
 
 <div class="mediaDrawer fixed animate mediaViewer">
 	<span class="close">X</span>
+
 	<h2><a href="#" class="userToggle active">Your Media</a> – <a href="#" class="foundToggle">Found Media</a></h2><br>
 	<h3 class="editBtn warn" id="deleteMedia"></h3>
 
 	<div class="myMedia">
 	  <div class="noMedia">You have no media yet.  Upload some!</div>
+	  <span class="container"></span>
+		<a href="#" class="viewMore btn">view more</a>
 	</div>
+
+	<span class="fileUpload">
+		<input type="hidden" name="_csrf" value="[[- token ]]">
+		<form>
+			<span class="ion-ios7-upload-outline upload-icon"></span><br>
+			Upload File
+			<input type="file" accept="image/*" class="file" multiple>
+		</form>
+		<small>~ or ~</small><br>
+		<input type="text" placeholder="Enter Vimeo or YouTube or image link" class="url">
+	</span>
 	
 	<div class="foundMedia">
-	</div>
+	  <span class="container"></span>
+ 	</div>
 </div>
\ No newline at end of file
-- 
cgit v1.2.3-70-g09d2


From d50fa94e9b758270b15dfeb5100063c6d876d64c Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Wed, 15 Oct 2014 12:04:00 -0400
Subject: cursor that follows mouse

---
 .../javascripts/mx/extensions/mx.movements.js      | 14 ++++----
 .../javascripts/rectangles/engine/rooms/_walls.js  |  2 +-
 .../javascripts/rectangles/engine/rooms/mover.js   |  3 +-
 public/assets/javascripts/ui/editor/EditorView.js  |  1 +
 public/assets/javascripts/ui/editor/HelpCursor.js  | 38 ++++++++++++++++++++++
 public/assets/javascripts/ui/editor/MediaViewer.js | 33 ++++++++++++++-----
 public/assets/stylesheets/app.css                  | 18 +++++++---
 views/controls/editor/media-drawer.ejs             | 13 +++++++-
 views/controls/editor/settings.ejs                 |  2 ++
 views/partials/scripts.ejs                         |  1 +
 10 files changed, 104 insertions(+), 21 deletions(-)
 create mode 100644 public/assets/javascripts/ui/editor/HelpCursor.js

(limited to 'public/assets/javascripts/rectangles/engine/rooms/_walls.js')

diff --git a/public/assets/javascripts/mx/extensions/mx.movements.js b/public/assets/javascripts/mx/extensions/mx.movements.js
index 5ba5d69..b158625 100644
--- a/public/assets/javascripts/mx/extensions/mx.movements.js
+++ b/public/assets/javascripts/mx/extensions/mx.movements.js
@@ -226,12 +226,14 @@ MX.Movements = function (cam) {
 		},
 		
 		mousewheel: function (e, deltaY, deltaX) {
-			cam.rotationY += deltaX / 20
-
-			pos.x += deltaY * Math.cos(cam.rotationY + Math.PI / 2) * 10
-			pos.z += deltaY * Math.sin(cam.rotationY + Math.PI / 2) * 10
-
-			app.tube("move", pos)
+		  if (e.shiftKey) {
+        cam.rotationY -= deltaY / 150
+      }
+      else {
+        pos.x += deltaY * Math.cos(cam.rotationY + Math.PI / 2) * 10
+        pos.z += deltaY * Math.sin(cam.rotationY + Math.PI / 2) * 10
+        app.tube("move", pos)
+      }
 		},
 
 		update: function () {
diff --git a/public/assets/javascripts/rectangles/engine/rooms/_walls.js b/public/assets/javascripts/rectangles/engine/rooms/_walls.js
index 119a659..f2348f0 100644
--- a/public/assets/javascripts/rectangles/engine/rooms/_walls.js
+++ b/public/assets/javascripts/rectangles/engine/rooms/_walls.js
@@ -135,7 +135,7 @@
 		}
 		
 		base.luminance = function(rgb){
-			rgb = rgb || Walls.colors.wall
+			rgb = rgb || Walls.colors.ceiling
 			var rgb_max = Math.max.apply(0, rgb)
 			var rgb_min = Math.min.apply(255, rgb)
 			return (rgb_max + rgb_min ) / 2
diff --git a/public/assets/javascripts/rectangles/engine/rooms/mover.js b/public/assets/javascripts/rectangles/engine/rooms/mover.js
index a2d2223..dd63db2 100644
--- a/public/assets/javascripts/rectangles/engine/rooms/mover.js
+++ b/public/assets/javascripts/rectangles/engine/rooms/mover.js
@@ -11,7 +11,8 @@ Rooms.mover = new function(){
 	
 	base.bind = function(){
 		app.on("move", base.update)
-		keys.on("backslash", function(){
+		keys.on("backslash", function(e){
+		  if ( ! (e.ctrlKey || e.metaKey) ) return
 			base.noclip = ! base.noclip
 			base.room = null
 			app.movements.gravity( ! base.noclip )
diff --git a/public/assets/javascripts/ui/editor/EditorView.js b/public/assets/javascripts/ui/editor/EditorView.js
index ccd6c63..05d1bec 100644
--- a/public/assets/javascripts/ui/editor/EditorView.js
+++ b/public/assets/javascripts/ui/editor/EditorView.js
@@ -9,6 +9,7 @@ var EditorView = View.extend({
 	},
 	
 	initialize: function(){
+	  this.cursor = new HelpCursor ({ parent: this })
 		this.toolbar = new EditorToolbar ({ parent: this })
 		this.settings = new EditorSettings ({ parent: this })
 		this.info = new BuilderInfo ({ parent: this })
diff --git a/public/assets/javascripts/ui/editor/HelpCursor.js b/public/assets/javascripts/ui/editor/HelpCursor.js
new file mode 100644
index 0000000..842e871
--- /dev/null
+++ b/public/assets/javascripts/ui/editor/HelpCursor.js
@@ -0,0 +1,38 @@
+
+var HelpCursor = View.extend({
+	el: "#helpCursor",
+	
+	messages: {
+	  start: "Welcome to Vvalls!",
+	  move: "Use the up and down keys to move around. Use left and right to pivot. WASD works too.",
+	},
+	shown: {},
+
+  initialize: function(){
+    $(window).mousemove(function(e){
+      this.el.style.left = e.pageX + "px"
+      this.el.style.top = e.pageY + "px"
+    }.bind(this))
+    this.show("start")
+  },
+
+  show: function(name){
+    if (name) this.showMessage(name)
+    this.$el.show()
+  },
+
+  hide: function(){
+    this.$el.hide()
+  },
+
+  showMessage: function(name){
+    if (+(this.shown[name] || 0) < 2) {
+      this.$el.html(this.messages[name])
+      this.shown[name] = (+this.shown[name] || 0) + 1
+    }
+    else {
+      this.$el.html("")
+    }
+  },
+
+})
diff --git a/public/assets/javascripts/ui/editor/MediaViewer.js b/public/assets/javascripts/ui/editor/MediaViewer.js
index 10819af..b270be5 100644
--- a/public/assets/javascripts/ui/editor/MediaViewer.js
+++ b/public/assets/javascripts/ui/editor/MediaViewer.js
@@ -20,29 +20,46 @@ var MediaViewer = ModalView.extend({
 	initialize: function(opt){
 		this.__super__.initialize.call(this)
 		this.parent = opt.parent
+
 		this.$myMedia = this.$(".myMedia")
 		this.$myMediaContainer = this.$(".myMedia > .container")
 		this.$userToggle = this.$(".userToggle")
+
 		this.$foundMedia = this.$(".foundMedia")
 		this.$foundMediaContainer = this.$(".foundMedia > .container")
 		this.$foundToggle = this.$(".foundToggle")
+
+		this.$wallpaperMedia = this.$(".wallpaperMedia")
+		this.$wallpaperMediaContainer = this.$(".wallpaperMedia > .container")
+		this.$wallpaperToggle = this.$(".wallpaperToggle")
+
 		this.$deleteMedia = this.$("#deleteMedia")
 		this.$viewMore = this.$(".viewMore")
 		this.$noMedia = this.$(".noMedia")
   },
 
+	wallpaperToggle: function(){
+    this.$wallpaperMedia.addClass("active")
+    this.$foundMedia.addClass("inactive")
+    this.$myMedia.addClass("inactive")
+    this.$("a").removeClass("active")
+    this.$foundToggle.addClass("active")
+	},
+	
 	foundToggle: function(){
-    this.$foundMedia.addClass("active");
-    this.$myMedia.addClass("inactive");
-    this.$("a").removeClass("active");
-    this.$foundToggle.addClass("active");
+    this.$wallpaperMedia.removeClass("active")
+    this.$foundMedia.addClass("active")
+    this.$myMedia.addClass("inactive")
+    this.$("a").removeClass("active")
+    this.$foundToggle.addClass("active")
 	},
 	
 	userToggle: function(){
-    this.$foundMedia.removeClass("active");
-    this.$myMedia.removeClass("inactive");
-    this.$("a").removeClass("active");
-    this.$userToggle.addClass("active");
+    this.$wallpaperMedia.removeClass("active")
+    this.$foundMedia.removeClass("active")
+    this.$myMedia.removeClass("inactive")
+    this.$("a").removeClass("active")
+    this.$userToggle.addClass("active")
 	},
 
 	show: function(){
diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index cf98170..0140dc6 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -901,7 +901,7 @@ border-left: 1px solid black;
 
 .face {
 	background-color: #fff;
-	transition: 0.1s background-color ease;
+	transition: 0.1s background-color ease, 0.05s background-color ease;
 }
 .front { background-color: #fff; }
 .back  { background-color: #fff; }
@@ -1271,7 +1271,7 @@ border-left: 1px solid black;
 .noMedia {
   margin: 40px;
 }
-.foundMedia {
+.foundMedia, .wallpaperMedia {
   position:absolute;
   top:0;
   left:0;
@@ -1282,8 +1282,7 @@ border-left: 1px solid black;
   padding-top:40px;
   width: 100%;
 }
-
-.foundMedia.active {
+.foundMedia.active, .wallpaperMedia.active {
   -webkit-transform: translateX(0%);
   transform: translateX(0%);
 }
@@ -1718,6 +1717,17 @@ input[type="range"]::-webkit-slider-thumb {
 	cursor: pointer;
 }
 
+#helpCursor {
+  position: fixed;
+  max-width: 200px;
+  font-size: 13px;
+  color: black;
+  background: #fff;
+  margin: 8px 0 0 8px;
+  padding: 4px;
+  font-weight: 500;
+  z-index: 22;
+}
 
 .settings.info {
   right: auto;
diff --git a/views/controls/editor/media-drawer.ejs b/views/controls/editor/media-drawer.ejs
index 7996f84..d1e2c99 100644
--- a/views/controls/editor/media-drawer.ejs
+++ b/views/controls/editor/media-drawer.ejs
@@ -6,7 +6,13 @@
 <span class="close" id="fixed_close">X</span>
 
 <div class="mediaDrawer fixed animate mediaViewer">
-	<h2><a href="#" class="userToggle active">Your Media</a> – <a href="#" class="foundToggle">Found Media</a></h2><br>
+	<h2>
+	  <a href="#" class="userToggle active">Your Media</a>
+	  – <a href="#" class="foundToggle">Found Media</a>
+<!--
+	  – <a href="#" class="wallpaperToggle">Wallpaper</a>
+ -->
+	</h2><br>
 	<h3 class="editBtn warn" id="deleteMedia"></h3>
 
 	<div class="myMedia">
@@ -29,4 +35,9 @@
 	<div class="foundMedia">
 	  <span class="container"></span>
  	</div>
+ 	
+ 	<div class="wallpaperMedia">
+	  <span class="container"></span>
+ 	</div>
+ 	
 </div>
\ No newline at end of file
diff --git a/views/controls/editor/settings.ejs b/views/controls/editor/settings.ejs
index 7c40a75..8443abb 100644
--- a/views/controls/editor/settings.ejs
+++ b/views/controls/editor/settings.ejs
@@ -1,3 +1,5 @@
+<span id="helpCursor"></span>
+
 <div class="vvbox settings" id="editorSettings">
 	<h4>Room Settings</h4>
 	<input type="hidden" name="_csrf" value="[[- token ]]">
diff --git a/views/partials/scripts.ejs b/views/partials/scripts.ejs
index 07ee7a5..05f4b58 100644
--- a/views/partials/scripts.ejs
+++ b/views/partials/scripts.ejs
@@ -102,6 +102,7 @@
 <script type="text/javascript" src="/assets/javascripts/ui/editor/EditorView.js"></script>
 <script type="text/javascript" src="/assets/javascripts/ui/editor/EditorSettings.js"></script>
 <script type="text/javascript" src="/assets/javascripts/ui/editor/EditorToolbar.js"></script>
+<script type="text/javascript" src="/assets/javascripts/ui/editor/HelpCursor.js"></script>
 <script type="text/javascript" src="/assets/javascripts/ui/editor/LightControl.js"></script>
 <script type="text/javascript" src="/assets/javascripts/ui/editor/Collaborators.js"></script>
 <script type="text/javascript" src="/assets/javascripts/ui/editor/MediaEditor.js"></script>
-- 
cgit v1.2.3-70-g09d2


From c13532ec95c2d410354f7d342df70fd68dd78272 Mon Sep 17 00:00:00 2001
From: Julie Lala <jules@okfoc.us>
Date: Thu, 16 Oct 2014 02:21:46 -0400
Subject: matrix mode

---
 .../javascripts/rectangles/engine/rooms/_walls.js  | 31 ++++++++++++++++-
 .../javascripts/rectangles/engine/rooms/mover.js   |  8 ++---
 .../assets/javascripts/rectangles/models/wall.js   |  4 +--
 .../assets/javascripts/ui/editor/ColorControl.js   | 21 ++++++++----
 public/assets/javascripts/ui/editor/Presets.js     | 39 ++++++++++++++++++++--
 public/assets/stylesheets/app.css                  | 22 +++++++-----
 views/controls/editor/presets.ejs                  | 12 -------
 7 files changed, 101 insertions(+), 36 deletions(-)

(limited to 'public/assets/javascripts/rectangles/engine/rooms/_walls.js')

diff --git a/public/assets/javascripts/rectangles/engine/rooms/_walls.js b/public/assets/javascripts/rectangles/engine/rooms/_walls.js
index f2348f0..5c16ce6 100644
--- a/public/assets/javascripts/rectangles/engine/rooms/_walls.js
+++ b/public/assets/javascripts/rectangles/engine/rooms/_walls.js
@@ -140,6 +140,36 @@
 			var rgb_min = Math.min.apply(255, rgb)
 			return (rgb_max + rgb_min ) / 2
 		}
+    
+    base.setBodyColor = function(){
+  		$("#header").toggleClass("black", Walls.luminance() < 100)
+			$("body").css("background-color", rgb_string( Walls.colors.wall ))
+		}
+		base.clearBodyColor = function(){
+			$("#header").removeClass("black")
+			$("body").css("background-color", "transparent")
+		}
+		
+		base.setWallpaper = {
+			wall: function(background){
+				var img = new Image ()
+				img.onload = function(){
+					Walls.list.forEach(function(wall){
+						wall.wallpaper(background, img)
+					})
+				}.bind(this)
+				img.src = background.src
+				img.complete && img.onload()
+			}
+		}
+		
+		base.clearWallpaper = {
+			wall: function(){
+				Walls.list.forEach(function(wall){
+					wall.wallpaper("none")
+				})
+			}
+		}
 		
     base.setColor = {
     
@@ -181,7 +211,6 @@
           room.setCeilingColor(rgbColor)
         })
       },
-  
     }
   }
 
diff --git a/public/assets/javascripts/rectangles/engine/rooms/mover.js b/public/assets/javascripts/rectangles/engine/rooms/mover.js
index dd63db2..fae2ce6 100644
--- a/public/assets/javascripts/rectangles/engine/rooms/mover.js
+++ b/public/assets/javascripts/rectangles/engine/rooms/mover.js
@@ -44,8 +44,7 @@ Rooms.mover = new function(){
 
 			// in this case, we appear to have left the room..
 			// $(".face.active").removeClass("active")
-			$("#header").removeClass("black")
-			$("body").css("background-color", "transparent")
+			Walls.clearBodyColor()
 			base.room = null
 		}
 
@@ -61,8 +60,9 @@ Rooms.mover = new function(){
 		// did we actually enter a room?
 		if (intersects.length) {
 			base.room = intersects[0]
-			$("#header").toggleClass("black", Walls.luminance() < 100)
-			$("body").css("background-color", rgb_string( Walls.colors.wall ))
+			if (! base.noclip) {
+				Walls.setBodyColor()
+			}
       app.tube("change-room", { room: base.room })
 		}
 
diff --git a/public/assets/javascripts/rectangles/models/wall.js b/public/assets/javascripts/rectangles/models/wall.js
index 2ee88d9..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)
diff --git a/public/assets/javascripts/ui/editor/ColorControl.js b/public/assets/javascripts/ui/editor/ColorControl.js
index 26358f1..61a7ef6 100644
--- a/public/assets/javascripts/ui/editor/ColorControl.js
+++ b/public/assets/javascripts/ui/editor/ColorControl.js
@@ -4,9 +4,10 @@ var ColorControl = View.extend({
   
   events: {
     "mousedown": "stopPropagation",
-    "click .color-swatches span": "select",
     "mousedown #brightness-control": "beginBrightness",
     "input #brightness-control": "updateBrightness",
+    "click .color-swatches span": "setSurface",
+    "click .colors span": "setHue",
   },
 
 	colors: [
@@ -48,16 +49,15 @@ var ColorControl = View.extend({
     	$swatch.css("background-color","rgb(" + color + ")")
     	$swatch.data('color', color)
     	this.$colors.append($swatch)
-    }.bind(this))
-    
+    }.bind(this))    
   },
 
   modes: [ "wall", "outline", "floor", "ceiling" ],
 
   load: function(data){
     this.modes.forEach(function(mode){
-      Walls.setColor[mode](data[mode])
-      this.$swatch[ mode ].css("background-color", rgb_string(data[mode]))
+			Walls.setColor[mode](data[mode])
+			this.$swatch[ mode ].css("background-color", rgb_string(data[mode]))
     }.bind(this))
     this.setMode("wall")
   },
@@ -134,11 +134,20 @@ var ColorControl = View.extend({
     this.$brightnessControl.val( this.labColor[0] )
   },
   
-  select: function(e){
+  setSurface: function(e){
     var mode = $('.swatch', e.currentTarget).data('mode')
     this.setMode(mode)
   },
   
+  setHue: function(e){
+  	var color = $(e.currentTarget).data('color')
+
+    this.labColor = this.colorPicker.load(color)
+    this.$brightnessControl.val( this.labColor[0] )
+
+    this.pick(color, this.labColor)
+  },
+  
   beginBrightness: function(){
     this.begin()
     $(window).one("mouseup", this.finalize.bind(this))
diff --git a/public/assets/javascripts/ui/editor/Presets.js b/public/assets/javascripts/ui/editor/Presets.js
index a3dc610..c34c826 100644
--- a/public/assets/javascripts/ui/editor/Presets.js
+++ b/public/assets/javascripts/ui/editor/Presets.js
@@ -19,8 +19,9 @@ var Presets = View.extend({
       outline: [0,0,0],
       floor: [109,116,106],
       ceiling: [159,163,157],
+      background: [109,116,106],
     },
-    pfunk: {
+    "p.funk": {
       wall: [255,63,78],
       outline: [255,246,0],
       floor: [255,255,0],
@@ -32,10 +33,24 @@ var Presets = View.extend({
       floor: [0,0,0],
       ceiling: [0,0,0],
     },
+    matrix: {
+    	wall: { src: "http://bibleway.biz/images/Matrix1.gif", scale: 4.0, color: [0,0,0] },
+    	outline: [0,0,0],
+      floor: [10,15,10],
+      ceiling: [0,0,0],
+    },
   },
   
   initialize: function(opt){
     this.parent = opt.parent
+
+		this.$presets = this.$(".presets")
+  	_.keys(this.presets).forEach(function(name){
+			var $swatch = $("<span>")
+			$swatch.html(capitalize(name))
+			$swatch.data('preset', name)
+			this.$presets.append($swatch)
+  	}.bind(this))
   },
 
   toggle: function(state){
@@ -54,9 +69,9 @@ var Presets = View.extend({
   selectPreset: function(e){
     var preset = $(e.currentTarget).data('preset')
     if (! this.presets[preset]) return
-    this.parent.colorControl.load(this.presets[preset])
     this.$(".active").removeClass('active')
     $(e.currentTarget).addClass('active')
+    this.load(this.presets[preset])
   },
   
   selectColor: function(e){
@@ -64,4 +79,24 @@ var Presets = View.extend({
     console.log(preset)
   },
   
+  lastPreset: {wall:[1],outline:[1],floor:[1],ceiling:[1]},
+  load: function(preset){
+    this.parent.colorControl.modes.forEach(function(mode){
+    	if (! preset[mode].length) {
+    		Walls.setWallpaper[mode](preset[mode])
+				Walls.setColor[mode](preset[mode].color)
+			}
+			else {
+				if (! this.lastPreset[mode].length) {
+					Walls.clearWallpaper[mode]()
+				}
+				Walls.setColor[mode](preset[mode])
+				this.parent.colorControl.$swatch[ mode ].css("background-color", rgb_string(preset[mode]))
+    	}
+    }.bind(this))
+    this.parent.colorControl.setMode(preset.wall.color ? "wall" : "floor")
+    Walls.setBodyColor()
+    this.lastPreset = preset
+  },
+  
 })
\ No newline at end of file
diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index d7999b9..bd2d42c 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -1445,12 +1445,12 @@ border-left: 1px solid black;
 .wallpaper, #presets {
   right: 80px;
   margin-top: 77px;
-  width: 172px;
+  width: 202px;
   -webkit-transition: -webkit-transform 0.1s ease-in-out;
   -webkit-transform: translateX(400px);
   transition: transform 0.1s ease-in-out;
   transform: translateX(400px);
-	padding: 5px 5px 9px 5px;
+	padding: 10px 12px 12px 12px;
 }
 
 #presets {
@@ -1467,6 +1467,7 @@ border-left: 1px solid black;
   display: inline-block;
   border: 1px solid;
   background-size: contain;
+  margin: 0 2px 4px 2px;
   -webkit-transition: -webkit-transform 0.1s ease-in-out;
   line-height: 0;
   vertical-align: text-bottom;
@@ -1486,7 +1487,7 @@ border-left: 1px solid black;
 }
 
 .vvbox .colors {
-  max-width: 170px;
+  max-width: 155px;
 	margin-bottom: 5px;
 }
 .vvbox .colors span {
@@ -1585,7 +1586,7 @@ border-left: 1px solid black;
 .colorcontrol {
   margin-top: 8%;
   right: 80px;
-  padding: 13px 20px 20px 20px;
+  padding: 10px 12px 12px 12px;
   -webkit-transform: translateX(400px);
   -webkit-transition: -webkit-transform 0.2s ease-in-out;
   transform: translateX(400px);
@@ -1607,8 +1608,8 @@ input[type=range] {
   -moz-appearance: none;
   cursor: pointer;
   background-color: black;
-  width: 180px;
-  height:3px;
+  width: 155px;
+  height: 3px;
 }
 input[type="range"]::-webkit-slider-thumb {
   -webkit-appearance: none;
@@ -1702,8 +1703,7 @@ input[type="range"]::-webkit-slider-thumb {
 	margin-bottom:5px;
 }
 .color-swatches span.active, .color-swatches span.active:hover{
-	background:#000;
-	color:white;
+	background: #fff;
 }
 .color-swatches span:nth-child(3){
 	clear:left;
@@ -1711,10 +1711,14 @@ input[type="range"]::-webkit-slider-thumb {
 .color-swatches span:hover {
 	background:#eee;
 }
+.color-swatches span.active label,
+.color-swatches span:hover label {
+	border-bottom: 1px solid;
+}
 
 .color-swatches label {
 	position: relative;
-	padding-left: 5px;
+	margin-left: 5px;
 	display: inline-block;
 	cursor: pointer;
 }
diff --git a/views/controls/editor/presets.ejs b/views/controls/editor/presets.ejs
index 8dd1986..04b1cf1 100644
--- a/views/controls/editor/presets.ejs
+++ b/views/controls/editor/presets.ejs
@@ -1,17 +1,5 @@
 <div class="vvbox" id="presets">
   <h4>Preset Styles</h4>
   <div class="presets">
-    <span data-preset="inverse">
-      Inverse
-    </span>
-    <span data-preset="shaded">
-      Shaded
-    </span>
-    <span data-preset="wireframe">
-      Wireframe
-    </span>
-    <span data-preset="pfunk">
-      P.Funk
-    </span>
   </div>
 </div>
-- 
cgit v1.2.3-70-g09d2


From 37851cbd12dcb17be77265164876184019d34602 Mon Sep 17 00:00:00 2001
From: Julie Lala <jules@okfoc.us>
Date: Thu, 16 Oct 2014 03:09:22 -0400
Subject: .. and floor and ceiling

---
 .../javascripts/rectangles/engine/rooms/_walls.js  | 28 ++++++++++++++++++++--
 .../assets/javascripts/rectangles/models/floor.js  |  5 ++--
 public/assets/javascripts/ui/editor/Presets.js     | 25 ++++++++++++++++---
 public/assets/javascripts/util.js                  |  3 ++-
 public/assets/stylesheets/app.css                  |  7 ++++++
 views/controls/editor/presets.ejs                  |  1 +
 6 files changed, 60 insertions(+), 9 deletions(-)

(limited to 'public/assets/javascripts/rectangles/engine/rooms/_walls.js')

diff --git a/public/assets/javascripts/rectangles/engine/rooms/_walls.js b/public/assets/javascripts/rectangles/engine/rooms/_walls.js
index 5c16ce6..fe5913d 100644
--- a/public/assets/javascripts/rectangles/engine/rooms/_walls.js
+++ b/public/assets/javascripts/rectangles/engine/rooms/_walls.js
@@ -160,7 +160,19 @@
 				}.bind(this)
 				img.src = background.src
 				img.complete && img.onload()
-			}
+			},
+			floor: function(background){
+				Walls.floors.forEach(function(floor){
+					if (floor.ceiling) return
+					floor.wallpaper(background)
+				})
+			},
+			ceiling: function(background){
+				Walls.floors.forEach(function(floor){
+					if (! floor.ceiling) return
+					floor.wallpaper(background)
+				})
+			},
 		}
 		
 		base.clearWallpaper = {
@@ -168,7 +180,19 @@
 				Walls.list.forEach(function(wall){
 					wall.wallpaper("none")
 				})
-			}
+			},
+			floor: function(){
+				Walls.floors.forEach(function(floor){
+					if (floor.ceiling) return
+					wall.wallpaper("none")
+				})
+			},
+			ceiling: function(){
+				Walls.floors.forEach(function(floor){
+					if (! floor.ceiling) return
+					wall.wallpaper("none")
+				})
+			},
 		}
 		
     base.setColor = {
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/ui/editor/Presets.js b/public/assets/javascripts/ui/editor/Presets.js
index c34c826..cde2fdf 100644
--- a/public/assets/javascripts/ui/editor/Presets.js
+++ b/public/assets/javascripts/ui/editor/Presets.js
@@ -5,6 +5,8 @@ var Presets = View.extend({
 		"mousedown": "stopPropagation",
     "click .presets span": "selectPreset",
     "click .swatches span": "selectColor",
+    "change .url": "tileWalls",
+    "keydown .url": "enterSetUrl",
 	},
 	
   presets: {
@@ -21,7 +23,7 @@ var Presets = View.extend({
       ceiling: [159,163,157],
       background: [109,116,106],
     },
-    "p.funk": {
+    "p.Funk": {
       wall: [255,63,78],
       outline: [255,246,0],
       floor: [255,255,0],
@@ -34,7 +36,7 @@ var Presets = View.extend({
       ceiling: [0,0,0],
     },
     matrix: {
-    	wall: { src: "http://bibleway.biz/images/Matrix1.gif", scale: 4.0, color: [0,0,0] },
+    	wall: { src: "http://dump.fm/images/20130225/1361818675427-dumpfm-melipone-matrixremixtransfast.gif", scale: 4.0, color: [0,0,0] },
     	outline: [0,0,0],
       floor: [10,15,10],
       ceiling: [0,0,0],
@@ -43,7 +45,9 @@ var Presets = View.extend({
   
   initialize: function(opt){
     this.parent = opt.parent
-
+    
+    this.$url = this.$(".url")
+    
 		this.$presets = this.$(".presets")
   	_.keys(this.presets).forEach(function(name){
 			var $swatch = $("<span>")
@@ -99,4 +103,19 @@ var Presets = View.extend({
     this.lastPreset = preset
   },
   
+  tileWalls: function(){
+  	var url = this.$url.sanitize()
+  	if (url.length && url.indexOf("http://") == 0) {
+			Walls.setWallpaper.wall({ src: url })
+			Walls.setWallpaper.floor({ src: url })
+			Walls.setWallpaper.ceiling({ src: url })
+  	}
+  },
+	enterSetUrl: function (e) {
+		e.stopPropagation()
+		if (e.keyCode == 13) {
+			setTimeout(this.tileWalls.bind(this), 100)
+		}
+	},
+
 })
\ No newline at end of file
diff --git a/public/assets/javascripts/util.js b/public/assets/javascripts/util.js
index 76c5c7b..367e20e 100644
--- a/public/assets/javascripts/util.js
+++ b/public/assets/javascripts/util.js
@@ -4,10 +4,11 @@ if (window.$) {
   $.fn.string = function() { return trim($(this).val()) }
   $.fn.enable = function() { return $(this).attr("disabled",null) }
   $.fn.disable = function() { return $(this).attr("disabled","disabled") }
+  $.fn.sanitize = function(s) { return trim(sanitize($(this).val())) }
   $.fn.htmlSafe = function(s) { return $(this).html(sanitize(s)) }
 }
 
-function trim(s){ return s.replace(/^\s+/,"").replace(/\s+$/,"") }
+function trim (s){ return s.replace(/^\s+/,"").replace(/\s+$/,"") }
 function sanitize (s){ return (s || "").replace(new RegExp("[<>&]", 'g'), "") }
 function capitalize (s){ return s.split(" ").map(capitalizeWord).join(" ") }
 function capitalizeWord (s){ return s.charAt(0).toUpperCase() + s.slice(1) }
diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index bd2d42c..a711baa 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -1698,6 +1698,13 @@ input[type="range"]::-webkit-slider-thumb {
 	width: 100%;
 	color: #555;
 }
+#presets .url {
+	margin: 4px 0;
+	padding: 2px;
+	font-size: 12px;
+	border: 1px black solid;
+	width: 100%;
+}
 
 .color-swatches span:nth-child(1),.color-swatches span:nth-child(2){
 	margin-bottom:5px;
diff --git a/views/controls/editor/presets.ejs b/views/controls/editor/presets.ejs
index 04b1cf1..02e9d42 100644
--- a/views/controls/editor/presets.ejs
+++ b/views/controls/editor/presets.ejs
@@ -2,4 +2,5 @@
   <h4>Preset Styles</h4>
   <div class="presets">
   </div>
+  <input type="text" class="url" placeholder="enter a url">
 </div>
-- 
cgit v1.2.3-70-g09d2


From 27e6f068a626239f47041b800f33676769ce9591 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Fri, 17 Oct 2014 11:40:20 -0400
Subject: coupla things

---
 public/assets/javascripts/mx/extensions/mx.movements.js     | 6 +++---
 public/assets/javascripts/rectangles/engine/rooms/_walls.js | 2 ++
 2 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'public/assets/javascripts/rectangles/engine/rooms/_walls.js')

diff --git a/public/assets/javascripts/mx/extensions/mx.movements.js b/public/assets/javascripts/mx/extensions/mx.movements.js
index 386819a..5b1e2de 100644
--- a/public/assets/javascripts/mx/extensions/mx.movements.js
+++ b/public/assets/javascripts/mx/extensions/mx.movements.js
@@ -139,15 +139,15 @@ MX.Movements = function (cam) {
 						app.controller.mediaViewer.hide()
 						$(".inuse").removeClass("inuse")
 					}
-					else if (app.controller.colorControl.$el.hasClass('active')) {
+					else if (app.controller.colorControl && app.controller.colorControl.$el.hasClass('active')) {
 						app.controller.colorControl.hide()
 						$(".inuse").removeClass("inuse")
 					}
-					else if (app.controller.wallpaperPicker.$el.hasClass('active')) {
+					else if (app.controller.wallpaperPicker && app.controller.wallpaperPicker.$el.hasClass('active')) {
 						app.controller.wallpaperPicker.hide()
 						$(".inuse").removeClass("inuse")
 					}
-					else if (app.controller.presets.$el.hasClass('active')) {
+					else if (app.controller.presets && app.controller.presets.$el.hasClass('active')) {
 						app.controller.presets.hide()
 						$(".inuse").removeClass("inuse")
 					}
diff --git a/public/assets/javascripts/rectangles/engine/rooms/_walls.js b/public/assets/javascripts/rectangles/engine/rooms/_walls.js
index fe5913d..29338cb 100644
--- a/public/assets/javascripts/rectangles/engine/rooms/_walls.js
+++ b/public/assets/javascripts/rectangles/engine/rooms/_walls.js
@@ -181,6 +181,8 @@
 					wall.wallpaper("none")
 				})
 			},
+			outline: function(){
+			},
 			floor: function(){
 				Walls.floors.forEach(function(floor){
 					if (floor.ceiling) return
-- 
cgit v1.2.3-70-g09d2


From 8ad9d0afa5175c4f54606e419319916e2f2a7667 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Fri, 17 Oct 2014 11:41:08 -0400
Subject: etc

---
 public/assets/javascripts/rectangles/engine/rooms/_walls.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'public/assets/javascripts/rectangles/engine/rooms/_walls.js')

diff --git a/public/assets/javascripts/rectangles/engine/rooms/_walls.js b/public/assets/javascripts/rectangles/engine/rooms/_walls.js
index 29338cb..69b9aa4 100644
--- a/public/assets/javascripts/rectangles/engine/rooms/_walls.js
+++ b/public/assets/javascripts/rectangles/engine/rooms/_walls.js
@@ -186,13 +186,13 @@
 			floor: function(){
 				Walls.floors.forEach(function(floor){
 					if (floor.ceiling) return
-					wall.wallpaper("none")
+					floor.wallpaper("none")
 				})
 			},
 			ceiling: function(){
 				Walls.floors.forEach(function(floor){
 					if (! floor.ceiling) return
-					wall.wallpaper("none")
+					floor.wallpaper("none")
 				})
 			},
 		}
-- 
cgit v1.2.3-70-g09d2


From 38a948be224d704589fa203520f224615a81c7d9 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Fri, 17 Oct 2014 12:09:21 -0400
Subject: colors work after editing layout

---
 .../javascripts/rectangles/engine/map/ui_editor.js      |  4 ++--
 .../javascripts/rectangles/engine/rooms/_walls.js       | 17 +++++++++--------
 public/assets/javascripts/rectangles/models/room.js     | 14 +-------------
 3 files changed, 12 insertions(+), 23 deletions(-)

(limited to 'public/assets/javascripts/rectangles/engine/rooms/_walls.js')

diff --git a/public/assets/javascripts/rectangles/engine/map/ui_editor.js b/public/assets/javascripts/rectangles/engine/map/ui_editor.js
index 1a4ea3c..1ab9c73 100644
--- a/public/assets/javascripts/rectangles/engine/map/ui_editor.js
+++ b/public/assets/javascripts/rectangles/engine/map/ui_editor.js
@@ -220,7 +220,7 @@ Map.UI.Editor = function(map){
 		if (intersects.length) {
 			wheelState = wheelState || intersects[0].copy()
 			
-			intersects[0].height = clamp( ~~(intersects[0].height - deltaY * 2), height_min, height_max )
+			intersects[0].height = clamp( ~~(intersects[0].height + deltaY * 2), height_min, height_max )
 		  app.tube("builder-pick-room", intersects[0])
 			
 			clearTimeout(wheelTimeout)
@@ -235,7 +235,7 @@ Map.UI.Editor = function(map){
 			}, 250)
 		}
 		else {
-			map.set_zoom(map.zoom_exponent - deltaY/20)
+			map.set_zoom(map.zoom_exponent + deltaY/20)
 		}
 	}
 	
diff --git a/public/assets/javascripts/rectangles/engine/rooms/_walls.js b/public/assets/javascripts/rectangles/engine/rooms/_walls.js
index 69b9aa4..653278c 100644
--- a/public/assets/javascripts/rectangles/engine/rooms/_walls.js
+++ b/public/assets/javascripts/rectangles/engine/rooms/_walls.js
@@ -126,11 +126,10 @@
       var ceilingColor = rgb_string(Walls.colors.ceiling)
       Walls.list.forEach(function(wall){
         wall.outline(wallColor, outlineColor)
-        // TODO: SET WALLPAPER HERE
       })
-      Rooms.forEach(function(room){
-        room.setFloorColor(floorColor)
-        room.setCeilingColor(ceilingColor)
+      Walls.floors.forEach(function(floor){
+        if (floor.ceiling) floor.color(ceilingColor)
+        else floor.color(floorColor)
       })
 		}
 		
@@ -225,16 +224,18 @@
       floor: function(rgb){
         var rgbColor = rgb_string(rgb)
         Walls.colors.floor = rgb
-        Rooms.forEach(function(room){
-          room.setFloorColor(rgbColor)
+				Walls.floors.forEach(function(floor){
+					if (floor.ceiling) return
+          floor.color(rgbColor)
         })
       },
 
       ceiling: function(rgb){
         var rgbColor = rgb_string(rgb)
         Walls.colors.ceiling = rgb
-        Rooms.forEach(function(room){
-          room.setCeilingColor(rgbColor)
+				Walls.floors.forEach(function(floor){
+					if (! floor.ceiling) return
+          floor.color(rgbColor)
         })
       },
     }
diff --git a/public/assets/javascripts/rectangles/models/room.js b/public/assets/javascripts/rectangles/models/room.js
index 1a4606c..b0344a1 100644
--- a/public/assets/javascripts/rectangles/models/room.js
+++ b/public/assets/javascripts/rectangles/models/room.js
@@ -158,19 +158,7 @@
 		})
 		return collision
 	}
-
-  Room.prototype.setFloorColor = function(rgbColor) {
-    this.mx_floor.map(function(mx){
-      mx.el.style.backgroundColor = rgbColor
-    })
-  }
-  
-  Room.prototype.setCeilingColor = function(rgbColor) {
-    this.mx_ceiling.map(function(mx){
-      mx.el.style.backgroundColor = rgbColor
-    })
-  }
-
+	
 	if ('window' in this) {
 		window.Room = Room
 	}
-- 
cgit v1.2.3-70-g09d2


From 6fa1570122f2bae9abfaffc5ed90c8b6e36675ea Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Fri, 24 Oct 2014 16:57:50 -0400
Subject: hit enter to flood, floods room, badaboom

---
 .../javascripts/rectangles/engine/rooms/_walls.js  |  2 +-
 .../javascripts/ui/editor/WallpaperPicker.js       | 37 ++++++++++++++++------
 public/assets/stylesheets/app.css                  |  3 +-
 3 files changed, 30 insertions(+), 12 deletions(-)

(limited to 'public/assets/javascripts/rectangles/engine/rooms/_walls.js')

diff --git a/public/assets/javascripts/rectangles/engine/rooms/_walls.js b/public/assets/javascripts/rectangles/engine/rooms/_walls.js
index 653278c..25b1c58 100644
--- a/public/assets/javascripts/rectangles/engine/rooms/_walls.js
+++ b/public/assets/javascripts/rectangles/engine/rooms/_walls.js
@@ -157,7 +157,7 @@
 						wall.wallpaper(background, img)
 					})
 				}.bind(this)
-				img.src = background.src
+				img.src = background.src.replace("url(","").replace(")","")
 				img.complete && img.onload()
 			},
 			floor: function(background){
diff --git a/public/assets/javascripts/ui/editor/WallpaperPicker.js b/public/assets/javascripts/ui/editor/WallpaperPicker.js
index 3b6168e..20fdf85 100644
--- a/public/assets/javascripts/ui/editor/WallpaperPicker.js
+++ b/public/assets/javascripts/ui/editor/WallpaperPicker.js
@@ -7,12 +7,12 @@ var WallpaperPicker = UploadView.extend({
 	uploadAction: "/api/media/upload",
 
 	events: {
-	  "contextmenu": 'cancel',
+	  "contextmenu": 'contextmenu',
 		"mousedown": 'stopPropagation',
 		"click .swatch": 'pick',
 		"click .wallpaperRemove": 'remove',
     "input [data-role='wallpaper-scale']": 'updateScale',
-    "change .url": "tileWalls",
+    "change .url": "enterUrl",
     "keydown .url": "enterSetUrl",
   },
 	
@@ -122,15 +122,21 @@ var WallpaperPicker = UploadView.extend({
 	  }
 	},
 	
-	cancel: function(e){
+	contextmenu: function(e){
     if (Scenery.nextWallpaper) {
       e.preventDefault()
+      this.cancel()
+    }
+	},
+	cancel: function(){
+    if (Scenery.nextWallpaper) {
       Scenery.nextWallpaper = null
       app.tube('cancel-wallpaper')
     }
 	},
 
   follow: function(e, wallpaper, icon){
+    var base = this
     icon = icon || wallpaper
     
 		var $floatingSwatch = $(".floatingSwatch")
@@ -139,6 +145,8 @@ var WallpaperPicker = UploadView.extend({
 
 		Scenery.nextWallpaper = wallpaper
 
+    $(".floodMessage").show()
+
 		setTimeout(function(){
 			function _followCursor(e) {
 				$floatingSwatch.css({
@@ -151,7 +159,12 @@ var WallpaperPicker = UploadView.extend({
 				// $(window).off('click', _hideCursor)
 				app.off('cancel-wallpaper', _hideCursor)
 				$floatingSwatch.removeClass("scissors").hide()
+				$(".floodMessage").hide()
 			}
+			function _floodRoom (e) {
+        base.flood()
+			}
+			$(window).on('keydown', _floodRoom)
 			$(window).on('mousemove', _followCursor)
 			// $(window).one('click', _hideCursor);
       app.on('cancel-wallpaper', _hideCursor)
@@ -178,22 +191,26 @@ var WallpaperPicker = UploadView.extend({
     this.wall.wallpaperPosition({ scale: scale })
   },
 
-  tileWalls: function(){
+  enterUrl: function(){
   	var url = this.$url.sanitize()
-  	if (url.length && url.indexOf("http") == 0) {
-			Walls.setWallpaper.wall({ src: url })
-			Walls.setWallpaper.floor({ src: url })
-			Walls.setWallpaper.ceiling({ src: url })
-  	}
   	this.addUrl(url)
   	this.$url.val("")
   },
 	enterSetUrl: function (e) {
 		e.stopPropagation()
 		if (e.keyCode == 13) {
-			setTimeout(this.tileWalls.bind(this), 100)
+			setTimeout(this.enterUrl.bind(this), 100)
 		}
 	},
+	
+	flood: function(url){
+	  url = url || Scenery.nextWallpaper
+	  if (! url) return
+    Walls.setWallpaper.wall({ src: url })
+    Walls.setWallpaper.floor({ src: url })
+    Walls.setWallpaper.ceiling({ src: url })
+    this.cancel()
+	},
 
 	initializePositionCursor: function(){
 	  var base = this
diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index e5b10e3..8e259ef 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -1706,7 +1706,8 @@ input[type="range"]::-webkit-slider-thumb {
   display: none;
   animation: flicker 0.2s infinite;
   color: black;
-  margin: 5px 5px 49px 5px;
+  float: left;
+  margin: 10px 5px 5px 5px;
   font-size: 13px;
   font-weight: 300;
   text-align: center;
-- 
cgit v1.2.3-70-g09d2


From 0df2cd6c000e593795c1de868a47666862d3ed96 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Mon, 3 Nov 2014 14:54:12 -0500
Subject: undo presets

---
 .../javascripts/rectangles/engine/rooms/_walls.js  | 15 +++++++----
 .../javascripts/rectangles/engine/scenery/undo.js  | 28 +++++++++++++++++++--
 public/assets/javascripts/ui/editor/Presets.js     | 29 +++++++++++++++++-----
 3 files changed, 59 insertions(+), 13 deletions(-)

(limited to 'public/assets/javascripts/rectangles/engine/rooms/_walls.js')

diff --git a/public/assets/javascripts/rectangles/engine/rooms/_walls.js b/public/assets/javascripts/rectangles/engine/rooms/_walls.js
index 25b1c58..04d0594 100644
--- a/public/assets/javascripts/rectangles/engine/rooms/_walls.js
+++ b/public/assets/javascripts/rectangles/engine/rooms/_walls.js
@@ -40,12 +40,17 @@
 		base.colors = {}
 		
 		base.init = function(){
-      base.colors = {
-        wall: app.defaults.colors.wall.slice(),
-        outline: app.defaults.colors.outline.slice(),
-        floor: app.defaults.colors.floor.slice(),
-        ceiling: app.defaults.colors.ceiling.slice(),
+      base.colors = base.copyColors( app.defaults.colors )
+    }
+    
+    base.copyColors = function(colors){
+      var copy = {
+        wall: colors.wall.slice(),
+        outline: colors.outline.slice(),
+        floor: colors.floor.slice(),
+        ceiling: colors.ceiling.slice(),
       }
+      return copy
     }
 
 		base.first = function(){
diff --git a/public/assets/javascripts/rectangles/engine/scenery/undo.js b/public/assets/javascripts/rectangles/engine/scenery/undo.js
index ff4f911..52a57d9 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/undo.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/undo.js
@@ -114,7 +114,32 @@
       undo: function(state){
         var wall = Walls.lookup[state.id]
         wall.deserialize(state)
-
+        Minotaur.watch( app.router.editorView.settings )
+      },
+    },
+    {
+      type: "update-all-wallpaper",
+      undo: function(state){
+        Walls.deserialize(state)
+        Minotaur.watch( app.router.editorView.settings )
+      },
+    },
+    {
+      type: "choose-preset",
+      undo: function(state){
+        app.controller.colorControl.load(state.colors)
+        Walls.deserialize(state.walls)
+        Minotaur.watch( app.router.editorView.settings )
+      },
+      redo: function(state){
+        app.controller.presets.loadByName(state)
+        Minotaur.watch( app.router.editorView.settings )
+      },
+    },
+    {
+      type: "choose-another-preset",
+      undo: function(state){
+        app.controller.presets.loadByName(state)
         Minotaur.watch( app.router.editorView.settings )
       },
     },
@@ -123,7 +148,6 @@
       undo: function(state){
         Walls.setColor[ state.mode ]( state.rgb )
         app.router.editorView.colorControl.setSwatchColor( state.mode, state.rgb )
-
         Minotaur.watch( app.router.editorView.settings )
       },
     },
diff --git a/public/assets/javascripts/ui/editor/Presets.js b/public/assets/javascripts/ui/editor/Presets.js
index ac77d6b..1327e03 100644
--- a/public/assets/javascripts/ui/editor/Presets.js
+++ b/public/assets/javascripts/ui/editor/Presets.js
@@ -4,7 +4,6 @@ var Presets = View.extend({
 	events: {
 		"mousedown": "stopPropagation",
     "click .presets span": "selectPreset",
-    "click .swatches span": "selectColor",
 	},
 	
   presets: {
@@ -53,7 +52,9 @@ var Presets = View.extend({
   	}.bind(this))
   },
 
-  modified: false,
+  modified: true,
+  lastPreset: "wireframe",
+  
   toggle: function(state){
     this.$el.toggleClass("active", state)
     this.parent.cursor.message(state ? "presets" : "start")
@@ -75,15 +76,31 @@ var Presets = View.extend({
     if (! this.presets[preset]) return
     this.$(".active").removeClass('active')
     $(e.currentTarget).addClass('active')
+    if (this.modified) {
+      UndoStack.push({
+        type: "choose-preset",
+        undo: { walls: Walls.serialize(), colors: Walls.copyColors(Walls.colors) },
+        redo: preset,
+      })
+      Minotaur.watch( app.router.editorView.settings )
+    }
+    else {
+      UndoStack.push({
+        type: "choose-another-preset",
+        undo: this.lastPreset,
+        redo: preset,
+      })
+      Minotaur.watch( app.router.editorView.settings )
+    }
+    this.lastPreset = preset
     this.load(this.presets[preset])
     this.modified = false
   },
   
-  selectColor: function(e){
-    var preset = $(e.currentTarget).data('color')
-    console.log(preset)
+  loadByName: function(name){
+    var preset = this.presets[name]
+    this.load(preset)
   },
-  
   load: function(preset){
     this.parent.colorControl.modes.forEach(function(mode){
       var color
-- 
cgit v1.2.3-70-g09d2


From 9d3c9cb918d03a8a30eb325e1f7e4d55f1765dcc Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Mon, 25 Jan 2016 20:31:37 +0100
Subject: remove quotes from css url

---
 public/assets/javascripts/rectangles/engine/rooms/_walls.js | 2 +-
 public/assets/javascripts/rectangles/models/floor.js        | 2 +-
 public/assets/javascripts/rectangles/models/wall.js         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'public/assets/javascripts/rectangles/engine/rooms/_walls.js')

diff --git a/public/assets/javascripts/rectangles/engine/rooms/_walls.js b/public/assets/javascripts/rectangles/engine/rooms/_walls.js
index 04d0594..38dac84 100644
--- a/public/assets/javascripts/rectangles/engine/rooms/_walls.js
+++ b/public/assets/javascripts/rectangles/engine/rooms/_walls.js
@@ -162,7 +162,7 @@
 						wall.wallpaper(background, img)
 					})
 				}.bind(this)
-				img.src = background.src.replace("url(","").replace(")","")
+        img.src = background.src.replace(/url\(\"?\'?/,"").replace(/\"?\'?\)/,"")
 				img.complete && img.onload()
 			},
 			floor: function(background){
diff --git a/public/assets/javascripts/rectangles/models/floor.js b/public/assets/javascripts/rectangles/models/floor.js
index 799bdc7..63eebcc 100644
--- a/public/assets/javascripts/rectangles/models/floor.js
+++ b/public/assets/javascripts/rectangles/models/floor.js
@@ -153,7 +153,7 @@
     background.scale = background.scale || 1
 
 		this.background = background
-		this.background.src = this.background.src.replace("url(","").replace(")","")
+    this.background.src = this.background.src.replace(/url\(\"?\'?/,"").replace(/\"?\'?\)/,"")
 
 		if (this.background.src == "none") {
 		  this.wallpaperLoad(this.background.src)
diff --git a/public/assets/javascripts/rectangles/models/wall.js b/public/assets/javascripts/rectangles/models/wall.js
index 5aa8359..cf3cea8 100644
--- a/public/assets/javascripts/rectangles/models/wall.js
+++ b/public/assets/javascripts/rectangles/models/wall.js
@@ -294,7 +294,7 @@
     background.scale = background.scale || 1
 
 		this.background = background
-		this.background.src = this.background.src.replace("url(","").replace(")","")
+    this.background.src = this.background.src.replace(/url\(\"?\'?/,"").replace(/\"?\'?\)/,"")
 
 		if (this.background.src == "none") {
 		  this.wallpaperLoad(this.background.src)
-- 
cgit v1.2.3-70-g09d2