Make DistancePointLine visible in .h file and add supporting type

diff --git a/lib/glcomp/glutils.c b/lib/glcomp/glutils.c
index 85df1634cea3240ab83d4d3fd9b5721f371f6c18..468caaac738033b9597347797001b3515c8bd7c2 100644 (file)
--- a/lib/glcomp/glutils.c
+++ b/lib/glcomp/glutils.c
@@ -300,11 +300,11 @@ static point sub (point p, point q)
 
 static double dot (point p, point q)
 {
-    return (p.x*p.x + p.y*p.y + p.z*p.z); }
+    return (p.x*q.x + p.y*q.y + p.z*q.z); }
 
 double len (point p)
 {
-    sqrt(dot(p,p));
+    return sqrt(dot(p,p));
 }
 
 point scale (double d, point p)
@@ -353,58 +353,52 @@ double point_to_line_dist (point a, point b, point p) {
 }
 
 
-
-typedef struct tagXYZ
-{
-    float X, Y, Z;
-}
-XYZ;
-
-float Magnitude( XYZ *Point1, XYZ *Point2 )
+static float Magnitude(point3f *Point1, point3f *Point2 )
 {
-    XYZ Vector;
+    point3f Vector;
 
-    Vector.X = Point2->X - Point1->X;
-    Vector.Y = Point2->Y - Point1->Y;
-    Vector.Z = Point2->Z - Point1->Z;
+    Vector.x = Point2->x - Point1->x;
+    Vector.y = Point2->y - Point1->y;
+    Vector.z = Point2->z - Point1->z;
 
-    return (float)sqrt( Vector.X * Vector.X + Vector.Y * Vector.Y + Vector.Z * Vector.Z );
+    return (float)sqrt( Vector.x * Vector.x + Vector.y * Vector.y + Vector.z * Vector.z );
 }
 
-int DistancePointLine( XYZ *Point, XYZ *LineStart, XYZ *LineEnd, float *Distance )
+int DistancePointLine(point3f *Point, point3f *LineStart, point3f *LineEnd, float *Distance )
 {
     float LineMag;
     float U;
-    XYZ Intersection;
+    point3f Intersection;
 
     LineMag = Magnitude( LineEnd, LineStart );
 
-    U = ( ( ( Point->X - LineStart->X ) * ( LineEnd->X - LineStart->X ) ) +
-    ( ( Point->Y - LineStart->Y ) * ( LineEnd->Y - LineStart->Y ) ) +
-    ( ( Point->Z - LineStart->Z ) * ( LineEnd->Z - LineStart->Z ) ) ) /
+    U = ( ( ( Point->x - LineStart->x ) * ( LineEnd->x - LineStart->x ) ) +
+    ( ( Point->y - LineStart->y ) * ( LineEnd->y - LineStart->y ) ) +
+    ( ( Point->z - LineStart->z ) * ( LineEnd->z - LineStart->z ) ) ) /
     ( LineMag * LineMag );
 
     if( U < 0.0f || U > 1.0f )
         return 0;   // closest point does not fall within the line segment
 
-    Intersection.X = LineStart->X + U * ( LineEnd->X - LineStart->X );
-    Intersection.Y = LineStart->Y + U * ( LineEnd->Y - LineStart->Y );
-    Intersection.Z = LineStart->Z + U * ( LineEnd->Z - LineStart->Z );
+    Intersection.x = LineStart->x + U * ( LineEnd->x - LineStart->x );
+    Intersection.y = LineStart->y + U * ( LineEnd->y - LineStart->y );
+    Intersection.z = LineStart->z + U * ( LineEnd->z - LineStart->z );
 
     *Distance = Magnitude( Point, &Intersection );
 
     return 1;
 }
 
-/*void main( void )
+#ifdef DEBUG
+void main( void )
 {
-    XYZ LineStart, LineEnd, Point;
+    point3f LineStart, LineEnd, Point;
     float Distance;
 
 
-    LineStart.X =  50.0f; LineStart.Y =   80.0f; LineStart.Z =  300.0f;
-    LineEnd.X   =  50.0f; LineEnd.Y   = -800.0f; LineEnd.Z   = 1000.0f;
-    Point.X     =  20.0f; Point.Y     = 1000.0f; Point.Z     =  400.0f;
+    LineStart.x =  50.0f; LineStart.y =   80.0f; LineStart.z =  300.0f;
+    LineEnd.x   =  50.0f; LineEnd.y   = -800.0f; LineEnd.z   = 1000.0f;
+    Point.x     =  20.0f; Point.y     = 1000.0f; Point.z     =  400.0f;
 
     if( DistancePointLine( &Point, &LineStart, &LineEnd, &Distance ) )
         printf( "closest point falls within line segment, distance = %f\n", Distance     );
@@ -412,13 +406,14 @@ int DistancePointLine( XYZ *Point, XYZ *LineStart, XYZ *LineEnd, float *Distance
         printf( "closest point does not fall within line segment\n" );
 
 
-    LineStart.X =  0.0f; LineStart.Y =   0.0f; LineStart.Z =  50.0f;
-    LineEnd.X   =  0.0f; LineEnd.Y   =   0.0f; LineEnd.Z   = -50.0f;
-    Point.X     = 10.0f; Point.Y     =  50.0f; Point.Z     =  10.0f;
+    LineStart.x =  0.0f; LineStart.y =   0.0f; LineStart.z =  50.0f;
+    LineEnd.x   =  0.0f; LineEnd.y   =   0.0f; LineEnd.z   = -50.0f;
+    Point.x     = 10.0f; Point.y     =  50.0f; Point.z     =  10.0f;
 
     if( DistancePointLine( &Point, &LineStart, &LineEnd, &Distance ) )
         printf( "closest point falls within line segment, distance = %f\n", Distance     );
     else
         printf( "closest point does not fall within line segment\n" );
-}*/
+}
+#endif
 

diff --git a/lib/glcomp/glutils.h b/lib/glcomp/glutils.h
index 4a2149617c36cc076d8a7c9d14c84cec89805247..ab39934cf720240278081454dc52a7665046f862 100644 (file)
--- a/lib/glcomp/glutils.h
+++ b/lib/glcomp/glutils.h
@@ -22,15 +22,16 @@
 #include <GL/glu.h>
 
 
+typedef struct {
+    float x, y, z;
+} point3f;
 
-
-
-int GetFixedOGLPos(int x, int y, float kts, GLfloat * X, GLfloat * Y,
-                  GLfloat * Z);
+int GetFixedOGLPos(int, int, float, GLfloat*, GLfloat*, GLfloat * Z);
 int GetOGLPosRef(int x, int y, float *X, float *Y, float *Z);
 float GetOGLDistance(int l);
-int GetFixedOGLPoslocal(int x, int y, GLfloat * X, GLfloat * Y,
-                  GLfloat * Z);
+int GetFixedOGLPoslocal(int x, int y, GLfloat * X, GLfloat * Y, GLfloat * Z);
 void to3D(int x, int y, GLfloat * X, GLfloat * Y,GLfloat * Z);
-void linear_interplotate (float x1,float y1,float x3,float y3,float x2,float* y2);
+void linear_interplotate (float,float,float,float,float,float*);
+int DistancePointLine(point3f *, point3f *, point3f *, float *);
+
 #endif