From 76f8fa3c7ad8d625ed04305c24e7ccad408b7819 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Wed, 16 Apr 2014 12:16:10 -0400
Subject: gray color scheme

---
 assets/javascripts/rectangles/builder.js |  7 ++++++-
 assets/javascripts/rectangles/wheel.js   | 17 +++++++++++------
 2 files changed, 17 insertions(+), 7 deletions(-)

(limited to 'assets/javascripts/rectangles')

diff --git a/assets/javascripts/rectangles/builder.js b/assets/javascripts/rectangles/builder.js
index ef0a28c..b25bd59 100644
--- a/assets/javascripts/rectangles/builder.js
+++ b/assets/javascripts/rectangles/builder.js
@@ -5,6 +5,12 @@ var builder = new function(){
 	var els = []
 	
 	base.tube.on("clipper:update", rebuild)
+	base.wheel = new wheel({
+		el: document.querySelector("#map"),
+		update: function(e, val, delta){
+			console.log(e.clientX, e.clientY, delta)
+		}
+	})
 	
 	function rebuild(){
 		clear()
@@ -20,7 +26,6 @@ var builder = new function(){
 		})
 	}
 	function clear (){
-		console.log(els.length)
 		els.forEach(function(el){
 			scene.remove(el)
 		})
diff --git a/assets/javascripts/rectangles/wheel.js b/assets/javascripts/rectangles/wheel.js
index 9773a8c..f7a9bc3 100644
--- a/assets/javascripts/rectangles/wheel.js
+++ b/assets/javascripts/rectangles/wheel.js
@@ -3,7 +3,7 @@
 	
 		base.wheel = new wheel({
 			el: document.querySelector("#map"),
-			update: function(val, delta){
+			update: function(e, val, delta){
 				// do something with val
 			},
 		})
@@ -12,18 +12,20 @@
 
 function wheel (opt) {
 	opt = defaults(opt, {
+		el: document,
+		fn: function(e, val, delta){},
 		propagate: false,
 		locked: false,
+		reversible: true,
 		ratio: 0.02,
 		val: 0,
 		min: -Infinity,
 		max: Infinity,
-		el: document,
-		fn: function(){}
 	})
 
-	el.addEventListener('mousewheel', onMouseWheel, false);
-  el.addEventListener('DOMMouseScroll', onMouseWheel, false);
+	opt.el.addEventListener('mousewheel', onMouseWheel, false);
+  opt.el.addEventListener('DOMMouseScroll', onMouseWheel, false);
+
 	function onMouseWheel (e) {
 		if (opt.locked) {
 			return
@@ -51,9 +53,12 @@ function wheel (opt) {
 		
 		opt.val = clamp(opt.val + delta, opt.min, opt.max)
 		
-		opt.update(opt.val, delta)
+		opt.update(e, opt.val, delta)
 	}
 
+	opt.lock = function(){ opt.locked = true }
+	opt.unlock = function(){ opt.locked = false }
+
 	return opt
 }
 
-- 
cgit v1.2.3-70-g09d2