scenery uid

2 files changed, 5 insertions, 5 deletions

diff --git a/public/assets/javascripts/rectangles/engine/scenery/_scenery.js b/public/assets/javascripts/rectangles/engine/scenery/_scenery.js
index 143a4d9..74801e9 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/_scenery.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/_scenery.js
@@ -12,16 +12,16 @@ var Scenery = new function(){
 		base.resize.init()
 	}
 
-	base.add = function(wall, media){
+	base.add = function(wall, media, id){
 		var scene_media
 		switch (media.type) {
 			case 'image':
-				scene_media = new Scenery.types.image ({ media: media, wall: wall })
+				scene_media = new Scenery.types.image ({ media: media, wall: wall, id: id })
 				break
 			
 			case 'youtube':
 			case 'vimeo':
-				scene_media = new Scenery.types.video ({ media: media, wall: wall })
+				scene_media = new Scenery.types.video ({ media: media, wall: wall, id: id })
 				break
 		}
 
@@ -64,7 +64,7 @@ var Scenery = new function(){
 	base.deserialize = function(scenery_data){
 		scenery_data.forEach(function(data){
 			var wall = Rooms.walls[data.wall_id]
-			var scene_media = base.add(wall, data.media)
+			var scene_media = base.add(wall, data.media, data.id)
 			scene_media.deserialize(data)
 		})
 	}
diff --git a/public/assets/javascripts/rectangles/engine/scenery/types/_object.js b/public/assets/javascripts/rectangles/engine/scenery/types/_object.js
index 4367efc..05c760b 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/types/_object.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/types/_object.js
@@ -5,7 +5,7 @@ Scenery.types.base = Fiber.extend(function(base){
 		init: function(opt){
 			_.bindAll(this, 'enter', 'leave')
 
-			this.id = Scenery.uid("scenery")
+			this.id = opt.id || Scenery.uid("scenery")
 			this.move = new Scenery.move (this)
 			this.media = opt.media
 			this.dimensions = new vec2(this.media.width, this.media.height)