fly/terragear
1
0
Fork 0
Code Activity

More reorg.

Browse source
This commit is contained in:
curt 2000-02-16 22:01:47 +00:00
parent c687e7563b
commit 13cbdf7ecc
41 changed files with 145 additions and 71 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

75
README.gpc Normal file
View file

@ -0,0 +1,75 @@
You need to have the GPC library installed on your system to build
some of the scenery generation tools, otherwise you won't be able to
create scenery.
You can get the library from:
http://www.cs.man.ac.uk/aig/staff/alan/software/
Unfortunately, because of some of the wording in the GPC licensing
terms we are unable to include the GPC library with the Flight Gear
distribution.
This library comes as a single source file and header with no build
directions. So, here are some directions contributed by Riley Rainey
<riley.rainey@websimulations.com> with additional notes by Curt Olson:
1. Download the GPC library source code from URL:
http://www.cs.man.ac.uk/aig/staff/alan/software
2. Unpack it; the current version seems to be 2.30:
$ zcat gpc231.tar.Z | tar xvf -
3. ***IMPORTANT STEP*** ***DO NOT SKIP***
This is important step if you want to use gpc to generate quality
scenery!
Before building the library, edit the gpc.h file and change
GPC_EPSILON to something bigger. You may experiment with this
value, but the following seems to work well for me:
#define GPC_EPSILON (0.000001)
4. Copy in the Makefile attached to this message:
$ cp Makefile ./gpc231
5. Check install paths. Edit the Makefile and make sure the install
paths are satisfactory. Also make sure that all the make commands
have leading tabs (i.e. that the tabs aren't expanded out into 8
spaces) otherwise the make will fail.
6. Build and install it:
$ cd ./gpc231
$ make
$ su
Password:
# make install
-------------------------- snip ------------------------------
# Unix/Linux makefile for GPC 2.31
#
# Riley Rainey (riley.rainey@websimulations.com)
CFLAGS = -O -g
libgpc.a: gpc.o
rm -f $@
ar cr $@ $<
ranlib $@
clean:
rm -f libgpc.a *.o core *~
install: libgpc.a
-mkdir -p /usr/local/lib
-mkdir -p /usr/local/include
install libgpc.a /usr/local/lib/libgpc.a
install gpc.h /usr/local/include/gpc.h

6
src/Airports/GenAirports/build.cxx
View file

@ -38,10 +38,10 @@
#include <plib/sg.h> // plib include #include <plib/sg.h> // plib include
#include <simgear/newbucket.hxx>
#include <simgear/constants.h> #include <simgear/constants.h>
#include <simgear/fg_geodesy.hxx> #include <simgear/bucket/newbucket.hxx>
#include <simgear/texcoord.hxx> #include <simgear/math/fg_geodesy.hxx>
#include <simgear/misc/texcoord.hxx>
#include <Array/array.hxx> #include <Array/array.hxx>
#include <Build/trinodes.hxx> #include <Build/trinodes.hxx>

2
src/Airports/GenAirports/convex_hull.hxx
View file

@ -32,7 +32,7 @@
using namespace std; using namespace std;
#endif #endif
#include <simgear/fg_types.hxx> #include <simgear/math/fg_types.hxx>
#include <Polygon/polygon.hxx> #include <Polygon/polygon.hxx>

6
src/Airports/GenAirports/main.cxx
View file

@ -37,10 +37,10 @@
#include <string.h> #include <string.h>
#include STL_STRING #include STL_STRING
#include <simgear/newbucket.hxx>
#include <simgear/logstream.hxx>
#include <simgear/constants.h> #include <simgear/constants.h>
#include <simgear/fgstream.hxx> #include <simgear/bucket/newbucket.hxx>
#include <simgear/debug/logstream.hxx>
#include <simgear/misc/fgstream.hxx>
#include <Polygon/index.hxx> #include <Polygon/index.hxx>

4
src/Airports/GenAirports/point2d.hxx
View file

@ -26,8 +26,8 @@
#define _POINT2D_HXX #define _POINT2D_HXX
#include <simgear/fg_types.hxx> #include <simgear/math/fg_types.hxx>
#include <simgear/point3d.hxx> #include <simgear/math/point3d.hxx>
// convert a point from cartesian to polar coordinates // convert a point from cartesian to polar coordinates

4
src/Airports/GenAirports/runway.cxx
View file

@ -26,8 +26,8 @@
#include <stdio.h> #include <stdio.h>
#include <simgear/constants.h> #include <simgear/constants.h>
#include <simgear/fg_types.hxx> #include <simgear/math/fg_types.hxx>
#include <simgear/fg_geodesy.hxx> #include <simgear/math/fg_geodesy.hxx>
#include "runway.hxx" #include "runway.hxx"
#include "point2d.hxx" #include "point2d.hxx"

