merge

1 files changed, 49 insertions, 26 deletions

diff --git a/public/assets/javascripts/mx/primitives/mx.text.js b/public/assets/javascripts/mx/primitives/mx.text.js
index 9c7af5c..3095b67 100644
--- a/public/assets/javascripts/mx/primitives/mx.text.js
+++ b/public/assets/javascripts/mx/primitives/mx.text.js
@@ -3,34 +3,57 @@ MX.Text = MX.Object3D.extend({
   init: function (ops) {
 
 		this.type = "Text"
-		
-    var layer = new MX.Object3D('text')
-    layer.width = ops.width || 100
-    layer.height = ops.height || 50
-    layer.x = ops.x || 0
-    layer.y = ops.y || 0
-    layer.z = ops.z || 0
-    layer.scale = ops.scale || 1
-    layer.el.innerHTML = ops.value || ""
-    if (ops.id) layer.el.id = ops.id;
-    if (ops.background) layer.el.style.background = ops.background;
-    if (ops.color) layer.el.style.color = ops.color;
-    if (ops.fontSize) layer.el.style.fontSize = ops.fontSize + "px";
 
-    this.add(layer)
+  	this.type = "Image"
+		this.media = ops.media
+    this.width = 0
+    this.height = 0
+		this.x = ops.x || 0
+		this.y = ops.y || 0
+		this.z = ops.z || 0
+		this.scale = ops.scale || 1
+		this.backface = ops.backface || false
+
+    this.scale = ops.scale || 1
+    this.width = ops.media.width
+    this.height = ops.media.height
+    this.x = ops.x || 0
+    this.y = ops.y || 0
+    this.z = ops.z || 0
+    this.rotationX = ops.rotationX || 0
+    this.rotationY = ops.rotationY || 0
+    this.rotationZ = ops.rotationZ || 0
+		
+		ops.className && this.el.classList.add(ops.className)
+		this.backface && this.el.classList.add("backface-visible")
+		this.el.classList.add("mx-text")
+		this.el.classList.add("mx-scenery")
+		
+		this.inner = document.createElement("div")
+		this.inner.classList.add("inner")
+		this.el.appendChild(this.inner)
+		
+		this.load(ops)
+  },
+  
+  load: function(ops){
+    var media = ops.media
+    if (media.font) this.setFont(media.font)
 
-    this.children.forEach(function (c, i) {
-      if (ops.classname) {
-        c.el.classList.add(ops.classname)
-      }
-      else {
-      }
-      c.el.style.backgroundRepeat = 'no-repeat'
-    })
+    this.setText( media.description )
+  },
+  
+  setFont: function(font){
+    if (! font.color || font.color[0] == "#") { font.color = [0,0,0] }
 
-    this.dirty = true
-    this.updateChildren = true
-    this.update()
-  }
+    this.inner.style.fontFamily = "'" + font.family + "',sans-serif"
+    this.el.style.fontSize = (font.size / devicePixelRatio) + "pt"
+    this.el.style.textAlign = font.align
+    this.el.style.color = rgb_string(font.color)
+  },
+  
+  setText: function(text){
+    this.inner.innerHTML = marked( text || "" )
+  },
 
 })