Changeset 3220 for trunk/MagicSoft/Mars/mgui

Timestamp:

02/17/04 20:10:59 (21 years ago)

Author:

moralejo

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mgui/MHexagon.cc (modified) (3 diffs)

trunk/MagicSoft/Mars/mgui/MHexagon.cc

@@ -154 +154 @@
 // ------------------------------------------------------------------------
 //
-// compute the distance of a point (px,py) to the Hexagon in world
+// compute the distance of a point (px,py) to the Hexagon center in world
 // coordinates. Return -1 if inside.
 //
@@ -164 +164 @@
     const Double_t dx = px-fX;
     const Double_t dy = py-fY;
+    const Double_t disthex = TMath::Sqrt(dx*dx + dy*dy);
+
+    if (TMath::Abs(dx) > fD/2.)
+      return disthex;
+
+    const Double_t dx2 = dx*0.5 + dy*0.866025403784438597;
+
+    if  (TMath::Abs(dx2) > fD/2.)
+      return disthex;
+
+    const Double_t dx3 = dx*0.5 - dy*0.866025403784438597;
+
+    if  (TMath::Abs(dx3) > fD/2.)
+      return disthex;
+
+    return -1;
+}
+
+/*
+Float_t MHexagon::DistanceToPrimitive(Float_t px, Float_t py)
+{
+    //
+    //  compute the distance of the Point to the center of the Hexagon
+    //
+    const Double_t dx = px-fX;
+    const Double_t dy = py-fY;
 
     const Double_t disthex = TMath::Sqrt(dx*dx + dy*dy);
@@ -177 +203 @@
     //
 }
+*/
 
 // ------------------------------------------------------------------------