2
src/Airports/GenAirports/runway.hxx
View file

@ -29,7 +29,7 @@
#include <string> #include <string>
#include <vector> #include <vector>
#include <simgear/point3d.hxx> #include <simgear/math/point3d.hxx>
#include <Polygon/polygon.hxx> #include <Polygon/polygon.hxx>

4
src/BuildTiles/Clipper/clipper.cxx
View file

@ -24,9 +24,9 @@
#include <simgear/logstream.hxx>
#include <simgear/constants.h> #include <simgear/constants.h>
#include <simgear/fgstream.hxx> #include <simgear/debug/logstream.hxx>
#include <simgear/misc/fgstream.hxx>
#include <Polygon/names.hxx> #include <Polygon/names.hxx>

2
src/BuildTiles/Clipper/clipper.hxx
View file

@ -34,7 +34,7 @@
#include <simgear/compiler.h> #include <simgear/compiler.h>
#include <simgear/fg_types.hxx> #include <simgear/math/fg_types.hxx>
#include <Polygon/polygon.hxx> #include <Polygon/polygon.hxx>

4
src/BuildTiles/Clipper/testclipper.cxx
View file

@ -22,8 +22,8 @@
#include <simgear/logstream.hxx> #include <simgear/bucket/newbucket.hxx>
#include <simgear/newbucket.hxx> #include <simgear/debug/logstream.hxx>
#include "clipper.hxx" #include "clipper.hxx"

2
src/BuildTiles/GenOutput/genobj.cxx
View file

@ -24,7 +24,7 @@
#include <time.h> #include <time.h>
#include <simgear/texcoord.hxx> #include <simgear/misc/texcoord.hxx>
#include <Polygon/names.hxx> #include <Polygon/names.hxx>
#include "scenery_version.hxx" #include "scenery_version.hxx"

8
src/BuildTiles/GenOutput/genobj.hxx
View file

@ -35,10 +35,10 @@
#include STL_STRING #include STL_STRING
#include <simgear/fg_types.hxx> #include <simgear/bucket/newbucket.hxx>
#include <simgear/newbucket.hxx> #include <simgear/math/fg_geodesy.hxx>
#include <simgear/fg_geodesy.hxx> #include <simgear/math/fg_types.hxx>
#include <simgear/point3d.hxx> #include <simgear/math/point3d.hxx>
#include <Combine/genfans.hxx> #include <Combine/genfans.hxx>
#include <Main/construct.hxx> #include <Main/construct.hxx>

2
src/BuildTiles/Main/construct.hxx
View file

@ -39,7 +39,7 @@
#include STL_STRING #include STL_STRING
#include <simgear/newbucket.hxx> #include <simgear/bucket/newbucket.hxx>
#include <Build/trinodes.hxx> #include <Build/trinodes.hxx>
#include <Build/trisegs.hxx> #include <Build/trisegs.hxx>

6
src/BuildTiles/Main/main.cxx
View file

@ -28,10 +28,10 @@
#include <sys/resource.h> // set mem allocation limit #include <sys/resource.h> // set mem allocation limit
#include <unistd.h> // set mem allocation limit #include <unistd.h> // set mem allocation limit
#include <simgear/newbucket.hxx>
#include <simgear/constants.h> #include <simgear/constants.h>
#include <simgear/mat3.h> #include <simgear/bucket/newbucket.hxx>
#include <simgear/logstream.hxx> #include <simgear/debug/logstream.hxx>
#include <simgear/math/mat3.h>
#include <Array/array.hxx> #include <Array/array.hxx>
#include <Clipper/clipper.hxx> #include <Clipper/clipper.hxx>

2
src/BuildTiles/Main/master.cxx
View file

@ -27,7 +27,7 @@
#include <string> #include <string>
#include <simgear/newbucket.hxx> #include <simgear/bucket/newbucket.hxx>
// #include <Include/fg_constants.h> // #include <Include/fg_constants.h>
// #include <Math/mat3.h> // #include <Math/mat3.h>

6
src/BuildTiles/Match/match.cxx
View file

@ -25,9 +25,9 @@
# include <config.h> # include <config.h>
#endif #endif
#include <simgear/fg_geodesy.hxx> #include <simgear/math/fg_geodesy.hxx>
#include <simgear/point3d.hxx> #include <simgear/math/point3d.hxx>
#include <simgear/fgstream.hxx> #include <simgear/misc/fgstream.hxx>
#include "match.hxx" #include "match.hxx"

4
src/BuildTiles/Match/match.hxx
View file

@ -31,8 +31,8 @@
#include <simgear/compiler.h> #include <simgear/compiler.h>
#include <simgear/fg_types.hxx> #include <simgear/math/fg_types.hxx>
#include <simgear/newbucket.hxx> #include <simgear/bucket/newbucket.hxx>
#include <Main/construct.hxx> #include <Main/construct.hxx>

