new scenery type: text

18 files changed, 230 insertions, 170 deletions

diff --git a/public/assets/img/text-cursor.png b/public/assets/img/text-cursor.png
new file mode 100644
index 0000000..66e9e0d
--- /dev/null
+++ b/public/assets/img/text-cursor.png
diff --git a/public/assets/javascripts/mx/primitives/mx.text.js b/public/assets/javascripts/mx/primitives/mx.text.js
index 9c7af5c..7b8e595 100644
--- a/public/assets/javascripts/mx/primitives/mx.text.js
+++ b/public/assets/javascripts/mx/primitives/mx.text.js
@@ -3,34 +3,49 @@ 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.children.forEach(function (c, i) {
-      if (ops.classname) {
-        c.el.classList.add(ops.classname)
-      }
-      else {
-      }
-      c.el.style.backgroundRepeat = 'no-repeat'
-    })
+    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("text")
+		this.el.classList.add("mx-scenery")
+		
+		this.inner = document.createElement("div")
+		this.inner.style.width = "100%"
+		this.el.appendChild(this.inner)
+		
+		this.load(ops)
+  },
+  
+  load: function(ops){
+    if (ops.color) this.el.style.color = ops.color;
+    if (ops.fontFamily) this.el.style.fontFamily = "'" + ops.fontFamily + "',sans-serif";
+    if (ops.fontSize) this.el.style.fontSize = ops.fontSize + "px";
 
-    this.dirty = true
-    this.updateChildren = true
-    this.update()
-  }
+    this.inner.innerHTML = ops.media.description || ""
+  },
+  
+  setText: function(text){
+    this.inner.innerHTML = text
+  },
 
 })
diff --git a/public/assets/javascripts/rectangles/engine/rooms/projector.js b/public/assets/javascripts/rectangles/engine/rooms/projector.js
deleted file mode 100644
index 2eac314..0000000
--- a/public/assets/javascripts/rectangles/engine/rooms/projector.js
+++ /dev/null
@@ -1,30 +0,0 @@
-
-rooms.projector = new function(){
-
-  projector = new THREE.Projector();
-  vector = new THREE.Vector3( mouse.x, mouse.y, 0.5 );
-  projector.unprojectVector( vector, camera );
-
-  raycaster = new THREE.Raycaster( camera.position, vector.sub( camera.position ).normalize() );
-  intersects = raycaster.intersectObjects( scene.children, true );
-
-}
-
-
-
-THREE.Projector = function () {
-
-	_viewProjectionMatrix = new THREE.Matrix4(),
-
-	this.unprojectVector = function ( vector, camera ) {
-		camera.projectionMatrixInverse.getInverse( camera.projectionMatrix );
-		
-		_viewProjectionMatrix.multiplyMatrices(
-			camera.matrixWorld,
-			camera.projectionMatrixInverse
-		);
-
-		return vector.applyProjection( _viewProjectionMatrix );
-	};
-
-}
diff --git a/public/assets/javascripts/rectangles/engine/scenery/_scenery.js b/public/assets/javascripts/rectangles/engine/scenery/_scenery.js
index 69e9ba7..3d3067f 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/_scenery.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/_scenery.js
@@ -24,6 +24,10 @@ var Scenery = new function(){
 			case 'vimeo':
 				scene_media = new Scenery.types.video (opt)
 				break
+			
+			case 'text':
+			  scene_media = new Scenery.types.text (opt)
+			  break
 		}
 		base.list[scene_media.id] = scene_media
 		return scene_media
