fly/flightgear
1
0
Fork 0
Code Activity

Prepairing for C++ integration.

Browse source
This commit is contained in:
curt 1998-04-21 17:03:45 +00:00
parent 9d504a9e19
commit e5efd5bf69
14 changed files with 152 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
Debug/fg_debug.c
View file

@ -87,10 +87,12 @@ void fgInitDebug( void ) {
// Support for log file/alt debug output via command line, environment or // Support for log file/alt debug output via command line, environment or
// reasonable default. // reasonable default.
/*
if( strlen( logArgbuf ) > 3) { // First check for command line option if( strlen( logArgbuf ) > 3) { // First check for command line option
// Assumed that we will append. // Assumed that we will append.
fg_DebugOutput = fopen(logArgbuf, "a+" ); fg_DebugOutput = fopen(logArgbuf, "a+" );
} }
*/
if( !fg_DebugOutput ) { // If not set on command line, environment? if( !fg_DebugOutput ) { // If not set on command line, environment?
pszFile = getenv( "FG_DEBUGFILE" ); pszFile = getenv( "FG_DEBUGFILE" );
@ -110,9 +112,11 @@ void fgInitDebug( void ) {
// is in range (properly optioned) the we will override both defaults // is in range (properly optioned) the we will override both defaults
// and the environmental value. // and the environmental value.
/*
if ((priorityArgValue >= FG_BULK) && (priorityArgValue <= FG_ABORT)) { if ((priorityArgValue >= FG_BULK) && (priorityArgValue <= FG_ABORT)) {
fg_DebugPriority = priorityArgValue; fg_DebugPriority = priorityArgValue;
} else { // Either not set or out of range. We will not warn the user. } else { // Either not set or out of range. We will not warn the user.
*/
pszPrio = getenv( "FG_DEBUGPRIORITY" ); pszPrio = getenv( "FG_DEBUGPRIORITY" );
if( pszPrio ) { if( pszPrio ) {
fg_DebugPriority = atoi( pszPrio ); fg_DebugPriority = atoi( pszPrio );
@ -120,12 +124,14 @@ void fgInitDebug( void ) {
"fg_debug.c: Environment overrides default debug priority (%d)\n", "fg_debug.c: Environment overrides default debug priority (%d)\n",
fg_DebugPriority ); fg_DebugPriority );
} }
} /* } */
/*
if ((debugArgValue >= FG_ALL) && (debugArgValue < FG_UNDEFD)) { if ((debugArgValue >= FG_ALL) && (debugArgValue < FG_UNDEFD)) {
fg_DebugPriority = priorityArgValue; fg_DebugPriority = priorityArgValue;
} else { // Either not set or out of range. We will not warn the user. } else { // Either not set or out of range. We will not warn the user.
*/
pszClass = getenv( "FG_DEBUGCLASS" ); pszClass = getenv( "FG_DEBUGCLASS" );
if( pszClass ) { if( pszClass ) {
fg_DebugClass = fgDebugStrToClass( pszClass ); fg_DebugClass = fgDebugStrToClass( pszClass );
@ -133,7 +139,7 @@ void fgInitDebug( void ) {
"fg_debug.c: Environment overrides default debug class (0x%08X)\n", "fg_debug.c: Environment overrides default debug class (0x%08X)\n",
fg_DebugClass ); fg_DebugClass );
} }
} /* } */
FG_RELEASEDEBUGSEM; FG_RELEASEDEBUGSEM;
} }
@ -266,9 +272,12 @@ int fgPrintf( fgDebugClass dbg_class, fgDebugPriority prio, char *fmt, ... ) {
/* $Log$ /* $Log$
/* Revision 1.1 1998/04/18 03:52:04 curt /* Revision 1.2 1998/04/21 17:03:45 curt
/* Moved to Lib directory and created a libDebug. /* Prepairing for C++ integration.
/* /*
* Revision 1.1 1998/04/18 03:52:04 curt
* Moved to Lib directory and created a libDebug.
*
* Revision 1.10 1998/03/14 00:31:21 curt * Revision 1.10 1998/03/14 00:31:21 curt
* Beginning initial terrain texturing experiments. * Beginning initial terrain texturing experiments.
* *

12
Debug/fg_debug.h
View file

@ -27,6 +27,12 @@
#ifndef _FG_DEBUG_H #ifndef _FG_DEBUG_H
#define _FG_DEBUG_H #define _FG_DEBUG_H
#ifdef __cplusplus
extern "C" {
#endif
#include <stdio.h> #include <stdio.h>
/* NB: To add a dbg_class, add it here, and add it to the structure in /* NB: To add a dbg_class, add it here, and add it to the structure in
@ -139,5 +145,11 @@ extern fgDebugPriority fg_DebugPriority;
extern FILE * fg_DebugOutput; extern FILE * fg_DebugOutput;
#ifdef __cplusplus
}
#endif
#endif /* _FG_DEBUG_H */ #endif /* _FG_DEBUG_H */

1
Math/Makefile.am
View file

@ -8,6 +8,7 @@ libMath_la_SOURCES = \
MAT3vec.c \ MAT3vec.c \
fg_geodesy.c fg_geodesy.h \ fg_geodesy.c fg_geodesy.h \
fg_random.c fg_random.h \ fg_random.c fg_random.h \
interpolater.c interpolater.h \
mat3.h mat3defs.h mat3err.h \ mat3.h mat3defs.h mat3err.h \
polar.c polar.h \ polar.c polar.h \
vector.c vector.h vector.c vector.h

7
Math/Makefile.in
View file

@ -80,6 +80,7 @@ libMath_la_SOURCES = \
MAT3vec.c \ MAT3vec.c \
fg_geodesy.c fg_geodesy.h \ fg_geodesy.c fg_geodesy.h \
fg_random.c fg_random.h \ fg_random.c fg_random.h \
interpolater.c interpolater.h \
mat3.h mat3defs.h mat3err.h \ mat3.h mat3defs.h mat3err.h \
polar.c polar.h \ polar.c polar.h \
vector.c vector.h vector.c vector.h
@ -100,7 +101,7 @@ X_PRE_LIBS = @X_PRE_LIBS@
libMath_la_LDFLAGS = libMath_la_LDFLAGS =
libMath_la_LIBADD = libMath_la_LIBADD =
libMath_la_OBJECTS = MAT3geom.lo MAT3inv.lo MAT3mat.lo MAT3vec.lo \ libMath_la_OBJECTS = MAT3geom.lo MAT3inv.lo MAT3mat.lo MAT3vec.lo \
fg_geodesy.lo fg_random.lo polar.lo vector.lo fg_geodesy.lo fg_random.lo interpolater.lo polar.lo vector.lo
CFLAGS = @CFLAGS@ CFLAGS = @CFLAGS@
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
@ -113,8 +114,8 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
TAR = tar TAR = tar
GZIP = --best GZIP = --best
DEP_FILES = .deps/MAT3geom.P .deps/MAT3inv.P .deps/MAT3mat.P \ DEP_FILES = .deps/MAT3geom.P .deps/MAT3inv.P .deps/MAT3mat.P \
.deps/MAT3vec.P .deps/fg_geodesy.P .deps/fg_random.P .deps/polar.P \ .deps/MAT3vec.P .deps/fg_geodesy.P .deps/fg_random.P \
.deps/vector.P .deps/interpolater.P .deps/polar.P .deps/vector.P
SOURCES = $(libMath_la_SOURCES) SOURCES = $(libMath_la_SOURCES)
OBJECTS = $(libMath_la_OBJECTS) OBJECTS = $(libMath_la_OBJECTS)

19
Math/fg_geodesy.h
View file

@ -15,6 +15,11 @@
#define _FG_GEODESY_H #define _FG_GEODESY_H
#ifdef __cplusplus
extern "C" {
#endif
/* 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
@ -89,6 +94,9 @@ void fgGeodToGeoc( double lat_geod, double alt, double *sl_radius,
$Header$ $Header$
$Log$ $Log$
Revision 1.3 1998/04/21 17:03:48 curt
Prepairing for C++ integration.
Revision 1.2 1998/01/22 02:59:38 curt Revision 1.2 1998/01/22 02:59:38 curt
Changed #ifdef FILE_H to #ifdef _FILE_H Changed #ifdef FILE_H to #ifdef _FILE_H
@ -144,13 +152,20 @@ Initial Flight Gear revision.
--------------------------------------------------------------------------*/ --------------------------------------------------------------------------*/
#ifdef __cplusplus
}
#endif
#endif /* _FG_GEODESY_H */ #endif /* _FG_GEODESY_H */
/* $Log$ /* $Log$
/* 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.2 1998/01/22 02:59:38 curt
* Changed #ifdef FILE_H to #ifdef _FILE_H
*
* Revision 1.1 1997/07/31 23:13:14 curt * Revision 1.1 1997/07/31 23:13:14 curt
* Initial revision. * Initial revision.
* *

17
Math/fg_random.h
View file

@ -28,6 +28,11 @@
#define _FG_RANDOM_H #define _FG_RANDOM_H
#ifdef __cplusplus
extern "C" {
#endif
/* Seed the random number generater with time() so we don't see the /* Seed the random number generater with time() so we don't see the
* same sequence every time */ * same sequence every time */
void fg_srandom(void); void fg_srandom(void);
@ -36,13 +41,21 @@ void fg_srandom(void);
double fg_random(void); double fg_random(void);
#ifdef __cplusplus
}
#endif
#endif /* _FG_RANDOM_H */ #endif /* _FG_RANDOM_H */
/* $Log$ /* $Log$
/* 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.2 1998/01/22 02:59:38 curt
* Changed #ifdef FILE_H to #ifdef _FILE_H
*
* Revision 1.1 1997/07/30 16:04:09 curt * Revision 1.1 1997/07/30 16:04:09 curt
* Moved random routines from Utils/ to Math/ * Moved random routines from Utils/ to Math/
* *

8
Math/mat3.h
View file

@ -7,6 +7,10 @@
#ifndef MAT3_HAS_BEEN_INCLUDED #ifndef MAT3_HAS_BEEN_INCLUDED
#define MAT3_HAS_BEEN_INCLUDED #define MAT3_HAS_BEEN_INCLUDED
#ifdef __cplusplus
extern "C" {
#endif
/* ----------------------------- Constants ------------------------------ */ /* ----------------------------- Constants ------------------------------ */
/* /*
@ -143,5 +147,9 @@ int MAT3mult_hvec (MAT3hvec result_vec, MAT3hvec vec, MAT3mat mat, int normaliz
void MAT3cross_product(MAT3vec result,MAT3vec,MAT3vec); void MAT3cross_product(MAT3vec result,MAT3vec,MAT3vec);
void MAT3perp_vec(MAT3vec result_vec, MAT3vec vec, int is_unit); void MAT3perp_vec(MAT3vec result_vec, MAT3vec vec, int is_unit);
#ifdef __cplusplus
}
#endif
#endif /* MAT3_HAS_BEEN_INCLUDED */ #endif /* MAT3_HAS_BEEN_INCLUDED */

