7 files changed, 39 insertions, 20 deletions

diff --git a/public/assets/javascripts/rectangles/_env.js b/public/assets/javascripts/rectangles/_env.js
index 00c2c44..1b95989 100644
--- a/public/assets/javascripts/rectangles/_env.js
+++ b/public/assets/javascripts/rectangles/_env.js
@@ -16,25 +16,9 @@ environment.init = function(){
 		
 		scene.camera.radius = 20
 	}
-		
-// 	map.center.a = scene.camera.x
-// 	map.center.b = scene.camera.z
-
+	
 	map.center.a = 0
 	map.center.b = 0
-
-// 	Rooms.add( new Room ({
-// 		rect: new Rect(-500,-500, 500,500),
-// 		height: 500,
-// 	}))
-// 	Rooms.add( new Room ({
-// 		rect: new Rect(600,0, 1100,500),
-// 		height: 500,
-// 	}))
-// 	Rooms.add( new Room ({
-// 		rect: new Rect(450,150, 650,350),
-// 		height: 300,
-// 	}))
 	
 	app.movements.gravity(true)
 	
diff --git a/public/assets/javascripts/rectangles/engine/scenery/_scenery.js b/public/assets/javascripts/rectangles/engine/scenery/_scenery.js
index 9e9e2bf..96eea19 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/_scenery.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/_scenery.js
@@ -3,7 +3,8 @@ var Scenery = new function(){
 	
 	var base = this;
 
-	base.images = []
+	base.media = []
+	base.nextMedia = null
 	
 	base.mouse = new mouse ({ use_offset: false })
 	
@@ -40,6 +41,31 @@ var Scenery = new function(){
 			})
 		})
 	}
+
+	base.add = function(wall, media){
+		var scene_media
+		switch (media.type) {
+			case 'image':
+				scene_media = new Scenery.image (wall, media)
+				break
+			
+			case 'youtube':
+			case 'vimeo':
+				scene_media = new Scenery.video (wall, media)
+				break
+		}
+		base.media.push(scene_media)
+		scene_img.init()
+	}
+	base.addNextToWall = function(wall){
+		base.add(wall, base.nextMedia)
+		console.log("add next to wall")
+		base.nextMedia = null
+	}
 	
+	base.remove = function(id){
+		base.images.splcie(id)
+	}
+
 	return base
 }
diff --git a/public/assets/javascripts/rectangles/engine/scenery/image/_image.js b/public/assets/javascripts/rectangles/engine/scenery/types/_image.js
index dadb2d2..ba8ba03 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/image/_image.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/types/_image.js
@@ -1,4 +1,4 @@
-Scenery.image = function (wall, img) {
+Scenery.image = function (wall, media) {
 
 	var base = this
 	
diff --git a/public/assets/javascripts/rectangles/engine/scenery/image/move.js b/public/assets/javascripts/rectangles/engine/scenery/types/move.js
index e79ede9..188a3f4 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/image/move.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/types/move.js
@@ -8,6 +8,7 @@ Scenery.image.move = function(base){
 	this.bind = function(){
 		Scenery.mouse.bind_el(base.mx_img.el)
 		Scenery.mouse.on("down", down)
+		Scenery.mouse.on("move", move)
 		Scenery.mouse.on("enter", switch_wall)
 		Scenery.mouse.on("drag", drag)
 		Scenery.mouse.on("up", up)
@@ -16,6 +17,7 @@ Scenery.image.move = function(base){
 	this.unbind = function(){
 		Scenery.mouse.bind_el(base.mx_img.el)
 		Scenery.mouse.off("down", down)
+		Scenery.mouse.off("move", move)
 		Scenery.mouse.off("enter", switch_wall)
 		Scenery.mouse.off("drag", drag)
 		Scenery.mouse.off("up", up)
@@ -31,6 +33,10 @@ Scenery.image.move = function(base){
 		document.body.classList.add("dragging")
 	}
 	
+	function move (e, cursor){
+		console.log("hey")
+	}
+	
 	function drag (e, cursor){
 		if (! dragging) return
 		
diff --git a/public/assets/javascripts/rectangles/engine/scenery/image/resize.js b/public/assets/javascripts/rectangles/engine/scenery/types/resize.js
index a0a98c5..a0a98c5 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/image/resize.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/types/resize.js
diff --git a/public/assets/javascripts/rectangles/models/wall.js b/public/assets/javascripts/rectangles/models/wall.js
index 4270551..6c20444 100644
--- a/public/assets/javascripts/rectangles/models/wall.js
+++ b/public/assets/javascripts/rectangles/models/wall.js
@@ -42,6 +42,9 @@ window.Wall = (function(){
 			mousedown: function(){
 				base.randomize_colors()
 				console.log(sidesToString(base.side))
+				if (Scenery.nextMedia) {
+					Scenery.addNextToWall(base)
+				}
 			}
 		})
 	}
diff --git a/public/assets/javascripts/rectangles/util/mouse.js b/public/assets/javascripts/rectangles/util/mouse.js
index 3aa7cfc..2ec35e6 100644
--- a/public/assets/javascripts/rectangles/util/mouse.js
+++ b/public/assets/javascripts/rectangles/util/mouse.js
@@ -111,7 +111,7 @@ function mouse (opt) {
 	}
 	base.mousemove = function(e){
 		e.stopPropagation()
-		
+
 		if (opt.use_offset && ! offset) return
 		
 		var pos = positionFromMouse(e)