diff --git a/public/assets/javascripts/rectangles/engine/scenery/resize.js b/public/assets/javascripts/rectangles/engine/scenery/resize.js
index 893237c..0ce976e 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/resize.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/resize.js
@@ -117,22 +117,13 @@ Scenery.resize = new function(){
 	base.bind = function(){
 		dots.forEach(function(dot){
 			Scenery.mouse.bind_el(dot.el)
-			$(dot.el).bind({
-				mouseenter: function(e){
-// 					Scenery.resize.hovering = true 
-				},
-				mouseleave: function(e){
-// 					Scenery.resize.hovering = false
-// 					base.defer_hide()
-				}
-			})
 		})
 		Scenery.mouse.on("down", down)
 		Scenery.mouse.on("drag", drag)
 		Scenery.mouse.on("up", up)
 	}
 
-	this.unbind = function(){
+	base.unbind = function(){
 		dots.forEach(function(dot){
 			Scenery.mouse.unbind_el(dot.el)
 		})
@@ -151,7 +142,6 @@ Scenery.resize = new function(){
 		naturalDimension = obj.naturalDimensions
 		dimension = obj.dimensions
 		position = new vec3(obj.mx.x, obj.mx.y, obj.mx.z)
-		scale = obj.mx.scale
 		oldState = obj.serialize()
 
 		document.body.classList.add("dragging")
@@ -165,7 +155,6 @@ Scenery.resize = new function(){
 		var width = cursor.x.magnitude()
 		var height = cursor.y.magnitude()
 		var mag = cursor.magnitude()
-		var old_width = dimension.a * scale
 
 		if (abs(width) > abs(height)) {
 			mag = x_sign * mag * sign(width)
@@ -175,9 +164,6 @@ Scenery.resize = new function(){
 		}
 
  		obj.set_scale( ( dimension.a + mag ) / naturalDimension.a )
- 		// dimension.a // scale * (old_width + mag) / old_width
-
-// console.log(scale, obj.mx.scale, dimension.a + mag, naturalDimension.a)
 
 		if (selected_dot.side & LEFT_RIGHT) {
 			obj.mx.x = position.a + cos(rotationY) * mag/2 * (x_sign)
diff --git a/public/assets/javascripts/rectangles/engine/scenery/types/image.js b/public/assets/javascripts/rectangles/engine/scenery/types/image.js
index aa43341..bed847b 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/types/image.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/types/image.js
@@ -3,6 +3,8 @@ Scenery.types.image = Scenery.types.base.extend(function(base){
 
 	var exports = {
 	
+	  type: 'image',
+	
 		init: function(opt){
 
 			opt.scale = opt.scale || (opt.data && opt.data.scale) || 300 / max(300, opt.media.width)
diff --git a/public/assets/javascripts/rectangles/engine/scenery/types/text.js b/public/assets/javascripts/rectangles/engine/scenery/types/text.js
new file mode 100644
index 0000000..16c7a5c
--- /dev/null
+++ b/public/assets/javascripts/rectangles/engine/scenery/types/text.js
@@ -0,0 +1,66 @@
+
+Scenery.types.text = Scenery.types.base.extend(function(base){
+
+	var exports = {
+
+	  type: 'text',
+	
+		init: function(opt){
+
+			opt.scale = 1
+
+			base.init.call(this, opt)
+
+			this.build()
+			this.bind()
+			
+			if (opt.data) {
+        if (opt.wall) {
+        	var position = opt.wall.mxToPosition(opt.data.position)
+        	opt.index = opt.wall.surface.index_for_x( position.a, 0 )
+        }
+      	this.set_wall(opt)
+        this.deserialize(opt.data)
+      }
+      else {
+      	this.set_wall(opt)
+      	if (this.bounds) {
+          this.recenter()
+          if (opt.position) {
+            this.translateTo(opt.position)
+          }
+          var mx_position = this.wall.positionToMx( this.position, this.dimensions )
+          this.mx.move(mx_position)
+        }
+      }
+		},
+
+		build: function(){
+			this.mx = new MX.Text({
+				scale: this.scale,
+				media: this.media,
+				y: this.scale * this.media.height/2,
+				backface: false,
+			})
+			scene.add( this.mx )
+		},
+		
+		setText: function(text){
+      this.media.description = text
+      this.mx.setText(text)
+		},
+
+		serialize: function(){
+			var data = base.serialize.call(this)
+			return data
+		},
+	  
+		deserialize: function(data){
+			this.mx.move(data.position)
+			this.mx.ops.width = data.dimensions.a
+			this.mx.ops.height = data.dimensions.b
+		},
+	}
+	
+	return exports
+})
diff --git a/public/assets/javascripts/rectangles/engine/scenery/types/video.js b/public/assets/javascripts/rectangles/engine/scenery/types/video.js
index 2ef6ec3..b723f56 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/types/video.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/types/video.js
@@ -2,6 +2,8 @@
 Scenery.types.video = Scenery.types.base.extend(function(base){
 
 	var exports = {
+	  
+	  type: 'video',
 	
 		init: function(opt){
 			opt.scale = opt.scale || (opt.data && opt.data.scale) || 300 / max(300, opt.media.width)
diff --git a/public/assets/javascripts/rectangles/models/mat4.js b/public/assets/javascripts/rectangles/models/mat4.js
deleted file mode 100644
index b061199..0000000
--- a/public/assets/javascripts/rectangles/models/mat4.js
+++ /dev/null
@@ -1,78 +0,0 @@
-function mat4(e){
-	this.elements = [ 1, 0, 0, 0,
-	                  0, 1, 0, 0,
-	                  0, 0, 1, 0,
-	                  0, 0, 0, 1 ]
-	return this
-}
-mat4.prototype.set = function (a) {
-	var els = this.elements
-	a.forEach(function(n,i){ els[i] = n })
-	return this
-}
-mat4.prototype.clone = function(){
-	return (new mat4).set(this.els)
-}
-mat4.prototype.identity = function () {
-	this.set([
-		1, 0, 0, 0,
-		0, 1, 0, 0,
-		0, 0, 1, 0,
-		0, 0, 0, 1
-	]);
-	return this;
-}
-mat4.prototype.getInverse = function (m, throwOnInvertible) {
-
-	// based on http://www.euclideanspace.com/maths/algebra/matrix/functions/inverse/fourD/index.htm
-	var te = this.elements;
-	var me = m.elements;
-
-	var n11 = me[0], n12 = me[4], n13 = me[8], n14 = me[12];
-	var n21 = me[1], n22 = me[5], n23 = me[9], n24 = me[13];
-	var n31 = me[2], n32 = me[6], n33 = me[10], n34 = me[14];
-	var n41 = me[3], n42 = me[7], n43 = me[11], n44 = me[15];
-
-	te[0] = n23*n34*n42 - n24*n33*n42 + n24*n32*n43 - n22*n34*n43 - n23*n32*n44 + n22*n33*n44;
-	te[4] = n14*n33*n42 - n13*n34*n42 - n14*n32*n43 + n12*n34*n43 + n13*n32*n44 - n12*n33*n44;
-	te[8] = n13*n24*n42 - n14*n23*n42 + n14*n22*n43 - n12*n24*n43 - n13*n22*n44 + n12*n23*n44;
-	te[12] = n14*n23*n32 - n13*n24*n32 - n14*n22*n33 + n12*n24*n33 + n13*n22*n34 - n12*n23*n34;
-	te[1] = n24*n33*n41 - n23*n34*n41 - n24*n31*n43 + n21*n34*n43 + n23*n31*n44 - n21*n33*n44;
-	te[5] = n13*n34*n41 - n14*n33*n41 + n14*n31*n43 - n11*n34*n43 - n13*n31*n44 + n11*n33*n44;
-	te[9] = n14*n23*n41 - n13*n24*n41 - n14*n21*n43 + n11*n24*n43 + n13*n21*n44 - n11*n23*n44;
-	te[13] = n13*n24*n31 - n14*n23*n31 + n14*n21*n33 - n11*n24*n33 - n13*n21*n34 + n11*n23*n34;
-	te[2] = n22*n34*n41 - n24*n32*n41 + n24*n31*n42 - n21*n34*n42 - n22*n31*n44 + n21*n32*n44;
-	te[6] = n14*n32*n41 - n12*n34*n41 - n14*n31*n42 + n11*n34*n42 + n12*n31*n44 - n11*n32*n44;
-	te[10] = n12*n24*n41 - n14*n22*n41 + n14*n21*n42 - n11*n24*n42 - n12*n21*n44 + n11*n22*n44;
-	te[14] = n14*n22*n31 - n12*n24*n31 - n14*n21*n32 + n11*n24*n32 + n12*n21*n34 - n11*n22*n34;
-	te[3] = n23*n32*n41 - n22*n33*n41 - n23*n31*n42 + n21*n33*n42 + n22*n31*n43 - n21*n32*n43;
-	te[7] = n12*n33*n41 - n13*n32*n41 + n13*n31*n42 - n11*n33*n42 - n12*n31*n43 + n11*n32*n43;
-	te[11] = n13*n22*n41 - n12*n23*n41 - n13*n21*n42 + n11*n23*n42 + n12*n21*n43 - n11*n22*n43;
-	te[15] = n12*n23*n31 - n13*n22*n31 + n13*n21*n32 - n11*n23*n32 - n12*n21*n33 + n11*n22*n33;
-
-	var det = n11 * te[ 0 ] + n21 * te[ 4 ] + n31 * te[ 8 ] + n41 * te[ 12 ];
-
-	if ( det == 0 ) {
-		var msg = "Matrix4.getInverse(): can't invert matrix, determinant is 0";
-
-		if ( throwOnInvertible || false ) {
-			throw new Error( msg )
-		}
-		else {
-			console.warn( msg )
-		}
-		this.identity();
-		return this
-	}
-	this.multiplyScalar( 1 / det );
-	return this
-}
-mat4.prototype.multiplyScalar = function (n) {
-	var els = this.elements
-	els[0] *= n; els[4] *= n; els[8]  *= n; els[12] *= n
-	els[1] *= n; els[5] *= n; els[9]  *= n; els[13] *= n
-	els[2] *= n; els[6] *= n; els[10] *= n; els[14] *= n
-	els[3] *= n; els[7] *= n; els[11] *= n; els[15] *= n
-	return this
-}
-
diff --git a/public/assets/javascripts/rectangles/models/wall.js b/public/assets/javascripts/rectangles/models/wall.js
index fdc8d8c..dc38183 100644
--- a/public/assets/javascripts/rectangles/models/wall.js
+++ b/public/assets/javascripts/rectangles/models/wall.js
@@ -68,9 +68,7 @@
 				},
 */
 				mousedown: function(e){
-					if (Scenery.nextText) {
-					}
-					else if (Scenery.nextMedia) {
+					if (Scenery.nextMedia) {
             var offset = offsetFromPoint(e, mx.el)
             if (! offset) { return }
 
@@ -91,13 +89,15 @@
             app.controller.toolbar.resetPermissions()
             Scenery.resize.show(scenery)
             Scenery.hovering = true 
+            
+            app.controller.pick(scenery)
 
   					UndoStack.push({
   					  type: 'create-scenery',
   					  undo: { id: scenery.id },
               redo: scenery.serialize(),
   					})
-
+  					
             // TODO: watch individual scenery object here
             Minotaur.watch( app.router.editorView.settings )
           }
diff --git a/public/assets/javascripts/ui/editor/EditorToolbar.js b/public/assets/javascripts/ui/editor/EditorToolbar.js
index 513306d..49decc2 100644
--- a/public/assets/javascripts/ui/editor/EditorToolbar.js
+++ b/public/assets/javascripts/ui/editor/EditorToolbar.js
@@ -3,6 +3,7 @@ var EditorToolbar = View.extend({
 	el: "#editorToolbar",
 
 	events: {
+	  "mousedown": 'stopPropagation',
 		"click [data-role='toggle-map-view']": 'toggleMap',
 		"click [data-role='toggle-project-settings']": 'toggleSettings',
 		"click [data-role='open-media-viewer']": 'openMediaViewer',
@@ -42,6 +43,7 @@ var EditorToolbar = View.extend({
 		// this.resizeMedia(true)
 		// this.destroyMedia(false)
  	  $(".inuse").removeClass("inuse")
+    $("body").removeClass("addText")
 		this.parent.hideExtras()
 		this.resetPermissions()
 	},
@@ -131,6 +133,7 @@ var EditorToolbar = View.extend({
 		$("[data-role='toggle-text-editor']").toggleClass("inuse", state)
 		this.parent.mediaEditor.hide()
 		this.parent.wallpaperPicker.hide()
+		this.parent.lightControl.hide()
 		this.parent.settings.hide()
 		this.parent.textEditor.toggle(state)
   },
diff --git a/public/assets/javascripts/ui/editor/EditorView.js b/public/assets/javascripts/ui/editor/EditorView.js
index 83db532..67687fe 100644
--- a/public/assets/javascripts/ui/editor/EditorView.js
+++ b/public/assets/javascripts/ui/editor/EditorView.js
@@ -42,11 +42,19 @@ var EditorView = View.extend({
 	},
 	
 	pick: function(scenery){
-		this.mediaEditor.pick(scenery)
+	  if (scenery.type == "text") {
+      this.mediaEditor.hide()
+      this.textEditor.pick(scenery)
+	  }
+	  else {
+      this.textEditor.hide()
+      this.mediaEditor.pick(scenery)
+	  }
 	},
 	
 	hideExtras: function(){
 		this.mediaEditor.hide()
+		this.textEditor.hide()
     Scenery.resize.hide()
 		Scenery.hovering = false
   }
diff --git a/public/assets/javascripts/ui/editor/MediaEditor.js b/public/assets/javascripts/ui/editor/MediaEditor.js
index e4f93df..0a4d894 100644
--- a/public/assets/javascripts/ui/editor/MediaEditor.js
+++ b/public/assets/javascripts/ui/editor/MediaEditor.js
@@ -76,7 +76,6 @@ var MediaEditor = FormView.extend({
 			case "image":
 				this.$(".image").show()
 				this.$(".video").hide()
-								
 				break
 
 			case "youtube":
@@ -90,7 +89,6 @@ var MediaEditor = FormView.extend({
 				this.$loop.prop('checked', !! media.loop)
 				this.$mute.prop('checked', !! media.mute)
 				this.$keyframe.val( Number(media.keyframe || 0) )
-
 				break
 		}
 	},
@@ -166,7 +164,6 @@ var MediaEditor = FormView.extend({
       this.scenery.media.title = this.$name.val()
       this.scenery.media.description = this.$description.val()
       Minotaur.watch( app.router.editorView.settings )
-
 	    if (this.scenery.mx) {
         this.scenery.mx.bound = false
         this.scenery.mx.el.classList.remove("picked")
@@ -177,8 +174,6 @@ var MediaEditor = FormView.extend({
 	},
 	
 	destroy: function(){
-// 		ConfirmModal.confirm("Are you sure you want delete this object?", function(){
-// 		}.bind(this))
     var scenery = this.scenery
     this.hide()
     Scenery.remove(scenery.id)
diff --git a/public/assets/javascripts/ui/editor/TextEditor.js b/public/assets/javascripts/ui/editor/TextEditor.js
index 0319a31..0d082ca 100644
--- a/public/assets/javascripts/ui/editor/TextEditor.js
+++ b/public/assets/javascripts/ui/editor/TextEditor.js
@@ -1,6 +1,8 @@
 
 var TextEditor = FormView.extend({
 	el: "#textEditor",
+	tainted: false,
+	scenery: null,
 		
 	events: {
 		"keydown": 'taint',
@@ -9,20 +11,87 @@ var TextEditor = FormView.extend({
 		"change [name=font-family]": 'changeFontFamily',
 		"change [name=font-size]": 'changeFontSize',
 		"input [name=text-body]": 'changeText',
-		"click [data-role=destroy-media]": "destroy",
+		"click [data-role=destroy-text]": "destroy",
 	},
 	
 	initialize: function(opt){
 		this.parent = opt.parent
 		this.__super__.initialize.call(this)
     
+    this.$settings = this.$(".setting")
+    this.$noTextMessage = this.$(".no-text")
     this.$fontFamily = this.$("[name=font-family]")
     this.$fontSize = this.$("[name=font-size]")
     this.$textBody = this.$("[name=text-body]")
 	},
 
   toggle: function(state){
-    this.$el.toggleClass("active", state);
+    $("#keyhint").fadeOut(200)
+    
+    this.$el.toggleClass("active", state)
+    if (state) {
+      Scenery.nextMedia = { type: 'text', width: 300, height: 150 }
+      this.createMode(true)
+    }
+  },
+
+	hide: function(scenery){
+		if (this.scenery) {
+			this.unbind()
+		}
+		this.toggle(false)
+	},
+
+	taint: function(e){
+	  e.stopPropagation()
+		this.tainted = true
+	},
+
+	bind: function(scenery){
+    this.tainted = false
+		this.scenery = scenery
+		this.scenery.mx.bound = true
+		this.scenery.mx.el.classList.add("picked")
+	},
+	
+	unbind: function(){
+	  if (this.scenery && this.tainted) {
+      Minotaur.watch( app.router.editorView.settings )
+
+	    if (this.scenery.mx) {
+        this.scenery.mx.bound = false
+        this.scenery.mx.el.classList.remove("picked")
+      }
+    }
+    this.tainted = false
+    this.scenery = null
+	},
+  
+  createMode: function(state){
+    this.$settings.toggle(! state)
+    this.$noTextMessage.toggle(!! state)
+    $("body").toggleClass("addText", !! state)
+  },
+  
+  pick: function(scenery){
+		if (this.scenery) {
+			this.unbind()
+		}
+
+		Scenery.resize.show(scenery)
+		Scenery.hovering = true
+		
+		this.bind(scenery)
+		this.$el.toggleClass("active", true)
+		this.$textBody.val( this.scenery.media.description )
+
+    this.createMode(false)
+
+    if (! this.scenery.media.description) {
+      setTimeout(function(){
+        this.$textBody.focus()
+      }.bind(this), 100)
+    }
   },
   
   taint: function(e){
@@ -35,7 +104,17 @@ var TextEditor = FormView.extend({
   changeFontSize: function(){
   },
   
-  changeText: function(){
+  changeText: function(e){
+    e.stopPropagation()
+    var text = this.$textBody.val()
+    this.scenery.setText(text)
   },
+  
+	destroy: function(){
+    var scenery = this.scenery
+    this.hide()
+    Scenery.remove(scenery.id)
+    Scenery.resize.hide()
+	},
 
 })
diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index e626d39..e746cad 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -667,9 +667,12 @@ iframe.embed {
   -webkit-box-sizing: content-box;
   box-sizing: content-box;
 }
-.destroyActive .mx-scene, .destroyActive .mx-object3d.image, .menu span.inuse[data-role="destroy-media"] {
+.destroyActive .mx-scene, .destroyActive .mx-object3d.image {
 	cursor:url(/assets/img/delete-cursor.png), auto;
 }
+.addText .mx-scene, .menu span.inuse[data-role="toggle-text-editor"] {
+	cursor:url(/assets/img/text-cursor.png), auto;
+}
 
 .mx-scenery:active {
   cursor: pointer;
diff --git a/views/controls/editor/text-editor.ejs b/views/controls/editor/text-editor.ejs
index 205fbdf..a14c469 100644
--- a/views/controls/editor/text-editor.ejs
+++ b/views/controls/editor/text-editor.ejs
@@ -1,6 +1,10 @@
 <div class="vvbox settings" id="textEditor">
 	<h4>Edit Text</h4>
   
+  <div class="no-text">
+    Click a wall to add text.
+  </div>
+  
 	<div class="setting">
     <select name="font-family">
       <option>Helvetica</option>
diff --git a/views/controls/editor/toolbar.ejs b/views/controls/editor/toolbar.ejs
index 586194b..f9d91af 100644
--- a/views/controls/editor/toolbar.ejs
+++ b/views/controls/editor/toolbar.ejs
@@ -30,7 +30,7 @@
 [[ if (user.username == "test12343") { ]]
 	<span
 		data-role='toggle-text-editor'
-		data-info="edit wall text"
+		data-info="add text to wall"
 		class="icon-ios7-compose-outline"></span>
 [[ } ]]
 		
diff --git a/views/partials/scripts.ejs b/views/partials/scripts.ejs
index 4af9938..35dd782 100644
--- a/views/partials/scripts.ejs
+++ b/views/partials/scripts.ejs
@@ -17,6 +17,7 @@
 <script type="text/javascript" src="/assets/javascripts/mx/extensions/mx.movements.js"></script>
 <script type="text/javascript" src="/assets/javascripts/mx/extensions/mx.movementsMobile.js"></script>
 <script type="text/javascript" src="/assets/javascripts/mx/primitives/mx.image.js"></script>
+<script type="text/javascript" src="/assets/javascripts/mx/primitives/mx.text.js"></script>
 <script type="text/javascript" src="/assets/javascripts/mx/primitives/mx.video.js"></script>
 <script type="text/javascript" src="/assets/javascripts/mx/primitives/mx.youtube.js"></script>
 <script type="text/javascript" src="/assets/javascripts/mx/primitives/mx.vimeo.js"></script>
@@ -27,19 +28,18 @@
 <script type="text/javascript" src="/assets/javascripts/rectangles/util/colors.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/util/coords.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/util/debug.js"></script>
-<script type="text/javascript" src="/assets/javascripts/rectangles/util/permissions.js"></script>
+<script type="text/javascript" src="/assets/javascripts/rectangles/util/keys.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/util/measurement.js"></script>
+<script type="text/javascript" src="/assets/javascripts/rectangles/util/minotaur.js"></script>
+<script type="text/javascript" src="/assets/javascripts/rectangles/util/mouse.js"></script>
+<script type="text/javascript" src="/assets/javascripts/rectangles/util/permissions.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/util/sort.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/util/uid.js"></script>
-<script type="text/javascript" src="/assets/javascripts/rectangles/util/wheel.js"></script>
-<script type="text/javascript" src="/assets/javascripts/rectangles/util/mouse.js"></script>
-<script type="text/javascript" src="/assets/javascripts/rectangles/util/keys.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/util/undostack.js"></script>
-<script type="text/javascript" src="/assets/javascripts/rectangles/util/minotaur.js"></script>
+<script type="text/javascript" src="/assets/javascripts/rectangles/util/wheel.js"></script>
 
 <script type="text/javascript" src="/assets/javascripts/rectangles/models/vec2.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/models/vec3.js"></script>
-<script type="text/javascript" src="/assets/javascripts/rectangles/models/mat4.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/models/rect.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/models/surface.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/models/tree.js"></script>
@@ -60,6 +60,7 @@
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/scenery/undo.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/scenery/types/_object.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/scenery/types/image.js"></script>
+<script type="text/javascript" src="/assets/javascripts/rectangles/engine/scenery/types/text.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/scenery/types/video.js"></script>
 
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/map/_map.js"></script>