17
Math/mat3defs.h
View file

@ -1,5 +1,14 @@
/* Copyright 1988, Brown Computer Graphics Group. All Rights Reserved. */ /* Copyright 1988, Brown Computer Graphics Group. All Rights Reserved. */
#ifndef _MAT3DEFS_H
#define _MAT3DEFS_H
#ifdef __cplusplus
extern "C" {
#endif
#include <stdio.h> #include <stdio.h>
/* #include <Math/mat3err.h> */ /* #include <Math/mat3err.h> */
#include <Math/mat3.h> #include <Math/mat3.h>
@ -37,3 +46,11 @@
/* ------------------------- Global Variables ---------------------------- */ /* ------------------------- Global Variables ---------------------------- */
/* extern ERRid *MAT3_errid; */ /* extern ERRid *MAT3_errid; */
#ifdef __cplusplus
}
#endif
#endif /* _MAT3DEFS_H */

15
Math/mat3err.h
View file

@ -1,3 +1,12 @@
#ifndef _MAT3ERR_H
#define _MAT3ERR_H
#ifdef __cplusplus
extern "C" {
#endif
#include "sph_errtypes.h" #include "sph_errtypes.h"
#ifdef THINK_C #ifdef THINK_C
@ -24,3 +33,9 @@ typedef int ERRid;
#define ERRregister_package(S) 100 #define ERRregister_package(S) 100
#ifdef __cplusplus
}
#endif
#endif /* _MAT3ERR_H */