2
src/BuildTiles/Parallel/client.cxx
View file

@ -27,7 +27,7 @@
#include <iostream> #include <iostream>
#include <string> #include <string>
#include <simgear/newbucket.hxx> #include <simgear/bucket/newbucket.hxx>
#define MAXBUF 1024 #define MAXBUF 1024

2
src/BuildTiles/Parallel/server.cxx
View file

@ -18,7 +18,7 @@
#include <iostream> #include <iostream>
#include <string> #include <string>
#include <simgear/newbucket.hxx> #include <simgear/bucket/newbucket.hxx>
#if defined (sun) #if defined (sun)

2
src/BuildTiles/Triangulate/triangle.hxx
View file

@ -31,7 +31,7 @@
#include <simgear/compiler.h> #include <simgear/compiler.h>
#include <simgear/point3d.hxx> #include <simgear/math/point3d.hxx>
#include <Array/array.hxx> #include <Array/array.hxx>
#include <Clipper/clipper.hxx> #include <Clipper/clipper.hxx>

6
src/Lib/Array/array.cxx
View file

@ -47,9 +47,9 @@
#include STL_STRING #include STL_STRING
#include <simgear/constants.h> #include <simgear/constants.h>
#include <simgear/fgstream.hxx> #include <simgear/misc/fgstream.hxx>
#include <simgear/strutils.hxx> #include <simgear/misc/strutils.hxx>
#include <simgear/leastsqs.hxx> #include <simgear/math/leastsqs.hxx>
#include "array.hxx" #include "array.hxx"

9
src/Lib/Array/array.hxx
View file

@ -34,11 +34,10 @@
#include <vector> #include <vector>
#include <simgear/fg_types.hxx> #include <simgear/bucket/newbucket.hxx>
#include <simgear/math/fg_types.hxx>
#include <simgear/newbucket.hxx> #include <simgear/math/point3d.hxx>
#include <simgear/point3d.hxx> #include <simgear/misc/fgstream.hxx>
#include <simgear/fgstream.hxx>
FG_USING_STD(vector); FG_USING_STD(vector);

2
src/Lib/Array/testarray.cxx
View file

@ -1,4 +1,4 @@
#include <simgear/newbucket.hxx> #include <simgear/bucket/newbucket.hxx>
#include "array.hxx" #include "array.hxx"

4
src/Lib/DEM/dem.cxx
View file

@ -47,9 +47,9 @@
# include <unistd.h> // stat() # include <unistd.h> // stat()
#endif #endif
#include <simgear/fgstream.hxx>
#include <simgear/strutils.hxx>
#include <simgear/constants.h> #include <simgear/constants.h>
#include <simgear/misc/fgstream.hxx>
#include <simgear/misc/strutils.hxx>
#include "dem.hxx" #include "dem.hxx"

4
src/Lib/DEM/dem.hxx
View file

@ -30,8 +30,8 @@
#endif #endif
#include <simgear/newbucket.hxx> #include <simgear/bucket/newbucket.hxx>
#include <simgear/fgstream.hxx> #include <simgear/misc/fgstream.hxx>
#define DEM_SIZE 1200 #define DEM_SIZE 1200

4
src/Lib/Geometry/poly_support.cxx
View file

@ -23,7 +23,7 @@
#include <simgear/compiler.h> #include <simgear/compiler.h>
#include <simgear/fg_types.hxx> #include <simgear/math/fg_types.hxx>
#include <Polygon/polygon.hxx> #include <Polygon/polygon.hxx>
@ -38,7 +38,7 @@ void calc_point_inside( const int contour, const FGTriNodes& trinodes );
#include <simgear/constants.h> #include <simgear/constants.h>
#include <simgear/point3d.hxx> #include <simgear/math/point3d.hxx>
#include <Build/trisegs.hxx> #include <Build/trisegs.hxx>

2
src/Lib/Geometry/poly_support.hxx
View file

@ -32,7 +32,7 @@
#include <simgear/compiler.h> #include <simgear/compiler.h>
#include <simgear/fg_types.hxx> #include <simgear/math/fg_types.hxx>
#include <Polygon/polygon.hxx> #include <Polygon/polygon.hxx>

4
src/Lib/Geometry/trinodes.hxx
View file

@ -31,8 +31,8 @@
#include <simgear/compiler.h> #include <simgear/compiler.h>
#include <simgear/fg_types.hxx> #include <simgear/math/fg_types.hxx>
#include <simgear/point3d.hxx> #include <simgear/math/point3d.hxx>

2
src/Lib/Geometry/trisegs.cxx
View file

@ -22,7 +22,7 @@
#include <simgear/constants.h> #include <simgear/constants.h>
#include <simgear/point3d.hxx> #include <simgear/math/point3d.hxx>
#include "trinodes.hxx" #include "trinodes.hxx"

