Changeset 12685

Timestamp:

12/02/11 14:45:18 (13 years ago)

Author:

lyard

Message:

fixed camera position bug with blurry pixels

File:

• trunk/FACT++/gui/BasicGlCamera.cc (modified) (4 diffs)

trunk/FACT++/gui/BasicGlCamera.cc

@@ -940 +940 @@
     void BasicGlCamera::calculatePixelsCoords()
     {
-        if (pixelsCoords[0][1] >= 0.299999 && pixelsCoords[0][1] <= 0.300001)
+        if (pixelsCoords[0][1] >= (0.299999-hexRadius) && pixelsCoords[0][1] <= (0.300001-hexRadius))
             return;
         pixelsCoords[0][0] = 0;
-        pixelsCoords[0][1] = 0.3;
+        pixelsCoords[0][1] = 0.3 - hexRadius;
         pixelsCoords[0][2] = 0;
         pixelsCoords[1][0] = 0;
-        pixelsCoords[1][1] = 0.3+2*hexRadius;
+        pixelsCoords[1][1] = 0.3+hexRadius;
         pixelsCoords[1][2] = 0;
         neighbors[0][0] = 1;
@@ -997 +997 @@
             break;
             };
+//            pixelsCoords[i][1] -= hexRadius;
 
             updateNeighbors(i);
@@ -1044 +1045 @@
                      cVertex[k] = hexcoords[j][k]*hexRadius + pixelsCoords[i][k];
 
-//                 cVertex[1] -= hexRadius;
-
                  bool found = false;
                  for (int k=0;k<numVertices;k++)
@@ -1074 +1073 @@
                      cVertex[k] = hexcoords[j][k]*hexRadius + pixelsCoords[i][k];
 
-//                 cVertex[1] -= hexRadius;
-
                  for (int k=0;k<numVertices;k++)
                  {