fly/flightgear
1
0
Fork 0
Code Activity

minor renaming and a bit of rearranging.

Browse source
This commit is contained in:
curt 1999-03-17 23:48:58 +00:00
parent 685895dce4
commit 53a09c553f
2 changed files with 24 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Clipper/clipper.cxx
View file

@ -144,7 +144,7 @@ bool FGClipper::load_polys(const string& path) {
// Do actually clipping work
bool FGClipper::clip_all(const point2d& min, const point2d& max) {
gpc_polygon accum, result_diff, result_union, tmp;
polylist_iterator current, last;
gpcpoly_iterator current, last;
FG_LOG( FG_CLIPPER, FG_INFO, "Running master clipper" );
@ -198,7 +198,7 @@ bool FGClipper::clip_all(const point2d& min, const point2d& max) {
gpc_polygon_clip(GPC_UNION, &accum, &tmp, &result_union);
}
polys_out.polys[i].push_back(&result_diff);
polys_clipped.polys[i].push_back(&result_diff);
accum = result_union;
}
}
@ -207,7 +207,7 @@ bool FGClipper::clip_all(const point2d& min, const point2d& max) {
// clip to accum against original base tile
gpc_polygon_clip(GPC_DIFF, &polys_in.safety_base, &accum,
&polys_out.safety_base);
&polys_clipped.safety_base);
// tmp output accum
FILE *ofp= fopen("accum", "w");
@ -215,13 +215,16 @@ bool FGClipper::clip_all(const point2d& min, const point2d& max) {
// tmp output safety_base
ofp= fopen("safety_base", "w");
gpc_write_polygon(ofp, &polys_out.safety_base);
gpc_write_polygon(ofp, &polys_clipped.safety_base);
return true;
}
// $Log$
// Revision 1.3 1999/03/17 23:48:58 curt
// minor renaming and a bit of rearranging.
//
// Revision 1.2 1999/03/13 23:51:33 curt
// Renamed main.cxx to testclipper.cxx
// Converted clipper routines to a class FGClipper.

22
Clipper/clipper.hxx
View file

@ -48,22 +48,28 @@ extern "C" {
#include STL_STRING
#include <vector>
typedef vector < gpc_polygon * > polylist;
typedef polylist::iterator polylist_iterator;
FG_USING_STD(string);
FG_USING_STD(vector);
typedef vector < gpc_polygon * > gpcpoly_container;
typedef gpcpoly_container::iterator gpcpoly_iterator;
#define FG_MAX_AREAS 20
#define EXTRA_SAFETY_CLIP
#define FG_MAX_VERTICES 100000
class point2d {
public:
double x, y;
};
class FGPolyList {
class FGgpcPolyList {
public:
polylist polys[FG_MAX_AREAS];
gpcpoly_container polys[FG_MAX_AREAS];
gpc_polygon safety_base;
};
@ -74,7 +80,7 @@ private:
gpc_vertex_list v_list;
// static gpc_polygon poly;
FGPolyList polys_in, polys_out;
FGgpcPolyList polys_in, polys_clipped;
public:
@ -92,6 +98,9 @@ public:
// Do actually clipping work
bool clip_all(const point2d& min, const point2d& max);
// return output poly list
inline FGgpcPolyList get_polys_clipped() const { return polys_clipped; }
};
@ -99,6 +108,9 @@ public:
// $Log$
// Revision 1.3 1999/03/17 23:48:59 curt
// minor renaming and a bit of rearranging.
//
// Revision 1.2 1999/03/13 23:51:34 curt
// Renamed main.cxx to testclipper.cxx
// Converted clipper routines to a class FGClipper.