2
src/Lib/Optimize/genfans.hxx
View file

@ -34,7 +34,7 @@
#include <vector> #include <vector>
#include <simgear/fg_types.hxx> #include <simgear/math/fg_types.hxx>
#include <Triangulate/trieles.hxx> #include <Triangulate/trieles.hxx>

2
src/Lib/Polygon/polygon.cxx
View file

@ -30,7 +30,7 @@ extern "C" {
} }
#include <simgear/constants.h> #include <simgear/constants.h>
#include <simgear/point3d.hxx> #include <simgear/math/point3d.hxx>
#include <poly2tri/interface.h> #include <poly2tri/interface.h>

2
src/Lib/Polygon/polygon.hxx
View file

@ -31,7 +31,7 @@
#include <simgear/compiler.h> #include <simgear/compiler.h>
#include <simgear/fg_types.hxx> #include <simgear/math/fg_types.hxx>
#include <string> #include <string>
#include <vector> #include <vector>

4
src/Lib/Polygon/split.cxx
View file

@ -25,8 +25,8 @@
#include STL_STRING #include STL_STRING
#include <simgear/newbucket.hxx> #include <simgear/bucket/newbucket.hxx>
#include <simgear/logstream.hxx> #include <simgear/debug/logstream.hxx>
#include "index.hxx" #include "index.hxx"
#include "names.hxx" #include "names.hxx"

4
src/Prep/DemChop/demchop.cxx
View file

@ -26,8 +26,8 @@
#include STL_STRING #include STL_STRING
#include <simgear/logstream.hxx> #include <simgear/bucket/newbucket.hxx>
#include <simgear/newbucket.hxx> #include <simgear/debug/logstream.hxx>
#include <DEM/dem.hxx> #include <DEM/dem.hxx>

2
src/Prep/GSHHS/debug.cxx
View file

@ -27,7 +27,7 @@
#include STL_STRING #include STL_STRING
#include <simgear/logstream.hxx> #include <simgear/debug/logstream.hxx>
#include <zlib.h> #include <zlib.h>
#include <Polygon/index.hxx> #include <Polygon/index.hxx>

4
src/Prep/GSHHS/gshhs_split.cxx
View file

@ -25,8 +25,8 @@
#include STL_STRING #include STL_STRING
#include <simgear/newbucket.hxx> #include <simgear/bucket/newbucket.hxx>
#include <simgear/logstream.hxx> #include <simgear/debug/logstream.hxx>
#include <Polygon/index.hxx> #include <Polygon/index.hxx>
#include <Polygon/names.hxx> #include <Polygon/names.hxx>

2
src/Prep/GSHHS/main.cxx
View file

@ -27,7 +27,7 @@
#include STL_STRING #include STL_STRING
#include <simgear/logstream.hxx> #include <simgear/debug/logstream.hxx>
#include <zlib.h> #include <zlib.h>
#include <Polygon/index.hxx> #include <Polygon/index.hxx>

4
src/Prep/MergerClipper/merger.cxx
View file

@ -22,9 +22,9 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-------------------------------------------------------------------------- --------------------------------------------------------------------------
*/ */
#include <simgear/logstream.hxx>
#include <simgear/constants.h> #include <simgear/constants.h>
#include <simgear/fgstream.hxx> #include <simgear/debug/logstream.hxx>
#include <simgear/misc/fgstream.hxx>
#include <Polygon/names.hxx> #include <Polygon/names.hxx>
#include <Polygon/index.hxx> #include <Polygon/index.hxx>

2
src/Prep/MergerClipper/merger.hxx
View file

@ -32,7 +32,7 @@
#include <simgear/compiler.h> #include <simgear/compiler.h>
#include <simgear/fg_types.hxx> #include <simgear/math/fg_types.hxx>
#include <Polygon/polygon.hxx> #include <Polygon/polygon.hxx>
#include <Polygon/names.hxx> #include <Polygon/names.hxx>

4
src/Prep/MergerClipper/testmerger.cxx
View file

@ -22,8 +22,8 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-------------------------------------------------------------------------- --------------------------------------------------------------------------
*/ */
#include <simgear/logstream.hxx> #include <simgear/debug/logstream.hxx>
#include <simgear/newbucket.hxx> #include <simgear/bucket/newbucket.hxx>
#include <dirent.h> #include <dirent.h>
#include "merger.hxx" #include "merger.hxx"

2
src/Prep/ShapeFile/main.cxx
View file

@ -27,7 +27,7 @@
#include STL_STRING #include STL_STRING
#include <simgear/logstream.hxx> #include <simgear/debug/logstream.hxx>
#include <Polygon/index.hxx> #include <Polygon/index.hxx>
#include <Polygon/names.hxx> #include <Polygon/names.hxx>