merge

6 files changed, 115 insertions, 19 deletions

diff --git a/public/assets/javascripts/rectangles/models/floor.js b/public/assets/javascripts/rectangles/models/floor.js
index 51537f3..417494b 100644
--- a/public/assets/javascripts/rectangles/models/floor.js
+++ b/public/assets/javascripts/rectangles/models/floor.js
@@ -68,8 +68,43 @@
 				    }
 				    return
 				  }
+          
 
-          if (Scenery.nextWallpaper) {
+          var offset = offsetFromPoint(e, mx.el)
+          if (! offset) { return }
+
+          var x = mx.x + mx.width * (offset.left-0.5)
+          var z = mx.z + mx.height * (0.5-offset.top)
+  
+          if (Scenery.nextMedia) {
+            e.preventDefault()
+          
+            var sculpture = Sculpture.addNext({
+              position: { x: x, y: 0, z: z },
+            })
+          
+            // scenery was not placed
+            if (! sculpture) {	
+              e.stopPropagation()
+              return
+            }
+
+            app.controller.toolbar.resetPermissions()
+            Sculpture.resize.show(sculpture)
+            Sculpture.hovering = true 
+          
+            // app.controller.pick(sculpture)
+
+            UndoStack.push({
+              type: 'create-sculpture',
+              undo: { id: sculpture.id },
+              redo: sculpture.serialize(),
+            })
+          
+            // TODO: watch individual sculpture object here
+            Minotaur.watch( app.router.editorView.settings )
+          }
+          else if (Scenery.nextWallpaper) {
 					  var oldState = base.serialize()
 						base.wallpaper(Scenery.nextWallpaper)
 						// Scenery.nextWallpaper = null
@@ -98,7 +133,7 @@
 			this.mx.reverse()
 		}
 	}
-
+	
 	Floor.prototype.color = function(color){
 		this.$els.css("background-color", color)
 	}
