merge

2 files changed, 52 insertions, 3 deletions

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)
 	}