making the point/vec2 naming more normal

1 files changed, 14 insertions, 15 deletions

diff --git a/assets/javascripts/util/mouse.js b/assets/javascripts/util/mouse.js
index d113d10..6d07f07 100644
--- a/assets/javascripts/util/mouse.js
+++ b/assets/javascripts/util/mouse.js
@@ -5,17 +5,17 @@
       el: document.querySelector("#map"),
       down: function(e, cursor){
         // do something with val
-        // cursor.x.a
-        // cursor.y.a
+        // cursor.a.x
+        // cursor.a.y
       },
       move: function(e, cursor){
         // var delta = cursor.delta()
-        // delta.a (x)
-        // delta.b (y)
+        // delta.x
+        // delta.y
       },
       up: function(e, cursor, new_cursor){
-        // cursor.x.a
-        // cursor.y.a
+        // cursor.a.x
+        // cursor.a.y
       },
     })
 
@@ -43,7 +43,7 @@ function mouse (opt) {
   base.creating = false
   base.dragging = false
 
-  base.cursor = new vec2(0,0,0,0)
+  base.cursor = new vec2 (0,0,0,0)
 
   base.tube = new Tube ()
   opt.down && base.tube.on("down", opt.down)
@@ -102,8 +102,7 @@ function mouse (opt) {
     
     var pos = positionFromMouse(e)
     
-    var x = pos.a, y = pos.b
-    base.cursor = new vec2 (x,y, x,y)
+    base.cursor = new vec2 (pos.x, pos.y)
     base.down = true
     e.clickAccepted = true
     
@@ -125,17 +124,17 @@ function mouse (opt) {
       pos.quantize(10)
     }
 
-    var x = pos.a, y = pos.b
+    var x = pos.x, y = pos.y
     
     if (base.down) {
-      base.cursor.x.b = x
-      base.cursor.y.b = y
+      base.cursor.b.x = x
+      base.cursor.b.y = y
       base.tube("drag", e, base.cursor)
       e.stopPropagation()
     }
     else {
-      base.cursor.x.a = base.cursor.x.b = x
-      base.cursor.y.a = base.cursor.y.b = y
+      base.cursor.a.x = base.cursor.b.x = x
+      base.cursor.a.y = base.cursor.b.y = y
       base.tube("move", e, base.cursor)
     }
   }
@@ -156,7 +155,7 @@ function mouse (opt) {
       e.stopPropagation()
       base.down = false
       pos = positionFromMouse(e)
-      new_cursor = new vec2 (pos.a, pos.b)
+      new_cursor = new vec2 (pos.x, pos.y)
       base.tube("up", e, base.cursor, new_cursor)
       base.cursor = new_cursor
     }