merge

15 files changed, 158 insertions, 27 deletions

diff --git a/public/assets/javascripts/app.js b/public/assets/javascripts/app.js
index a6b6088..98e1820 100644
--- a/public/assets/javascripts/app.js
+++ b/public/assets/javascripts/app.js
@@ -17,6 +17,11 @@ else {
 
 new WOW().init();
 
+
+$('#help-button').click( function(){
+   $('body').chardinJs('start')
+});
+
 var scene, cam, map;
 
 var app = new function(){}
diff --git a/public/assets/javascripts/mx/extensions/mx.movements.js b/public/assets/javascripts/mx/extensions/mx.movements.js
index c02c285..4627cd3 100644
--- a/public/assets/javascripts/mx/extensions/mx.movements.js
+++ b/public/assets/javascripts/mx/extensions/mx.movements.js
@@ -29,6 +29,8 @@ MX.Movements = function (cam) {
 	
 	var pos = { x: 0, y: 0, z: 0, rotationX: 0, rotationY: 0 }
 
+  $(document).one("keydown", function(){ $("#keyhint").fadeOut(250) })
+
 	return {
 
 		init: function () {
diff --git a/public/assets/javascripts/rectangles/engine/scenery/_scenery.js b/public/assets/javascripts/rectangles/engine/scenery/_scenery.js
index d34e299..69e9ba7 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/_scenery.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/_scenery.js
@@ -48,7 +48,7 @@ var Scenery = new function(){
 	base.find = function(id){
 		return base.list[id] || null
 	}
-		
+	
 	base.remove = function(id){
 		var scene_media = base.list[id]
 		delete base.list[id]
diff --git a/public/assets/javascripts/rectangles/engine/scenery/move.js b/public/assets/javascripts/rectangles/engine/scenery/move.js
index 55d6ef1..7d148cf 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/move.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/move.js
@@ -101,7 +101,7 @@ Scenery.move = function(base){
 
     // TODO: watch individual scenery object here
     Minotaur.watch( app.router.editorView.settings )
-
+  
     oldState = null
 	}
 	
diff --git a/public/assets/javascripts/rectangles/engine/scenery/resize.js b/public/assets/javascripts/rectangles/engine/scenery/resize.js
index 2ba84a1..893237c 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/resize.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/resize.js
@@ -57,35 +57,32 @@ Scenery.resize = new function(){
 	
 	// move all the dots to the object's current position
 	base.move_dots = function(){
-		x = obj.mx.x + sin(rotationY) * dot_distance_from_picture
-		y = obj.mx.y
-		z = obj.mx.z - cos(rotationY) * dot_distance_from_picture
+		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)
+			base.move_dot(dot, { x: x, y: y, z: z })
 		})
 	}
 		
 	// move a dot .. to the initial position of the image
-	base.move_dot = function(dot){
-		dot.x = x
-		dot.y = y
-		dot.z = z
-		
+	base.move_dot = function(dot, pos){
 		if (dot.side & TOP) {
-			dot.y += obj.mx.height * obj.mx.scale / 2
+			pos.y += obj.dimensions.b / 2
 		}
 		if (dot.side & BOTTOM) {
-			dot.y -= obj.mx.height * obj.mx.scale / 2
+			pos.y -= obj.dimensions.b / 2
 		}
 		if (dot.side & LEFT) {
-			dot.x -= cos(rotationY) * (obj.mx.width * obj.mx.scale) / 2
-			dot.z -= sin(rotationY) * (obj.mx.width * obj.mx.scale) / 2
+			pos.x -= cos(rotationY) * (obj.dimensions.a) / 2
+			pos.z -= sin(rotationY) * (obj.dimensions.a) / 2
 		}
 		if (dot.side & RIGHT) {
-			dot.x += cos(rotationY) * (obj.mx.width * obj.mx.scale) / 2
-			dot.z += sin(rotationY) * (obj.mx.width * obj.mx.scale) / 2
+			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
diff --git a/public/assets/javascripts/rectangles/engine/scenery/types/_object.js b/public/assets/javascripts/rectangles/engine/scenery/types/_object.js
index 5eed53e..4e5e2c5 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/types/_object.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/types/_object.js
@@ -33,11 +33,33 @@ Scenery.types.base = Fiber.extend(function(base){
 			var center = this.bounds.center()
 			center.a -= this.dimensions.a / 2
 			center.b -= this.dimensions.b / 2
-			var mx_position = this.wall.positionToMx( center, this.dimensions )
-			this.mx.move(mx_position)
 			this.position.assign(center)
 		},
 		
+		translateTo: function (position){
+      var flipX = this.wall.side & (FRONT | RIGHT)
+      var delta = position.clone().subVec(this.position)
+      delta.a -= this.dimensions.a/2
+      delta.b -= this.dimensions.b/2
+      
+      if (flipX) { delta.a *= -1 }
+
+      var new_bounds = this.wall.surface.translate( this.bounds, this.dimensions, this.position, delta )
+
+      this.position.b += delta.b
+
+      switch (this.wall.side) {
+        case FRONT:
+        case BACK:
+          this.position.a += delta.a * cos(wall_rotation[this.wall.side])
+          break
+        case LEFT:
+        case RIGHT:
+          this.position.a += delta.a * sin(wall_rotation[this.wall.side])
+          break
+      }
+		},
+		
 		bind: function(){
 			this.move.bind()
 			$(this.mx.el).bind({
diff --git a/public/assets/javascripts/rectangles/engine/scenery/types/image.js b/public/assets/javascripts/rectangles/engine/scenery/types/image.js
index d2fa3ab..aa43341 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/types/image.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/types/image.js
@@ -22,7 +22,14 @@ Scenery.types.image = Scenery.types.base.extend(function(base){
       }
       else {
       	this.set_wall(opt)
-        this.bounds && this.recenter()
+      	if (this.bounds) {
+          this.recenter()
+          if (opt.position) {
+            this.translateTo(opt.position)
+          }
+          var mx_position = this.wall.positionToMx( this.position, this.dimensions )
+          this.mx.move(mx_position)
+        }
       }
 		},
 
diff --git a/public/assets/javascripts/rectangles/engine/scenery/types/video.js b/public/assets/javascripts/rectangles/engine/scenery/types/video.js
index 76f32ac..2ef6ec3 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/types/video.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/types/video.js
@@ -21,7 +21,14 @@ Scenery.types.video = Scenery.types.base.extend(function(base){
       }
       else {
       	this.set_wall(opt)
-        this.bounds && this.recenter()
+        if (this.bounds) {
+          this.recenter()
+          if (opt.position) {
+            this.translateTo(opt.position)
+          }
+          var mx_position = this.wall.positionToMx( this.position, this.dimensions )
+          this.mx.move(mx_position)
+        }
       }
     },
 
diff --git a/public/assets/javascripts/rectangles/models/vec2.js b/public/assets/javascripts/rectangles/models/vec2.js
index 0040435..49613c3 100644
--- a/public/assets/javascripts/rectangles/models/vec2.js
+++ b/public/assets/javascripts/rectangles/models/vec2.js
@@ -37,6 +37,9 @@
 	vec2.prototype.midpoint = function(){
 		return lerp(0.5, this.a, this.b)
 	}
+	vec2.prototype.lerp = function(n){
+	  return lerp(n, this.a, this.b)
+	}
 	vec2.prototype.eq = function(v){
 		return this.a == v.a && this.b == v.b
 	}
@@ -60,9 +63,23 @@
 		this.b /= n
 		return this
 	}
+	vec2.prototype.addVec = function(v){
+	  this.a += v.a
+	  this.b += v.b
+	  return this
+	}
+  vec2.prototype.subVec = function(v){
+	  this.a -= v.a
+	  this.b -= v.b
+	  return this
+	}
 	vec2.prototype.zero = function(){
 		this.a = this.b = 0
 	}
+	vec2.prototype.round = function(){
+	  this.a = Math.round(this.a)
+	  this.b = Math.round(this.b)
+	}
 	vec2.prototype.setPosition = function(n){
 		var len = this.length()
 		this.a = n
diff --git a/public/assets/javascripts/rectangles/models/wall.js b/public/assets/javascripts/rectangles/models/wall.js
index 1b37aa0..fdc8d8c 100644
--- a/public/assets/javascripts/rectangles/models/wall.js
+++ b/public/assets/javascripts/rectangles/models/wall.js
@@ -50,13 +50,36 @@
 						index: index,
 					})
 				},
+/*
 				mousemove: function(e){
+          var offset = offsetFromPoint(e, mx.el)
+          if (offset) {
+            var pos = base.mxOffsetToPosition( offset, index )
+            
+            var mx_pos = base.positionToMx(pos, new vec2(5,5))
+            var mx_dot = new MX.Object3D
+            mx_dot.move(mx_pos)
+            mx_dot.width = 5
+            mx_dot.height = 5
+            mx_dot.rotationY = wall_rotation[base.side]
+            mx_dot.el.style.backgroundColor = "red"
+            scene.add(mx_dot)
+          }
 				},
+*/
 				mousedown: function(e){
-					if (Scenery.nextMedia) {
+					if (Scenery.nextText) {
+					}
+					else if (Scenery.nextMedia) {
+            var offset = offsetFromPoint(e, mx.el)
+            if (! offset) { return }
+
+            var pos = base.mxOffsetToPosition( offset, index )
+
             var scenery = Scenery.addNextToWall({
             	wall: base,
-            	index: index
+            	index: index,
+            	position: pos,
             })
             
             // scenery was not placed
@@ -176,7 +199,16 @@
 	  }
 	  return position
 	}
-	
+  Wall.prototype.mxOffsetToPosition = function( offset, index ) {
+    var face = this.surface.faces[index]
+    var shouldFlip = this.side & (RIGHT | FRONT)
+    var position = new vec2(0,0)
+    position.a = face.x.lerp(shouldFlip ? 1-offset.left : offset.left)
+    position.b = face.y.lerp(1-offset.top)
+    position.round()
+    return position
+  }
+
 	Wall.prototype.color = function(color){
 		this.$walls.css("background-color", color)
 	}
diff --git a/public/assets/javascripts/rectangles/util/coords.js b/public/assets/javascripts/rectangles/util/coords.js
new file mode 100644
index 0000000..74b7fda
--- /dev/null
+++ b/public/assets/javascripts/rectangles/util/coords.js
@@ -0,0 +1,33 @@
+function offsetFromPoint(event, element) {
+  function a(width) {
+    var l = 0, r = 200;
+    while (r - l > 0.0001) {
+      var mid = (r + l) / 2;
+      var a = document.createElement('div');
+      a.style.cssText = 'position: absolute;left:0;top:0;background: red;z-index: 1000;';
+      a.style[width ? 'width' : 'height'] = mid.toFixed(3) + '%';
+      a.style[width ? 'height' : 'width'] = '100%';
+      element.appendChild(a);
+      var x = document.elementFromPoint(event.clientX, event.clientY);
+      element.removeChild(a);
+      if (x === a) {
+        r = mid;
+      } else {
+        if (r === 200) {
+          return null;
+        }
+        l = mid;
+      }
+    }
+    return mid;
+  }
+  var l = a(1), 
+      t = a(0);
+  return l && t ? {
+    left: l / 100,
+    top: t / 100,
+    toString: function () {
+      return 'left: ' + l + '%, top: ' + t + '%';
+    }
+  } : null;
+}
diff --git a/public/assets/javascripts/rectangles/util/minotaur.js b/public/assets/javascripts/rectangles/util/minotaur.js
index 4d9a795..d165ccc 100644
--- a/public/assets/javascripts/rectangles/util/minotaur.js
+++ b/public/assets/javascripts/rectangles/util/minotaur.js
@@ -4,7 +4,7 @@
     var base = this
     base.$el = $("#minotaur")
     base.timeout = null
-    base.delay = 5000
+    base.delay = 2500
     base.objects = {}
     
     base.init = function () {
diff --git a/public/assets/javascripts/ui/editor/EditorSettings.js b/public/assets/javascripts/ui/editor/EditorSettings.js
index eb0d044..fd251b7 100644
--- a/public/assets/javascripts/ui/editor/EditorSettings.js
+++ b/public/assets/javascripts/ui/editor/EditorSettings.js
@@ -93,7 +93,7 @@ var EditorSettings = FormView.extend({
 	},
 	
 	clear: function(){
-		Rooms.removeAll()
+		Scenery.removeAll()
 	},
 	
 	destroy: function(){
diff --git a/public/assets/javascripts/ui/site/EditProfileModal.js b/public/assets/javascripts/ui/site/EditProfileModal.js
index b023923..d0e5d05 100644
--- a/public/assets/javascripts/ui/site/EditProfileModal.js
+++ b/public/assets/javascripts/ui/site/EditProfileModal.js
@@ -3,11 +3,14 @@ var EditProfileModal = ModalFormView.extend({
 	el: ".mediaDrawer.editProfile",
 	action: "/api/profile",
 	method: "put",
+	
+	events: {
+	  "click [data-role='changePasswordToggle']": 'togglePasswordFields'
+	},
 
 	load: function(){
 		this.reset()
 		$.get("/api/profile", function(data){
-			console.log(data)
 			
 			for (var i in data) {
 				this.$("[name='" + i + "']").val(data[i])
@@ -25,6 +28,10 @@ var EditProfileModal = ModalFormView.extend({
 			this.show()
 		}.bind(this))
 	},
+	
+	togglePasswordFields: function(){
+    this.$("[data-role='changePasswordFields']").toggleClass("hidden")
+	},
 
 	validate: function(){
 		var errors = []
diff --git a/public/assets/javascripts/vendor/chardinjs.min.js b/public/assets/javascripts/vendor/chardinjs.min.js
new file mode 100755
index 0000000..56cd7b7
--- /dev/null
+++ b/public/assets/javascripts/vendor/chardinjs.min.js
@@ -0,0 +1,2 @@
+// Generated by CoffeeScript 1.6.2
+(function(){var e=[].slice;(function(t,n){var r;return r=function(){function e(e){var r=this;this.$el=t(e),t(n).resize(function(){return r.refresh()})}return e.prototype.start=function(){var e,t,n,r;if(this._overlay_visible())return!1;this._add_overlay_layer(),r=this.$el.find("*[data-intro]:visible");for(t=0,n=r.length;t<n;t++)e=r[t],this._show_element(e);return this.$el.trigger("chardinJs:start")},e.prototype.toggle=function(){return this._overlay_visible()?this.stop():this.start()},e.prototype.refresh=function(){var e,t,n,r,i;if(this._overlay_visible()){r=this.$el.find("*[data-intro]:visible"),i=[];for(t=0,n=r.length;t<n;t++)e=r[t],i.push(this._position_helper_layer(e));return i}return this},e.prototype.stop=function(){return this.$el.find(".chardinjs-overlay").fadeOut(function(){return t(this).remove()}),this.$el.find(".chardinjs-helper-layer").remove(),this.$el.find(".chardinjs-show-element").removeClass("chardinjs-show-element"),this.$el.find(".chardinjs-relative-position").removeClass("chardinjs-relative-position"),n.removeEventListener?n.removeEventListener("keydown",this._onKeyDown,!0):document.detachEvent&&document.detachEvent("onkeydown",this._onKeyDown),this.$el.trigger("chardinJs:stop")},e.prototype._overlay_visible=function(){return this.$el.find(".chardinjs-overlay").length!==0},e.prototype._add_overlay_layer=function(){var e,t,n,r=this;return this._overlay_visible()?!1:(t=document.createElement("div"),n="",t.className="chardinjs-overlay",this.$el.prop("tagName")==="BODY"?(n+="top: 0;bottom: 0; left: 0;right: 0;position: fixed;",t.setAttribute("style",n)):(e=this._get_offset(this.$el.get()[0]),e&&(n+="width: "+e.width+"px; height:"+e.height+"px; top:"+e.top+"px;left: "+e.left+"px;",t.setAttribute("style",n))),this.$el.get()[0].appendChild(t),t.onclick=function(){return r.stop()},setTimeout(function(){return n+="opacity: .8;opacity: .8;-ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=80)';filter: alpha(opacity=80);",t.setAttribute("style",n)},10))},e.prototype._get_position=function(e){return e.getAttribute("data-position")||"bottom"},e.prototype._place_tooltip=function(e){var n,r,i,s,o,u,a;u=t(e).data("tooltip_layer"),a=this._get_offset(u),u.style.top=null,u.style.right=null,u.style.bottom=null,u.style.left=null;switch(this._get_position(e)){case"top":case"bottom":i=this._get_offset(e),o=i.width,r=t(u).width(),u.style.left=""+(o/2-a.width/2)+"px";break;case"left":case"right":i=this._get_offset(e),s=i.height,n=t(u).height(),u.style.top=""+(s/2-a.height/2)+"px"}switch(this._get_position(e)){case"left":return u.style.left="-"+(a.width-34)+"px";case"right":return u.style.right="-"+(a.width-34)+"px";case"bottom":return u.style.bottom="-"+a.height+"px";case"top":return u.style.top="-"+a.height+"px"}},e.prototype._position_helper_layer=function(e){var n,r;return r=t(e).data("helper_layer"),n=this._get_offset(e),r.setAttribute("style","width: "+n.width+"px; height:"+n.height+"px; top:"+n.top+"px; left: "+n.left+"px;")},e.prototype._show_element=function(e){var n,r,i,s;r=this._get_offset(e),i=document.createElement("div"),s=document.createElement("div"),t(e).data("helper_layer",i).data("tooltip_layer",s),e.id&&i.setAttribute("data-id",e.id),i.className="chardinjs-helper-layer chardinjs-"+this._get_position(e),this._position_helper_layer(e),this.$el.get()[0].appendChild(i),s.className="chardinjs-tooltip chardinjs-"+this._get_position(e),s.innerHTML="<div class='chardinjs-tooltiptext'>"+e.getAttribute("data-intro")+"</div>",i.appendChild(s),this._place_tooltip(e),e.className+=" chardinjs-show-element",n="",e.currentStyle?n=e.currentStyle.position:document.defaultView&&document.defaultView.getComputedStyle&&(n=document.defaultView.getComputedStyle(e,null).getPropertyValue("position")),n=n.toLowerCase();if(n!=="absolute"&&n!=="relative")return e.className+=" chardinjs-relative-position"},e.prototype._get_offset=function(e){var t,n,r;t={width:e.offsetWidth,height:e.offsetHeight},n=0,r=0;while(e&&!isNaN(e.offsetLeft)&&!isNaN(e.offsetTop))n+=e.offsetLeft,r+=e.offsetTop,e=e.offsetParent;return t.top=r,t.left=n,t},e}(),t.fn.extend({chardinJs:function(){var n,i,s,o;return o=arguments[0],i=2<=arguments.length?e.call(arguments,1):[],n=t(this[0]),s=n.data("chardinJs"),s||n.data("chardinJs",s=new r(this,o)),typeof o=="string"&&s[o].apply(s,i),s}})})(window.jQuery,window)}).call(this);
\ No newline at end of file