fly/flightgear
1
0
Fork 0
Code Activity

Tweaks for compiling with g++

Browse source
This commit is contained in:
curt 1998-03-03 15:36:11 +00:00
parent 4b577c8bab
commit 9125f72449
5 changed files with 33 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
FixObj/obj.c
View file

@ -33,13 +33,13 @@
/* what do ya' know, here's some global variables */ /* what do ya' know, here's some global variables */
double nodes[MAXNODES][3]; static double nodes[MAXNODES][3];
double normals[MAXNODES][3]; static double normals[MAXNODES][3];
int ccw_list[MAXNODES]; static int ccw_list[MAXNODES];
int ccw_list_ptr; int ccw_list_ptr;
int cw_list[MAXNODES]; static int cw_list[MAXNODES];
int cw_list_ptr; int cw_list_ptr;
FILE *in, *out; FILE *in, *out;
@ -288,9 +288,12 @@ void obj_fix(char *infile, char *outfile) {
/* $Log$ /* $Log$
/* Revision 1.5 1998/03/03 03:37:03 curt /* Revision 1.6 1998/03/03 15:36:12 curt
/* Cumulative tweaks. /* Tweaks for compiling with g++
/* /*
* Revision 1.5 1998/03/03 03:37:03 curt
* Cumulative tweaks.
*
* Revision 1.4 1998/01/31 00:41:25 curt * Revision 1.4 1998/01/31 00:41:25 curt
* Made a few changes converting floats to doubles. * Made a few changes converting floats to doubles.
* *

11
FixObj/obj.h
View file

@ -30,10 +30,6 @@
#define MAXNODES 100000 #define MAXNODES 100000
extern double nodes[MAXNODES][3];
extern double normals[MAXNODES][3];
extern int stack[MAXNODES];
/* Load a .obj file */ /* Load a .obj file */
void obj_fix(char *infile, char *outfile); void obj_fix(char *infile, char *outfile);
@ -43,9 +39,12 @@ void obj_fix(char *infile, char *outfile);
/* $Log$ /* $Log$
/* Revision 1.3 1998/01/31 00:41:25 curt /* Revision 1.4 1998/03/03 15:36:13 curt
/* Made a few changes converting floats to doubles. /* Tweaks for compiling with g++
/* /*
* Revision 1.3 1998/01/31 00:41:25 curt
* Made a few changes converting floats to doubles.
*
* Revision 1.2 1998/01/09 23:03:13 curt * Revision 1.2 1998/01/09 23:03:13 curt
* Restructured to split 1deg x 1deg dem's into 64 subsections. * Restructured to split 1deg x 1deg dem's into 64 subsections.
* *

15
SplitTris/splittris.c
View file

@ -45,11 +45,11 @@
int nodecount, tricount; int nodecount, tricount;
double xmin, xmax, ymin, ymax; double xmin, xmax, ymin, ymax;
double nodes_orig[MAX_NODES][3]; static double nodes_orig[MAX_NODES][3];
int tris[MAX_TRIS][3]; static int tris[MAX_TRIS][3];
int new_tris[MAX_TRIS][3]; /* static int new_tris[MAX_TRIS][3]; */
struct fgCartesianPoint nodes_cart[MAX_NODES]; static struct fgCartesianPoint nodes_cart[MAX_NODES];
struct fgBUCKET ne_index, nw_index, sw_index, se_index; struct fgBUCKET ne_index, nw_index, sw_index, se_index;
struct fgBUCKET north_index, south_index, east_index, west_index; struct fgBUCKET north_index, south_index, east_index, west_index;
@ -612,9 +612,12 @@ int main(int argc, char **argv) {
/* $Log$ /* $Log$
/* Revision 1.5 1998/03/03 03:37:04 curt /* Revision 1.6 1998/03/03 15:36:13 curt
/* Cumulative tweaks. /* Tweaks for compiling with g++
/* /*
* Revision 1.5 1998/03/03 03:37:04 curt
* Cumulative tweaks.
*
* Revision 1.4 1998/01/31 00:41:26 curt * Revision 1.4 1998/01/31 00:41:26 curt
* Made a few changes converting floats to doubles. * Made a few changes converting floats to doubles.
* *

10
SplitTris/splittris.h
View file

@ -37,9 +37,6 @@
extern int nodecount, tricount; extern int nodecount, tricount;
extern struct fgCartesianPoint nodes[MAX_NODES];
extern int tris[MAX_TRIS][3];
extern int new_tris[MAX_TRIS][3];
/* Initialize a new mesh structure */ /* Initialize a new mesh structure */
@ -50,9 +47,12 @@ void triload(char *basename);
/* $Log$ /* $Log$
/* Revision 1.2 1998/01/15 02:49:25 curt /* Revision 1.3 1998/03/03 15:36:13 curt
/* Misc. housekeeping. /* Tweaks for compiling with g++
/* /*
* Revision 1.2 1998/01/15 02:49:25 curt
* Misc. housekeeping.
*
* Revision 1.1 1998/01/14 02:11:32 curt * Revision 1.1 1998/01/14 02:11:32 curt
* Initial revision. * Initial revision.
* *

7
Tools/Makefile
View file

@ -27,8 +27,8 @@
include $(FG_ROOT_SRC)/commondefs include $(FG_ROOT_SRC)/commondefs
SUBDIRS = AssemTris Dem2node DemRaw2Ascii FixNode FixObj SplitTris Stripe_u \ SUBDIRS = AssemTris Dem2node DemRaw2Ascii FixNode FixObj SplitTris \
Tri2obj Triangle Stripe_u Tri2obj Triangle
ORDEREDDIRS = $(SUBDIRS) ORDEREDDIRS = $(SUBDIRS)
@ -90,6 +90,9 @@ bin-zip:
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
# $Log$ # $Log$
# Revision 1.10 1998/03/03 15:36:11 curt
# Tweaks for compiling with g++
#
# Revision 1.9 1998/03/03 01:21:17 curt # Revision 1.9 1998/03/03 01:21:17 curt
# Added DemRaw2Ascii # Added DemRaw2Ascii
# #