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

---
 .../assets/javascripts/rectangles/models/floor.js  | 146 +++++++++++++++++++++
 1 file changed, 146 insertions(+)
 create mode 100644 public/assets/javascripts/rectangles/models/floor.js

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

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
+	}
+})()
-- 
cgit v1.2.3-70-g09d2


From 646b9a935b4fbcc7b0108a66fe7309a61c55d3c1 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Tue, 7 Oct 2014 16:52:43 -0400
Subject: tiling wallpaper on ceiling / floor

---
 .../javascripts/rectangles/engine/rooms/grouper.js     |  2 ++
 public/assets/javascripts/rectangles/models/floor.js   | 18 +++++++++---------
 2 files changed, 11 insertions(+), 9 deletions(-)

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

diff --git a/public/assets/javascripts/rectangles/engine/rooms/grouper.js b/public/assets/javascripts/rectangles/engine/rooms/grouper.js
index ec776a2..890a476 100644
--- a/public/assets/javascripts/rectangles/engine/rooms/grouper.js
+++ b/public/assets/javascripts/rectangles/engine/rooms/grouper.js
@@ -171,10 +171,12 @@
 		base.groupFloors = function(floors, collections){
 		  var floor = new Floor ({
 		    id: 'floor',
+		    side: FLOOR,
 		    mx: collections[FLOOR]
 		  })
 		  var ceiling = new Floor ({
 		    id: 'ceiling',
+		    side: CEILING,
 		    mx: collections[CEILING]
 		  })
 		  floors.push(floor)
diff --git a/public/assets/javascripts/rectangles/models/floor.js b/public/assets/javascripts/rectangles/models/floor.js
index ee264c7..78e9019 100644
--- a/public/assets/javascripts/rectangles/models/floor.js
+++ b/public/assets/javascripts/rectangles/models/floor.js
@@ -32,11 +32,10 @@
 	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)
@@ -119,22 +118,23 @@
 		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){
+		this.mx.forEach(function(mx, i){
+      
+      var region = mx.rect
       
       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 )
+        dx = Math.round( this.background.x - region.x.a )
+        dy = Math.round( this.background.y - region.y.a )
       }
       else {
-        mx = this.mx[i]
-        dx = Math.round( this.background.x - face.x.b )
-        dy = Math.round( this.background.y + face.y.b )
+        dx = Math.round( this.background.x - region.x.a )
+        dy = Math.round( this.background.y + region.y.b )
       }
       
       mx.el.style.backgroundPosition = dx + 'px ' + dy + 'px'
       mx.el.style.backgroundSize = w + 'px ' + h + 'px'
     }.bind(this))
+    bbb = this
 	}
 
 	if ('window' in this) {
-- 
cgit v1.2.3-70-g09d2


From c2e2334328256fa0409341692284f25f3167ab30 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Tue, 7 Oct 2014 19:03:56 -0400
Subject: scale cil/floor wallapper

---
 public/assets/javascripts/rectangles/models/floor.js | 3 +++
 1 file changed, 3 insertions(+)

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

diff --git a/public/assets/javascripts/rectangles/models/floor.js b/public/assets/javascripts/rectangles/models/floor.js
index 78e9019..7ed52a1 100644
--- a/public/assets/javascripts/rectangles/models/floor.js
+++ b/public/assets/javascripts/rectangles/models/floor.js
@@ -49,6 +49,9 @@
 
             // TODO: watch individual scenery object here
             Minotaur.watch( app.router.editorView.settings )
+          }
+          else {
+            app.controller.pickWall(base, null)
           }
 				}
 			})
-- 
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/models/floor.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 f8a4bb4609511393c92c618962f990673328d2f0 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Thu, 16 Oct 2014 14:31:13 -0400
Subject: cursor stuff, hit esc to exit wallpaper mode

---
 .../assets/javascripts/rectangles/models/floor.js  |  2 +-
 .../assets/javascripts/rectangles/models/wall.js   |  2 +-
 .../assets/javascripts/ui/editor/ColorControl.js   |  4 +-
 public/assets/javascripts/ui/editor/HelpCursor.js  | 15 ++++++-
 .../javascripts/ui/editor/WallpaperPicker.js       | 46 ++++++++++------------
 5 files changed, 39 insertions(+), 30 deletions(-)

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