19
Math/polar.h
View file

@ -28,6 +28,11 @@
#define _POLAR_H #define _POLAR_H
#ifdef __cplusplus
extern "C" {
#endif
#include <Include/fg_types.h> #include <Include/fg_types.h>
@ -59,14 +64,22 @@ void fgRotateBatchInit(double Theta, double Phi);
struct fgCartesianPoint fgRotateCartesianPoint(struct fgCartesianPoint p); struct fgCartesianPoint fgRotateCartesianPoint(struct fgCartesianPoint p);
#ifdef __cplusplus
}
#endif
#endif /* _POLAR_H */ #endif /* _POLAR_H */
/* $Log$ /* $Log$
/* Revision 1.7 1998/01/27 00:48:00 curt /* Revision 1.8 1998/04/21 17:03:50 curt
/* Incorporated Paul Bleisch's <bleisch@chromatic.com> new debug message /* Prepairing for C++ integration.
/* system and commandline/config file processing code.
/* /*
* Revision 1.7 1998/01/27 00:48:00 curt
* Incorporated Paul Bleisch's <bleisch@chromatic.com> new debug message
* system and commandline/config file processing code.
*
* Revision 1.6 1998/01/22 02:59:39 curt * Revision 1.6 1998/01/22 02:59:39 curt
* Changed #ifdef FILE_H to #ifdef _FILE_H * Changed #ifdef FILE_H to #ifdef _FILE_H
* *

17
Math/vector.h
View file

@ -28,6 +28,11 @@
#define _VECTOR_H #define _VECTOR_H
#ifdef __cplusplus
extern "C" {
#endif
#include <Math/mat3.h> #include <Math/mat3.h>
@ -36,13 +41,21 @@ void map_vec_onto_cur_surface_plane(MAT3vec normal, MAT3vec v0, MAT3vec vec,
MAT3vec result); MAT3vec result);
#ifdef __cplusplus
}
#endif
#endif /* _VECTOR_H */ #endif /* _VECTOR_H */
/* $Log$ /* $Log$
/* 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.3 1998/01/22 02:59:39 curt
* Changed #ifdef FILE_H to #ifdef _FILE_H
*
* Revision 1.2 1998/01/19 19:27:14 curt * Revision 1.2 1998/01/19 19:27:14 curt
* Merged in make system changes from Bob Kuehne <rpk@sgi.com> * Merged in make system changes from Bob Kuehne <rpk@sgi.com>
* This should simplify things tremendously. * This should simplify things tremendously.

11
XGL/xgl.h
View file

@ -2,6 +2,11 @@
#define _XGL_H #define _XGL_H
#ifdef __cplusplus
extern "C" {
#endif
#include <GL/gl.h> #include <GL/gl.h>
#include <GL/glu.h> #include <GL/glu.h>
#include <stdio.h> #include <stdio.h>
@ -826,4 +831,10 @@ void xglPrioritizeTexturesEXT ( GLsizei n, GLuint *textures, GLclampf *pri
#endif #endif
#ifdef __cplusplus
}
#endif
#endif /* _XGL_H */ #endif /* _XGL_H */

