From f5ab61241bf9519325a36b86ee74ab2df13a4331 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Tue, 7 Oct 2014 14:43:45 -0400
Subject: colorpicker presets

---
 .../assets/javascripts/ui/editor/LightControl.js   | 33 ++++++++++++++++++++++
 1 file changed, 33 insertions(+)

(limited to 'public/assets/javascripts/ui/editor/LightControl.js')

diff --git a/public/assets/javascripts/ui/editor/LightControl.js b/public/assets/javascripts/ui/editor/LightControl.js
index 3eb2861..2b7cfaa 100644
--- a/public/assets/javascripts/ui/editor/LightControl.js
+++ b/public/assets/javascripts/ui/editor/LightControl.js
@@ -10,6 +10,7 @@ var LightControl = View.extend({
     "input #brightness-control": "updateBrightness",
     "input #outline-hue": "updateShadow",
     "input #wall-hue": "updateShadow",
+    "click .presets span": "selectPreset",
   },
   
   initialize: function(){
@@ -114,6 +115,38 @@ var LightControl = View.extend({
     this.setMode(mode)
   },
   
+  presets: {
+    wireframe: {
+      wall: [255,255,255],
+      outline: [0,0,0],
+      floor: [246,246,246],
+      ceiling: [255,255,255],
+    },
+    shaded: {
+      wall: [205,205,204],
+      outline: [0,0,0],
+      floor: [109,116,106],
+      ceiling: [159,163,157],
+    },
+    pfunk: {
+      wall: [255,63,78],
+      outline: [255,246,0],
+      floor: [255,255,0],
+      ceiling: [225,118,252],
+    },
+    seapunk: {
+      wall: [110,255,255],
+      outline: [146,133,255],
+      floor: [89,221,255],
+      ceiling: [139,255,173],
+    },
+  },
+  selectPreset: function(e){
+    var preset = $(e.currentTarget).data('preset')
+    if (! this.presets[preset]) return
+    this.load(this.presets[preset])
+  },
+  
   beginBrightness: function(){
     this.begin()
     $(window).one("mouseup", this.finalize.bind(this))
-- 
cgit v1.2.3-70-g09d2


From 4dede1ce3a31cfb17cbad80749863725a9957d19 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Tue, 7 Oct 2014 18:38:43 -0400
Subject: inverse colors

---
 public/assets/javascripts/ui/editor/LightControl.js | 11 ++++++-----
 public/assets/stylesheets/app.css                   |  6 +++++-
 views/controls/editor/light-control.ejs             |  6 +++---
 3 files changed, 14 insertions(+), 9 deletions(-)

(limited to 'public/assets/javascripts/ui/editor/LightControl.js')

diff --git a/public/assets/javascripts/ui/editor/LightControl.js b/public/assets/javascripts/ui/editor/LightControl.js
index 2b7cfaa..51e6be7 100644
--- a/public/assets/javascripts/ui/editor/LightControl.js
+++ b/public/assets/javascripts/ui/editor/LightControl.js
@@ -134,17 +134,18 @@ var LightControl = View.extend({
       floor: [255,255,0],
       ceiling: [225,118,252],
     },
-    seapunk: {
-      wall: [110,255,255],
-      outline: [146,133,255],
-      floor: [89,221,255],
-      ceiling: [139,255,173],
+    inverse: {
+      wall: [0,0,0],
+      outline: [0,230,255],
+      floor: [0,0,0],
+      ceiling: [0,0,0],
     },
   },
   selectPreset: function(e){
     var preset = $(e.currentTarget).data('preset')
     if (! this.presets[preset]) return
     this.load(this.presets[preset])
+    $(e.currentTarget).addClass('active')
   },
   
   beginBrightness: function(){
diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index b4d176f..f770637 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -1529,6 +1529,10 @@ input[type="range"]::-webkit-slider-thumb {
 	width: 50%;
 	float:left;
 	cursor:pointer;
+  border-bottom: 1px transparent solid;
+}
+.presets span.active {
+  border-bottom: 1px dotted;
 }
 .color-swatches span {
 	display: inline-block;
@@ -1589,7 +1593,7 @@ input[type="range"]::-webkit-slider-thumb {
   font-size: 12px;
   -webkit-transform: translateY(500px);
   -webkit-transition: -webkit-transform 0.2s ease-in-out;
-  transform: translateY(450px);
+  transform: translateY(500px);
   transition: -webkit-transform 0.2s ease-in-out;
 	width: 210px;
 }
diff --git a/views/controls/editor/light-control.ejs b/views/controls/editor/light-control.ejs
index 1fc4484..8f42d8d 100644
--- a/views/controls/editor/light-control.ejs
+++ b/views/controls/editor/light-control.ejs
@@ -30,11 +30,11 @@
     <span data-preset="shaded">
       Shaded
     </span>
+    <span data-preset="inverse">
+      Inverse
+    </span>
     <span data-preset="pfunk">
       P.Funk
     </span>
-    <span data-preset="seapunk">
-      SeaPunk
-    </span>
   </div>
 </div>
-- 
cgit v1.2.3-70-g09d2