environment working again

5 files changed, 44 insertions, 8 deletions

diff --git a/public/assets/javascripts/app.js b/public/assets/javascripts/app.js
index 310dc69..3c0fbe5 100644
--- a/public/assets/javascripts/app.js
+++ b/public/assets/javascripts/app.js
@@ -17,6 +17,8 @@ var viewHeight = window.viewHeight || 150
 
 var app = new function(){}
 
+app.mode = { editor: false, builder: false }
+
 app.init = function () {
 	app.tube = new Tube ()
 	app.router = new Router ()
diff --git a/public/assets/javascripts/rectangles/engine/map/ui.js b/public/assets/javascripts/rectangles/engine/map/ui.js
index 2e40cad..6e9a5ab 100644
--- a/public/assets/javascripts/rectangles/engine/map/ui.js
+++ b/public/assets/javascripts/rectangles/engine/map/ui.js
@@ -2,8 +2,6 @@
 map.ui = new function(){
 
 	var base = this
-	
-	if (! base.el) return
 
 	base.creating = base.dragging = base.resizing = false
 
diff --git a/public/assets/javascripts/ui/DocumentModal.js b/public/assets/javascripts/ui/DocumentModal.js
index f821d07..d9901bd 100644
--- a/public/assets/javascripts/ui/DocumentModal.js
+++ b/public/assets/javascripts/ui/DocumentModal.js
@@ -1,5 +1,4 @@
 
-
 var DocumentModal = ModalFormView.extend({
 	el: ".mediaDrawer.editDocument",
 	createAction: "/api/docs/new",
diff --git a/public/assets/javascripts/ui/Router.js b/public/assets/javascripts/ui/Router.js
index fea3698..a7aa566 100644
--- a/public/assets/javascripts/ui/Router.js
+++ b/public/assets/javascripts/ui/Router.js
@@ -19,7 +19,8 @@ var Router = View.extend({
 		"/profile/edit":     'editProfile',
 		"/about/:name/edit": 'editDocument',
 		"/about/new":        'newDocument',
-		"/app":              'launch',
+		"/editor":           'launchEditor',
+		"/builder":          'launchBuilder',
 	},
 
 	initialize: function(){
@@ -33,13 +34,11 @@ var Router = View.extend({
 		this.originalPath = window.location.pathname
 		
 		var path = window.location.pathname.split("/")
-		console.log(path)
+		// console.log(path)
 		for (var route in this.routes) {
 			var routePath = route.split("/")
 			if (routePath[1] == path[1]) {
 				if (routePath[2] && routePath[2].indexOf(":") !== -1 && path[2] && (path[3] === routePath[3]) ) {
-					console.log("GOT :")
-					console.log(routePath)
 					this[this.routes[route]](null, path[2])
 					break;
 				}
@@ -57,7 +56,13 @@ var Router = View.extend({
 		$("body").removeClass("loading")
 	},
 	
-	launch: function(){
+	launchBuilder: function(){
+		app.mode.builder = true
+		app.launch()
+	},
+
+	launchEditor: function(){
+		app.mode.editor = true
 		app.launch()
 	},
 	
diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index e3f4de5..7335dc8 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -519,6 +519,38 @@ h5{
   -ms-backface-visibility:     visible;
   backface-visibility:         visible;
 }
+#hud {
+	position: absolute;
+	top:0;left:0;
+	z-index: 10;
+}
+.face {
+	background-color: #fff;
+	transition: 0.1s background-color ease;
+}
+.front { background-color: #fff; }
+.back  { background-color: #fff; }
+.left  { background-color: #fff; }
+.right { background-color: #fff; }
+.floor { background-color: #eee; }
+.ceiling { background-color: rgba(230,230,255,0.3); }
+
+.active.floor { background-color: #ffe; }
+.active.ceiling { background-color: rgba(230,230,255,0.3); }
+
+.dragging .mx-object3d.image {
+	pointer-events: none;
+}
+
+.dot {
+	background:white;
+	border-radius:20px;
+	border: 1px solid black;
+}
+
+.image {
+	background-size: 100% 100%;
+}