1
0
Fork 0

*.[ch] renamed to *.[ch]xx

This commit is contained in:
curt 1998-07-08 14:59:13 +00:00
parent 4267b78a4d
commit 00276b769b
2 changed files with 24 additions and 18 deletions

View file

@ -32,7 +32,7 @@
#include <sys/stat.h> /* for stat() */ #include <sys/stat.h> /* for stat() */
#include <unistd.h> /* for stat() */ #include <unistd.h> /* for stat() */
#include "splittris.h" #include "splittris.hxx"
#include <Include/fg_constants.h> #include <Include/fg_constants.h>
#include <Include/fg_types.h> #include <Include/fg_types.h>
@ -40,7 +40,7 @@
#include <Math/fg_geodesy.h> #include <Math/fg_geodesy.h>
#include <Math/mat3.h> #include <Math/mat3.h>
#include <Math/polar3d.h> #include <Math/polar3d.hxx>
int nodecount, tricount; int nodecount, tricount;
double xmin, xmax, ymin, ymax; double xmin, xmax, ymin, ymax;
@ -49,16 +49,16 @@ static double nodes_orig[MAX_NODES][3];
static int tris[MAX_TRIS][3]; static int tris[MAX_TRIS][3];
/* static int new_tris[MAX_TRIS][3]; */ /* static int new_tris[MAX_TRIS][3]; */
static fgCartesianPoint3d nodes_cart[MAX_NODES]; static fgPoint3d nodes_cart[MAX_NODES];
fgBUCKET ne_index, nw_index, sw_index, se_index; fgBUCKET ne_index, nw_index, sw_index, se_index;
fgBUCKET north_index, south_index, east_index, west_index; fgBUCKET north_index, south_index, east_index, west_index;
/* convert a geodetic point lon(arcsec), lat(arcsec), elev(meter) to /* convert a geodetic point lon(arcsec), lat(arcsec), elev(meter) to
* a cartesian point */ * a cartesian point */
fgCartesianPoint3d geod_to_cart(double geod[3]) { fgPoint3d geod_to_cart(double geod[3]) {
fgCartesianPoint3d cp; fgPoint3d cp;
fgPolarPoint3d pp; fgPoint3d pp;
double gc_lon, gc_lat, sl_radius; double gc_lon, gc_lat, sl_radius;
/* printf("A geodetic point is (%.2f, %.2f, %.2f)\n", /* printf("A geodetic point is (%.2f, %.2f, %.2f)\n",
@ -72,7 +72,7 @@ fgCartesianPoint3d geod_to_cart(double geod[3]) {
pp.lon = gc_lon; pp.lon = gc_lon;
pp.lat = gc_lat; pp.lat = gc_lat;
pp.radius = sl_radius+geod[2]; pp.radius = sl_radius + geod[2];
cp = fgPolarToCart3d(pp); cp = fgPolarToCart3d(pp);
/* printf("A cart point is (%.8f, %.8f, %.8f)\n", cp.x, cp.y, cp.z); */ /* printf("A cart point is (%.8f, %.8f, %.8f)\n", cp.x, cp.y, cp.z); */
@ -82,8 +82,8 @@ fgCartesianPoint3d geod_to_cart(double geod[3]) {
/* given three points defining a triangle, calculate the normal */ /* given three points defining a triangle, calculate the normal */
void calc_normal(fgCartesianPoint3d p1, fgCartesianPoint3d p2, void calc_normal(fgPoint3d p1, fgPoint3d p2,
fgCartesianPoint3d p3, double normal[3]) fgPoint3d p3, double normal[3])
{ {
double v1[3], v2[3]; double v1[3], v2[3];
double temp; double temp;
@ -616,9 +616,12 @@ int main(int argc, char **argv) {
/* $Log$ /* $Log$
/* Revision 1.11 1998/07/04 00:56:40 curt /* Revision 1.1 1998/07/08 14:59:13 curt
/* typedef'd struct fgBUCKET. /* *.[ch] renamed to *.[ch]xx
/* /*
* Revision 1.11 1998/07/04 00:56:40 curt
* typedef'd struct fgBUCKET.
*
* Revision 1.10 1998/05/02 01:54:37 curt * Revision 1.10 1998/05/02 01:54:37 curt
* Converting to polar3d.h routines. * Converting to polar3d.h routines.
* *

View file

@ -1,5 +1,5 @@
/* splittris.h -- read in a .ele/.node file pair generated by the triangle /* splittris.hxx -- read in a .ele/.node file pair generated by the triangle
* program and output edge vertices w/ normals. * program and output edge vertices w/ normals.
* *
* Written by Curtis Olson, started January 1998. * Written by Curtis Olson, started January 1998.
* *
@ -24,8 +24,8 @@
*/ */
#ifndef SPLITTRIS_H #ifndef SPLITTRIS_HXX
#define SPLITTRIS_H #define SPLITTRIS_HXX
#include <stdio.h> #include <stdio.h>
@ -43,13 +43,16 @@ extern int nodecount, tricount;
void triload(char *basename); void triload(char *basename);
#endif /* SPLITTRIS_H */ #endif /* SPLITTRIS_HXX */
/* $Log$ /* $Log$
/* Revision 1.3 1998/03/03 15:36:13 curt /* Revision 1.1 1998/07/08 14:59:14 curt
/* Tweaks for compiling with g++ /* *.[ch] renamed to *.[ch]xx
/* /*
* Revision 1.3 1998/03/03 15:36:13 curt
* Tweaks for compiling with g++
*
* Revision 1.2 1998/01/15 02:49:25 curt * Revision 1.2 1998/01/15 02:49:25 curt
* Misc. housekeeping. * Misc. housekeeping.
* *