3 files changed, 22 insertions, 17 deletions
diff --git a/public/assets/javascripts/mx/primitives/mx.video.js b/public/assets/javascripts/mx/primitives/mx.video.js
index c9ec339..b2727c0 100644
--- a/public/assets/javascripts/mx/primitives/mx.video.js
+++ b/public/assets/javascripts/mx/primitives/mx.video.js
@@ -4,11 +4,14 @@ MX.Video = MX.Object3D.extend({
   	this.type = "Video"
 
     var layer = this
-    layer.width = 0
-    layer.height = 0
+    layer.width = ops.width
+    layer.height = ops.height
 		layer.x = ops.x || 0
 		layer.y = ops.y || 0
 		layer.z = ops.z || 0
+		layer.rotationX = ops.rotationX || 0
+		layer.rotationY = ops.rotationY || 0
+		layer.rotationZ = ops.rotationZ || 0
 		layer.scale = ops.scale || 1
 		layer.backface = ops.backface || false
 		layer.media = ops.media
@@ -30,15 +33,22 @@ MX.Video = MX.Object3D.extend({
 
   loadVideo: function(ops){
     var layer = this
-  	layer.ops = defaults(ops, layer.ops)
 
     var video = document.createElement('video')
 		video.addEventListener("loadedmetadata", function(){
-			//
-			video.play()
+			if (ops.autoplay) {
+				video.play()
+			}
+			else {
+				video.currentTime = video.duration / 3
+			}
 		})
+		video.width = layer.width
+		video.height = layer.height
     video.src = ops.src
     video.load()
+    
+    this.el.appendChild(video)
   },
   
   move: function(ops){
@@ -49,11 +59,6 @@ MX.Video = MX.Object3D.extend({
   	}
 		layer.dirty = true
 		layer.update()
-  },
-
-	toString: function(){
-		var params = "id src width height depth x y z rotationX rotationY rotationZ scale".split(" ")
-		return this.__toString(params)
-	},
+  }
 
 })
diff --git a/public/assets/javascripts/mx/primitives/mx.vimeo.js b/public/assets/javascripts/mx/primitives/mx.vimeo.js
index b65f35a..b8efa17 100644
--- a/public/assets/javascripts/mx/primitives/mx.vimeo.js
+++ b/public/assets/javascripts/mx/primitives/mx.vimeo.js
@@ -11,9 +11,9 @@ MX.Vimeo = MX.Object3D.extend({
 		layer.x = ops.x || 0
 		layer.y = ops.y || 0
 		layer.z = ops.z || 0
-		layer.rotationX = layer.ops.rotationX || 0
-		layer.rotationY = layer.ops.rotationY || 0
-		layer.rotationZ = layer.ops.rotationZ || 0
+		layer.rotationX = ops.rotationX || 0
+		layer.rotationY = ops.rotationY || 0
+		layer.rotationZ = ops.rotationZ || 0
 		layer.scale = ops.scale || 1
 		layer.backface = ops.backface || false
 		
diff --git a/public/assets/javascripts/mx/primitives/mx.youtube.js b/public/assets/javascripts/mx/primitives/mx.youtube.js
index 068ef9f..3756d80 100644
--- a/public/assets/javascripts/mx/primitives/mx.youtube.js
+++ b/public/assets/javascripts/mx/primitives/mx.youtube.js
@@ -11,9 +11,9 @@ MX.Youtube = MX.Object3D.extend({
 		layer.x = ops.x || 0
 		layer.y = ops.y || 0
 		layer.z = ops.z || 0
-		layer.rotationX = layer.ops.rotationX || 0
-		layer.rotationY = layer.ops.rotationY || 0
-		layer.rotationZ = layer.ops.rotationZ || 0
+		layer.rotationX = ops.rotationX || 0
+		layer.rotationY = ops.rotationY || 0
+		layer.rotationZ = ops.rotationZ || 0
 		layer.scale = ops.scale || 1
 		layer.backface = ops.backface || false