better wall colors

9 files changed, 22 insertions, 13 deletions

diff --git a/public/assets/javascripts/rectangles/engine/scenery/_scenery.js b/public/assets/javascripts/rectangles/engine/scenery/_scenery.js
index 0a3187c..3fe6b66 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/_scenery.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/_scenery.js
@@ -45,7 +45,6 @@ var Scenery = new function(){
 		var scenery = base.media.map(function(media){
 			return media.serialize()
 		})
-		console.log(scenery)
 		return scenery
 	}
 
diff --git a/public/assets/javascripts/rectangles/models/wall.js b/public/assets/javascripts/rectangles/models/wall.js
index d0a2045..b2a5b12 100644
--- a/public/assets/javascripts/rectangles/models/wall.js
+++ b/public/assets/javascripts/rectangles/models/wall.js
@@ -40,8 +40,8 @@ window.Wall = (function(){
 			mousemove: function(e){
 			},
 			mousedown: function(){
-				base.randomize_colors()
-				console.log(sidesToString(base.side))
+				// base.randomize_colors()
+				// console.log(sidesToString(base.side))
 				if (Scenery.nextMedia) {
 					Scenery.addNextToWall(base)
 				}
@@ -58,6 +58,7 @@ window.Wall = (function(){
 		return new Rect( new vec2( coord.a + halfWidth, coord.b - halfWidth ),
 		                 new vec2( halfHeight, Rooms.list[this.room].height - halfHeight ) )
 	}
+	
 	Wall.prototype.fits = function(img, scale){
 		if (this.side & FRONT_BACK && this.rect.x.length() < img.width * scale) {
 			return false
@@ -118,7 +119,7 @@ window.Wall = (function(){
 	}
 
 	Wall.prototype.randomize_colors = function(){
-		var color = choice(window.colors)
+		var color = window.grayColors[ this.side | this.half_side ]
 		this.siblings().forEach(function(w){ w.color(color) })
 	}
 
diff --git a/public/assets/javascripts/rectangles/util/colors.js b/public/assets/javascripts/rectangles/util/colors.js
index 58553b1..c590072 100644
--- a/public/assets/javascripts/rectangles/util/colors.js
+++ b/public/assets/javascripts/rectangles/util/colors.js
@@ -16,10 +16,10 @@
 			"rgba(0,0,0,0.4)",
 		],
 		bone: [
-			"hsla(0,0%,90%,0.95)",
-			"hsla(0,0%,80%,0.95)",
+			"hsla(0,0%,91%,0.95)",
+			"hsla(0,0%,88%,0.95)",
 			"hsla(0,0%,85%,0.95)",
-			"hsla(0,0%,75%,0.95)",
+			"hsla(0,0%,82%,0.95)",
 		],
 		colors: [
 			"rgba(255,0,0,0.5)",
@@ -53,5 +53,9 @@
 	})
 
 	window.colors = color_palettes[select ? select.value : 'bone']
+	window.grayColors = {}
+	_.zip([FRONT, LEFT, BACK, RIGHT], color_palettes.bone).map(function(pair){
+		window.grayColors[pair[0]] = pair[1]
+	})
 	window.palettes = color_palettes
 })()
diff --git a/public/assets/javascripts/ui/SiteRouter.js b/public/assets/javascripts/ui/SiteRouter.js
index f0c5530..dae2131 100644
--- a/public/assets/javascripts/ui/SiteRouter.js
+++ b/public/assets/javascripts/ui/SiteRouter.js
@@ -12,6 +12,7 @@ var SiteRouter = Router.extend({
 		"click [data-role='edit-document-modal']": 'editDocument',
 		"click [data-role='delete-document-modal']": 'destroyDocument',
 		"click [data-role='show-layouts-modal']": 'layoutPicker',
+		"click [data-role='show-projects-modal']": 'projectPicker',
 	},
 	
 	routes: {
@@ -61,7 +62,6 @@ var SiteRouter = Router.extend({
 		this.layoutsModal.load()
 	},
 
-
 	projectPicker: function(e){
 		e && e.preventDefault()
 		window.history.pushState(null, document.title, "/project")
diff --git a/public/assets/javascripts/ui/editor/EditorToolbar.js b/public/assets/javascripts/ui/editor/EditorToolbar.js
index 76218fe..f966ab6 100644
--- a/public/assets/javascripts/ui/editor/EditorToolbar.js
+++ b/public/assets/javascripts/ui/editor/EditorToolbar.js
@@ -7,9 +7,9 @@ var EditorToolbar = View.extend({
 		"click [data-role='toggle-project-settings']": 'toggleSettings',
 		"click [data-role='open-media-viewer']": 'openMediaViewer',
 		"click [data-role='resize-media']": 'resize',
+		"click [data-role='delete-media']": 'deleteMedia',
 		"click [data-role='toggle-wallpaper-panel']": 'toggleWallpaper',
 		"click [data-role='toggle-light-control']": 'toggleLightControl',
-		"click [data-role='delete-media']": 'deleteMedia',
 		"click [data-role='edit-wall-text']": 'editWallText',
 	},
 	
diff --git a/public/assets/javascripts/ui/site/LayoutsModal.js b/public/assets/javascripts/ui/site/LayoutsModal.js
index 47fa193..46ed634 100644
--- a/public/assets/javascripts/ui/site/LayoutsModal.js
+++ b/public/assets/javascripts/ui/site/LayoutsModal.js
@@ -52,6 +52,11 @@ var ProjectsModal = ModalView.extend(LayoutsIndex.prototype).extend({
 		
 		// actually do
 		window.location.pathname = "/project/" + $layout.data("slug")
+	},
+	
+	newProject: function(e){
+		e && e.preventDefault()
+		window.location.pathname = "/project/new"
 	}
 
 })
diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index 93d68ca..cb56a68 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -748,10 +748,10 @@ h5 {
   background-image:url(https://s3.amazonaws.com/luckyplop/735c46b0268cd511a22c37bc0c11e9f60c4459b2.png)!important;
   cursor:move;
 }
-.deleteActive .image {
+.deleteActive .mx-object3d.image {
   cursor:pointer;
 }
-.deleteActive .image:after {
+.deleteActive .mx-object3d.image:after {
   content: "\e68f";
   font-family: 'ionicons';
   speak: none;
diff --git a/views/partials/header.ejs b/views/partials/header.ejs
index 55505ed..e83f42a 100644
--- a/views/partials/header.ejs
+++ b/views/partials/header.ejs
@@ -7,7 +7,7 @@
 		<a href="/layout" data-role="show-layouts-modal" class="topLink">Layouts</a>
 	[[ } ]]
 
-	<a href="/project" class="topLink">Projects</a>
+	<a href="/project" data-role="show-projects-modal" class="topLink">Projects</a>
 
 	[[ if (profile && String(user._id) == String(profile._id)) { ]]
 	<a href="/profile" data-role="edit-profile-modal" class="topLink editProfile">Edit Profile <span class="icon-ios7-gear-outline"></span></a>
diff --git a/views/partials/scripts.ejs b/views/partials/scripts.ejs
index 2d34480..df80d95 100644
--- a/views/partials/scripts.ejs
+++ b/views/partials/scripts.ejs
@@ -10,8 +10,8 @@
 <script type="text/javascript" src="/assets/javascripts/util.js"></script>
 
 <script type="text/javascript" src="/assets/javascripts/rectangles/_env.js"></script>
-<script type="text/javascript" src="/assets/javascripts/rectangles/util/colors.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/util/constants.js"></script>
+<script type="text/javascript" src="/assets/javascripts/rectangles/util/colors.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/util/debug.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/util/sort.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/util/wheel.js"></script>