summaryrefslogtreecommitdiff
path: root/public/assets/javascripts/rectangles/engine
diff options
context:
space:
mode:
Diffstat (limited to 'public/assets/javascripts/rectangles/engine')
-rw-r--r--public/assets/javascripts/rectangles/engine/scenery/_scenery.js1
-rw-r--r--public/assets/javascripts/rectangles/engine/scenery/types/_object.js2
-rw-r--r--public/assets/javascripts/rectangles/engine/scenery/types/video.js4
3 files changed, 5 insertions, 2 deletions
diff --git a/public/assets/javascripts/rectangles/engine/scenery/_scenery.js b/public/assets/javascripts/rectangles/engine/scenery/_scenery.js
index 1493fc6..abd14ba 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/_scenery.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/_scenery.js
@@ -25,7 +25,6 @@ var Scenery = new function(){
scene_media = new Scenery.types.video ({ media: media, wall: wall, id: id })
break
}
-
base.list[scene_media.id] = scene_media
return scene_media
}
diff --git a/public/assets/javascripts/rectangles/engine/scenery/types/_object.js b/public/assets/javascripts/rectangles/engine/scenery/types/_object.js
index 65f3a94..7202ce0 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/types/_object.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/types/_object.js
@@ -10,7 +10,7 @@ Scenery.types.base = Fiber.extend(function(base){
this.media = opt.media
this.dimensions = new vec2(this.media.width, this.media.height)
this.scale = this.media.scale
-
+
if (opt.wall) {
this.set_wall(opt.wall)
}
diff --git a/public/assets/javascripts/rectangles/engine/scenery/types/video.js b/public/assets/javascripts/rectangles/engine/scenery/types/video.js
index d3e2e76..79cfb1c 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/types/video.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/types/video.js
@@ -73,6 +73,10 @@ Scenery.types.video = Scenery.types.base.extend(function(base){
this.mx.seek(n)
},
+ setLoop: function(shouldLoop){
+ this.mx.setLoop(shouldLoop)
+ },
+
mute: function(muted){
if (muted) {
this.mx.mute()