4
zlib/Makefile.am
View file

@ -1,5 +1,8 @@
libdir = ${exec_prefix}/lib libdir = ${exec_prefix}/lib
EXTRA_DIST = ChangeLog INDEX Make_vms.com Makefile.riscos README \
algorithm.txt descrip.mms example.c maketree.c minigzip.c zlib.3
lib_LTLIBRARIES = libz.la lib_LTLIBRARIES = libz.la
libz_la_SOURCES = \ libz_la_SOURCES = \
@ -22,6 +25,7 @@ libz_la_SOURCES = \
infutil.c \ infutil.c \
infutil.h \ infutil.h \
trees.c \ trees.c \
trees.h \
uncompr.c \ uncompr.c \
zconf.h \ zconf.h \
zlib.h \ zlib.h \

4
zlib/Makefile.in
View file

@ -72,6 +72,9 @@ VERSION = @VERSION@
libdir = ${exec_prefix}/lib libdir = ${exec_prefix}/lib
EXTRA_DIST = ChangeLog INDEX Make_vms.com Makefile.riscos README \
algorithm.txt descrip.mms example.c maketree.c minigzip.c zlib.3
lib_LTLIBRARIES = libz.la lib_LTLIBRARIES = libz.la
libz_la_SOURCES = \ libz_la_SOURCES = \
@ -94,6 +97,7 @@ libz_la_SOURCES = \
infutil.c \ infutil.c \
infutil.h \ infutil.h \
trees.c \ trees.c \
trees.h \
uncompr.c \ uncompr.c \
zconf.h \ zconf.h \
zlib.h \ zlib.h \