separate orbit test & add mousewheel zoom

2 files changed, 26 insertions, 5 deletions

diff --git a/public/assets/javascripts/rectangles/engine/map/draw.js b/public/assets/javascripts/rectangles/engine/map/draw.js
index b525696..564b351 100644
--- a/public/assets/javascripts/rectangles/engine/map/draw.js
+++ b/public/assets/javascripts/rectangles/engine/map/draw.js
@@ -228,7 +228,7 @@ Map.Draw = function(map, opt){
 		line(r.x.a, r.y.a, r.x.b, r.y.b, r.translation)
 	}
 
-	function dot_at (x,z){
+	draw.dot_at = function dot_at (x,z){
 		ctx.save()
 		ctx.translate(x,z)
 
@@ -240,4 +240,23 @@ Map.Draw = function(map, opt){
 
 		ctx.restore()
 	}
+
+	draw.x_at = function x_at (x, z, length){
+		ctx.save()
+		ctx.translate(x,z)
+
+		var len = (length/2 || 4) / map.zoom
+
+    ctx.lineCap = "square"
+    ctx.lineWidth = 2/map.zoom
+    ctx.beginPath()
+		ctx.moveTo( -len, -len);
+		ctx.lineTo(  len,  len);
+		ctx.moveTo( -len,  len);
+		ctx.lineTo(  len, -len);
+		ctx.stroke();
+
+		ctx.restore()
+	}
+
 }
\ No newline at end of file
diff --git a/public/assets/javascripts/rectangles/util/wheel.js b/public/assets/javascripts/rectangles/util/wheel.js
index 712d470..4155a70 100644
--- a/public/assets/javascripts/rectangles/util/wheel.js
+++ b/public/assets/javascripts/rectangles/util/wheel.js
@@ -3,8 +3,8 @@
 	
 		base.wheel = new wheel({
 			el: document.querySelector("#map"),
-			update: function(e, val, delta){
-				// do something with val
+			update: function(e, delta){
+				// do something with delta
 			},
 		})
 
@@ -13,7 +13,7 @@
 function wheel (opt) {
 	opt = defaults(opt, {
 		el: document,
-		fn: function(e, val, delta){},
+		update: function(e, delta){},
 		propagate: false,
 		locked: false,
 		reversible: true,
@@ -22,7 +22,7 @@ function wheel (opt) {
 	})
 
 	opt.el.addEventListener('wheel', onMouseWheel, false);
-// 	opt.el.addEventListener('mousewheel', onMouseWheel, false);
+  // opt.el.addEventListener('mousewheel', onMouseWheel, false);
 	opt.el.addEventListener('DOMMouseScroll', onMouseWheel, false);
 
 	function onMouseWheel (e) {
@@ -58,6 +58,8 @@ function wheel (opt) {
 		
 		// opt.val = clamp(opt.val + delta, opt.min, opt.max)
 		
+		// deltaX is also passed, but these values tend to be unusable
+		// try http://vvalls.com/assets/test/wheel.html with a trackpad
 		opt.update(e, deltaY, deltaX)
 	}