Changeset 3230 for trunk/MagicSoft/Mars

Timestamp:

02/18/04 16:40:01 (21 years ago)

Author:

moralejo

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mgui/MHexagon.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -9 +9 @@
     * mgui/MHexagon.cc
       - added comment explaining the algorithm.
-
+      - changed explicit values of Sin and Cos 60 degrees by const
+        variables (more readable).
 
  2004/02/18: Hendrik Bartko

trunk/MagicSoft/Mars/mgui/MHexagon.cc

@@ -170 +170 @@
     // in three coordinate systems: the default one, in which two sides of
     // the hexagon are paralel to the y axis (see camera displays) and two 
-    // more, rotated with respect to that one by +- 60 degrees. The values
-    // 0.5 and 0.866025403784438597 are the sine and cosine of 60 degrees.
+    // more, rotated with respect to that one by +- 60 degrees.
     //
 
@@ -177 +176 @@
       return disthex;
 
-    const Double_t dx2 = dx*0.5 + dy*0.866025403784438597;
+    const static Double_t cos60 = TMath::Cos(60/kRad2Deg);
+    const static Double_t sin60 = TMath::Sin(60/kRad2Deg);
+
+    const Double_t dx2 = dx*cos60 + dy*sin60;
 
     if  (TMath::Abs(dx2) > fD/2.)
       return disthex;
 
-    const Double_t dx3 = dx*0.5 - dy*0.866025403784438597;
+    const Double_t dx3 = dx*cos60 - dy*sin60;
 
     if  (TMath::Abs(dx3) > fD/2.)