fly/terragear
1
0
Fork 0
Code Activity

Minor code reorg.

Browse source
This commit is contained in:
curt 2000-05-08 17:04:23 +00:00
parent 34db12893e
commit c963e6304a
6 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
configure.in
View file

@ -240,7 +240,6 @@ AC_OUTPUT( \
src/Include/Makefile \
src/Construct/Makefile \
src/Construct/Clipper/Makefile \
src/Construct/Combine/Makefile \
src/Construct/GenOutput/Makefile \
src/Construct/Match/Makefile \
src/Construct/Triangulate/Makefile \
@ -250,6 +249,7 @@ AC_OUTPUT( \
src/Lib/Array/Makefile \
src/Lib/Build/Makefile \
src/Lib/DEM/Makefile \
src/Lib/Optimize/Makefile \
src/Lib/Polygon/Makefile \
src/Lib/poly2tri/Makefile \
src/Lib/shapelib/Makefile \

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

@ -40,7 +40,7 @@
#include <simgear/math/fg_types.hxx>
#include <simgear/math/point3d.hxx>
#include <Combine/genfans.hxx>
#include <Optimize/genfans.hxx>
#include <Main/construct.hxx>
#include <Triangulate/triangle.hxx>

2
src/BuildTiles/Main/Makefile.am
View file

@ -7,11 +7,11 @@ fgfs_construct_SOURCES = \
fgfs_construct_LDADD = \
$(top_builddir)/src/Construct/Clipper/libClipper.a \
$(top_builddir)/src/Construct/GenOutput/libGenOutput.a \
$(top_builddir)/src/Construct/Combine/libCombine.a \
$(top_builddir)/src/Construct/Match/libMatch.a \
$(top_builddir)/src/Construct/Triangulate/libTriangulate.a \
$(top_builddir)/src/Lib/Array/libArray.a \
$(top_builddir)/src/Lib/Build/libBuild.a \
$(top_builddir)/src/Lib/Optimize/libOptimize.a \
$(top_builddir)/src/Lib/Polygon/libPolygon.a \
$(top_builddir)/src/Lib/poly2tri/libpoly2tri.a \
$(top_builddir)/src/Lib/Triangle/libTriangle.a \

1
src/BuildTiles/Makefile.am
View file

@ -1,7 +1,6 @@
SUBDIRS = \
Triangulate \
Clipper \
Combine \
GenOutput \
Match \
Parallel \

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

@ -227,8 +227,8 @@ Point3D calc_point_inside( const FGPolygon& p, const int contour,
// basic triangulation of a polygon with out adding points or
// splitting edges
static triele_list triangulate_poly( const point_list contour,
const point_list holes ) {
static triele_list triangulate_contour( const point_list contour,
const point_list holes ) {
// triangle list
triele_list elelist;
struct triangulateio in, out, vorout;
@ -384,7 +384,7 @@ static Point3D point_inside_hole( point_list contour ) {
point_list holes;
holes.clear();
triele_list elelist = triangulate_poly( contour, holes );
triele_list elelist = triangulate_contour( contour, holes );
if ( elelist.size() <= 0 ) {
cout << "Error polygon triangulated to zero triangles!" << endl;
exit(-1);
@ -416,7 +416,8 @@ static Point3D point_inside_contour( const FGPolygon p, int contour ) {
}
}
triele_list elelist = triangulate_poly( p.get_contour( contour ), holes );
triele_list elelist = triangulate_contour( p.get_contour( contour ),
holes );
if ( elelist.size() <= 0 ) {
cout << "Error polygon triangulated to zero triangles!" << endl;
exit(-1);

1
src/Lib/Makefile.am
View file

@ -2,6 +2,7 @@ SUBDIRS = \
Array \
Build \
DEM \
Optimize \
Polygon \
poly2tri \
shapelib \