diff --git a/public/assets/javascripts/rectangles/models/floor.js b/public/assets/javascripts/rectangles/models/floor.js
index 9838232..a144ecd 100644
--- a/public/assets/javascripts/rectangles/models/floor.js
+++ b/public/assets/javascripts/rectangles/models/floor.js
@@ -40,7 +40,7 @@
 					if (Scenery.nextWallpaper) {
 					  var oldState = base.serialize()
 						base.wallpaper(Scenery.nextWallpaper)
-						Scenery.nextWallpaper = null
+						// Scenery.nextWallpaper = null
 
   					UndoStack.push({
   					  type: 'update-wallpaper',
diff --git a/public/assets/javascripts/rectangles/models/wall.js b/public/assets/javascripts/rectangles/models/wall.js
index 542c99a..eb445a7 100644
--- a/public/assets/javascripts/rectangles/models/wall.js
+++ b/public/assets/javascripts/rectangles/models/wall.js
@@ -104,7 +104,7 @@
 					else if (Scenery.nextWallpaper) {
 					  var oldState = base.serialize()
 						base.wallpaper(Scenery.nextWallpaper)
-						Scenery.nextWallpaper = null
+						// Scenery.nextWallpaper = null
 
   					UndoStack.push({
   					  type: 'update-wallpaper',
diff --git a/public/assets/javascripts/ui/editor/ColorControl.js b/public/assets/javascripts/ui/editor/ColorControl.js
index 4d8a7bb..459ac1e 100644
--- a/public/assets/javascripts/ui/editor/ColorControl.js
+++ b/public/assets/javascripts/ui/editor/ColorControl.js
@@ -73,11 +73,13 @@ var ColorControl = View.extend({
   },
   
   toggle: function(state){
+    if (state) {
+      this.parent.cursor.message("colors")
+    }
     this.$el.toggleClass("active", state);
   },
   
   show: function(){
-    this.parent.cursor.message("colors")
     this.toggle(true)
   },
   
diff --git a/public/assets/javascripts/ui/editor/HelpCursor.js b/public/assets/javascripts/ui/editor/HelpCursor.js
index 9b6807e..06f6ab2 100644
--- a/public/assets/javascripts/ui/editor/HelpCursor.js
+++ b/public/assets/javascripts/ui/editor/HelpCursor.js
@@ -43,9 +43,12 @@ var HelpCursor = View.extend({
     document.removeEventListener("mousemove", this.moveFn)
   },
   
+  offset: 100,
+  lastPosition: { pageX: 0, pageY: 0 },
   move: function(e){
-    this.el.style.left = e.pageX + "px"
+    this.el.style.right = clamp(window.innerWidth - e.pageX, this.offset, window.innerWidth) + "px"
     this.el.style.top = e.pageY + "px"
+    this.lastPosition = e
   },
 
   show: function(name){
@@ -54,6 +57,16 @@ var HelpCursor = View.extend({
 
   message: function(name){
     if (! this.active) return
+    if (name == "start" || name == "media" || name == "settings") {
+      this.offset = 100
+    }
+    else if (name == "colors") {
+      this.offset = 270
+    }
+    else {
+      this.offset = 290
+    }
+    this.move(this.lastPosition)
     this.$el.html(this.messages[name])
   },
 
diff --git a/public/assets/javascripts/ui/editor/WallpaperPicker.js b/public/assets/javascripts/ui/editor/WallpaperPicker.js
index 6bcd859..afdfca7 100644
--- a/public/assets/javascripts/ui/editor/WallpaperPicker.js
+++ b/public/assets/javascripts/ui/editor/WallpaperPicker.js
@@ -28,19 +28,28 @@ var WallpaperPicker = UploadView.extend({
 	
   loaded: false,
 	show: function(){
-		if (! this.loaded) {
-      this.parent.cursor.message("wallpaper")
-			this.load()
-		}
-		else {
-      this.toggle(true)
-		}
+    this.toggle(true)
 	},
-	
 	hide: function(){
-		this.__super__.hide.call(this)
+		this.toggle(false)
 	},
-
+// 	hide: function(){
+// 		this.__super__.hide.call(this)
+// 	},
+  
+	toggle: function (state) {
+    app.tube('cancel-wallpaper')
+    this.$el.toggleClass("active", state)
+	  if (state) {
+      this.parent.cursor.message("wallpaper")
+	    if (! this.loaded) {
+        this.load()
+      }
+	  }
+    // toggle the class that makes the cursor a paintbucket
+    // $("body").removeClass("pastePaper")
+	},
+		
 	load: function(){
 		$.get("/api/media/user", { tag: this.mediaTag }, this.populate.bind(this))
 	},
@@ -86,21 +95,6 @@ var WallpaperPicker = UploadView.extend({
 		}.bind(this))
 	},
 
-	toggle: function (state) {
-	  if (state && ! this.loaded) {
-	    this.show()
-	  }
-	  else {
-      this.$el.toggleClass("active", state)
-	  }
-    // toggle the class that makes the cursor a paintbucket
-    // $("body").removeClass("pastePaper")
-	},
-	
-	hide: function(){
-		this.toggle(false)
-	},
-	
 	beforeUpload: function(){
 	},
 	
@@ -145,7 +139,7 @@ var WallpaperPicker = UploadView.extend({
 				$floatingSwatch.removeClass("scissors").hide()
 			}
 			$(window).on('mousemove', _followCursor)
-			$(window).one('click', _hideCursor);
+			// $(window).one('click', _hideCursor);
       app.on('cancel-wallpaper', _hideCursor)
 			$floatingSwatch.show()
 			_followCursor(e);
-- 
cgit v1.2.3-70-g09d2


From d9a6199f75d324c7b644beb1c732680a67ab8047 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Fri, 17 Oct 2014 13:37:23 -0400
Subject: layout editor stuff

---
 .../assets/javascripts/rectangles/models/floor.js  | 34 ++++++++++++-
 public/assets/javascripts/ui/_router.js            |  1 -
 .../assets/javascripts/ui/builder/BuilderInfo.js   | 13 ++++-
 public/assets/javascripts/ui/editor/Presets.js     | 11 ++---
 public/assets/javascripts/ui/lib/UploadView.js     |  4 +-
 public/assets/javascripts/util.js                  | 55 ++++++++++++++++++++++
 public/assets/stylesheets/app.css                  | 22 ++++++---
 views/controls/editor/media-drawer.ejs             |  2 +-
 views/controls/editor/wallpaper.ejs                | 17 ++-----
 9 files changed, 125 insertions(+), 34 deletions(-)

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

diff --git a/public/assets/javascripts/rectangles/models/floor.js b/public/assets/javascripts/rectangles/models/floor.js
index a144ecd..3f452e1 100644
--- a/public/assets/javascripts/rectangles/models/floor.js
+++ b/public/assets/javascripts/rectangles/models/floor.js
@@ -36,8 +36,40 @@
 
 		this.mx.forEach(function(mx, index){
 			$(mx.el).bind({
+        contextmenu: function(e){
+          if (! (e.ctrlKey || e.metaKey || e.shiftKey) ) {
+            e.preventDefault()
+          }
+          if (Scenery.nextMedia) {
+            e.preventDefault()
+            Scenery.nextMedia = null
+            app.tube('cancel-scenery')
+          }
+          else if (Scenery.nextWallpaper) {
+            e.preventDefault()
+            Scenery.nextWallpaper = null
+            app.tube('cancel-wallpaper')
+          }
+        },
+
 				mousedown: function(e){
-					if (Scenery.nextWallpaper) {
+				  
+				  // right-click
+				  if (e.which == 3) {
+				    if (Scenery.nextMedia) {
+				      e.preventDefault()
+              Scenery.nextMedia = null
+              app.tube('cancel-scenery')
+				    }
+				    else if (Scenery.nextWallpaper) {
+				      e.preventDefault()
+              Scenery.nextWallpaper = null
+              app.tube('cancel-wallpaper')
+				    }
+				    return
+				  }
+
+          if (Scenery.nextWallpaper) {
 					  var oldState = base.serialize()
 						base.wallpaper(Scenery.nextWallpaper)
 						// Scenery.nextWallpaper = null
diff --git a/public/assets/javascripts/ui/_router.js b/public/assets/javascripts/ui/_router.js
index 794079e..bda0960 100644
--- a/public/assets/javascripts/ui/_router.js
+++ b/public/assets/javascripts/ui/_router.js
@@ -212,7 +212,6 @@ var SiteRouter = Router.extend({
 		// this.documentModal.destroy(name)
 	},
 
-
 	testWallpaper: function(e){
 		var content = document.getElementById("content")
 		content.style.width = "680px"
diff --git a/public/assets/javascripts/ui/builder/BuilderInfo.js b/public/assets/javascripts/ui/builder/BuilderInfo.js
index 67834e7..c708275 100644
--- a/public/assets/javascripts/ui/builder/BuilderInfo.js
+++ b/public/assets/javascripts/ui/builder/BuilderInfo.js
@@ -10,8 +10,10 @@ var BuilderInfo = View.extend({
 		"change [name=width]": 'changeWidth',
 		"change [name=depth]": 'changeDepth',
 		"change [name=height]": 'changeHeight',
+		"keydown [name=width]": 'enterWidth',
+		"keydown [name=depth]": 'enterDepth',
+		"keydown [name=height]": 'enterHeight',
 		"change [name=units]": 'changeUnits',
-		"change [name=resolution]": 'changeResolution',
 		"change [name=viewHeight]": 'changeViewHeight',
 		"click [data-role=destroy-room]": 'destroy',
 	},
@@ -85,16 +87,25 @@ var BuilderInfo = View.extend({
 		this.hide()
 	},
 
+	enterWidth: function(e){
+	  if (e.keyCode == 13) this.changeWidth(e)
+	},
 	changeWidth: function(e){
 		e.stopPropagation()
 		this.room.rect.x.setLength( this.$width.unitVal() )
     Rooms.rebuild()
 	},
+	enterDepth: function(e){
+	  if (e.keyCode == 13) this.changeDepth(e)
+	},
 	changeDepth: function(e){
 		e.stopPropagation()
 		this.room.rect.y.setLength( this.$depth.unitVal() )
     Rooms.rebuild()
 	},
+	enterHeight: function(e){
+	  if (e.keyCode == 13) this.changeHeight(e)
+	},
 	changeHeight: function(e){
 		e.stopPropagation()
 		this.room.height = this.$height.unitVal()
diff --git a/public/assets/javascripts/ui/editor/Presets.js b/public/assets/javascripts/ui/editor/Presets.js
index be86af3..ab311ef 100644
--- a/public/assets/javascripts/ui/editor/Presets.js
+++ b/public/assets/javascripts/ui/editor/Presets.js
@@ -84,15 +84,12 @@ var Presets = View.extend({
     this.parent.colorControl.modes.forEach(function(mode){
     	if (! preset[mode].length) {
     		Walls.setWallpaper[mode](preset[mode])
-				Walls.setColor[mode](preset[mode].color)
 			}
 			else {
-				if (preset[mode].length) {
-					Walls.clearWallpaper[mode]()
-				}
-				Walls.setColor[mode](preset[mode])
-				this.parent.colorControl.$swatch[ mode ].css("background-color", rgb_string(preset[mode]))
-    	}
+        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()
diff --git a/public/assets/javascripts/ui/lib/UploadView.js b/public/assets/javascripts/ui/lib/UploadView.js
index efaa8c9..2d2c2c7 100644
--- a/public/assets/javascripts/ui/lib/UploadView.js
+++ b/public/assets/javascripts/ui/lib/UploadView.js
@@ -4,12 +4,12 @@ var UploadView = View.extend({
   // define uploadAction
 
 	events: {
-		"change .file": "handleFileSelect",
+		"change [type=file]": "handleFileSelect",
 		"submit form": "preventDefault",
 	},
 	
 	initialize: function(){
-		this.$file = this.$(".file")
+		this.$file = this.$("[type=file]")
 		this.$upload = this.$(".upload-icon")
   },
   
diff --git a/public/assets/javascripts/util.js b/public/assets/javascripts/util.js
index 367e20e..2fa994a 100644
--- a/public/assets/javascripts/util.js
+++ b/public/assets/javascripts/util.js
@@ -185,3 +185,58 @@ function bitcount(v) {
   v = (v & 0x33333333) + ((v >>> 2) & 0x33333333);
   return ((v + (v >>> 4) & 0xF0F0F0F) * 0x1010101) >>> 24;
 }
+
+// Function.bind polyfill
+if (!Function.prototype.bind) {
+  Function.prototype.bind = function(oThis) {
+    if (typeof this !== 'function') {
+      // closest thing possible to the ECMAScript 5
+      // internal IsCallable function
+      throw new TypeError('Function.prototype.bind - what is trying to be bound is not callable');
+    }
+
+    var aArgs   = Array.prototype.slice.call(arguments, 1),
+        fToBind = this,
+        fNOP    = function() {},
+        fBound  = function() {
+          return fToBind.apply(this instanceof fNOP && oThis
+                 ? this
+                 : oThis,
+                 aArgs.concat(Array.prototype.slice.call(arguments)));
+        };
+
+    fNOP.prototype = this.prototype;
+    fBound.prototype = new fNOP();
+
+    return fBound;
+  };
+}
+
+// rAF polyfill
+(function() {
+    var lastTime = 0;
+    var vendors = ['ms', 'moz', 'webkit', 'o'];
+    for(var x = 0; x < vendors.length && !window.requestAnimationFrame; ++x) {
+        window.requestAnimationFrame = window[vendors[x]+'RequestAnimationFrame'];
+        window.cancelAnimationFrame = window[vendors[x]+'CancelAnimationFrame'] 
+                                   || window[vendors[x]+'CancelRequestAnimationFrame'];
+    }
+ 
+    if (!window.requestAnimationFrame)
+        window.requestAnimationFrame = function(callback, element) {
+            var currTime = new Date().getTime();
+            var timeToCall = Math.max(0, 16 - (currTime - lastTime));
+            var id = window.setTimeout(function() { callback(currTime + timeToCall); }, 
+              timeToCall);
+            lastTime = currTime + timeToCall;
+            return id;
+        };
+ 
+    if (!window.cancelAnimationFrame)
+        window.cancelAnimationFrame = function(id) {
+            clearTimeout(id);
+        };
+}());
+
+
+
diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index 28eabd9..9df1573 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -1507,9 +1507,12 @@ border-left: 1px solid black;
 
 .toolButton {
 	border: 1px solid;
-	display: inline-block;
-	width: 100%;
-	margin-top: 5px;
+	position: relative;
+	display: block;
+	float: right;
+	margin-left: 3px;
+  width: 35px;
+  height: 35px;
 	font-size: 14px;
 	font-weight: 300;
 }
@@ -1524,9 +1527,9 @@ border-left: 1px solid black;
 }
 .wallpaper form {
   position: relative;
-  padding: 2px 0 0 0;
   font-size: 14px;
   font-weight: 300;
+  overflow: hidden;
 }
 .toolButton:hover {
 	background:black;
@@ -1550,14 +1553,19 @@ border-left: 1px solid black;
 .wallpaper .wallpaperRemove:hover img {
   -webkit-filter:invert(100%);
 }
+.wallpaperUpload .upload-icon {
+  margin: 0 8px;
+}
 .wallpaperUpload .upload-icon.uploading {
 }
 .wallpaperUpload .upload-icon.uploading:before {
 	content: ' ' !important;
 	background-image: url("/assets/img/loader.gif");
 	background-repeat: no-repeat;
-	width: 40px;
-	height: 40px;
+	background-position: center;
+	width: 100%;
+	height: 100%;
+	position:absolute;top:0;left:0;
 }
 .wallpaperUpload input[type="text"]{
   border: 1px solid #ccc;
@@ -1575,7 +1583,7 @@ border-left: 1px solid black;
   top: 0;
   left: 0;
 	background: blue;
-	height: 28px;
+	height: 100%;
 	width: 100%;
 	opacity: 0;
 	cursor: pointer;
diff --git a/views/controls/editor/media-drawer.ejs b/views/controls/editor/media-drawer.ejs
index d1e2c99..1404d86 100644
--- a/views/controls/editor/media-drawer.ejs
+++ b/views/controls/editor/media-drawer.ejs
@@ -26,7 +26,7 @@
 		<form>
 			<span class="ion-ios7-upload-outline upload-icon"></span><br>
 			Upload File
-			<input type="file" accept="image/*" class="file" multiple>
+			<input type="file" accept="image/*" multiple>
 		</form>
 		<small>~ or ~</small><br>
 		<input type="text" placeholder="Enter Vimeo or YouTube or image link" class="url">
diff --git a/views/controls/editor/wallpaper.ejs b/views/controls/editor/wallpaper.ejs
index ed175ae..69a60ec 100644
--- a/views/controls/editor/wallpaper.ejs
+++ b/views/controls/editor/wallpaper.ejs
@@ -9,31 +9,20 @@
 			<span class="swatch" style="background-image:url(/assets/img/plainpattern.png)"></span>
 			<span class="swatch" style="background-image:url(/assets/img/plainpattern2.png)"></span>
   </span>
+
+  <input type="text" class="url" placeholder="enter a url">
   
   <div class="wallpaperUpload toolButton">
     <form>
       <span class="ion-ios7-upload-outline upload-icon"></span>
-      <label>Upload Wallpaper</label>
-      <input type="file" accept="image/*" class="file" multiple>
+      <input type="file" accept="image/*" multiple>
     </form>
-<!-- 
-    <input type="text" placeholder="Enter Image URL" class="url">
- -->
   </div>
   
   <div class="wallpaperRemove toolButton">
     <span class="ion-scissors"></span>
-    <label>Remove Wallpaper</label>
   </div>
 
-<!--
-  <div class="wallpaperResize toolButton">
-    <span class="ion-arrow-resize"></span>
-    <label>Resize Wallpaper</label>
-  </div>
--->
-  <input type="text" class="url" placeholder="enter a url">
-
   <div class="wallpaperResizeControls">
     <span data-role="wallpaper-position" class="ion-arrow-expand"></span>
     <input data-role="wallpaper-scale" type="range" min="0.01" max="8.0" step="0.1" value="1.0">
-- 
cgit v1.2.3-70-g09d2


From a6d479579964014077502db5bc6e3af59c1f317e Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Sat, 18 Oct 2014 09:34:46 -0400
Subject: reader adjustments

---
 public/assets/javascripts/rectangles/models/floor.js |  2 ++
 public/assets/javascripts/ui/builder/BuilderInfo.js  |  2 ++
 public/assets/javascripts/ui/reader/MediaPlayer.js   |  2 +-
 public/assets/stylesheets/app.css                    | 11 +++++++++--
 4 files changed, 14 insertions(+), 3 deletions(-)

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

diff --git a/public/assets/javascripts/rectangles/models/floor.js b/public/assets/javascripts/rectangles/models/floor.js
index 3f452e1..2fb870f 100644
--- a/public/assets/javascripts/rectangles/models/floor.js
+++ b/public/assets/javascripts/rectangles/models/floor.js
@@ -82,6 +82,8 @@
 
             // TODO: watch individual scenery object here
             Minotaur.watch( app.router.editorView.settings )
+
+						app.controller.pickWall(base, null)
           }
           else {
             app.controller.pickWall(base, null)
diff --git a/public/assets/javascripts/ui/builder/BuilderInfo.js b/public/assets/javascripts/ui/builder/BuilderInfo.js
index 4408511..4fd145d 100644
--- a/public/assets/javascripts/ui/builder/BuilderInfo.js
+++ b/public/assets/javascripts/ui/builder/BuilderInfo.js
@@ -96,6 +96,7 @@ var BuilderInfo = View.extend({
 		this.room.rect.x.setLength( this.$width.unitVal() )
     Rooms.rebuild()
 	},
+	
 	enterDepth: function(e){
 	  if (e.keyCode == 13) this.changeDepth(e)
 	},
@@ -104,6 +105,7 @@ var BuilderInfo = View.extend({
 		this.room.rect.y.setLength( this.$depth.unitVal() )
     Rooms.rebuild()
 	},
+	
 	enterHeight: function(e){
 	  if (e.keyCode == 13) this.changeHeight(e)
 	},
diff --git a/public/assets/javascripts/ui/reader/MediaPlayer.js b/public/assets/javascripts/ui/reader/MediaPlayer.js
index 6195ab6..7f73e1b 100644
--- a/public/assets/javascripts/ui/reader/MediaPlayer.js
+++ b/public/assets/javascripts/ui/reader/MediaPlayer.js
@@ -44,7 +44,7 @@ var MediaPlayer = FormView.extend({
 			this.unbind()
 		}
 		if (media.type == "image") {
-			if ((! media.title || ! media.title.length) && (! media.description || ! media.description.length)) {
+			if ((! media.title || ! media.title.length) && (! media.description || ! media.description.length) || (media.title == filenameFromUrl(media.url)) ) {
 				this.hide()
 				return
 			}
diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index 9df1573..226fe98 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -1930,8 +1930,8 @@ input[type="range"]::-webkit-slider-thumb {
 }
 
 .playButton,.muteButton {
-	border-radius: 50px;
-	font-size: 22px;
+	border-radius: 50%;
+	font-size: 23px;
 	padding: 5px 0;
 	cursor: pointer;
 	margin-right: 5px;
@@ -1942,6 +1942,8 @@ input[type="range"]::-webkit-slider-thumb {
 }
 .playButton .on {
 	display: inline;
+  position: relative;
+  left: 1px;
 }
 .playButton.paused .on {
 	display: none;
@@ -1956,6 +1958,8 @@ input[type="range"]::-webkit-slider-thumb {
 .muteButton .on {
 	display: inline;
 	padding-right: 3px;
+  position: relative;
+  left: 2px;
 }
 .muteButton.muted .on {
 	display: none;
@@ -1966,6 +1970,9 @@ input[type="range"]::-webkit-slider-thumb {
 .muteButton.muted .off {
 	display: inline;
 	padding-right: 3px;
+  position: relative;
+  left: 2px;
+  top: -1px;
 }
 
 .btn, button {
-- 
cgit v1.2.3-70-g09d2


From b21cb665e3ca296b56d389d3a2f83434f4646f26 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Mon, 20 Oct 2014 16:42:08 -0400
Subject: logarithmic wallpaper scale

---
 public/assets/javascripts/rectangles/models/floor.js   |  5 +++--
 public/assets/javascripts/rectangles/models/wall.js    |  7 ++++---
 public/assets/javascripts/ui/editor/WallpaperPicker.js | 10 +++++-----
 views/controls/editor/wallpaper.ejs                    |  2 +-
 4 files changed, 13 insertions(+), 11 deletions(-)

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

diff --git a/public/assets/javascripts/rectangles/models/floor.js b/public/assets/javascripts/rectangles/models/floor.js
index 2fb870f..ac1f8c9 100644
--- a/public/assets/javascripts/rectangles/models/floor.js
+++ b/public/assets/javascripts/rectangles/models/floor.js
@@ -146,8 +146,9 @@
 
 	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.x = background.x || this.background.x || 0
+	  this.background.y = background.y || this.background.y || 0
 	  this.background.scale = background.scale || this.background.scale || 1
 
 		var mx, dx, dy
diff --git a/public/assets/javascripts/rectangles/models/wall.js b/public/assets/javascripts/rectangles/models/wall.js
index 75814dc..8590de7 100644
--- a/public/assets/javascripts/rectangles/models/wall.js
+++ b/public/assets/javascripts/rectangles/models/wall.js
@@ -288,10 +288,11 @@
 
 	Wall.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.x = background.x || this.background.x || 0
+	  this.background.y = background.y || this.background.y || 0
 	  this.background.scale = background.scale || this.background.scale || 1
-	  
+
 		var mx, dx, dy
 		var w = Math.round( this.backgroundImage.naturalWidth * this.background.scale )
 		var h = Math.round( this.backgroundImage.naturalHeight * this.background.scale )
diff --git a/public/assets/javascripts/ui/editor/WallpaperPicker.js b/public/assets/javascripts/ui/editor/WallpaperPicker.js
index b26a5dc..8f701b0 100644
--- a/public/assets/javascripts/ui/editor/WallpaperPicker.js
+++ b/public/assets/javascripts/ui/editor/WallpaperPicker.js
@@ -157,13 +157,13 @@ var WallpaperPicker = UploadView.extend({
       return;
     }
     this.wall = wall
-    this.$scale.val( this.wall.background.scale )
+    this.$scale.val( Math.log( this.wall.background.scale ) )
   },
   
   updateScale: function(){
     if (! this.wall) return;
-    s = parseFloat(this.$scale.val())
-    this.wall.wallpaperPosition({ scale: s })
+    var scale = Math.exp( parseFloat(this.$scale.val()) )
+    this.wall.wallpaperPosition({ scale: scale })
   },
 
   tileWalls: function(){
@@ -192,7 +192,7 @@ var WallpaperPicker = UploadView.extend({
       down: function(e, cursor){
         if (! base.wall) return
         dragging = true
-        s = parseFloat( base.$scale.val() )
+        // s = parseFloat( base.$scale.val() )
         x = base.wall.background.x
         y = base.wall.background.y
       },
@@ -203,7 +203,7 @@ var WallpaperPicker = UploadView.extend({
         dx = delta.a*s
         dy = delta.b*s
         base.wall.wallpaperPosition({
-          scale: s,
+          // scale: s,
           x: x+dx,
           y: y+dy,
         })
diff --git a/views/controls/editor/wallpaper.ejs b/views/controls/editor/wallpaper.ejs
index 69a60ec..d2559cc 100644
--- a/views/controls/editor/wallpaper.ejs
+++ b/views/controls/editor/wallpaper.ejs
@@ -25,7 +25,7 @@
 
   <div class="wallpaperResizeControls">
     <span data-role="wallpaper-position" class="ion-arrow-expand"></span>
-    <input data-role="wallpaper-scale" type="range" min="0.01" max="8.0" step="0.1" value="1.0">
+    <input data-role="wallpaper-scale" type="range" min="-4" max="4" step="0.01" value="0.0">
   </div>
 
 </div>
-- 
cgit v1.2.3-70-g09d2


From 39f1a7136567ae7e0afbf085732853cc86123393 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Wed, 1 Apr 2015 19:30:22 -0400
Subject: stub in 3d object ui

---
 .../javascripts/rectangles/engine/scenery/undo.js  | 65 ++++++++++++++
 .../rectangles/engine/sculpture/_sculpture.js      | 94 +++++++++++++++++++++
 .../rectangles/engine/sculpture/types/image.js     | 98 ++++++++++++++++++++++
 .../assets/javascripts/rectangles/models/floor.js  |  8 +-
 views/controls/editor/sculpture.ejs                | 42 ++++++++++
 views/editor.ejs                                   |  1 +
 views/partials/scripts.ejs                         |  3 +
 7 files changed, 309 insertions(+), 2 deletions(-)
 create mode 100644 public/assets/javascripts/rectangles/engine/sculpture/_sculpture.js
 create mode 100644 public/assets/javascripts/rectangles/engine/sculpture/types/image.js
 create mode 100644 views/controls/editor/sculpture.ejs

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

diff --git a/public/assets/javascripts/rectangles/engine/scenery/undo.js b/public/assets/javascripts/rectangles/engine/scenery/undo.js
index 1232780..b976ea2 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/undo.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/undo.js
@@ -195,5 +195,70 @@
       },
     },
     
+    //
+    {
+      type: "create-sculpture",
+      undo: function(state){
+        Sculpture.remove(state.id)
+        Sculpture.resize.hide()
+
+        // TODO: watch individual scenery object here
+        Minotaur.watch( app.router.editorView.settings )
+      },
+      redo: function(state){
+        var scenery = Sculpture.deserialize([ state ])
+        Sculpture.resize.show( sculpture )
+
+        // TODO: watch individual scenery object here
+        Minotaur.watch( app.router.editorView.settings )
+      },
+    },
+    {
+      type: "update-sculpture",
+      undo: function(state){
+        var sculpture = Sculpture.find(state.id)
+
+        sculpture.deserialize(state)
+        
+        if (editor.permissions.resize) {
+          Sculpture.resize.show(sculpture)
+        }
+
+        // TODO: watch individual scenery object here
+        Minotaur.watch( app.router.editorView.settings )
+      },
+      redo: function(state){
+        var sculpture = Sculpture.find(state.id)
+
+        sculpture.deserialize(state)
+
+        if (editor.permissions.resize) {
+          Sculpture.resize.show(sculpture)
+          Sculpture.resize.move_dots()
+          Sculpture.resize.rotate_dots()
+        }
+
+        // TODO: watch individual scenery object here
+        Minotaur.watch( app.router.editorView.settings )
+      },
+    },
+    {
+      type: "destroy-sculpture",
+      undo: function(state){
+        var sculpture = Sculpture.deserialize([ state ])
+        Sculpture.resize.show( sculpture )
+
+        // TODO: watch individual scenery object here
+        Minotaur.watch( app.router.editorView.settings )
+      },
+      redo: function(state){
+        Sculpture.resize.hide()
+        Sculpture.remove(state.id)
+
+        // TODO: watch individual scenery object here
+        Minotaur.watch( app.router.editorView.settings )
+      },
+    },
+
   ])
 })()
diff --git a/public/assets/javascripts/rectangles/engine/sculpture/_sculpture.js b/public/assets/javascripts/rectangles/engine/sculpture/_sculpture.js
new file mode 100644
index 0000000..eb64e92
--- /dev/null
+++ b/public/assets/javascripts/rectangles/engine/sculpture/_sculpture.js
@@ -0,0 +1,94 @@
+
+var Sculpture = new function(){
+	
+	var base = this;
+
+	base.list = {}
+	base.nextMedia = null
+	
+	base.mouse = new mouse ({ use_offset: false, mousedownUsesCapture: true })
+	
+	base.init = function(){
+	}
+
+	base.add = function(opt){
+		var scene_media
+		switch (opt.media.type) {
+			case 'image':
+				scene_media = new Sculpture.types.image (opt)
+				break
+		}
+		base.list[scene_media.id] = scene_media
+		return scene_media
+	}
+	
+	base.addNextToWall = function(opt){
+	  opt.newMedia = true
+		opt.media = base.nextMedia
+		opt.index = opt.index || 0
+		var scene_media = base.add(opt)
+		
+		// test if scenery was placed here
+		if (! scene_media) {
+		  return null
+		}
+		else {
+			base.nextMedia = null
+			return scene_media
+		}
+	}
+
+	base.find = function(id){
+		return base.list[id] || null
+	}
+	
+	base.remove = function(id){
+		var scene_media = base.list[id]
+		delete base.list[id]
+		scene_media && scene_media.destroy()
+	}
+	
+	base.removeAll = function(){
+		base.forEach(function(scene_media){
+			base.remove(scene_media.id)
+		})
+	}
+
+	base.uid = new UidGenerator(base.list)
+	
+	base.forEach = function(f){
+		return base.values().forEach(f)
+	}
+	
+	base.map = function(f){
+		return base.values().map(f)
+	}
+	
+	base.values = function(){
+		return _.values(base.list)
+	}
+	
+	base.serialize = function(){
+		var sculptures = base.map(function(sculpture){
+			return sculpture.serialize()
+		})
+		return sculptures
+	}
+
+	base.deserialize = function(sculpture_data){
+	  var added = []
+		sculpture_data.forEach(function(data){
+			var scene_media = base.add({
+				id: data.id,
+			  data: data,
+				media: data.media,
+			})
+			added.push(scene_media)
+		})
+		return added
+	}
+
+	return base
+}
+
+Sculpture.types = {}
diff --git a/public/assets/javascripts/rectangles/engine/sculpture/types/image.js b/public/assets/javascripts/rectangles/engine/sculpture/types/image.js
new file mode 100644
index 0000000..af538f7
--- /dev/null
+++ b/public/assets/javascripts/rectangles/engine/sculpture/types/image.js
@@ -0,0 +1,98 @@
+Scenery.types.base = Fiber.extend(function(base){
+
+	var exports = {
+
+		init: function(opt){
+			_.bindAll(this, 'enter', 'leave')
+
+			this.id = opt.id || Scenery.uid("scenery")
+			this.move = new Scenery.move (this)
+			this.media = opt.media
+			this.naturalDimensions = new vec2(this.media.width, this.media.height)
+			
+			this.set_scale( opt.scale || this.media.scale || 1.0 )
+			this.position = new vec2(0,0)
+		},
+
+		set_scale: function(scale){
+			this.scale = scale || 1.0
+			if (this.mx) {
+				this.mx.scale = this.mx.ops.scale = this.scale
+			}
+			this.dimensions = this.naturalDimensions.clone().mul(this.scale)
+		},
+		
+		bind: function(){
+			this.move.bind()
+// 			$(this.mx.el).bind({
+// 				mouseenter: this.enter,
+// 				mouseleave: this.leave,
+// 			})
+		},
+	
+		unbind: function(){
+			this.move.unbind()
+// 			$(this.mx.el).unbind({
+// 				mouseenter: this.enter,
+// 				mouseleave: this.leave,
+// 			})
+		},
+		
+		remove: function(){
+		  if (this.removed) return
+		  this.removed = true
+		  
+      UndoStack.push({
+        type: 'destroy-sculpture',
+        undo: this.serialize(),
+        redo: { id: this.id },
+      })
+
+      // TODO: watch individual scenery object here
+      Minotaur.watch( app.router.editorView.settings )
+
+			Scenery.remove(this.id)
+
+      Scenery.resize.hide()
+      if (app.controller.mediaEditor) {
+        app.controller.mediaEditor.tainted = false
+        app.controller.mediaEditor.hide()
+      }
+      if (app.controller.textEditor) {
+        app.controller.textEditor.tainted = false
+        app.controller.textEditor.hide()
+      }
+		},
+
+		destroy: function(){
+			this.unbind()
+			scene.remove(this.mx)
+			this.mx.media = null
+			this.mx.ops = null
+			this.mx = null
+			this.move = null
+			this.media = null
+			this.dimensions = null
+			this.naturalDimensions = null
+			this.wall = null
+			this.bounds = null
+			this.center = null
+		},
+
+		serialize: function(){
+			var data = {
+				id: this.id,
+				wall_id: this.wall && this.wall.id,
+				side: this.wall && this.wall.side,
+				dimensions: this.dimensions.serialize(),
+				position: app.position(this.mx),
+				scale: this.scale,
+				media: this.media,
+			}
+			return data
+		},
+	}
+	
+	return exports
+
+})
diff --git a/public/assets/javascripts/rectangles/models/floor.js b/public/assets/javascripts/rectangles/models/floor.js
index ac1f8c9..439c16a 100644
--- a/public/assets/javascripts/rectangles/models/floor.js
+++ b/public/assets/javascripts/rectangles/models/floor.js
@@ -68,8 +68,12 @@
 				    }
 				    return
 				  }
-
-          if (Scenery.nextWallpaper) {
+          
+          if (Scenery.nextMedia) {
+            e.preventDefault()
+            //
+          }
+          else if (Scenery.nextWallpaper) {
 					  var oldState = base.serialize()
 						base.wallpaper(Scenery.nextWallpaper)
 						// Scenery.nextWallpaper = null
diff --git a/views/controls/editor/sculpture.ejs b/views/controls/editor/sculpture.ejs
new file mode 100644
index 0000000..21e5039
--- /dev/null
+++ b/views/controls/editor/sculpture.ejs
@@ -0,0 +1,42 @@
+<div class="vvbox settings" id="sculptureEditor">
+  <h4>3D Object</h4>
+  
+	<input type="hidden" name="_csrf" value="[[- token ]]">
+	<input type="hidden" name="_id" value="new">
+
+	<div class="setting">
+		<input type="text" name="name" placeholder="media title">
+	</div>
+	
+	<div class="setting">
+		<textarea name="description" placeholder="short description"></textarea>
+	</div>
+	
+	<div class="setting">
+	  <input type="checkbox" name="outline" value="1" id="sculpture_outline">
+	  <label for="sculpture_outline">Show outline?</label>
+	  <input type="color" name="color" value="#000000">
+	</div>
+
+  <div class="setting">
+	  <input type="checkbox" name="billboard" value="1" id="sculpture_billboard">
+	  <label for="sculpture_billboard">Billboard?</label>
+  </div>
+
+	<div class="setting number">
+		<label for="sculpture-width">width</label>
+		<input type="text" class="units" name="width" id="sculpture-width">
+	</div>
+	<div class="setting number">
+		<label for="sculpture-height">height</label>
+		<input type="text" class="units" name="height" id="sculpture-height">
+	</div>
+	<div class="setting number">
+		<label for="sculpture-height">depth</label>
+		<input type="text" class="units" name="height" id="sculpture-height">
+	</div>
+	<div class="setting">
+		<a href="#" class="warn btn" data-role="destroy-sculpture">remove object</a>
+	</div>
+
+</div>
diff --git a/views/editor.ejs b/views/editor.ejs
index 74e4d6d..08959a0 100755
--- a/views/editor.ejs
+++ b/views/editor.ejs
@@ -16,6 +16,7 @@
 			[[ include controls/builder/info ]]
 			[[ include controls/editor/media-drawer ]]
 			[[ include controls/editor/media-editor ]]
+			[[ include controls/editor/sculpture ]]
 			[[ include controls/editor/wallpaper ]]
 			[[ include controls/editor/color-control ]]
 			[[ include controls/editor/text-editor ]]
diff --git a/views/partials/scripts.ejs b/views/partials/scripts.ejs
index 72aaa8c..6cc5315 100644
--- a/views/partials/scripts.ejs
+++ b/views/partials/scripts.ejs
@@ -73,6 +73,9 @@
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/scenery/types/text.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/scenery/types/video.js"></script>
 
+<script type="text/javascript" src="/assets/javascripts/rectangles/engine/sculpture/_sculpture.js"></script>
+<script type="text/javascript" src="/assets/javascripts/rectangles/engine/sculpture/types/image.js"></script>
+
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/map/_map.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/map/ui_editor.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/map/ui_minimap.js"></script>
-- 
cgit v1.2.3-70-g09d2


From f9112718b560d4cc8380dd905d6cb60c497230bb Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Wed, 1 Apr 2015 21:42:40 -0400
Subject: get x/z position when clicking floor

---
 .../assets/javascripts/rectangles/models/floor.js  | 36 ++++++++++++++++++++--
 1 file changed, 34 insertions(+), 2 deletions(-)

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

diff --git a/public/assets/javascripts/rectangles/models/floor.js b/public/assets/javascripts/rectangles/models/floor.js
index 439c16a..7b020a9 100644
--- a/public/assets/javascripts/rectangles/models/floor.js
+++ b/public/assets/javascripts/rectangles/models/floor.js
@@ -69,9 +69,41 @@
 				    return
 				  }
           
+
+          var offset = offsetFromPoint(e, mx.el)
+          if (! offset) { return }
+
+          var x = mx.x + mx.width * (offset.left-0.5)
+          var z = mx.z + mx.height * (0.5-offset.top)
+  
           if (Scenery.nextMedia) {
             e.preventDefault()
-            //
+          
+            var sculpture = Sculpture.addNextToWall({
+              index: index,
+              position: pos,
+            })
+          
+            // scenery was not placed
+            if (! sculpture) {	
+              e.stopPropagation()
+              return
+            }
+
+            app.controller.toolbar.resetPermissions()
+            Sculpture.resize.show(sculpture)
+            Sculpture.hovering = true 
+          
+            // app.controller.pick(sculpture)
+
+            UndoStack.push({
+              type: 'create-sculpture',
+              undo: { id: sculpture.id },
+              redo: sculpture.serialize(),
+            })
+          
+            // TODO: watch individual sculpture object here
+            Minotaur.watch( app.router.editorView.settings )
           }
           else if (Scenery.nextWallpaper) {
 					  var oldState = base.serialize()
@@ -102,7 +134,7 @@
 			this.mx.reverse()
 		}
 	}
-
+	
 	Floor.prototype.color = function(color){
 		this.$els.css("background-color", color)
 	}
-- 
cgit v1.2.3-70-g09d2


From c6eea0f4887ba14e5a6ecfff8c9e8480ae6421c1 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Thu, 2 Apr 2015 17:05:31 -0400
Subject: placing objects on the floor

---
 .../rectangles/engine/sculpture/_sculpture.js      |  24 +++--
 .../rectangles/engine/sculpture/types/_object.js   |  91 +++++++++++++++++
 .../rectangles/engine/sculpture/types/image.js     | 110 ++++++---------------
 .../assets/javascripts/rectangles/models/floor.js  |   7 +-
 .../assets/javascripts/rectangles/models/vec3.js   |   9 ++
 .../assets/javascripts/ui/editor/EditorSettings.js |   3 +
 server/lib/schemas/Project.js                      |   1 +
 views/partials/scripts.ejs                         |   1 +
 8 files changed, 149 insertions(+), 97 deletions(-)
 create mode 100644 public/assets/javascripts/rectangles/engine/sculpture/types/_object.js

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

diff --git a/public/assets/javascripts/rectangles/engine/sculpture/_sculpture.js b/public/assets/javascripts/rectangles/engine/sculpture/_sculpture.js
index eb64e92..c8c90d3 100644
--- a/public/assets/javascripts/rectangles/engine/sculpture/_sculpture.js
+++ b/public/assets/javascripts/rectangles/engine/sculpture/_sculpture.js
@@ -4,7 +4,6 @@ var Sculpture = new function(){
 	var base = this;
 
 	base.list = {}
-	base.nextMedia = null
 	
 	base.mouse = new mouse ({ use_offset: false, mousedownUsesCapture: true })
 	
@@ -12,29 +11,28 @@ var Sculpture = new function(){
 	}
 
 	base.add = function(opt){
-		var scene_media
+		var sculpture
 		switch (opt.media.type) {
 			case 'image':
-				scene_media = new Sculpture.types.image (opt)
+				sculpture = new Sculpture.types.image (opt)
 				break
 		}
-		base.list[scene_media.id] = scene_media
-		return scene_media
+		base.list[sculpture.id] = sculpture
+		return sculpture
 	}
 	
-	base.addNextToWall = function(opt){
+	base.addNext = function(opt){
 	  opt.newMedia = true
-		opt.media = base.nextMedia
-		opt.index = opt.index || 0
-		var scene_media = base.add(opt)
+		opt.media = Scenery.nextMedia
+		var sculpture = base.add(opt)
 		
-		// test if scenery was placed here
-		if (! scene_media) {
+		// test if sculpture was placed here
+		if (! sculpture) {
 		  return null
 		}
 		else {
-			base.nextMedia = null
-			return scene_media
+			Scenery.nextMedia = null
+			return sculpture
 		}
 	}
 
diff --git a/public/assets/javascripts/rectangles/engine/sculpture/types/_object.js b/public/assets/javascripts/rectangles/engine/sculpture/types/_object.js
new file mode 100644
index 0000000..fa6b0b1
--- /dev/null
+++ b/public/assets/javascripts/rectangles/engine/sculpture/types/_object.js
@@ -0,0 +1,91 @@
+Sculpture.types.base = Fiber.extend(function(base){
+
+	var exports = {
+
+		init: function(opt){
+			this.id = opt.id || Sculpture.uid("sculpture")
+			// this.move = new Sculpture.move (this)
+			this.media = opt.media
+			this.naturalDimensions = new vec2(this.media.width, this.media.height)
+			
+			this.set_scale( opt.scale || this.media.scale || 1.0 )
+			this.position = new vec2(0,0)
+		},
+
+		set_scale: function(scale){
+			this.scale = scale || 1.0
+			if (this.mx) {
+				this.mx.scale = this.mx.ops.scale = this.scale
+			}
+			this.dimensions = this.naturalDimensions.clone().mul(this.scale)
+		},
+
+		place: function(opt){
+			if (opt.data) {
+        this.deserialize(opt.data)
+      }
+      else {
+        this.mx.move(opt.position)
+      }
+		},
+		
+		bind: function(){
+			// this.move.bind()
+		},
+	
+		unbind: function(){
+			// this.move.unbind()
+		},
+		
+		remove: function(){
+		  if (this.removed) return
+		  this.removed = true
+		  
+      UndoStack.push({
+        type: 'destroy-sculpture',
+        undo: this.serialize(),
+        redo: { id: this.id },
+      })
+
+      // TODO: watch individual scenery object here
+      Minotaur.watch( app.router.editorView.settings )
+
+			Sculpture.remove(this.id)
+
+      // Sculpture.resize.hide()
+      if (app.controller.sculptureEditor) {
+        app.controller.sculptureEditor.tainted = false
+        app.controller.sculptureEditor.hide()
+      }
+		},
+
+		destroy: function(){
+			this.unbind()
+			scene.remove(this.mx)
+			this.mx.media = null
+			this.mx.ops = null
+			this.mx = null
+			this.move = null
+			this.media = null
+			this.dimensions = null
+			this.naturalDimensions = null
+			this.wall = null
+			this.bounds = null
+			this.center = null
+		},
+
+		serialize: function(){
+			var data = {
+				id: this.id,
+				dimensions: this.dimensions.serialize(),
+				position: app.position(this.mx),
+				scale: this.scale,
+				media: this.media,
+			}
+			return data
+		},
+	}
+	
+	return exports
+
+})
diff --git a/public/assets/javascripts/rectangles/engine/sculpture/types/image.js b/public/assets/javascripts/rectangles/engine/sculpture/types/image.js
index af538f7..ae62133 100644
--- a/public/assets/javascripts/rectangles/engine/sculpture/types/image.js
+++ b/public/assets/javascripts/rectangles/engine/sculpture/types/image.js
@@ -1,98 +1,48 @@
-Scenery.types.base = Fiber.extend(function(base){
 
-	var exports = {
+Sculpture.types.image = Sculpture.types.base.extend(function(base){
 
+	var exports = {
+	
+	  type: 'image',
+	
 		init: function(opt){
-			_.bindAll(this, 'enter', 'leave')
 
-			this.id = opt.id || Scenery.uid("scenery")
-			this.move = new Scenery.move (this)
-			this.media = opt.media
-			this.naturalDimensions = new vec2(this.media.width, this.media.height)
-			
-			this.set_scale( opt.scale || this.media.scale || 1.0 )
-			this.position = new vec2(0,0)
-		},
+			opt.scale = opt.scale || (opt.data && opt.data.scale) || DEFAULT_PICTURE_WIDTH / max(DEFAULT_PICTURE_WIDTH, opt.media.width)
 
-		set_scale: function(scale){
-			this.scale = scale || 1.0
-			if (this.mx) {
-				this.mx.scale = this.mx.ops.scale = this.scale
-			}
-			this.dimensions = this.naturalDimensions.clone().mul(this.scale)
-		},
-		
-		bind: function(){
-			this.move.bind()
-// 			$(this.mx.el).bind({
-// 				mouseenter: this.enter,
-// 				mouseleave: this.leave,
-// 			})
-		},
-	
-		unbind: function(){
-			this.move.unbind()
-// 			$(this.mx.el).unbind({
-// 				mouseenter: this.enter,
-// 				mouseleave: this.leave,
-// 			})
-		},
-		
-		remove: function(){
-		  if (this.removed) return
-		  this.removed = true
-		  
-      UndoStack.push({
-        type: 'destroy-sculpture',
-        undo: this.serialize(),
-        redo: { id: this.id },
-      })
+			base.init.call(this, opt)
 
-      // TODO: watch individual scenery object here
-      Minotaur.watch( app.router.editorView.settings )
+			this.build(opt)
+			this.bind()
+			this.place(opt)
+		},
 
-			Scenery.remove(this.id)
+		build: function(opt){
+		  this.footprint = new MX.Object3D()
+			this.mx = new MX.Image({
+				src: this.media.url,
+				scale: this.scale,
+				media: this.media,
+				backface: true,
+			})
 
-      Scenery.resize.hide()
-      if (app.controller.mediaEditor) {
-        app.controller.mediaEditor.tainted = false
-        app.controller.mediaEditor.hide()
-      }
-      if (app.controller.textEditor) {
-        app.controller.textEditor.tainted = false
-        app.controller.textEditor.hide()
-      }
-		},
+			opt.position.y = opt.position.y || this.scale * this.media.height/2,
+      opt.position.rotationY = opt.position.rotationY || scene.camera.rotationY,
 
-		destroy: function(){
-			this.unbind()
-			scene.remove(this.mx)
-			this.mx.media = null
-			this.mx.ops = null
-			this.mx = null
-			this.move = null
-			this.media = null
-			this.dimensions = null
-			this.naturalDimensions = null
-			this.wall = null
-			this.bounds = null
-			this.center = null
+			scene.add( this.mx )
 		},
 
 		serialize: function(){
-			var data = {
-				id: this.id,
-				wall_id: this.wall && this.wall.id,
-				side: this.wall && this.wall.side,
-				dimensions: this.dimensions.serialize(),
-				position: app.position(this.mx),
-				scale: this.scale,
-				media: this.media,
-			}
+			var data = base.serialize.call(this)
 			return data
 		},
+	
+		deserialize: function(data){
+			this.mx.move(data.position)
+			this.mx.ops.width = data.dimensions.a
+			this.mx.ops.height = data.dimensions.b
+      this.dimensions.deserialize(data.dimensions)
+		},
 	}
 	
 	return exports
-
 })
diff --git a/public/assets/javascripts/rectangles/models/floor.js b/public/assets/javascripts/rectangles/models/floor.js
index 7b020a9..530de2b 100644
--- a/public/assets/javascripts/rectangles/models/floor.js
+++ b/public/assets/javascripts/rectangles/models/floor.js
@@ -79,9 +79,8 @@
           if (Scenery.nextMedia) {
             e.preventDefault()
           
-            var sculpture = Sculpture.addNextToWall({
-              index: index,
-              position: pos,
+            var sculpture = Sculpture.addNext({
+              position: { x: x, y: 0, z: z },
             })
           
             // scenery was not placed
@@ -91,7 +90,7 @@
             }
 
             app.controller.toolbar.resetPermissions()
-            Sculpture.resize.show(sculpture)
+            // Sculpture.resize.show(sculpture)
             Sculpture.hovering = true 
           
             // app.controller.pick(sculpture)
diff --git a/public/assets/javascripts/rectangles/models/vec3.js b/public/assets/javascripts/rectangles/models/vec3.js
index c44dfe6..97329ed 100644
--- a/public/assets/javascripts/rectangles/models/vec3.js
+++ b/public/assets/javascripts/rectangles/models/vec3.js
@@ -32,3 +32,12 @@ vec3.prototype.apply_projection = function (m) {
 
 	return this;
 }
+
+vec3.prototype.serialize = function(){
+  return [ round(this.a), round(this.b), round(this.c) ]
+}
+vec3.prototype.deserialize = function(data){
+  this.a = data[0]
+  this.b = data[1]
+  this.c = data[2]
+}
\ No newline at end of file
diff --git a/public/assets/javascripts/ui/editor/EditorSettings.js b/public/assets/javascripts/ui/editor/EditorSettings.js
index b319404..460863e 100644
--- a/public/assets/javascripts/ui/editor/EditorSettings.js
+++ b/public/assets/javascripts/ui/editor/EditorSettings.js
@@ -77,6 +77,7 @@ var EditorSettings = FormView.extend({
 			data.privacy && this.$privacy.find("[value=" + data.privacy + "]").prop("checked", "checked")
 			
 			data.media && Scenery.deserialize(data.media)
+			data.sculpture && Sculpture.deserialize(data.sculpture)
 		}
 	},
 	
@@ -112,6 +113,7 @@ var EditorSettings = FormView.extend({
 	clear: function(e){
 		e.preventDefault()
 		Scenery.removeAll()
+		Sculpture.removeAll()
 	},
 	
 	destroy: function(){
@@ -191,6 +193,7 @@ var EditorSettings = FormView.extend({
  		fd.append( "walls", JSON.stringify( Walls.serialize() ) )
  		fd.append( "colors", JSON.stringify( Walls.colors ) )
 		fd.append( "media", JSON.stringify( Scenery.serialize() ) )
+		fd.append( "sculpture", JSON.stringify( Sculpture.serialize() ) )
 		fd.append( "startPosition", JSON.stringify( this.startPosition || false ) )
 		fd.append( "lastPosition", JSON.stringify( app.position(scene.camera) ) )
 		
diff --git a/server/lib/schemas/Project.js b/server/lib/schemas/Project.js
index a923d85..e9501fc 100644
--- a/server/lib/schemas/Project.js
+++ b/server/lib/schemas/Project.js
@@ -30,6 +30,7 @@ var ProjectSchema = new mongoose.Schema({
 	rooms: [mongoose.Schema.Types.Mixed],
 	walls: [mongoose.Schema.Types.Mixed],
 	media: [mongoose.Schema.Types.Mixed],
+	sculpture: [mongoose.Schema.Types.Mixed],
 	colors: mongoose.Schema.Types.Mixed,
 	startPosition: mongoose.Schema.Types.Mixed,
 	lastPosition: mongoose.Schema.Types.Mixed,
diff --git a/views/partials/scripts.ejs b/views/partials/scripts.ejs
index 6cc5315..ca6cc94 100644
--- a/views/partials/scripts.ejs
+++ b/views/partials/scripts.ejs
@@ -74,6 +74,7 @@
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/scenery/types/video.js"></script>
 
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/sculpture/_sculpture.js"></script>
+<script type="text/javascript" src="/assets/javascripts/rectangles/engine/sculpture/types/_object.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/sculpture/types/image.js"></script>
 
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/map/_map.js"></script>
-- 
cgit v1.2.3-70-g09d2


From 0b8b54e26aa7a40065a0be6f7708b7021e4fec13 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Mon, 20 Apr 2015 15:03:35 -0400
Subject: resize scenery

---
 Gruntfile.js                                       |   1 +
 .../rectangles/engine/scenery/resize.js            |   1 +
 .../rectangles/engine/sculpture/_sculpture.js      |   4 +
 .../rectangles/engine/sculpture/move.js            |   6 +-
 .../rectangles/engine/sculpture/resize.js          | 207 +++++++++++++++++++++
 .../rectangles/engine/sculpture/types/_object.js   |   2 +-
 .../assets/javascripts/rectangles/models/floor.js  |   2 +-
 public/assets/javascripts/ui/editor/EditorView.js  |   1 +
 .../javascripts/ui/editor/SculptureEditor.js       |   3 +-
 views/partials/scripts.ejs                         |   1 +
 10 files changed, 221 insertions(+), 7 deletions(-)
 create mode 100644 public/assets/javascripts/rectangles/engine/sculpture/resize.js

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

diff --git a/Gruntfile.js b/Gruntfile.js
index 026ec6f..789ce6f 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -79,6 +79,7 @@ module.exports = function(grunt) {
 
           "public/assets/javascripts/rectangles/engine/sculpture/_sculpture.js",
           "public/assets/javascripts/rectangles/engine/sculpture/move.js",
+          "public/assets/javascripts/rectangles/engine/sculpture/resize.js",
           "public/assets/javascripts/rectangles/engine/sculpture/types/_object.js",
           "public/assets/javascripts/rectangles/engine/sculpture/types/image.js",
 
diff --git a/public/assets/javascripts/rectangles/engine/scenery/resize.js b/public/assets/javascripts/rectangles/engine/scenery/resize.js
index 006ff2a..8dac140 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/resize.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/resize.js
@@ -8,6 +8,7 @@ Scenery.resize = new function(){
 	var dragging = false
 	var naturalDimension, naturalDimensionCopy, dimension, position, scale
 	var oldState
+  var rotationY
 
 	var dots = [], dot, selected_dot
 
diff --git a/public/assets/javascripts/rectangles/engine/sculpture/_sculpture.js b/public/assets/javascripts/rectangles/engine/sculpture/_sculpture.js
index 1543def..888b925 100644
--- a/public/assets/javascripts/rectangles/engine/sculpture/_sculpture.js
+++ b/public/assets/javascripts/rectangles/engine/sculpture/_sculpture.js
@@ -9,6 +9,7 @@ var Sculpture = new function(){
 	
 	base.init = function(){
 	  app.on("move", base.updateBillboards)
+	  base.resize.init()
 	}
 	
 	base.updateBillboards = function(){
@@ -17,6 +18,9 @@ var Sculpture = new function(){
 	      sculpture.mx.rotationY = cam.rotationY
 	    }
 	  })
+	  if (Sculpture.resize.obj && Sculpture.resize.obj.billboard) {
+	    Sculpture.resize.move_dots()
+	  }
 	}
 
 	base.add = function(opt){
diff --git a/public/assets/javascripts/rectangles/engine/sculpture/move.js b/public/assets/javascripts/rectangles/engine/sculpture/move.js
index 28d707e..f968bcf 100644
--- a/public/assets/javascripts/rectangles/engine/sculpture/move.js
+++ b/public/assets/javascripts/rectangles/engine/sculpture/move.js
@@ -66,9 +66,9 @@ Sculpture.move = function(base){
     base.mx.x = x + delta.a * cos(cam.rotationY) - delta.b * sin(cam.rotationY)
     base.mx.z = z + delta.a * sin(cam.rotationY) + delta.b * cos(cam.rotationY)
 
-// 		if (editor.permissions.resize) {
-// 			Sculpture.resize.move_dots()
-// 		}
+		if (editor.permissions.resize) {
+			Sculpture.resize.move_dots()
+		}
 	}
 
 	function up (e, cursor){
diff --git a/public/assets/javascripts/rectangles/engine/sculpture/resize.js b/public/assets/javascripts/rectangles/engine/sculpture/resize.js
new file mode 100644
index 0000000..53b8b2d
--- /dev/null
+++ b/public/assets/javascripts/rectangles/engine/sculpture/resize.js
@@ -0,0 +1,207 @@
+Sculpture.resize = new function(){
+
+	var base = this
+	
+	var obj
+	var x, y, z, bounds
+	var dragging = false
+	var naturalDimension, naturalDimensionCopy, dimension, position, scale
+	var oldState
+  var rotationY
+
+	var dots = [], dot, selected_dot
+
+	base.init = function(){
+		base.build()
+		base.bind()
+	}
+	
+	// create 9 dots at the corners of the div
+	base.build = function(){
+		[ TOP,
+			TOP_RIGHT,
+			RIGHT,
+			BOTTOM_RIGHT,
+			BOTTOM,
+			BOTTOM_LEFT,
+			LEFT,
+			TOP_LEFT ].forEach(base.build_dot)
+	}
+	
+	// generate a dot element
+	base.build_dot = function(side) {
+		var dot = new MX.Object3D('.dot')
+		dot.width = dot.height = dot_side * 2
+		dot.scale = 0.5
+		dot.side = side
+		$(dot.el).on({
+			mouseenter: function(){ base.hovering = true },
+			mouseleave: function(){ base.hovering = false },
+		})
+		dots.push(dot)
+	}
+
+	base.add_dots = function(){
+		dots.forEach(function(dot){
+			scene.add(dot)
+		})
+	}
+	
+	// move all the dots to the object's current position
+	base.move_dots = function(){
+		rotationY = obj.mx.rotationY
+
+		var x = obj.mx.x + sin(rotationY) * dot_distance_from_picture
+		var y = obj.mx.y
+		var z = obj.mx.z - cos(rotationY) * dot_distance_from_picture
+
+		dots.forEach(function(dot){
+			base.move_dot(dot, { x: x, y: y, z: z, rotationY: rotationY })
+		})
+	}
+		
+	// move a dot .. to the initial position of the image
+	base.move_dot = function(dot, pos){
+		if (dot.side & TOP) {
+			pos.y += obj.dimensions.b / 2
+		}
+		if (dot.side & BOTTOM) {
+			pos.y -= obj.dimensions.b / 2
+		}
+		if (dot.side & LEFT) {
+			pos.x -= cos(rotationY) * (obj.dimensions.a) / 2
+			pos.z -= sin(rotationY) * (obj.dimensions.a) / 2
+		}
+		if (dot.side & RIGHT) {
+			pos.x += cos(rotationY) * (obj.dimensions.a) / 2
+			pos.z += sin(rotationY) * (obj.dimensions.a) / 2
+		}
+		dot.move(pos)
+	}
+
+	// pick a new object to focus on and show the dots
+	base.show = function(new_object) {
+		// if (obj === new_object) return
+    if (! new_object) return
+		base.obj = obj = new_object
+		base.add_dots()
+		base.move_dots()
+	}
+
+	// dismiss the dots on blur
+	var dotsHideTimeout;
+	base.defer_hide = function(){
+		clearTimeout(dotsHideTimeout)
+
+		dotsHideTimeout = setTimeout(function(){
+			if (Scenery.hovering || Scenery.resize.hovering || Scenery.mouse.down) return
+			Scenery.resize.hide()
+		}, dot_hide_delay)
+	}
+
+	base.hide = function () {
+	  if (! obj) return
+		base.obj = obj = null
+		dots.forEach(function(dot){
+			scene.remove(dot)
+		})
+	}
+
+	base.bind = function(){
+		dots.forEach(function(dot){
+			Sculpture.mouse.bind_el(dot.el)
+		})
+		Sculpture.mouse.on("down", down)
+		Sculpture.mouse.on("drag", drag)
+		Sculpture.mouse.on("up", up)
+	}
+
+	base.unbind = function(){
+		dots.forEach(function(dot){
+			Sculpture.mouse.unbind_el(dot.el)
+		})
+		Sculpture.mouse.off("down", down)
+		Sculpture.mouse.off("drag", drag)
+		Sculpture.mouse.off("up", up)
+	}
+
+	function down (e, cursor){
+		var selection = dots.filter(function(dot){return e.target == dot.el})
+		if (! selection.length) return
+
+		selected_dot = selection[0]
+		dragging = true
+
+		naturalDimension = obj.naturalDimensions
+		dimension = obj.dimensions
+		position = new vec3(obj.mx.x, obj.mx.y, obj.mx.z)
+		oldState = obj.serialize()
+		
+		if (obj.type == "text") {
+		  naturalDimensionCopy = naturalDimension.clone()
+		  positionCopy = position.clone()
+		}
+
+		document.body.classList.add("dragging")
+	}
+
+	function drag (e, cursor){
+		if (! dragging) return
+
+		var x_sign = selected_dot.side & LEFT ? -1 : selected_dot.side & RIGHT ? 1 : 0
+		var y_sign = selected_dot.side & TOP ? -1 : selected_dot.side & BOTTOM ? 1 : 0
+		var width = cursor.x.magnitude()
+		var height = cursor.y.magnitude()
+		var mag = cursor.magnitude()
+
+		if (abs(width) > abs(height)) {
+			mag = x_sign * mag * sign(width)
+		}
+		else {
+			mag = y_sign * mag * sign(height)
+		}
+
+    if (obj.type == "text") {
+      obj.mx.width = obj.media.width = naturalDimension.a = naturalDimensionCopy.a + (mag * 2)
+      obj.mx.height = obj.media.height = naturalDimension.b = naturalDimensionCopy.b + (mag * 2)
+      dimension.a = naturalDimension.a * obj.scale
+      dimension.b = naturalDimension.b * obj.scale
+    }
+    else {
+      obj.set_scale( ( dimension.a + mag ) / naturalDimension.a )
+    }
+
+    if (selected_dot.side & LEFT_RIGHT) {
+      obj.mx.x = position.a + cos(rotationY) * mag/2 * (x_sign)
+      obj.mx.z = position.c + sin(rotationY) * mag/2 * (x_sign)
+    }
+    if (selected_dot.side & TOP_BOTTOM) {
+      obj.mx.y = position.b - mag/2 * y_sign
+    }
+
+		base.move_dots()
+		
+		app.controller.sculptureEditor.setDimensions()
+	}
+
+	function up (e, cursor){
+    if (! dragging) return
+		dragging = false
+		if (! editor.permissions.resize) { return }
+
+    obj.scale = obj.mx.ops.scale = obj.mx.scale
+    obj.dimensions.assign(obj.naturalDimensions).mul(obj.scale)
+    
+    UndoStack.push({
+      type: 'update-sculpture',
+      undo: oldState,
+      redo: obj.serialize(),
+    })
+
+    // TODO: watch individual scenery object here
+    Minotaur.watch( app.router.editorView.settings )
+
+		document.body.classList.remove("dragging")
+		selected_dot = null
+	}
+}
\ No newline at end of file
diff --git a/public/assets/javascripts/rectangles/engine/sculpture/types/_object.js b/public/assets/javascripts/rectangles/engine/sculpture/types/_object.js
index b903c5b..390c42e 100644
--- a/public/assets/javascripts/rectangles/engine/sculpture/types/_object.js
+++ b/public/assets/javascripts/rectangles/engine/sculpture/types/_object.js
@@ -80,7 +80,7 @@ Sculpture.types.base = Fiber.extend(function(base){
 
 			Sculpture.remove(this.id)
 
-      // Sculpture.resize.hide()
+      Sculpture.resize.hide()
       if (app.controller.sculptureEditor) {
         app.controller.sculptureEditor.tainted = false
         app.controller.sculptureEditor.hide()
diff --git a/public/assets/javascripts/rectangles/models/floor.js b/public/assets/javascripts/rectangles/models/floor.js
index 530de2b..799bdc7 100644
--- a/public/assets/javascripts/rectangles/models/floor.js
+++ b/public/assets/javascripts/rectangles/models/floor.js
@@ -90,7 +90,7 @@
             }
 
             app.controller.toolbar.resetPermissions()
-            // Sculpture.resize.show(sculpture)
+            Sculpture.resize.show(sculpture)
             Sculpture.hovering = true 
           
             // app.controller.pick(sculpture)
diff --git a/public/assets/javascripts/ui/editor/EditorView.js b/public/assets/javascripts/ui/editor/EditorView.js
index a7b4f20..a2d84a6 100644
--- a/public/assets/javascripts/ui/editor/EditorView.js
+++ b/public/assets/javascripts/ui/editor/EditorView.js
@@ -84,6 +84,7 @@ var EditorView = View.extend({
 		this.mediaEditor.hide()
 		this.textEditor.hide()
 		this.share.hide()
+		Sculpture.resize.hide()
     Scenery.resize.hide()
 		Scenery.hovering = false
   }
diff --git a/public/assets/javascripts/ui/editor/SculptureEditor.js b/public/assets/javascripts/ui/editor/SculptureEditor.js
index ff1e6b9..35abc00 100644
--- a/public/assets/javascripts/ui/editor/SculptureEditor.js
+++ b/public/assets/javascripts/ui/editor/SculptureEditor.js
@@ -67,7 +67,7 @@ var SculptureEditor = FormView.extend({
 		
 //     app.controller.toolbar.resetMode()
     app.controller.toolbar.resetControls()
-		// Sculpture.resize.show(sculpture)
+		Sculpture.resize.show(sculpture)
 		Sculpture.hovering = true
 		
 		var media = sculpture.media
@@ -149,7 +149,6 @@ var SculptureEditor = FormView.extend({
 		this.tainted = true
 	},
 
-
 	setBillboard: function(){
 		var checked = this.$billboard.prop('checked')
 		this.sculpture.setBillboard(checked)
diff --git a/views/partials/scripts.ejs b/views/partials/scripts.ejs
index 1eda8bd..6dfe912 100644
--- a/views/partials/scripts.ejs
+++ b/views/partials/scripts.ejs
@@ -75,6 +75,7 @@
 
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/sculpture/_sculpture.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/sculpture/move.js"></script>
+<script type="text/javascript" src="/assets/javascripts/rectangles/engine/sculpture/resize.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/sculpture/types/_object.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/sculpture/types/image.js"></script>
 
-- 
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/models/floor.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