fly/flightgear
1
0
Fork 0
Code Activity

Tweaked the polygon type prioritization scheme just a bit.

Browse source 
Fixed a bug (dumb test idea) that was throwing away ocean areas.
This commit is contained in:
curt 1999-06-12 14:13:01 +00:00
parent 898833174e
commit 1e606bc183
2 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Tools/Construct/Clipper/clipper.cxx
View file

@ -135,9 +135,12 @@ bool FGClipper::load_polys(const string& path) {
} }
int area = (int)poly_type; int area = (int)poly_type;
if ( area == OceanArea ) {
// TEST - Ignore // if ( area == OceanArea ) {
} else if ( area < FG_MAX_AREA_TYPES ) { // TEST - Ignore
// } else
if ( area < FG_MAX_AREA_TYPES ) {
polys_in.polys[area].push_back(poly); polys_in.polys[area].push_back(poly);
} else { } else {
FG_LOG( FG_CLIPPER, FG_ALERT, "Polygon type out of range = " FG_LOG( FG_CLIPPER, FG_ALERT, "Polygon type out of range = "

8
Tools/Lib/Polygon/names.hxx
View file

@ -47,10 +47,10 @@ enum AreaType {
StreamArea = 8, StreamArea = 8,
CanalArea = 9, CanalArea = 9,
GlacierArea = 10, GlacierArea = 10,
UrbanArea = 11, OceanArea = 11,
MarshArea = 12, UrbanArea = 12,
DefaultArea = 13, MarshArea = 13,
OceanArea = 14, DefaultArea = 14,
VoidArea = 9997, VoidArea = 9997,
NullArea = 9998, NullArea = 9998,
UnknownArea = 9999 UnknownArea = 9999