Changeset 17788 for trunk

Timestamp:

05/07/14 13:43:37 (11 years ago)

Author:

tbretz

Message:

Simplified getIndex (now using the coordinate array)

File:

• trunk/FACT++/www/viewer/index.js (modified) (3 diffs)

trunk/FACT++/www/viewer/index.js

@@ -884 +884 @@
 }
 
-function getIndex(id, mouse)
-{
-    var canv = document.getElementById(id);
-
-    var scale = 83;
-
-    var w = Math.min(canv.width/scale, canv.height/scale);
-
-    //ctx.translate(canv.width/2, canv.height/2);
-    //ctx.scale(w*2, w*2);
-    //ctx.scale(1, Math.sqrt(3)/2);
-    //ctx.translate(-0.5, 0);
-
-    mouse.x -= canv.width/2;
-    mouse.y -= canv.height/2;
-    mouse.x /= w*2;
-    mouse.y /= w*2;
-    mouse.y /= Math.sqrt(3)/2;
-    mouse.x -= -0.5;
-
-    if (isInside(0, 0, mouse))
-        return 0;
-
-    var cnt = 1;
-    for (var ring=1; ring<24; ring++)
-    {
-        for (var s=0; s<6; s++)
-        {
-            for (var i=1; i<=ring; i++)
-            {
-                var pos = new Position(s, ring, i);
-                if (pos.d() - pos.x > 395.75)
-                    continue;
-
-                if (isInside(pos.x, pos.y, mouse))
-                    return cnt;
-                cnt++;
-            }
-        }
-    }
-
-    if (isInside(7, -22, mouse))
-        return 1438;
-    if (isInside(7, 22, mouse))
-        return 1439;
-
-    return -1;
-}
-
 var inprogress = { };
 function moveElement(id, n, target, callback)
@@ -1232 +1183 @@
 initCameraCoordinates();
 
+function getIndex(id, mouse)
+{
+    var canv = document.getElementById(id);
+
+    var scale = 83;
+
+    var w = Math.min(canv.width/scale, canv.height/scale);
+
+    //ctx.translate(canv.width/2, canv.height/2);
+    //ctx.scale(w*2, w*2);
+    //ctx.scale(1, Math.sqrt(3)/2);
+    //ctx.translate(-0.5, 0);
+
+    mouse.x -= canv.width/2;
+    mouse.y -= canv.height/2;
+    mouse.x /= w*2;
+    mouse.y /= w*2;
+    mouse.y /= Math.sqrt(3)/2;
+    mouse.x -= -0.5;
+
+    for (var i=0; i<1440; i++)
+        if (isInside(coord[i][0], coord[i][1], mouse))
+            return i;
+
+    return -1;
+}
+
+
 function hueToRGB(hue)
 {
@@ -1314 +1293 @@
 }
 
-var positions = new Array(1440);
-
-
 function drawFullCam(id)
 {