summaryrefslogtreecommitdiff
path: root/public/assets/javascripts/rectangles/engine/scenery/_scenery.js
diff options
context:
space:
mode:
Diffstat (limited to 'public/assets/javascripts/rectangles/engine/scenery/_scenery.js')
-rw-r--r--public/assets/javascripts/rectangles/engine/scenery/_scenery.js20
1 files changed, 14 insertions, 6 deletions
diff --git a/public/assets/javascripts/rectangles/engine/scenery/_scenery.js b/public/assets/javascripts/rectangles/engine/scenery/_scenery.js
index fe5f037..137c74a 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/_scenery.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/_scenery.js
@@ -12,25 +12,29 @@ var Scenery = new function(){
base.resize.init()
}
- base.add = function(wall, media, id){
+ base.add = function(opt){
var scene_media
switch (media.type) {
case 'image':
- scene_media = new Scenery.types.image ({ media: media, wall: wall, id: id })
+ scene_media = new Scenery.types.image (opt)
break
case 'video':
case 'youtube':
case 'vimeo':
- scene_media = new Scenery.types.video ({ media: media, wall: wall, id: id })
+ scene_media = new Scenery.types.video (opt)
break
}
base.list[scene_media.id] = scene_media
return scene_media
}
- base.addNextToWall = function(wall){
- base.add(wall, base.nextMedia)
+ base.addNextToWall = function(wall, mx){
+ base.add({
+ wall: wall,
+ media: base.nextMedia,
+ mx: mx
+ })
base.nextMedia = null
}
@@ -64,7 +68,11 @@ 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, data.id)
+ var scene_media = base.add({
+ wall: wall,
+ media: data.media,
+ id: data.id
+ })
scene_media.deserialize(data)
})
}