From c963e6304a7d212b7aece7d1247a544286a6a18c Mon Sep 17 00:00:00 2001
From: curt <curt>
Date: Mon, 8 May 2000 17:04:23 +0000
Subject: [PATCH] Minor code reorg.
---
configure.in | 2 +-
src/BuildTiles/GenOutput/genobj.hxx | 2 +-
src/BuildTiles/Main/Makefile.am | 2 +-
src/BuildTiles/Makefile.am | 1 -
src/Lib/Geometry/poly_support.cxx | 9 +++++----
src/Lib/Makefile.am | 1 +
6 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/configure.in b/configure.in
index bdb9e510..7f595e75 100644
--- a/configure.in
+++ b/configure.in
@@ -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 \
diff --git a/src/BuildTiles/GenOutput/genobj.hxx b/src/BuildTiles/GenOutput/genobj.hxx
index ecd91eb8..5cb12641 100644
--- a/src/BuildTiles/GenOutput/genobj.hxx
+++ b/src/BuildTiles/GenOutput/genobj.hxx
@@ -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>
diff --git a/src/BuildTiles/Main/Makefile.am b/src/BuildTiles/Main/Makefile.am
index 9bbbbe97..85c4eb86 100644
--- a/src/BuildTiles/Main/Makefile.am
+++ b/src/BuildTiles/Main/Makefile.am
@@ -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 \
diff --git a/src/BuildTiles/Makefile.am b/src/BuildTiles/Makefile.am
index 97170022..5c7139a3 100644
--- a/src/BuildTiles/Makefile.am
+++ b/src/BuildTiles/Makefile.am
@@ -1,7 +1,6 @@
SUBDIRS = \
Triangulate \
Clipper \
- Combine \
GenOutput \
Match \
Parallel \
diff --git a/src/Lib/Geometry/poly_support.cxx b/src/Lib/Geometry/poly_support.cxx
index 69f1c2fe..766a73bc 100644
--- a/src/Lib/Geometry/poly_support.cxx
+++ b/src/Lib/Geometry/poly_support.cxx
@@ -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);
diff --git a/src/Lib/Makefile.am b/src/Lib/Makefile.am
index 385d126a..b778abfe 100644
--- a/src/Lib/Makefile.am
+++ b/src/Lib/Makefile.am
@@ -2,6 +2,7 @@ SUBDIRS = \
Array \
Build \
DEM \
+ Optimize \
Polygon \
poly2tri \
shapelib \