diff options
Diffstat (limited to 'public/assets/javascripts/rectangles/engine')
| -rw-r--r-- | public/assets/javascripts/rectangles/engine/scenery/_scenery.js | 2 | ||||
| -rw-r--r-- | public/assets/javascripts/rectangles/engine/scenery/types/_image.js | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/public/assets/javascripts/rectangles/engine/scenery/_scenery.js b/public/assets/javascripts/rectangles/engine/scenery/_scenery.js index 96eea19..908a2d0 100644 --- a/public/assets/javascripts/rectangles/engine/scenery/_scenery.js +++ b/public/assets/javascripts/rectangles/engine/scenery/_scenery.js @@ -55,7 +55,7 @@ var Scenery = new function(){ break } base.media.push(scene_media) - scene_img.init() + scene_media.init() } base.addNextToWall = function(wall){ base.add(wall, base.nextMedia) diff --git a/public/assets/javascripts/rectangles/engine/scenery/types/_image.js b/public/assets/javascripts/rectangles/engine/scenery/types/_image.js index ba8ba03..b6f7de1 100644 --- a/public/assets/javascripts/rectangles/engine/scenery/types/_image.js +++ b/public/assets/javascripts/rectangles/engine/scenery/types/_image.js @@ -3,10 +3,10 @@ Scenery.image = function (wall, media) { var base = this base.wall = wall - base.img = img - base.dimensions = new vec2(img.width, img.height) + base.media = media + base.dimensions = new vec2(media.width, media.height) base.center = wall.center() - base.bounds = wall.bounds_for(img) + base.bounds = wall.bounds_for(media) // should be proportional to distance from wall var cursor_amp = 1.5 @@ -18,11 +18,11 @@ Scenery.image = function (wall, media) { base.build = function(){ base.mx_img = new MX.Image({ - src: img.src, + src: media.url, x: base.center.a, - y: Rooms.list[wall.room].height/2 - img.height/2 - 20, + y: Rooms.list[wall.room].height/2 - media.height/2 - 20, z: base.center.b, - scale: 300/img.naturalWidth, + scale: 300/media.width, rotationY: wall_rotation[ wall.side ], backface: false, }) |