diff --git a/public/assets/javascripts/rectangles/models/rect.js b/public/assets/javascripts/rectangles/models/rect.js
index c667cf5..4f73bec 100644
--- a/public/assets/javascripts/rectangles/models/rect.js
+++ b/public/assets/javascripts/rectangles/models/rect.js
@@ -1,4 +1,3 @@
-
 (function(){
 	var vec2
 	if ('window' in this) {
@@ -8,17 +7,17 @@
 		vec2 = require('./vec2')
 		FRONT = 0x1, BACK = 0x2, LEFT = 0x4, RIGHT = 0x8, FLOOR = 0x10, CEILING = 0x20
 		TOP = CEILING, BOTTOM = FLOOR
-		function sidesToString(sides){
-			var s = ""
-			if (sides & FRONT) s += "front "
-			if (sides & BACK)  s += "back "
-			if (sides & LEFT)  s += "left "
-			if (sides & RIGHT) s += "right "
-			if (sides & TOP)  s += "top "
-			if (sides & BOTTOM) s += "bottom "
-			return s
-		}
 	}
+  function sidesToString(sides){
+    var s = ""
+    if (sides & FRONT) s += "front "
+    if (sides & BACK)  s += "back "
+    if (sides & LEFT)  s += "left "
+    if (sides & RIGHT) s += "right "
+    if (sides & TOP)  s += "top "
+    if (sides & BOTTOM) s += "bottom "
+    return s
+  }
 
 	var Rect = function (x0,y0,x1,y1){
 		if (x0 instanceof vec2) {
@@ -39,6 +38,12 @@
 	Rect.prototype.clone = function(){
 		return new Rect( this.x.clone(), this.y.clone() )
 	}
+	Rect.prototype.x_component = function(){
+	  return new vec2( this.x.a, this.y.a )
+	}
+	Rect.prototype.y_component = function(){
+	  return new vec2( this.x.b, this.y.b )
+	}
 	Rect.prototype.assign = function(r) {
 	  this.x.assign(r.x)
 	  this.y.assign(r.y)
@@ -56,6 +61,12 @@
 	Rect.prototype.maxDimension = function(){
 		return abs(this.width) > abs(this.height) ? this.width : this.height
 	}
+	Rect.prototype.isVertical = function(){
+	  return this.x.isPoint()
+	}
+	Rect.prototype.isHorizontal = function(){
+	  return this.y.isPoint()
+	}
 
 	Rect.prototype.mul = function(n){
 		this.x.mul(n)
diff --git a/public/assets/javascripts/rectangles/models/room.js b/public/assets/javascripts/rectangles/models/room.js
index 26bf055..1abe2ba 100644
--- a/public/assets/javascripts/rectangles/models/room.js
+++ b/public/assets/javascripts/rectangles/models/room.js
@@ -31,10 +31,14 @@
 	var Room = function(opt){
 		this.id = opt.id || Rooms.uid("room_")
 		this.rect = opt.rect
-		this.regions = []
+		this.regions = opt.regions || []
 
 		this.height = opt.height || 200
 		this.focused = false
+
+		this.mx_walls = []
+		this.mx_floor = []
+		this.mx_ceiling = []
 	}
 	
 	Room.prototype.copy = function(){
@@ -125,6 +129,7 @@
 	Room.prototype.collidesDisc = function(src, dest, radius){
 	  var x = dest.x, y = dest.z
 		var collision = 0, wall_collision, contains_x, contains_y
+
 		this.regions.forEach(function(r){
 			if (! r.sides) return
 			
diff --git a/public/assets/javascripts/rectangles/models/vec2.js b/public/assets/javascripts/rectangles/models/vec2.js
index 14d0e6b..8942d92 100644
--- a/public/assets/javascripts/rectangles/models/vec2.js
+++ b/public/assets/javascripts/rectangles/models/vec2.js
@@ -43,6 +43,9 @@
 	vec2.prototype.eq = function(v){
 		return this.a == v.a && this.b == v.b
 	}
+	vec2.prototype.isPoint = function(){
+		return this.a == this.b
+	}
 	vec2.prototype.add = function(n){
 		this.a += n
 		this.b += n
@@ -80,6 +83,11 @@
 	  this.a = Math.round(this.a)
 	  this.b = Math.round(this.b)
 	}
+	vec2.prototype.distanceTo = function(v){
+		var va = (this.a - v.a)
+		var vb = (this.b - v.b)
+		return Math.sqrt( va*va + vb*vb )
+	}
 	vec2.prototype.setPosition = function(n){
 		var len = this.length()
 		this.a = n
@@ -103,6 +111,12 @@
 	vec2.prototype.containsDisc = function(n,r){
 		return this.a <= n-r && n+r <= this.b
 	}
+	vec2.prototype.containsVec = function(v){
+		return this.a <= v.a && v.b <= this.b
+	}
+	vec2.prototype.containsCenterVec = function(v){
+		return this.a < v.a && v.b < this.b
+	}
 	vec2.prototype.clamp = function(n){
 		return clamp(n, this.a, this.b)
 	}
@@ -200,13 +214,13 @@
 	}
 
 	vec2.prototype.toString = function(){
-		return "[" + round(this.a) + " " + round(this.b) + "]"
+		return "[" + Math.round(this.a) + " " + Math.round(this.b) + "]"
 	}
 	vec2.prototype.exactString = function(){
 		return "[" + this.a + " " + this.b + "]"
 	}
 	vec2.prototype.serialize = function(){
-		return [ round(this.a), round(this.b) ]
+		return [ Math.round(this.a), Math.round(this.b) ]
 	}
 	vec2.prototype.deserialize = function(data){
 		this.a = data[0]
diff --git a/public/assets/javascripts/rectangles/models/vec3.js b/public/assets/javascripts/rectangles/models/vec3.js
index c44dfe6..b3825a9 100644
--- a/public/assets/javascripts/rectangles/models/vec3.js
+++ b/public/assets/javascripts/rectangles/models/vec3.js
@@ -32,3 +32,28 @@ vec3.prototype.apply_projection = function (m) {
 
 	return this;
 }
+
+vec3.prototype.serialize = function(){
+  return [ round(this.a), round(this.b), round(this.c) ]
+}
+vec3.prototype.deserialize = function(data){
+  this.a = data[0]
+  this.b = data[1]
+  this.c = data[2] || data[0]
+  return this
+}
+vec3.prototype.clone = function(){
+  return new vec3(this.a, this.b, this.c)
+}
+vec3.prototype.assign = function(v){
+  this.a = v.a
+  this.b = v.b
+  this.c = v.c
+  return this
+}
+vec3.prototype.mul = function(n) {
+  this.a *= n
+  this.b *= n
+  this.c *= n
+  return this
+}
\ No newline at end of file
diff --git a/public/assets/javascripts/rectangles/models/wall.js b/public/assets/javascripts/rectangles/models/wall.js
index fc1ccbe..dadcd53 100644
--- a/public/assets/javascripts/rectangles/models/wall.js
+++ b/public/assets/javascripts/rectangles/models/wall.js
@@ -10,6 +10,11 @@
 		vec2 = require('./vec2')
 		Rect = require('./rect')
 		UidGenerator = require('../util/uid')
+		wall_rotation = {}
+    wall_rotation[FRONT] = PI
+    wall_rotation[BACK] = 0
+    wall_rotation[LEFT] = HALF_PI
+    wall_rotation[RIGHT] = -HALF_PI
 	}
 	
 	var Wall = function(opt){
@@ -18,6 +23,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 +95,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)
           }
@@ -192,7 +198,7 @@
 	}
 	
 	Wall.prototype.serialize = function(){
-	  return {
+	  return { 
 	    id: this.id,
 	    background: this.background,
 	  }
@@ -236,7 +242,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) {