Changeset 18984 for trunk

Timestamp:

04/06/18 16:46:40 (6 years ago)

Author:

tbretz

Message:

clang++ did not compile, it requires that the arguments here are floats and this requires either casts or a pre-defined constant.

File:

• trunk/FACT++/gui/BasicGlCamera.cc (modified) (1 diff)

trunk/FACT++/gui/BasicGlCamera.cc

@@ -31 +31 @@
 int BasicGlCamera::softwareMapping[NPIX];
 
+static const float _coord = 1/sqrt(3.);
+
 //Coordinates of an hexagon of radius 1 and center 0
-GLfloat hexcoords[6][2] = {{-1./sqrt(3.),  1},
-                           { 1./sqrt(3.),  1},
-                           { 2./sqrt(3.),  0},
-                           { 1./sqrt(3.), -1},
-                           {-1./sqrt(3.), -1},
-                           {-2./sqrt(3.),  0}};
+GLfloat hexcoords[6][2] = {{-1*_coord,  1},
+                           { 1*_coord,  1},
+                           { 2*_coord,  0},
+                           { 1*_coord, -1},
+                           {-1*_coord, -1},
+                           {-2*_coord,  0}};