From 3832685358c9d3ad3e0aead51228f29255702007 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Tue, 24 Mar 2015 13:23:33 -0400
Subject: setVolume functions

---
 public/assets/javascripts/rectangles/engine/scenery/types/video.js | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'public/assets/javascripts/rectangles/engine/scenery')

diff --git a/public/assets/javascripts/rectangles/engine/scenery/types/video.js b/public/assets/javascripts/rectangles/engine/scenery/types/video.js
index d1b1763..fb1a868 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/types/video.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/types/video.js
@@ -90,6 +90,10 @@ Scenery.types.video = Scenery.types.base.extend(function(base){
 			}
 		},
 
+		setVolume: function(n){
+			this.mx.setVolume(n)
+		},
+		
 		serialize: function(){
 			var data = base.serialize.call(this)
 			return data
-- 
cgit v1.2.3-70-g09d2


From 0a67e7f8ab74f82212a123dd6c30903124c1e8df Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Tue, 24 Mar 2015 17:08:47 -0400
Subject: sound interpolation

---
 .../assets/javascripts/mx/primitives/mx.soundcloud.js   |  5 +++++
 public/assets/javascripts/mx/primitives/mx.video.js     |  2 +-
 public/assets/javascripts/mx/primitives/mx.vimeo.js     |  2 +-
 public/assets/javascripts/mx/primitives/mx.youtube.js   |  2 +-
 .../javascripts/rectangles/engine/scenery/_scenery.js   |  1 +
 .../javascripts/rectangles/engine/scenery/sound.js      | 17 +++++++++++++++++
 .../rectangles/engine/scenery/types/audio.js            |  4 ++++
 views/partials/scripts.ejs                              |  1 +
 8 files changed, 31 insertions(+), 3 deletions(-)
 create mode 100644 public/assets/javascripts/rectangles/engine/scenery/sound.js

(limited to 'public/assets/javascripts/rectangles/engine/scenery')

diff --git a/public/assets/javascripts/mx/primitives/mx.soundcloud.js b/public/assets/javascripts/mx/primitives/mx.soundcloud.js
index 75286d9..fecb2f4 100644
--- a/public/assets/javascripts/mx/primitives/mx.soundcloud.js
+++ b/public/assets/javascripts/mx/primitives/mx.soundcloud.js
@@ -102,6 +102,11 @@ MX.Soundcloud = MX.Object3D.extend({
   setLoop: function(state){
 		this.media.loop = state
   },
+
+  setVolume: function(n){
+    if (this.muted || ! this.player) return
+  	this.player.setVolume(floor( n * 100 ))
+  },
   
   didPlay: function(){
     this.paused = false
diff --git a/public/assets/javascripts/mx/primitives/mx.video.js b/public/assets/javascripts/mx/primitives/mx.video.js
index 9138cdd..43c392a 100644
--- a/public/assets/javascripts/mx/primitives/mx.video.js
+++ b/public/assets/javascripts/mx/primitives/mx.video.js
@@ -88,7 +88,7 @@ MX.Video = MX.Object3D.extend({
   },
   
   setVolume: function(n){
-    if (this.muted) return
+    if (this.muted || ! this.player) return
   	this.player.volume = n
   },
   
diff --git a/public/assets/javascripts/mx/primitives/mx.vimeo.js b/public/assets/javascripts/mx/primitives/mx.vimeo.js
index bff781b..ccd0a13 100644
--- a/public/assets/javascripts/mx/primitives/mx.vimeo.js
+++ b/public/assets/javascripts/mx/primitives/mx.vimeo.js
@@ -132,7 +132,7 @@ MX.Vimeo = MX.Object3D.extend({
   },
 
   setVolume: function(n){
-    if (this.muted) return
+    if (this.muted || ! this.player) return
   	this.player.api('setVolume', n)
   },
   
diff --git a/public/assets/javascripts/mx/primitives/mx.youtube.js b/public/assets/javascripts/mx/primitives/mx.youtube.js
index fad66dd..e4e73d6 100644
--- a/public/assets/javascripts/mx/primitives/mx.youtube.js
+++ b/public/assets/javascripts/mx/primitives/mx.youtube.js
@@ -175,7 +175,7 @@ MX.Youtube = MX.Object3D.extend({
   },
 
   setVolume: function(n){
-    if (this.muted) return
+    if (this.muted || ! this.player || ! this.player.setVolume) return
     this.player.setVolume( floor(n * 100) )
   },
   
diff --git a/public/assets/javascripts/rectangles/engine/scenery/_scenery.js b/public/assets/javascripts/rectangles/engine/scenery/_scenery.js
index d52fe21..18d665f 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/_scenery.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/_scenery.js
@@ -11,6 +11,7 @@ var Scenery = new function(){
 	
 	base.init = function(){
 		base.resize.init()
+		base.sound.init()
 	}
 
 	base.add = function(opt){
diff --git a/public/assets/javascripts/rectangles/engine/scenery/sound.js b/public/assets/javascripts/rectangles/engine/scenery/sound.js
new file mode 100644
index 0000000..2f7f8de
--- /dev/null
+++ b/public/assets/javascripts/rectangles/engine/scenery/sound.js
@@ -0,0 +1,17 @@
+
+Scenery.sound = {}
+Scenery.sound.max_distance = 600
+Scenery.sound.init = function(){
+  app.tube.on("move", Scenery.sound.move)
+}
+Scenery.sound.move = function(){
+  var vals = Scenery.map(function(scenery){
+    if ((scenery.type == "video" || scenery.type == "audio") && ! scenery.muted()) {
+      //get distance from A to B
+      var distance = dist(cam.x, cam.z, 
+                          scenery.mx.x, scenery.mx.z)
+      var volume = 1 - (clamp( distance, 0, Scenery.sound.max_distance ) / Scenery.sound.max_distance)
+      scenery.setVolume(volume)
+    }
+  })
+}
diff --git a/public/assets/javascripts/rectangles/engine/scenery/types/audio.js b/public/assets/javascripts/rectangles/engine/scenery/types/audio.js
index 82f984e..fdd221d 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/types/audio.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/types/audio.js
@@ -39,6 +39,10 @@ Scenery.types.audio = Scenery.types.base.extend(function(base){
       this.dimensions.deserialize(data.dimensions)
 		},
 
+		setVolume: function(n){
+			this.mx.setVolume(n)
+		},
+		
 		play: function(){
 			this.mx.play()
 		},
diff --git a/views/partials/scripts.ejs b/views/partials/scripts.ejs
index 011644b..72aaa8c 100644
--- a/views/partials/scripts.ejs
+++ b/views/partials/scripts.ejs
@@ -65,6 +65,7 @@
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/scenery/move.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/scenery/resize.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/scenery/randomize.js"></script>
+<script type="text/javascript" src="/assets/javascripts/rectangles/engine/scenery/sound.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/scenery/undo.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/scenery/types/_object.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/scenery/types/audio.js"></script>
-- 
cgit v1.2.3-70-g09d2


From d7a12fac00ce78ef37a17da5eb1094281272bad7 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Wed, 25 Mar 2015 15:09:57 -0400
Subject: longer distance

---
 public/assets/javascripts/rectangles/engine/scenery/sound.js | 3 +--
 views/controls/editor/color-control.ejs                      | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'public/assets/javascripts/rectangles/engine/scenery')

diff --git a/public/assets/javascripts/rectangles/engine/scenery/sound.js b/public/assets/javascripts/rectangles/engine/scenery/sound.js
index 2f7f8de..776dd80 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/sound.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/sound.js
@@ -1,13 +1,12 @@
 
 Scenery.sound = {}
-Scenery.sound.max_distance = 600
+Scenery.sound.max_distance = 2000
 Scenery.sound.init = function(){
   app.tube.on("move", Scenery.sound.move)
 }
 Scenery.sound.move = function(){
   var vals = Scenery.map(function(scenery){
     if ((scenery.type == "video" || scenery.type == "audio") && ! scenery.muted()) {
-      //get distance from A to B
       var distance = dist(cam.x, cam.z, 
                           scenery.mx.x, scenery.mx.z)
       var volume = 1 - (clamp( distance, 0, Scenery.sound.max_distance ) / Scenery.sound.max_distance)
diff --git a/views/controls/editor/color-control.ejs b/views/controls/editor/color-control.ejs
index bcc955d..c035e24 100644
--- a/views/controls/editor/color-control.ejs
+++ b/views/controls/editor/color-control.ejs
@@ -1,4 +1,4 @@
-<div class="vvbox colorcontrol active">
+<div class="vvbox colorcontrol">
 	<h4>Edit Room Colors</h4>
 
   <div class="colors">
-- 
cgit v1.2.3-70-g09d2


From 2a984d83343d6d5f7510697ac6f61d2def21e721 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Wed, 25 Mar 2015 15:11:26 -0400
Subject: lil less

---
 public/assets/javascripts/rectangles/engine/scenery/sound.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'public/assets/javascripts/rectangles/engine/scenery')

diff --git a/public/assets/javascripts/rectangles/engine/scenery/sound.js b/public/assets/javascripts/rectangles/engine/scenery/sound.js
index 776dd80..37bdee0 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/sound.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/sound.js
@@ -1,6 +1,6 @@
 
 Scenery.sound = {}
-Scenery.sound.max_distance = 2000
+Scenery.sound.max_distance = 1500
 Scenery.sound.init = function(){
   app.tube.on("move", Scenery.sound.move)
 }
-- 
cgit v1.2.3-70-g09d2


From b38b008981ee88c58cfff5c2e2e7820046dde415 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Mon, 30 Mar 2015 17:35:30 -0400
Subject: store rotation on wall object

---
 public/assets/javascripts/rectangles/engine/scenery/move.js          | 5 +++--
 public/assets/javascripts/rectangles/engine/scenery/resize.js        | 2 +-
 public/assets/javascripts/rectangles/engine/scenery/types/_object.js | 4 ++--
 public/assets/javascripts/rectangles/models/wall.js                  | 5 +++--
 4 files changed, 9 insertions(+), 7 deletions(-)

(limited to 'public/assets/javascripts/rectangles/engine/scenery')

diff --git a/public/assets/javascripts/rectangles/engine/scenery/move.js b/public/assets/javascripts/rectangles/engine/scenery/move.js
index f57ddba..0d26582 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/move.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/move.js
@@ -75,13 +75,14 @@ Scenery.move = function(base){
 		switch (base.wall.side) {
 			case FRONT:
 			case BACK:
-				base.mx.x = position.a + delta.a * cos(wall_rotation[base.wall.side]) + dimension.a / 2
+				base.mx.x = position.a + delta.a * cos(base.wall.rotationY) + dimension.a / 2
 				break
 			case LEFT:
 			case RIGHT:
-				base.mx.z = position.a + delta.a * sin(wall_rotation[base.wall.side]) + dimension.a / 2
+				base.mx.z = position.a + delta.a * sin(base.wall.rotationY) + dimension.a / 2
 				break
 		}
+		console.log( sin(base.wall.rotationY), cos(base.wall.rotationY) )
 		if (editor.permissions.resize) {
 			Scenery.resize.move_dots()
 		}
diff --git a/public/assets/javascripts/rectangles/engine/scenery/resize.js b/public/assets/javascripts/rectangles/engine/scenery/resize.js
index 5af7f3f..73fd82a 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/resize.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/resize.js
@@ -49,7 +49,7 @@ Scenery.resize = new function(){
 	
 	// rotate the dots as appropriate
 	base.rotate_dots = function(){
-		rotationY = wall_rotation[obj.wall.side]
+		rotationY = obj.wall.rotationY
 		dots.forEach(function(dot){
 			dot.rotationY = rotationY
 		})
diff --git a/public/assets/javascripts/rectangles/engine/scenery/types/_object.js b/public/assets/javascripts/rectangles/engine/scenery/types/_object.js
index cd3f981..e3b9b4d 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/types/_object.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/types/_object.js
@@ -90,11 +90,11 @@ Scenery.types.base = Fiber.extend(function(base){
       switch (this.wall.side) {
         case FRONT:
         case BACK:
-          this.position.a += delta.a * cos(wall_rotation[this.wall.side])
+          this.position.a += delta.a * cos(this.wall.rotationY)
           break
         case LEFT:
         case RIGHT:
-          this.position.a += delta.a * sin(wall_rotation[this.wall.side])
+          this.position.a += delta.a * sin(this.wall.rotationY)
           break
       }
 		},
diff --git a/public/assets/javascripts/rectangles/models/wall.js b/public/assets/javascripts/rectangles/models/wall.js
index a026c3c..13f5cd7 100644
--- a/public/assets/javascripts/rectangles/models/wall.js
+++ b/public/assets/javascripts/rectangles/models/wall.js
@@ -18,6 +18,7 @@
 		this.edge = opt.edge
 		this.side = opt.side
 		this.surface = opt.surface
+		this.rotationY = ('rotationY' in opt) ? opt.rotationY : wall_rotation[opt.side]
 		this.mx = opt.mx
 		this.background = { src: "none" }
 	}
@@ -89,7 +90,7 @@
             mx_dot.move(mx_pos)
             mx_dot.width = 5
             mx_dot.height = 5
-            mx_dot.rotationY = wall_rotation[base.side]
+            mx_dot.rotationY = base.rotationY
             mx_dot.el.style.backgroundColor = "red"
             scene.add(mx_dot)
           }
@@ -236,7 +237,7 @@
 		  x: x,
 		  y: position.b + dimension.b / 2,
 		  z: z,
-		  rotationY: wall_rotation[ this.side ],
+		  rotationY: this.rotationY,
 		}
 	}
 	Wall.prototype.mxToPosition = function(mx, dimension) {
-- 
cgit v1.2.3-70-g09d2


From 9117849bf7d183c5ed773c5ed1ef105c41a0f659 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Mon, 30 Mar 2015 20:25:45 -0400
Subject: split out mx.grid

---
 public/assets/javascripts/mx/primitives/mx.grid.js |  60 +++++++
 .../javascripts/rectangles/engine/map/ui_ortho.js  |  65 +++++++
 .../javascripts/rectangles/engine/scenery/move.js  |   3 +-
 public/assets/test/ortho2.html                     | 200 +++++++++++++++++++++
 4 files changed, 326 insertions(+), 2 deletions(-)
 create mode 100644 public/assets/javascripts/mx/primitives/mx.grid.js
 create mode 100644 public/assets/javascripts/rectangles/engine/map/ui_ortho.js
 create mode 100644 public/assets/test/ortho2.html

(limited to 'public/assets/javascripts/rectangles/engine/scenery')

diff --git a/public/assets/javascripts/mx/primitives/mx.grid.js b/public/assets/javascripts/mx/primitives/mx.grid.js
new file mode 100644
index 0000000..7a40144
--- /dev/null
+++ b/public/assets/javascripts/mx/primitives/mx.grid.js
@@ -0,0 +1,60 @@
+MX.Grid = MX.Object3D.extend({
+  init: function (ops) {
+  
+  	this.type = "Grid"
+
+  	var ops = this.ops = defaults(ops, {
+  	  x: 0, 
+  	  y: 0,
+  	  z: 0,
+  	  space: 20,
+  	  cells: 20,
+  	})
+
+    ops.side = ops.space * ops.cells
+    
+    var ctx, canvas = document.createElement("canvas")
+    
+    this.el = canvas
+    this.width = this.height = canvas.width = canvas.height = ops.side + 4
+
+    ctx = canvas.getContext('2d')
+
+		this.x = ops.x || 0
+		this.y = ops.y || 0
+		this.z = ops.z || 0
+		this.rotationX = PI/2
+		this.scale = ops.scale || 1
+		this.backface = ops.backface || false
+			
+		ops.className && this.el.classList.add(ops.className)
+		this.backface && this.el.classList.add("backface-visible")
+		this.el.classList.add("mx-grid")
+		
+		this.draw(ctx)
+  },
+  
+  draw: function(ctx){
+    ctx = ctx || this.ctx
+    
+    var cells = this.ops.cells,
+        space = this.ops.space,
+        side = this.ops.side
+
+    ctx.strokeStyle = "#444"
+    ctx.lineWidth = 1
+    ctx.beginPath()
+    ctx.translate(1,1)
+    for (var i = 0; i <= cells; i++) {
+      ctx.moveTo(i*space, 0)
+      ctx.lineTo(i*space, side)
+      ctx.moveTo(0, i*space)
+      ctx.lineTo(side, i*space)
+    }
+    ctx.closePath()
+    ctx.stroke()
+  },
+
+})
+
+
diff --git a/public/assets/javascripts/rectangles/engine/map/ui_ortho.js b/public/assets/javascripts/rectangles/engine/map/ui_ortho.js
new file mode 100644
index 0000000..adff4d2
--- /dev/null
+++ b/public/assets/javascripts/rectangles/engine/map/ui_ortho.js
@@ -0,0 +1,65 @@
+Map.UI = Map.UI || {}
+Map.UI.Ortho = function(map){
+
+	var base = this
+
+	base.creating = base.dragging = base.resizing = false
+
+	base.mouse = new mouse({
+		el: map.el,
+		down: function(e, cursor){
+			cursor.x.div(map.dimensions.a).add(0.5).mul(map.dimensions.a / map.zoom).add(map.center.a)
+			cursor.y.div(map.dimensions.b).sub(0.5).mul(map.dimensions.b / map.zoom).sub(map.center.b)
+			// compare to initial point
+			var p = new vec2( cursor.x.a, cursor.y.a )
+			if (placing) {
+				if (points.length > 2 && points[0].distanceTo( p ) < 10/map.zoom) {
+					points.push( points[0].clone() )
+					placing = false
+					add_mx_polyline(points)
+				}
+				else {
+					points.push( p )
+          mx_points.push( add_mx_point(p) )
+				}
+			}
+			else {
+				placing = true
+				points = []
+				points.push( p )
+        mx_points.push( add_mx_point(p) )
+			}
+		},
+		move: function(e, cursor){
+			cursor.x.div(map.dimensions.a).add(0.5).mul(map.dimensions.a / map.zoom).add(map.center.a)
+			cursor.y.div(map.dimensions.b).sub(0.5).mul(map.dimensions.b / map.zoom).sub(map.center.b)
+			last_point = new vec2( cursor.x.a, cursor.y.a )
+			if (placing && points.length > 1 && points[0].distanceTo( last_point ) < 10/map.zoom) {
+				document.body.style.cursor = "pointer"
+				last_point.assign(points[0])
+				cursor.x.a = cursor.x.b = last_point.a
+				cursor.y.a = cursor.y.b =last_point.b
+			}
+			else {
+				document.body.style.cursor = "crosshair"
+			}
+		},
+		drag: function(e, cursor){
+			cursor.x.b = ((cursor.x.b/map.dimensions.a)+0.5) * map.dimensions.a / map.zoom + map.center.a
+			cursor.y.b = ((cursor.y.b/map.dimensions.b)-0.5) * map.dimensions.b / map.zoom - map.center.b
+		},
+		up: function(e, cursor, new_cursor){
+			new_cursor.x.div(map.dimensions.a).add(0.5).mul(map.dimensions.a / map.zoom).add(map.center.a)
+			new_cursor.y.div(map.dimensions.b).sub(0.5).mul(map.dimensions.b / map.zoom).sub(map.center.b)
+		}
+	})
+
+	base.wheel = new wheel({
+		el: map.el,
+		update: mousewheel,
+	})
+
+	function mousewheel (e, deltaY, deltaX){
+		map.set_zoom(map.zoom_exponent - deltaY/20)
+	}
+}
\ No newline at end of file
diff --git a/public/assets/javascripts/rectangles/engine/scenery/move.js b/public/assets/javascripts/rectangles/engine/scenery/move.js
index 0d26582..dd60a61 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/move.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/move.js
@@ -82,7 +82,7 @@ Scenery.move = function(base){
 				base.mx.z = position.a + delta.a * sin(base.wall.rotationY) + dimension.a / 2
 				break
 		}
-		console.log( sin(base.wall.rotationY), cos(base.wall.rotationY) )
+
 		if (editor.permissions.resize) {
 			Scenery.resize.move_dots()
 		}
@@ -105,7 +105,6 @@ Scenery.move = function(base){
 		dragging = moved = false
     oldState = null
 		document.body.classList.remove("dragging")
-
   }
 	
 	function switch_wall (e, target, cursor){
diff --git a/public/assets/test/ortho2.html b/public/assets/test/ortho2.html
new file mode 100644
index 0000000..d554a60
--- /dev/null
+++ b/public/assets/test/ortho2.html
@@ -0,0 +1,200 @@
+<style type="text/css">
+html,body{width:100%;height:100%;margin:0;padding:0;}
+body {
+	font-family: Menlo, monospace;
+	overflow: hidden;
+}
+#perspective {
+	position: absolute;
+	left:0%;
+	top:0px
+}
+#orthographic {
+	position: absolute;
+	left:50%;
+	top:0px
+}
+#hud {
+	white-space: pre;
+}
+</style>
+
+<div id="perspective"></div>
+<div id="orthographic"></div>
+
+<div id="hud"></div>
+
+<script src="/assets/javascripts/util.js"></script>
+<script src="/assets/javascripts/vendor/bower_components/jquery/dist/jquery.min.js"></script>
+<script src="/assets/javascripts/vendor/bower_components/lodash/lodash.min.js"></script>
+<script src="/assets/javascripts/vendor/bower_components/hidpi-canvas/dist/hidpi-canvas.js"></script>
+<script src="/assets/javascripts/vendor/polyfill.js"></script>
+<script src="/assets/javascripts/vendor/tube.js"></script>
+<script src="/assets/javascripts/mx/mx.js"></script>
+<script src="/assets/javascripts/mx/extensions/mx.scene.js"></script>
+<script src="/assets/javascripts/mx/extensions/mx.orbitCamera.js"></script>
+<script src="/assets/javascripts/mx/primitives/mx.grid.js"></script>
+<script src="/assets/javascripts/rectangles/util/constants.js"></script>
+<script src="/assets/javascripts/rectangles/util/mouse.js"></script>
+<script src="/assets/javascripts/rectangles/util/wheel.js"></script>
+<script src="/assets/javascripts/rectangles/models/vec2.js"></script>
+<script src="/assets/javascripts/rectangles/models/rect.js"></script>
+<script src="/assets/javascripts/rectangles/models/rect.js"></script>
+<script src="/assets/javascripts/rectangles/engine/map/_map.js"></script>
+<script src="/assets/javascripts/rectangles/engine/map/ui_ortho.js"></script>
+<script src="/assets/javascripts/rectangles/engine/map/draw.js"></script>
+
+<script>
+
+var scene, map, controls
+
+map = new Map ({
+	type: "ortho",
+	el: document.querySelector("#orthographic"),
+	width: window.innerWidth/2,
+	height: window.innerHeight,
+	zoom: 0,
+})
+
+var placing = false
+var points, mx_points = []
+var shapes = []
+var ctx = map.draw.ctx
+var last_point
+
+function polyline (points, finished) {
+  if (! points) return
+  if (points.length == 1) {
+    ctx.fillStyle = "#f80"
+    map.draw.dot_at(points[0].a, points[0].b, 5)
+  }
+  if (points.length > 1) {
+    ctx.fillStyle = "#ff0"
+    ctx.strokeStyle = "#f80"
+    ctx.lineWidth = 2 / map.zoom
+    ctx.beginPath()
+    ctx.moveTo(points[0].a, points[0].b)
+    points.forEach(function(point, i){
+      i && ctx.lineTo(point.a, point.b)
+    })
+		ctx.stroke()
+    if (! placing || finished) {
+      ctx.fill()
+    }
+  }
+}
+
+function add_mx_polyline (points) {
+  mx_points.forEach(function(mx){ scene.remove(mx) })
+  var faces = []
+  for (var i = 1; i < points.length; i++) {
+    var head = points[i-1]
+    var tail = points[i]
+    face = add_mx_polyline_face(head, tail)
+    faces.push(face)
+  }
+  shapes.push({
+    mx: faces,
+    points: points,
+  })
+  points = []
+}
+function add_mx_polyline_face(head, tail){
+  var mx = new MX.Object3D()
+  var mid_x = (head.a + tail.a)
+  var mid_z = (head.b + tail.b)
+  var len = head.distanceTo( tail )
+  var angle = atan2( head.b - tail.b, head.a - tail.a )
+  mx.move({
+    x: mid_x / 2,
+    y: 25 + 1,
+    z: mid_z / 2,
+    width: ceil(len),
+    height: 50,
+    rotationY: angle
+  })
+  var hue = abs(round( angle / PI * 90 + 300))
+  mx.el.style.backgroundColor = 'hsl(' + [hue, "100%", "50%"] + ')'
+  scene.add(mx)
+  return mx
+}
+function add_mx_point (p, i) {
+	var mx = new MX.Object3D()
+	mx.updateChildren = false
+	mx.move({
+		x: p.a,
+		y: 11,
+		z: p.b,
+		width: 20,
+		height: 20,
+	})
+	mx.el.style.backgroundColor = 'rgb(' + [abs(floor(p.a*30)), 0, abs(floor(p.b*30))] + ')'
+	mx.el.style.backfaceVisibility = "visible"
+	scene.add(mx)
+	return mx
+}
+
+document.addEventListener('DOMContentLoaded', build)
+function build () {
+	scene = new MX.Scene().addTo("#perspective")
+	scene.camera.radius = 20
+
+	scene.width = window.innerWidth/2
+	scene.height = window.innerHeight
+	scene.perspective = window.innerHeight
+
+  grid = new MX.Grid()
+  scene.add(grid)
+  
+	scene.update()
+
+	controls = new MX.OrbitCamera({
+	  el: scene.el,
+	  radius: 1000,
+	  rotationX: PI/4,
+	  rotationY: PI/2,
+	})
+	controls.init()
+
+	animate(0)
+}
+function animate(time){
+  requestAnimationFrame(animate)
+  map.update(time)
+
+	controls.update()
+  scene.update()
+
+	map.draw.ctx.save()
+	map.draw.translate()
+
+  map.draw.ctx.save()
+  map.draw.ctx.translate(-(20*20)/2, -(20*20)/2)
+  grid.draw(map.draw.ctx, 20, 20)
+  map.draw.ctx.restore()
+
+	map.draw.coords()
+
+  polyline(points)
+  if (placing && last_point) {
+    ctx.strokeStyle = "#f80"
+    ctx.lineWidth = 2 / map.zoom
+    ctx.beginPath()
+    ctx.moveTo(points[points.length-1].a, points[points.length-1].b)
+    ctx.lineTo(last_point.a, last_point.b)
+    ctx.stroke()
+  }
+
+  shapes.forEach(function(shape){
+    polyline(shape.points, true)
+  })
+
+  ctx.strokeStyle = "#f00";
+  map.draw.x_at(0,0)
+	map.draw.mouse(map.ui.mouse.cursor)
+	map.draw.camera(scene.camera)
+
+	map.draw.ctx.restore()
+}
+
+</script>
\ No newline at end of file
-- 
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/engine/scenery')

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 519ff21e00c5c48d06e1ddee0cdc1dc3d90a26f8 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Fri, 3 Apr 2015 18:40:04 -0400
Subject: pulling in move code / view code

---
 .../rectangles/engine/scenery/resize.js            |   1 +
 .../rectangles/engine/sculpture/move.js            | 158 ++++++++++++++++
 .../rectangles/engine/sculpture/types/_object.js   |  22 ++-
 .../rectangles/engine/sculpture/types/image.js     |  18 --
 public/assets/javascripts/ui/editor/EditorView.js  |  10 +-
 .../javascripts/ui/editor/SculptureEditor.js       | 200 +++++++++++++++++++++
 views/partials/scripts.ejs                         |   2 +
 7 files changed, 390 insertions(+), 21 deletions(-)
 create mode 100644 public/assets/javascripts/rectangles/engine/sculpture/move.js
 create mode 100644 public/assets/javascripts/ui/editor/SculptureEditor.js

(limited to 'public/assets/javascripts/rectangles/engine/scenery')

diff --git a/public/assets/javascripts/rectangles/engine/scenery/resize.js b/public/assets/javascripts/rectangles/engine/scenery/resize.js
index 73fd82a..a5e255a 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/resize.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/resize.js
@@ -49,6 +49,7 @@ Scenery.resize = new function(){
 	
 	// rotate the dots as appropriate
 	base.rotate_dots = function(){
+	console.trace()
 		rotationY = obj.wall.rotationY
 		dots.forEach(function(dot){
 			dot.rotationY = rotationY
diff --git a/public/assets/javascripts/rectangles/engine/sculpture/move.js b/public/assets/javascripts/rectangles/engine/sculpture/move.js
new file mode 100644
index 0000000..b5a4b40
--- /dev/null
+++ b/public/assets/javascripts/rectangles/engine/sculpture/move.js
@@ -0,0 +1,158 @@
+
+Sculpture.move = function(base){
+
+	var x, y, z, position, dimension, bounds
+	var dragging = false, moved = false
+	var oldState
+
+	this.bind = function(){
+		Sculpture.mouse.bind_el(base.mx.el)
+		Sculpture.mouse.on("down", down)
+		Sculpture.mouse.on("enter", switch_wall)
+		Sculpture.mouse.on("drag", drag)
+		Sculpture.mouse.on("up", up)
+	}
+
+	this.unbind = function(){
+	  base.focused = false
+		Sculpture.mouse.unbind_el(base.mx.el)
+		Sculpture.mouse.off("down", down)
+		Sculpture.mouse.off("enter", switch_wall)
+		Sculpture.mouse.off("drag", drag)
+		Sculpture.mouse.off("up", up)
+	}
+	
+	function down (e, cursor){
+		if (e.target != base.mx.el && (e.target != base.mx.overlay)) return;
+		if (editor.permissions.destroy) {
+		  base.remove()
+			return
+		}
+
+		// load the modal
+		app.controller.pick(base)
+
+    if (! base.focused) {
+			e.clickAccepted = false
+			base.focused = true
+			return
+    }
+		if (! (editor.permissions.move || editor.permissions.resize) ) {
+			e.clickAccepted = false
+			return
+		}
+		dragging = true
+		moved = false
+		x = base.mx.x
+		y = base.mx.y
+		z = base.mx.z
+		
+		bounds = base.bounds
+		dimension = base.dimensions
+		position = base.wall.mxToPosition( base.mx, dimension )
+		
+		oldState = base.serialize()
+		document.body.classList.add("dragging")
+	}
+	
+	function drag (e, cursor){
+		if (! dragging) return
+		
+		moved = true
+
+		var flipX = base.wall.side & (FRONT | RIGHT)
+
+		var delta = cursor.delta()
+		delta.mul( cursor_amp ) // TODO: this should be proportional to your distance from the wall
+		if (flipX) { delta.a *= -1 }
+		delta.b *= -1
+
+		var new_bounds = base.wall.surface.translate( bounds, dimension, position, delta )
+		if (new_bounds) bounds = new_bounds
+		if (flipX) { delta.a *= -1 }
+
+		base.mx.y = position.b + delta.b + dimension.b / 2
+		switch (base.wall.side) {
+			case FRONT:
+			case BACK:
+				base.mx.x = position.a + delta.a * cos(base.wall.rotationY) + dimension.a / 2
+				break
+			case LEFT:
+			case RIGHT:
+				base.mx.z = position.a + delta.a * sin(base.wall.rotationY) + dimension.a / 2
+				break
+		}
+
+		if (editor.permissions.resize) {
+			Sculpture.resize.move_dots()
+		}
+	}
+
+	function up (e, cursor){
+    if (! dragging || ! oldState) return
+        
+    if (moved) {
+      UndoStack.push({
+        type: 'update-sculpture',
+        undo: oldState,
+        redo: base.serialize(),
+      })
+
+      // TODO: watch individual sculpture object here
+      Minotaur.watch( app.router.editorView.settings )
+    }
+
+		dragging = moved = false
+    oldState = null
+		document.body.classList.remove("dragging")
+  }
+	
+	function switch_wall (e, target, cursor){
+		if (! dragging) return
+		if (target.wall.id == base.wall.id) return
+		
+		var old_wall_side = base.wall.side
+		var wall_group = old_wall_side | target.wall.side
+		var new_bounds = target.wall.surface.bounds_at_index_with_dimensions(target.index || 0, dimension)
+
+		if (! new_bounds) return
+
+		base.wall = target.wall
+		base.bounds = bounds = new_bounds
+
+		position.a = bounds.x.midpoint() - dimension.a / 2
+
+		if (old_wall_side !== target.wall.side && wall_group !== FRONT_BACK && wall_group !== LEFT_RIGHT) {
+			switch (old_wall_side) {
+				case FRONT:
+					position.a = bounds.x.a + dimension.a / 2
+					break
+				case BACK:
+					position.a = bounds.x.b - dimension.a / 2
+					break
+				case LEFT:
+					position.a = bounds.x.a + dimension.a / 2
+					break
+				case RIGHT:
+					position.a = bounds.x.b - dimension.a / 2
+					break
+			}
+		}
+
+		var mx_delta = base.wall.positionToMx( position, dimension )
+		base.mx.move(mx_delta)
+
+		if (editor.permissions.resize) {
+			Sculpture.resize.rotate_dots()
+ 			Sculpture.resize.move_dots()
+		}
+
+		cursor.x.a = cursor.x.b
+		//var delta = cursor.delta()
+		drag(e, cursor)
+
+	}
+	
+	return this
+
+}
\ 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 fa6b0b1..6c93b41 100644
--- a/public/assets/javascripts/rectangles/engine/sculpture/types/_object.js
+++ b/public/assets/javascripts/rectangles/engine/sculpture/types/_object.js
@@ -8,8 +8,14 @@ Sculpture.types.base = Fiber.extend(function(base){
 			this.media = opt.media
 			this.naturalDimensions = new vec2(this.media.width, this.media.height)
 			
+			this.move = new Sculpture.move (this)
+      this.billboard = true
+      this.backface = true
+
 			this.set_scale( opt.scale || this.media.scale || 1.0 )
 			this.position = new vec2(0,0)
+			
+			this.isSculpture = true
 		},
 
 		set_scale: function(scale){
@@ -30,11 +36,11 @@ Sculpture.types.base = Fiber.extend(function(base){
 		},
 		
 		bind: function(){
-			// this.move.bind()
+			this.move.bind()
 		},
 	
 		unbind: function(){
-			// this.move.unbind()
+			this.move.unbind()
 		},
 		
 		remove: function(){
@@ -81,9 +87,21 @@ Sculpture.types.base = Fiber.extend(function(base){
 				position: app.position(this.mx),
 				scale: this.scale,
 				media: this.media,
+        billboard: this.billboard,
+        backface: this.backface,
 			}
 			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.billboard = data.billboard
+			this.backface = data.backface
+			if (! this.backface) this.mx.el.classList.remove("backface-visible")
+      this.dimensions.deserialize(data.dimensions)
+		},
 	}
 	
 	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 9e8de58..3e5ab08 100644
--- a/public/assets/javascripts/rectangles/engine/sculpture/types/image.js
+++ b/public/assets/javascripts/rectangles/engine/sculpture/types/image.js
@@ -27,29 +27,11 @@ Sculpture.types.image = Sculpture.types.base.extend(function(base){
       if (opt.position) {
         opt.position.y = opt.position.y || this.scale * this.media.height/2 + 3
         opt.position.rotationY = opt.position.rotationY || scene.camera.rotationY
-        this.billboard = true
-        this.backface = true
       }
       
 			scene.add( this.mx )
 		},
 
-		serialize: function(){
-			var data = base.serialize.call(this)
-			data.billboard = this.billboard
-			data.backface = this.backface
-			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.billboard = data.billboard
-			this.backface = data.backface
-			if (! this.backface) this.mx.el.classList.remove("backface-visible")
-      this.dimensions.deserialize(data.dimensions)
-		},
 	}
 	
 	return exports
diff --git a/public/assets/javascripts/ui/editor/EditorView.js b/public/assets/javascripts/ui/editor/EditorView.js
index 50d3650..e5e2ca0 100644
--- a/public/assets/javascripts/ui/editor/EditorView.js
+++ b/public/assets/javascripts/ui/editor/EditorView.js
@@ -17,6 +17,7 @@ var EditorView = View.extend({
 		this.mediaUpload = new MediaUpload ({ parent: this })
 		this.mediaTumblr = new MediaTumblr ({ parent: this })
 		this.mediaEditor = new MediaEditor ({ parent: this })
+		this.sculptureEditor = new SculptureEditor ({ parent: this })
 		this.wallpaperPicker = new WallpaperPicker ({ parent: this })
 		this.colorControl = new ColorControl ({ parent: this })
 		this.textEditor = new TextEditor ({ parent: this })
@@ -56,12 +57,19 @@ var EditorView = View.extend({
 	},
 	
 	pick: function(scenery){
-	  if (scenery.type == "text") {
+	  if (scenery.isSculpture) {
       this.mediaEditor.hide()
+      this.textEditor.hide()
+      this.sculptureEditor.pick(scenery)
+	  }
+	  else if (scenery.type == "text") {
+      this.mediaEditor.hide()
+      this.sculptureEditor.hide()
       this.textEditor.pick(scenery)
 	  }
 	  else {
       this.textEditor.hide()
+      this.sculptureEditor.hide()
       this.mediaEditor.pick(scenery)
 	  }
 	},
diff --git a/public/assets/javascripts/ui/editor/SculptureEditor.js b/public/assets/javascripts/ui/editor/SculptureEditor.js
new file mode 100644
index 0000000..cce000e
--- /dev/null
+++ b/public/assets/javascripts/ui/editor/SculptureEditor.js
@@ -0,0 +1,200 @@
+
+var SculptureEditor = FormView.extend({
+	el: "#sculptureEditor",
+		
+	events: {
+		"keydown": 'taint',
+		"focus [name]": "clearMinotaur",
+		"click [data-role=play-media]": "togglePaused",
+		"mousedown [name=keyframe]": "stopPropagation",
+		"mousedown": "stopPropagation",
+		"change [name=keyframe]": "seek",
+		"change [name=autoplay]": "setAutoplay",
+		"change [name=loop]": "setLoop",
+		"change [name=mute]": "setMute",
+		"change [name=width]": 'changeWidth',
+		"change [name=height]": 'changeHeight',
+		"change [name=units]": 'changeUnits',
+		"click [data-role=destroy-media]": "destroy",
+	},
+	
+	initialize: function(opt){
+		this.parent = opt.parent
+		this.__super__.initialize.call(this)
+		
+		this.$name = this.$("[name=name]")
+		this.$description = this.$("[name=description]")
+
+		// image fields
+		this.$width = this.$("[name=width]")
+		this.$height = this.$("[name=height]")
+		this.$units = this.$("[name=units]")
+		
+		// video fields
+		this.$playButton = this.$("[data-role=play-media]")
+		this.$autoplay = this.$("[name=autoplay]")
+		this.$loop = this.$("[name=loop]")
+		this.$mute = this.$("[name=mute]")
+		this.$keyframe = this.$("[name=keyframe]")
+	},
+	
+	toggle: function(state) {
+    if (state) {
+      this.parent.settings.toggle()
+    }
+    this.$el.toggleClass("active", state);
+	},
+	
+	togglePaused: function(state){
+		var state = this.sculpture.toggle(state)
+		this.$playButton.toggleClass("paused", ! state)
+	},
+	
+	pick: function(sculpture) {
+		if (this.sculpture && sculpture !== this.sculpture) {
+			this.unbind()
+		}
+
+		this.bind(sculpture)
+		this.$el.addClass("active")
+		
+//     app.controller.toolbar.resetMode()
+    app.controller.toolbar.resetControls()
+		// Sculpture.resize.show(sculpture)
+		Sculpture.hovering = true
+		
+		var media = sculpture.media
+		
+		// console.log(media)
+		
+		this.$name.val(media.title) // || filenameFromUrl(media.url) )
+		this.$description.val(media.description)
+		this.setDimensions()
+		this.$units.val( "ft" )
+		
+		switch (media.type) {
+			case "image":
+				this.$(".video").hide()
+				this.$(".audio").hide()
+				this.$(".image").show()
+				break
+
+			case "youtube":
+			case "vimeo":
+			case "video":
+				this.$(".image").hide()
+				this.$(".audio").hide()
+				this.$(".video").show()
+				
+				this.$playButton.toggleClass("paused", ! this.sculpture.paused())
+				this.$autoplay.prop('checked', !! media.autoplay)
+				this.$loop.prop('checked', !! media.loop)
+				this.$mute.prop('checked', !! media.mute)
+				this.$keyframe.val( Number(media.keyframe || 0) )
+				break
+			
+			case "soundcloud":
+				this.$(".image").hide()
+				this.$(".video").hide()
+				this.$(".audio").show()
+				this.$playButton.toggleClass("paused", ! this.sculpture.paused())
+				this.$autoplay.prop('checked', !! media.autoplay)
+				this.$loop.prop('checked', !! media.loop)
+			  break
+		}
+	},
+
+	hide: function(sculpture){
+		if (this.sculpture) {
+			this.unbind()
+		}
+		this.toggle(false)
+	},
+	
+	seek: function(){
+		var n = parseFloat( this.$keyframe.val() )
+		this.sculpture.seek(n)
+		this.tainted = true
+		
+		this.sculpture.media.keyframe = n
+	},
+	setAutoplay: function(){
+		var checked = this.$autoplay.prop('checked')
+		this.sculpture.media.autoplay = checked
+		this.tainted = true
+		if (checked && this.sculpture.paused()) {
+			this.togglePaused()
+		}
+	},
+	setLoop: function(){
+		var checked = this.$loop.prop('checked')
+		this.sculpture.setLoop(checked)
+		this.tainted = true
+	},
+	setMute: function(){
+		var checked = this.$mute.prop('checked')
+		this.sculpture.media.mute = checked
+		this.sculpture.mute(checked)
+		this.tainted = true
+	},
+
+	setDimensions: function(){
+	  if (! this.sculpture) return
+		this.$width.unitVal( Number(this.sculpture.naturalDimensions.a * this.sculpture.scale) || "" )
+		this.$height.unitVal( Number(this.sculpture.naturalDimensions.b * this.sculpture.scale) || "" )
+		this.tainted = true
+	},
+	changeWidth: function(e){
+		e.stopPropagation()
+		this.sculpture.set_scale( this.$width.unitVal() / this.sculpture.naturalDimensions.a )
+		this.setDimensions()
+	},
+	changeHeight: function(e){
+		e.stopPropagation()
+		this.sculpture.set_scale( this.$height.unitVal() / this.sculpture.naturalDimensions.b )
+		this.setDimensions()
+	},
+	changeUnits: function(){
+		app.units = this.$units.val()
+		this.$('.units').resetUnitVal()
+	},
+	
+	taint: function(e){
+	  e.stopPropagation()
+		this.tainted = true
+	},
+
+	bind: function(sculpture){
+		this.sculpture = sculpture
+		this.sculpture.mx.bound = true
+		this.sculpture.mx.el.classList.add("picked")
+	},
+	
+	unbind: function(){
+	  if (this.sculpture) {
+	    this.sculpture.focused = false
+	    if (this.tainted && this.sculpture.media) {
+        this.sculpture.media.title = this.$name.val()
+        this.sculpture.media.description = this.$description.val()
+        Minotaur.watch( app.router.editorView.settings )
+      }
+	    if (this.sculpture.mx) {
+        this.sculpture.mx.bound = false
+        this.sculpture.mx.el.classList.remove("picked")
+      }
+    }
+    this.tainted = false
+    this.sculpture = null
+	},
+	
+	destroy: function(){
+    var sculpture = this.sculpture
+    this.hide()
+
+    sculpture.remove()
+    
+    this.tainted = false
+    this.sculpture = null
+	},
+
+})
diff --git a/views/partials/scripts.ejs b/views/partials/scripts.ejs
index ca6cc94..1eda8bd 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/move.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>
 
@@ -124,6 +125,7 @@
 <script type="text/javascript" src="/assets/javascripts/ui/editor/MediaUpload.js"></script>
 <script type="text/javascript" src="/assets/javascripts/ui/editor/MediaViewer.js"></script>
 <script type="text/javascript" src="/assets/javascripts/ui/editor/Presets.js"></script>
+<script type="text/javascript" src="/assets/javascripts/ui/editor/SculptureEditor.js"></script>
 <script type="text/javascript" src="/assets/javascripts/ui/editor/TextEditor.js"></script>
 <script type="text/javascript" src="/assets/javascripts/ui/editor/WallpaperPicker.js"></script>
 
-- 
cgit v1.2.3-70-g09d2


From 546fba7ee9dac48d2fb0015709247b1b2efca8bc Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Mon, 20 Apr 2015 14:31:24 -0400
Subject: store billboard setting

---
 public/assets/javascripts/rectangles/engine/scenery/resize.js      | 2 +-
 .../javascripts/rectangles/engine/sculpture/types/_object.js       | 6 ++++++
 public/assets/javascripts/ui/editor/EditorView.js                  | 1 +
 public/assets/javascripts/ui/editor/SculptureEditor.js             | 7 +++----
 4 files changed, 11 insertions(+), 5 deletions(-)

(limited to 'public/assets/javascripts/rectangles/engine/scenery')

diff --git a/public/assets/javascripts/rectangles/engine/scenery/resize.js b/public/assets/javascripts/rectangles/engine/scenery/resize.js
index a5e255a..006ff2a 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/resize.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/resize.js
@@ -49,7 +49,7 @@ Scenery.resize = new function(){
 	
 	// rotate the dots as appropriate
 	base.rotate_dots = function(){
-	console.trace()
+	  // console.trace()
 		rotationY = obj.wall.rotationY
 		dots.forEach(function(dot){
 			dot.rotationY = rotationY
diff --git a/public/assets/javascripts/rectangles/engine/sculpture/types/_object.js b/public/assets/javascripts/rectangles/engine/sculpture/types/_object.js
index 489a6a1..b903c5b 100644
--- a/public/assets/javascripts/rectangles/engine/sculpture/types/_object.js
+++ b/public/assets/javascripts/rectangles/engine/sculpture/types/_object.js
@@ -54,9 +54,13 @@ Sculpture.types.base = Fiber.extend(function(base){
 		setBillboard: function(val){
 		  this.billboard = val
 	    if (this.billboard) {
+	      this.mx.el.classList.add("backface-visible")
+	      this.mx.el.classList.remove("backface-hidden")
 	      this.mx.rotationY = cam.rotationY
 	    }
 	    else {
+	      this.mx.el.classList.add("backface-hidden")
+	      this.mx.el.classList.remove("backface-visible")
 	      this.mx.rotationY = PI/2
 	    }
     },
@@ -106,6 +110,8 @@ Sculpture.types.base = Fiber.extend(function(base){
 				scale: this.scale,
 				media: this.media,
         billboard: this.billboard,
+        outline: this.outline,
+        outlineColor: this.outlineColor,
         backface: this.backface,
 			}
 			return data
diff --git a/public/assets/javascripts/ui/editor/EditorView.js b/public/assets/javascripts/ui/editor/EditorView.js
index e5e2ca0..a7b4f20 100644
--- a/public/assets/javascripts/ui/editor/EditorView.js
+++ b/public/assets/javascripts/ui/editor/EditorView.js
@@ -80,6 +80,7 @@ var EditorView = View.extend({
 	},
 	
 	hideExtras: function(){
+		this.sculptureEditor.hide()
 		this.mediaEditor.hide()
 		this.textEditor.hide()
 		this.share.hide()
diff --git a/public/assets/javascripts/ui/editor/SculptureEditor.js b/public/assets/javascripts/ui/editor/SculptureEditor.js
index ab0ccd2..ff1e6b9 100644
--- a/public/assets/javascripts/ui/editor/SculptureEditor.js
+++ b/public/assets/javascripts/ui/editor/SculptureEditor.js
@@ -79,10 +79,9 @@ var SculptureEditor = FormView.extend({
 		this.setDimensions()
 		this.$units.val( "ft" )
 
-		this.$outline.prop( 'checked', !! media.outline )
-		this.$outlineColor.val( media.outlineColor )
-		this.$billboard.prop( 'checked', !! media.billboard )
-
+		this.$outline.prop( 'checked', !! sculpture.outline )
+		this.$outlineColor.val( sculpture.outlineColor || "#000000" )
+		this.$billboard.prop( 'checked', !! sculpture.billboard )
 		
 		switch (media.type) {
 			case "image":
-- 
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/engine/scenery')

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 226e90a540e185c8ae2f861eac5e2b1747f5d729 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Mon, 20 Apr 2015 15:05:11 -0400
Subject: hide dots

---
 public/assets/javascripts/rectangles/engine/scenery/resize.js | 1 +
 1 file changed, 1 insertion(+)

(limited to 'public/assets/javascripts/rectangles/engine/scenery')

diff --git a/public/assets/javascripts/rectangles/engine/scenery/resize.js b/public/assets/javascripts/rectangles/engine/scenery/resize.js
index 8dac140..252af74 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/resize.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/resize.js
@@ -95,6 +95,7 @@ Scenery.resize = new function(){
 		base.add_dots()
 		base.rotate_dots()
 		base.move_dots()
+    Sculpture.resize.hide()
 	}
 
 	// dismiss the dots on blur
-- 
cgit v1.2.3-70-g09d2


From 06fc629e2be66d79e94a02b169e12bc0918d0881 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Mon, 20 Apr 2015 15:45:55 -0400
Subject: shift-drag scupltures up and down; dont drag through floor

---
 .../assets/javascripts/rectangles/engine/scenery/move.js |  2 +-
 .../javascripts/rectangles/engine/sculpture/move.js      | 16 ++++++++++++----
 .../rectangles/engine/sculpture/types/image.js           |  2 +-
 public/assets/javascripts/rectangles/util/constants.js   |  3 ++-
 4 files changed, 16 insertions(+), 7 deletions(-)

(limited to 'public/assets/javascripts/rectangles/engine/scenery')

diff --git a/public/assets/javascripts/rectangles/engine/scenery/move.js b/public/assets/javascripts/rectangles/engine/scenery/move.js
index dd60a61..94c6281 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/move.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/move.js
@@ -28,7 +28,7 @@ Scenery.move = function(base){
 		  base.remove()
 			return
 		}
-
+    
 		// load the modal
 		app.controller.pick(base)
 
diff --git a/public/assets/javascripts/rectangles/engine/sculpture/move.js b/public/assets/javascripts/rectangles/engine/sculpture/move.js
index f968bcf..4f6d176 100644
--- a/public/assets/javascripts/rectangles/engine/sculpture/move.js
+++ b/public/assets/javascripts/rectangles/engine/sculpture/move.js
@@ -2,8 +2,9 @@
 Sculpture.move = function(base){
 
 	var x, y, z, position, dimension, bounds
-	var dragging = false, moved = false
+	var dragging = false, shiftPressed = false, moved = false
 	var oldState
+	var height, width
 
 	this.bind = function(){
 		Sculpture.mouse.bind_el(base.mx.el)
@@ -39,11 +40,13 @@ Sculpture.move = function(base){
 			e.clickAccepted = false
 			return
 		}
+    shiftPressed = e.shiftKey
 		dragging = true
 		moved = false
 		x = base.mx.x
 		y = base.mx.y
 		z = base.mx.z
+		height = base.mx.height * base.mx.scale
 		
 		bounds = base.bounds
 		dimension = base.dimensions
@@ -63,9 +66,14 @@ Sculpture.move = function(base){
 
     // here we need to move the element based on the XY coords, as 
 		// base.mx.y = position.b + delta.b + dimension.b / 2
-    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 (e.shiftKey) {
+      base.mx.y = clamp( y + delta.b, height/2 + sculpture_distance_from_floor, Infinity )
+    }
+    else {
+      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()
 		}
diff --git a/public/assets/javascripts/rectangles/engine/sculpture/types/image.js b/public/assets/javascripts/rectangles/engine/sculpture/types/image.js
index 3e5ab08..1a53f5b 100644
--- a/public/assets/javascripts/rectangles/engine/sculpture/types/image.js
+++ b/public/assets/javascripts/rectangles/engine/sculpture/types/image.js
@@ -25,7 +25,7 @@ Sculpture.types.image = Sculpture.types.base.extend(function(base){
 			})
 
       if (opt.position) {
-        opt.position.y = opt.position.y || this.scale * this.media.height/2 + 3
+        opt.position.y = opt.position.y || this.scale * this.media.height/2 + sculpture_distance_from_floor
         opt.position.rotationY = opt.position.rotationY || scene.camera.rotationY
       }
       
diff --git a/public/assets/javascripts/rectangles/util/constants.js b/public/assets/javascripts/rectangles/util/constants.js
index 3bc314c..a70cacd 100644
--- a/public/assets/javascripts/rectangles/util/constants.js
+++ b/public/assets/javascripts/rectangles/util/constants.js
@@ -25,7 +25,8 @@ var height_min = 200,
 		MAP_GRID_SIZE = 360          // 10 feet
 
 var painting_distance_from_wall = 10,
-		dot_distance_from_picture = 3
+		dot_distance_from_picture = 3,
+		sculpture_distance_from_floor = 3
 
 var dot_hide_delay = 50, // ms
 		dot_side = 20
-- 
cgit v1.2.3-70-g09d2


From 498069dec6ac9c1febf2da26b3d3f53f8bd1e1ef Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Wed, 29 Apr 2015 17:22:25 -0400
Subject: playAll/pauseAll/rewindAll

---
 public/assets/javascripts/mx/primitives/mx.vimeo.js      |  2 +-
 .../javascripts/rectangles/engine/scenery/_scenery.js    | 16 ++++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

(limited to 'public/assets/javascripts/rectangles/engine/scenery')

diff --git a/public/assets/javascripts/mx/primitives/mx.vimeo.js b/public/assets/javascripts/mx/primitives/mx.vimeo.js
index ccd0a13..e1a3b84 100644
--- a/public/assets/javascripts/mx/primitives/mx.vimeo.js
+++ b/public/assets/javascripts/mx/primitives/mx.vimeo.js
@@ -99,7 +99,7 @@ MX.Vimeo = MX.Object3D.extend({
   		return
   	}
   	
-  	if (! this.started || n === 0) {
+  	if (! this.started) {
 	  	return
   	}
   	
diff --git a/public/assets/javascripts/rectangles/engine/scenery/_scenery.js b/public/assets/javascripts/rectangles/engine/scenery/_scenery.js
index 18d665f..e9be663 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/_scenery.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/_scenery.js
@@ -114,6 +114,22 @@ var Scenery = new function(){
 		return added
 	}
 
+	base.rewindAll = function(){
+	  base.forEach(function(scenery){
+	    if (scenery.type == "video") scenery.seek(0)
+	  })
+	}
+	base.playAll = function(){
+	  base.forEach(function(scenery){
+	    if (scenery.type == "video") scenery.play()
+	  })
+	}
+	base.pauseAll = function(){
+	  base.forEach(function(scenery){
+	    if (scenery.type == "video") scenery.pause()
+	  })
+	}
+
 	return base
 }
 
-- 
cgit v1.2.3-70-g09d2


From 94ba321f96638906e41eda7abf371066011c8508 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Wed, 29 Apr 2015 18:46:21 -0400
Subject: misc edits

---
 public/assets/javascripts/mx/extensions/mx.movements.js |  2 +-
 public/assets/javascripts/mx/primitives/mx.video.js     |  3 +++
 public/assets/javascripts/mx/primitives/mx.vimeo.js     | 16 ++++++++++++----
 public/assets/javascripts/mx/primitives/mx.youtube.js   |  3 +++
 .../javascripts/rectangles/engine/scenery/_scenery.js   | 17 +++++++++++++++--
 .../javascripts/rectangles/engine/scenery/sound.js      |  2 +-
 .../rectangles/engine/scenery/types/video.js            |  7 ++++++-
 public/assets/javascripts/ui/reader/ReaderView.js       |  2 ++
 8 files changed, 43 insertions(+), 9 deletions(-)

(limited to 'public/assets/javascripts/rectangles/engine/scenery')

diff --git a/public/assets/javascripts/mx/extensions/mx.movements.js b/public/assets/javascripts/mx/extensions/mx.movements.js
index 931caac..fa59908 100644
--- a/public/assets/javascripts/mx/extensions/mx.movements.js
+++ b/public/assets/javascripts/mx/extensions/mx.movements.js
@@ -20,7 +20,7 @@ MX.Movements = function (cam) {
 			rotationX_max = PI/6
 
 	var v = 12,
-			vr = Math.PI * 0.012,
+			vr = Math.PI * 0.018,
 			jumpV = 23,
 			vx = vy = vz = 0,
 			creepFactor = 0.3
diff --git a/public/assets/javascripts/mx/primitives/mx.video.js b/public/assets/javascripts/mx/primitives/mx.video.js
index 43c392a..53ccf2e 100644
--- a/public/assets/javascripts/mx/primitives/mx.video.js
+++ b/public/assets/javascripts/mx/primitives/mx.video.js
@@ -21,6 +21,7 @@ MX.Video = MX.Object3D.extend({
 		this.el.classList.add("video")
 		this.el.classList.add("mx-scenery")
   	this.paused = !! this.media.autoplay
+  	this.playing = false
 		this.muted = app.muted || !! this.media.mute
   },
 
@@ -60,11 +61,13 @@ MX.Video = MX.Object3D.extend({
   
   play: function(){
   	this.paused = false
+  	this.playing = true
   	this.player.play()
   },
   
   pause: function(){
   	this.paused = true
+  	this.playing = false
   	this.player.pause()
   },
   
diff --git a/public/assets/javascripts/mx/primitives/mx.vimeo.js b/public/assets/javascripts/mx/primitives/mx.vimeo.js
index e1a3b84..af138ae 100644
--- a/public/assets/javascripts/mx/primitives/mx.vimeo.js
+++ b/public/assets/javascripts/mx/primitives/mx.vimeo.js
@@ -20,6 +20,7 @@ MX.Vimeo = MX.Object3D.extend({
 		this.backface && this.el.classList.add("backface-visible")		
 		this.el.classList.add("video")
 		this.el.classList.add("mx-scenery")
+    this.playing = false
   	this.paused = !! this.media.autoplay
 		this.muted = app.muted || !! this.media.mute
 		this.started = false
@@ -145,19 +146,26 @@ MX.Vimeo = MX.Object3D.extend({
   	if (this.paused) {
   		this.pause()
   	}
+  	else {
+      this.playing = true
+    }
   },
   
   onPause: function(){
   	if (! this.paused) {
   		this.play()
   	}
+  	else {
+      this.playing = false
+  	}
   },
   
   finished: function(){
-//   	if (this.media.loop) {
-//   		this.seek(0)
-//   		this.play()
-//   	}
+    console.log("vimeo finished")
+  	if (this.media.loop) {
+  		this.seek(0)
+  		this.play()
+  	}
 //   	else if (this.bound) {
   	if (! this.media.loop && this.bound) {
   		$(".playButton").removeClass('playing')
diff --git a/public/assets/javascripts/mx/primitives/mx.youtube.js b/public/assets/javascripts/mx/primitives/mx.youtube.js
index e4e73d6..8cd9f59 100644
--- a/public/assets/javascripts/mx/primitives/mx.youtube.js
+++ b/public/assets/javascripts/mx/primitives/mx.youtube.js
@@ -21,6 +21,7 @@ MX.Youtube = MX.Object3D.extend({
 		this.el.classList.add("video")
 		this.el.classList.add("mx-scenery")
   	this.paused = !! this.media.autoplay
+  	this.playing = false
 		this.muted = app.muted || !! this.media.mute
   },
 
@@ -143,11 +144,13 @@ MX.Youtube = MX.Object3D.extend({
   
   play: function(){
 		this.paused = false
+  	this.playing = true
   	this.player.playVideo()
   },
   
   pause: function(){
 		this.paused = true
+  	this.playing = false
 		this.player.pauseVideo()
   },
   
diff --git a/public/assets/javascripts/rectangles/engine/scenery/_scenery.js b/public/assets/javascripts/rectangles/engine/scenery/_scenery.js
index e9be663..6203c20 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/_scenery.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/_scenery.js
@@ -121,7 +121,10 @@ var Scenery = new function(){
 	}
 	base.playAll = function(){
 	  base.forEach(function(scenery){
-	    if (scenery.type == "video") scenery.play()
+	    if (scenery.type == "video") {
+	      scenery.unmute()
+	      scenery.play()
+	    }
 	  })
 	}
 	base.pauseAll = function(){
@@ -129,7 +132,17 @@ var Scenery = new function(){
 	    if (scenery.type == "video") scenery.pause()
 	  })
 	}
-
+	base.muteAll = function(){
+	  base.forEach(function(scenery){
+	    if (scenery.type == "video") scenery.mx.mute()
+	  })
+	}
+	base.unmuteAll = function(){
+	  base.forEach(function(scenery){
+	    if (scenery.type == "video") scenery.mx.unmute()
+	  })
+	}
+	
 	return base
 }
 
diff --git a/public/assets/javascripts/rectangles/engine/scenery/sound.js b/public/assets/javascripts/rectangles/engine/scenery/sound.js
index 37bdee0..d63d8c4 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/sound.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/sound.js
@@ -5,7 +5,7 @@ Scenery.sound.init = function(){
   app.tube.on("move", Scenery.sound.move)
 }
 Scenery.sound.move = function(){
-  var vals = Scenery.map(function(scenery){
+  Scenery.forEach(function(scenery){
     if ((scenery.type == "video" || scenery.type == "audio") && ! scenery.muted()) {
       var distance = dist(cam.x, cam.z, 
                           scenery.mx.x, scenery.mx.z)
diff --git a/public/assets/javascripts/rectangles/engine/scenery/types/video.js b/public/assets/javascripts/rectangles/engine/scenery/types/video.js
index fb1a868..163e19e 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/types/video.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/types/video.js
@@ -38,7 +38,8 @@ Scenery.types.video = Scenery.types.base.extend(function(base){
 				backface: false,
 			})
 			scene.add(this.mx)
-			this.mx.load()
+			
+      this.mx.load()
 		},
 		
 		play: function(){
@@ -90,6 +91,10 @@ Scenery.types.video = Scenery.types.base.extend(function(base){
 			}
 		},
 
+		unmute: function(){
+      this.mx.unmute()
+		},
+		
 		setVolume: function(n){
 			this.mx.setVolume(n)
 		},
diff --git a/public/assets/javascripts/ui/reader/ReaderView.js b/public/assets/javascripts/ui/reader/ReaderView.js
index 55d2520..1ba97cf 100644
--- a/public/assets/javascripts/ui/reader/ReaderView.js
+++ b/public/assets/javascripts/ui/reader/ReaderView.js
@@ -94,6 +94,8 @@ var ReaderView = View.extend({
 		
 		// disable until we start using spinning again
 		// this.listen()
+
+    app.tube("site-ready")
 	},
 	
 	listen: function(){
-- 
cgit v1.2.3-70-g09d2


From befad3026f5b0bb07cdd55560835425feb73b031 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Thu, 30 Apr 2015 15:04:55 -0400
Subject: ignore muted state FOR NOW

---
 public/assets/javascripts/rectangles/engine/scenery/sound.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'public/assets/javascripts/rectangles/engine/scenery')

diff --git a/public/assets/javascripts/rectangles/engine/scenery/sound.js b/public/assets/javascripts/rectangles/engine/scenery/sound.js
index d63d8c4..5a783d6 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/sound.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/sound.js
@@ -6,7 +6,7 @@ Scenery.sound.init = function(){
 }
 Scenery.sound.move = function(){
   Scenery.forEach(function(scenery){
-    if ((scenery.type == "video" || scenery.type == "audio") && ! scenery.muted()) {
+    if ((scenery.type == "video" || scenery.type == "audio")) { // && ! scenery.muted()) {
       var distance = dist(cam.x, cam.z, 
                           scenery.mx.x, scenery.mx.z)
       var volume = 1 - (clamp( distance, 0, Scenery.sound.max_distance ) / Scenery.sound.max_distance)
-- 
cgit v1.2.3-70-g09d2