fly/flightgear
1
0
Fork 0
Code Activity

c++-ifying.

Browse source
This commit is contained in:
curt 1998-10-16 23:36:36 +00:00
parent 787591dd79
commit bac27f1ce3
4 changed files with 286 additions and 258 deletions

141
Math/fg_geodesy.cxx
View file

@ -1,37 +1,36 @@
/************************************************************************** // fg_geodesy.cxx -- routines to convert between geodetic and geocentric
* fg_geodesy.c -- routines to convert between geodetic and geocentric // coordinate systems.
* coordinate systems. //
* // Copied and adapted directly from LaRCsim/ls_geodesy.c
* Copied and adapted directly from LaRCsim/ls_geodesy.c //
* // See below for the complete original LaRCsim comments.
* See below for the complete original LaRCsim comments. //
* // $Id$
* $Id$ // (Log is kept at end of this file)
* (Log is kept at end of this file)
**************************************************************************/
#include <math.h> #include <math.h>
#include <Math/fg_geodesy.h>
#include <Include/fg_constants.h> #include <Include/fg_constants.h>
#include <Math/fg_geodesy.hxx>
#include <Math/point3d.hxx>
/* ONE_SECOND is pi/180/60/60, or about 100 feet at earths' equator */ // ONE_SECOND is pi/180/60/60, or about 100 feet at earths' equator
#define ONE_SECOND 4.848136811E-6 #define ONE_SECOND 4.848136811E-6
/* fgGeocToGeod(lat_geoc, radius, *lat_geod, *alt, *sea_level_r) // fgGeocToGeod(lat_geoc, radius, *lat_geod, *alt, *sea_level_r)
* INPUTS: // INPUTS:
* lat_geoc Geocentric latitude, radians, + = North // lat_geoc Geocentric latitude, radians, + = North
* radius C.G. radius to earth center (meters) // radius C.G. radius to earth center (meters)
* //
* OUTPUTS: // OUTPUTS:
* lat_geod Geodetic latitude, radians, + = North // lat_geod Geodetic latitude, radians, + = North
* alt C.G. altitude above mean sea level (meters) // alt C.G. altitude above mean sea level (meters)
* sea_level_r radius from earth center to sea level at // sea_level_r radius from earth center to sea level at
* local vertical (surface normal) of C.G. (meters) // local vertical (surface normal) of C.G. (meters)
*/
void fgGeocToGeod( double lat_geoc, double radius, double void fgGeocToGeod( double lat_geoc, double radius, double
*lat_geod, double *alt, double *sea_level_r ) *lat_geod, double *alt, double *sea_level_r )
@ -39,8 +38,8 @@ void fgGeocToGeod( double lat_geoc, double radius, double
double t_lat, x_alpha, mu_alpha, delt_mu, r_alpha, l_point, rho_alpha; double t_lat, x_alpha, mu_alpha, delt_mu, r_alpha, l_point, rho_alpha;
double sin_mu_a, denom,delt_lambda, lambda_sl, sin_lambda_sl; double sin_mu_a, denom,delt_lambda, lambda_sl, sin_lambda_sl;
if( ( (FG_PI_2 - lat_geoc) < ONE_SECOND ) /* near North pole */ if( ( (FG_PI_2 - lat_geoc) < ONE_SECOND ) // near North pole
|| ( (FG_PI_2 + lat_geoc) < ONE_SECOND ) ) /* near South pole */ || ( (FG_PI_2 + lat_geoc) < ONE_SECOND ) ) // near South pole
{ {
*lat_geod = lat_geoc; *lat_geod = lat_geoc;
*sea_level_r = EQUATORIAL_RADIUS_M*E; *sea_level_r = EQUATORIAL_RADIUS_M*E;
@ -60,7 +59,7 @@ void fgGeocToGeod( double lat_geoc, double radius, double
(denom*denom*denom); (denom*denom*denom);
delt_mu = atan2(l_point*sin(delt_lambda),rho_alpha + *alt); delt_mu = atan2(l_point*sin(delt_lambda),rho_alpha + *alt);
*lat_geod = mu_alpha - delt_mu; *lat_geod = mu_alpha - delt_mu;
lambda_sl = atan( E*E * tan(*lat_geod) ); /* SL geoc. latitude */ lambda_sl = atan( E*E * tan(*lat_geod) ); // SL geoc. latitude
sin_lambda_sl = sin( lambda_sl ); sin_lambda_sl = sin( lambda_sl );
*sea_level_r = *sea_level_r =
sqrt(RESQ_M / (1 + ((1/(E*E))-1)*sin_lambda_sl*sin_lambda_sl)); sqrt(RESQ_M / (1 + ((1/(E*E))-1)*sin_lambda_sl*sin_lambda_sl));
@ -68,27 +67,27 @@ void fgGeocToGeod( double lat_geoc, double radius, double
} }
/* fgGeodToGeoc( lat_geod, alt, *sl_radius, *lat_geoc ) // fgGeodToGeoc( lat_geod, alt, *sl_radius, *lat_geoc )
* INPUTS: // INPUTS:
* lat_geod Geodetic latitude, radians, + = North // lat_geod Geodetic latitude, radians, + = North
* alt C.G. altitude above mean sea level (meters) // alt C.G. altitude above mean sea level (meters)
* //
* OUTPUTS: // OUTPUTS:
* sl_radius SEA LEVEL radius to earth center (meters) // sl_radius SEA LEVEL radius to earth center (meters)
* (add Altitude to get true distance from earth center. // (add Altitude to get true distance from earth center.
* lat_geoc Geocentric latitude, radians, + = North // lat_geoc Geocentric latitude, radians, + = North
* //
*/
void fgGeodToGeoc( double lat_geod, double alt, double *sl_radius, void fgGeodToGeoc( double lat_geod, double alt, double *sl_radius,
double *lat_geoc ) double *lat_geoc )
{ {
double lambda_sl, sin_lambda_sl, cos_lambda_sl, sin_mu, cos_mu, px, py; double lambda_sl, sin_lambda_sl, cos_lambda_sl, sin_mu, cos_mu, px, py;
lambda_sl = atan( E*E * tan(lat_geod) ); /* sea level geocentric latitude */ lambda_sl = atan( E*E * tan(lat_geod) ); // sea level geocentric latitude
sin_lambda_sl = sin( lambda_sl ); sin_lambda_sl = sin( lambda_sl );
cos_lambda_sl = cos( lambda_sl ); cos_lambda_sl = cos( lambda_sl );
sin_mu = sin(lat_geod); /* Geodetic (map makers') latitude */ sin_mu = sin(lat_geod); // Geodetic (map makers') latitude
cos_mu = cos(lat_geod); cos_mu = cos(lat_geod);
*sl_radius = *sl_radius =
sqrt(RESQ_M / (1 + ((1/(E*E))-1)*sin_lambda_sl*sin_lambda_sl)); sqrt(RESQ_M / (1 + ((1/(E*E))-1)*sin_lambda_sl*sin_lambda_sl));
@ -140,6 +139,9 @@ void fgGeodToGeoc( double lat_geod, double alt, double *sl_radius,
$Header$ $Header$
$Log$ $Log$
Revision 1.2 1998/10/16 23:36:36 curt
c++-ifying.
Revision 1.1 1998/10/16 19:30:40 curt Revision 1.1 1998/10/16 19:30:40 curt
Renamed .c -> .h so we can start adding c++ supporting routines. Renamed .c -> .h so we can start adding c++ supporting routines.
@ -215,31 +217,34 @@ Initial Flight Gear revision.
--------------------------------------------------------------------------*/ --------------------------------------------------------------------------*/
/* $Log$ // $Log$
/* Revision 1.1 1998/10/16 19:30:40 curt // Revision 1.2 1998/10/16 23:36:36 curt
/* Renamed .c -> .h so we can start adding c++ supporting routines. // c++-ifying.
/* //
* Revision 1.6 1998/07/08 14:40:07 curt // Revision 1.1 1998/10/16 19:30:40 curt
* polar3d.[ch] renamed to polar3d.[ch]xx, vector.[ch] renamed to vector.[ch]xx // Renamed .c -> .h so we can start adding c++ supporting routines.
* Updated fg_geodesy comments to reflect that routines expect and produce //
* meters. // Revision 1.6 1998/07/08 14:40:07 curt
* // polar3d.[ch] renamed to polar3d.[ch]xx, vector.[ch] renamed to vector.[ch]xx
* Revision 1.5 1998/04/25 22:06:23 curt // Updated fg_geodesy comments to reflect that routines expect and produce
* Edited cvs log messages in source files ... bad bad bad! // meters.
* //
* Revision 1.4 1998/01/27 00:47:59 curt // Revision 1.5 1998/04/25 22:06:23 curt
* Incorporated Paul Bleisch's <pbleisch@acm.org> new debug message // Edited cvs log messages in source files ... bad bad bad!
* system and commandline/config file processing code. //
* // Revision 1.4 1998/01/27 00:47:59 curt
* Revision 1.3 1998/01/19 19:27:12 curt // Incorporated Paul Bleisch's <pbleisch@acm.org> new debug message
* Merged in make system changes from Bob Kuehne <rpk@sgi.com> // system and commandline/config file processing code.
* This should simplify things tremendously. //
* // Revision 1.3 1998/01/19 19:27:12 curt
* Revision 1.2 1997/12/15 23:54:54 curt // Merged in make system changes from Bob Kuehne <rpk@sgi.com>
* Add xgl wrappers for debugging. // This should simplify things tremendously.
* Generate terrain normals on the fly. //
* // Revision 1.2 1997/12/15 23:54:54 curt
* Revision 1.1 1997/07/31 23:13:14 curt // Add xgl wrappers for debugging.
* Initial revision. // Generate terrain normals on the fly.
* //
*/ // Revision 1.1 1997/07/31 23:13:14 curt
// Initial revision.
//

150
Math/fg_geodesy.hxx
View file

@ -1,56 +1,82 @@
/************************************************************************** // fg_geodesy.hxx -- routines to convert between geodetic and geocentric
* fg_geodesy.h -- routines to convert between geodetic and geocentric // coordinate systems.
* coordinate systems. //
* // Copied and adapted directly from LaRCsim/ls_geodesy.c
* Copied and adapted directly from LaRCsim/ls_geodesy.c //
* // See below for the complete original LaRCsim comments.
* See below for the complete original LaRCsim comments. //
* // $Id$
* $Id$ // (Log is kept at end of this file)
* (Log is kept at end of this file)
**************************************************************************/
#ifndef _FG_GEODESY_H #ifndef _FG_GEODESY_HXX
#define _FG_GEODESY_H #define _FG_GEODESY_HXX
#ifdef __cplusplus #ifndef __cplusplus
extern "C" { # error This library requires C++
#endif #endif
/* fgGeocToGeod(lat_geoc, radius, *lat_geod, *alt, *sea_level_r) #include <Math/point3d.hxx>
* INPUTS: #include <Math/polar3d.hxx>
* lat_geoc Geocentric latitude, radians, + = North
* radius C.G. radius to earth center (meters)
* // fgGeocToGeod(lat_geoc, radius, *lat_geod, *alt, *sea_level_r)
* OUTPUTS: // INPUTS:
* lat_geod Geodetic latitude, radians, + = North // lat_geoc Geocentric latitude, radians, + = North
* alt C.G. altitude above mean sea level (meters) // radius C.G. radius to earth center (meters)
* sea_level_r radius from earth center to sea level at //
* local vertical (surface normal) of C.G. (meters) // OUTPUTS:
*/ // lat_geod Geodetic latitude, radians, + = North
// alt C.G. altitude above mean sea level (meters)
// sea_level_r radius from earth center to sea level at
// local vertical (surface normal) of C.G. (meters)
void fgGeocToGeod( double lat_geoc, double radius, double void fgGeocToGeod( double lat_geoc, double radius, double
*lat_geod, double *alt, double *sea_level_r ); *lat_geod, double *alt, double *sea_level_r );
/* fgGeodToGeoc( lat_geod, alt, *sl_radius, *lat_geoc )
* INPUTS: // fgGeodToGeoc( lat_geod, alt, *sl_radius, *lat_geoc )
* lat_geod Geodetic latitude, radians, + = North // INPUTS:
* alt C.G. altitude above mean sea level (meters) // lat_geod Geodetic latitude, radians, + = North
* // alt C.G. altitude above mean sea level (meters)
* OUTPUTS: //
* sl_radius SEA LEVEL radius to earth center (meters) // OUTPUTS:
* (add Altitude to get true distance from earth center. // sl_radius SEA LEVEL radius to earth center (meters)
* lat_geoc Geocentric latitude, radians, + = North // (add Altitude to get true distance from earth center.
* // lat_geoc Geocentric latitude, radians, + = North
*/ //
void fgGeodToGeoc( double lat_geod, double alt, double *sl_radius, void fgGeodToGeoc( double lat_geod, double alt, double *sl_radius,
double *lat_geoc ); double *lat_geoc );
// convert a geodetic point lon(radians), lat(radians), elev(meter) to
// a cartesian point
inline Point3D fgGeodToCart(const Point3D& geod) {
Point3D cp;
Point3D pp;
double gc_lon, gc_lat, sl_radius;
// printf("A geodetic point is (%.2f, %.2f, %.2f)\n",
// geod[0], geod[1], geod[2]);
gc_lon = geod.lon();
fgGeodToGeoc(geod.lat(), geod.radius(), &sl_radius, &gc_lat);
// printf("A geocentric point is (%.2f, %.2f, %.2f)\n", gc_lon,
// gc_lat, sl_radius+geod[2]);
pp.setvals(gc_lon, gc_lat, sl_radius + geod.radius());
cp = fgPolarToCart3d(pp);
// printf("A cart point is (%.8f, %.8f, %.8f)\n", cp.x, cp.y, cp.z);
return(cp);
}
/*************************************************************************** /***************************************************************************
@ -94,6 +120,9 @@ void fgGeodToGeoc( double lat_geod, double alt, double *sl_radius,
$Header$ $Header$
$Log$ $Log$
Revision 1.2 1998/10/16 23:36:37 curt
c++-ifying.
Revision 1.1 1998/10/16 19:30:42 curt Revision 1.1 1998/10/16 19:30:42 curt
Renamed .c -> .h so we can start adding c++ supporting routines. Renamed .c -> .h so we can start adding c++ supporting routines.
@ -160,29 +189,28 @@ Initial Flight Gear revision.
--------------------------------------------------------------------------*/ --------------------------------------------------------------------------*/
#ifdef __cplusplus #endif // _FG_GEODESY_HXX
}
#endif
#endif /* _FG_GEODESY_H */
/* $Log$ // $Log$
/* Revision 1.1 1998/10/16 19:30:42 curt // Revision 1.2 1998/10/16 23:36:37 curt
/* Renamed .c -> .h so we can start adding c++ supporting routines. // c++-ifying.
/* //
* Revision 1.4 1998/07/08 14:40:08 curt // Revision 1.1 1998/10/16 19:30:42 curt
* polar3d.[ch] renamed to polar3d.[ch]xx, vector.[ch] renamed to vector.[ch]xx // Renamed .c -> .h so we can start adding c++ supporting routines.
* Updated fg_geodesy comments to reflect that routines expect and produce //
* meters. // Revision 1.4 1998/07/08 14:40:08 curt
* // polar3d.[ch] renamed to polar3d.[ch]xx, vector.[ch] renamed to vector.[ch]xx
* Revision 1.3 1998/04/21 17:03:48 curt // Updated fg_geodesy comments to reflect that routines expect and produce
* Prepairing for C++ integration. // meters.
* //
* Revision 1.2 1998/01/22 02:59:38 curt // Revision 1.3 1998/04/21 17:03:48 curt
* Changed #ifdef FILE_H to #ifdef _FILE_H // Prepairing for C++ integration.
* //
* Revision 1.1 1997/07/31 23:13:14 curt // Revision 1.2 1998/01/22 02:59:38 curt
* Initial revision. // Changed #ifdef FILE_H to #ifdef _FILE_H
* //
*/ // Revision 1.1 1997/07/31 23:13:14 curt
// Initial revision.
//

146
Math/vector.cxx
View file

@ -1,27 +1,25 @@
/************************************************************************** // vector.cxx -- additional vector routines
* vector.c -- additional vector routines //
* // Written by Curtis Olson, started December 1997.
* Written by Curtis Olson, started December 1997. //
* // Copyright (C) 1997 Curtis L. Olson - curt@infoplane.com
* Copyright (C) 1997 Curtis L. Olson - curt@infoplane.com //
* // This program is free software; you can redistribute it and/or
* This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License as
* modify it under the terms of the GNU General Public License as // published by the Free Software Foundation; either version 2 of the
* published by the Free Software Foundation; either version 2 of the // License, or (at your option) any later version.
* License, or (at your option) any later version. //
* // This program is distributed in the hope that it will be useful, but
* This program is distributed in the hope that it will be useful, but // WITHOUT ANY WARRANTY; without even the implied warranty of
* WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU // General Public License for more details.
* General Public License for more details. //
* // You should have received a copy of the GNU General Public License
* You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software
* along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. //
* // $Id$
* $Id$ // (Log is kept at end of this file)
* (Log is kept at end of this file)
**************************************************************************/
#include <math.h> #include <math.h>
@ -35,18 +33,18 @@
#if !defined( USE_XTRA_MAT3_INLINES ) #if !defined( USE_XTRA_MAT3_INLINES )
/* Map a vector onto the plane specified by normal */ // Map a vector onto the plane specified by normal
void map_vec_onto_cur_surface_plane(MAT3vec normal, MAT3vec v0, MAT3vec vec, void map_vec_onto_cur_surface_plane(MAT3vec normal, MAT3vec v0, MAT3vec vec,
MAT3vec result) MAT3vec result)
{ {
MAT3vec u1, v, tmp; MAT3vec u1, v, tmp;
/* calculate a vector "u1" representing the shortest distance from // calculate a vector "u1" representing the shortest distance from
* the plane specified by normal and v0 to a point specified by // the plane specified by normal and v0 to a point specified by
* "vec". "u1" represents both the direction and magnitude of // "vec". "u1" represents both the direction and magnitude of
* this desired distance. */ // this desired distance.
/* u1 = ( (normal <dot> vec) / (normal <dot> normal) ) * normal */ // u1 = ( (normal <dot> vec) / (normal <dot> normal) ) * normal
MAT3_SCALE_VEC( u1, MAT3_SCALE_VEC( u1,
normal, normal,
@ -55,29 +53,27 @@ void map_vec_onto_cur_surface_plane(MAT3vec normal, MAT3vec v0, MAT3vec vec,
) )
); );
/* // printf(" vec = %.2f, %.2f, %.2f\n", vec[0], vec[1], vec[2]);
printf(" vec = %.2f, %.2f, %.2f\n", vec[0], vec[1], vec[2]); // printf(" v0 = %.2f, %.2f, %.2f\n", v0[0], v0[1], v0[2]);
printf(" v0 = %.2f, %.2f, %.2f\n", v0[0], v0[1], v0[2]); // printf(" u1 = %.2f, %.2f, %.2f\n", u1[0], u1[1], u1[2]);
printf(" u1 = %.2f, %.2f, %.2f\n", u1[0], u1[1], u1[2]);
*/ // calculate the vector "v" which is the vector "vec" mapped onto
// the plane specified by "normal" and "v0".
/* calculate the vector "v" which is the vector "vec" mapped onto // v = v0 + vec - u1
the plane specified by "normal" and "v0". */
/* v = v0 + vec - u1 */
MAT3_ADD_VEC(tmp, v0, vec); MAT3_ADD_VEC(tmp, v0, vec);
MAT3_SUB_VEC(v, tmp, u1); MAT3_SUB_VEC(v, tmp, u1);
/* printf(" v = %.2f, %.2f, %.2f\n", v[0], v[1], v[2]); */ // printf(" v = %.2f, %.2f, %.2f\n", v[0], v[1], v[2]);
/* Calculate the vector "result" which is "v" - "v0" which is a // Calculate the vector "result" which is "v" - "v0" which is a
* directional vector pointing from v0 towards v */ // directional vector pointing from v0 towards v
/* result = v - v0 */ // result = v - v0
MAT3_SUB_VEC(result, v, v0); MAT3_SUB_VEC(result, v, v0);
/* printf(" result = %.2f, %.2f, %.2f\n", // printf(" result = %.2f, %.2f, %.2f\n",
result[0], result[1], result[2]); */ // result[0], result[1], result[2]);
} }
#endif // !defined( USE_XTRA_MAT3_INLINES ) #endif // !defined( USE_XTRA_MAT3_INLINES )
@ -134,34 +130,32 @@ double fgPointLineSquared(MAT3vec p, MAT3vec p0, MAT3vec d) {
} }
/* $Log$ // $Log$
/* Revision 1.4 1998/10/16 00:50:31 curt // Revision 1.5 1998/10/16 23:36:38 curt
/* Added point3d.hxx to replace cheezy fgPoint3d struct. // c++-ifying.
/* //
* Revision 1.3 1998/08/24 20:04:12 curt // Revision 1.4 1998/10/16 00:50:31 curt
* Various "inline" code optimizations contributed by Norman Vine. // Added point3d.hxx to replace cheezy fgPoint3d struct.
* //
* Revision 1.2 1998/07/24 21:34:38 curt // Revision 1.3 1998/08/24 20:04:12 curt
* fgPointLine() rewritten into fgPointLineSquared() ... this ultimately saves // Various "inline" code optimizations contributed by Norman Vine.
* us from doing a sqrt(). //
* // Revision 1.2 1998/07/24 21:34:38 curt
* Revision 1.1 1998/07/08 14:40:10 curt // fgPointLine() rewritten into fgPointLineSquared() ... this ultimately saves
* polar3d.[ch] renamed to polar3d.[ch]xx, vector.[ch] renamed to vector.[ch]xx // us from doing a sqrt().
* Updated fg_geodesy comments to reflect that routines expect and produce //
* meters. // Revision 1.1 1998/07/08 14:40:10 curt
* // polar3d.[ch] renamed to polar3d.[ch]xx, vector.[ch] renamed to vector.[ch]xx
* Revision 1.3 1998/05/07 23:04:28 curt // Updated fg_geodesy comments to reflect that routines expect and produce
* Added a blank formating line! // meters.
* //
* Revision 1.2 1998/01/19 19:27:13 curt // Revision 1.3 1998/05/07 23:04:28 curt
* Merged in make system changes from Bob Kuehne <rpk@sgi.com> // Added a blank formating line!
* This should simplify things tremendously. //
* // Revision 1.2 1998/01/19 19:27:13 curt
* Revision 1.1 1997/12/22 04:13:17 curt // Merged in make system changes from Bob Kuehne <rpk@sgi.com>
* Initial revision. // This should simplify things tremendously.
* */ //
// Revision 1.1 1997/12/22 04:13:17 curt
// Initial revision.
//

107
Math/vector.hxx
View file

@ -1,27 +1,25 @@
/************************************************************************** // vector.hxx -- additional vector routines
* vector.hxx -- additional vector routines //
* // Written by Curtis Olson, started December 1997.
* Written by Curtis Olson, started December 1997. //
* // Copyright (C) 1997 Curtis L. Olson - curt@infoplane.com
* Copyright (C) 1997 Curtis L. Olson - curt@infoplane.com //
* // This program is free software; you can redistribute it and/or
* This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License as
* modify it under the terms of the GNU General Public License as // published by the Free Software Foundation; either version 2 of the
* published by the Free Software Foundation; either version 2 of the // License, or (at your option) any later version.
* License, or (at your option) any later version. //
* // This program is distributed in the hope that it will be useful, but
* This program is distributed in the hope that it will be useful, but // WITHOUT ANY WARRANTY; without even the implied warranty of
* WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU // General Public License for more details.
* General Public License for more details. //
* // You should have received a copy of the GNU General Public License
* You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software
* along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. //
* // $Id$
* $Id$ // (Log is kept at end of this file)
* (Log is kept at end of this file)
**************************************************************************/
#ifndef _VECTOR_HXX #ifndef _VECTOR_HXX
@ -36,7 +34,7 @@
#include "mat3.h" #include "mat3.h"
/* Map a vector onto the plane specified by normal */ // Map a vector onto the plane specified by normal
#if defined( USE_XTRA_MAT3_INLINES ) #if defined( USE_XTRA_MAT3_INLINES )
# define map_vec_onto_cur_surface_plane(normal, v0, vec, result) { \ # define map_vec_onto_cur_surface_plane(normal, v0, vec, result) { \
double scale = ((normal[0]*vec[0]+normal[1]*vec[1]+normal[2]*vec[2]) / \ double scale = ((normal[0]*vec[0]+normal[1]*vec[1]+normal[2]*vec[2]) / \
@ -61,33 +59,36 @@ double fgPointLine(MAT3vec p, MAT3vec p0, MAT3vec d);
double fgPointLineSquared(MAT3vec p, MAT3vec p0, MAT3vec d); double fgPointLineSquared(MAT3vec p, MAT3vec p0, MAT3vec d);
#endif /* _VECTOR_HXX */ #endif // _VECTOR_HXX
/* $Log$ // $Log$
/* Revision 1.3 1998/08/24 20:04:13 curt // Revision 1.4 1998/10/16 23:36:39 curt
/* Various "inline" code optimizations contributed by Norman Vine. // c++-ifying.
/* //
* Revision 1.2 1998/07/24 21:34:38 curt // Revision 1.3 1998/08/24 20:04:13 curt
* fgPointLine() rewritten into fgPointLineSquared() ... this ultimately saves // Various "inline" code optimizations contributed by Norman Vine.
* us from doing a sqrt(). //
* // Revision 1.2 1998/07/24 21:34:38 curt
* Revision 1.1 1998/07/08 14:40:10 curt // fgPointLine() rewritten into fgPointLineSquared() ... this ultimately saves
* polar3d.[ch] renamed to polar3d.[ch]xx, vector.[ch] renamed to vector.[ch]xx // us from doing a sqrt().
* Updated fg_geodesy comments to reflect that routines expect and produce //
* meters. // Revision 1.1 1998/07/08 14:40:10 curt
* // polar3d.[ch] renamed to polar3d.[ch]xx, vector.[ch] renamed to vector.[ch]xx
* Revision 1.4 1998/04/21 17:03:51 curt // Updated fg_geodesy comments to reflect that routines expect and produce
* Prepairing for C++ integration. // meters.
* //
* Revision 1.3 1998/01/22 02:59:39 curt // Revision 1.4 1998/04/21 17:03:51 curt
* Changed #ifdef FILE_H to #ifdef _FILE_H // Prepairing for C++ integration.
* //
* Revision 1.2 1998/01/19 19:27:14 curt // Revision 1.3 1998/01/22 02:59:39 curt
* Merged in make system changes from Bob Kuehne <rpk@sgi.com> // Changed #ifdef FILE_H to #ifdef _FILE_H
* This should simplify things tremendously. //
* // Revision 1.2 1998/01/19 19:27:14 curt
* Revision 1.1 1997/12/22 04:13:18 curt // Merged in make system changes from Bob Kuehne <rpk@sgi.com>
* Initial revision. // This should simplify things tremendously.
* //
*/ // Revision 1.1 1997/12/22 04:13:18 curt
// Initial revision.
//