fly/terragear
1
0
Fork 0
Code Activity

Support creation of polygon lines with non-integer widths. For instance,

Browse source 
road line markings in the USA typically are 4 inches wide (about 10cm).
This commit is contained in:
curt 2007-11-05 14:00:23 +00:00
parent 594c1ffa64
commit fbdbcb076b
2 changed files with 57 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/Lib/Geometry/util.cxx
View file

@ -59,7 +59,7 @@ getIntersection (const Point3D &p0, const Point3D &p1,
* uses the WGS80 functions, rather than simple Pythagorean stuff.
*/
void
makePolygon (const Point3D &p, int width, TGPolygon &polygon)
makePolygon (const Point3D &p, double width, TGPolygon &polygon)
{
double x, y, az;
double lon = p.x();
@ -67,21 +67,23 @@ makePolygon (const Point3D &p, int width, TGPolygon &polygon)
polygon.erase();
geo_direct_wgs_84(0, lat, lon, 90, width/2, &y, &x, &az);
geo_direct_wgs_84(0, lat, lon, 90, width/2.0, &y, &x, &az);
double dlon = x - lon;
geo_direct_wgs_84(0, lat, lon, 0, width/2, &y, &x, &az);
geo_direct_wgs_84(0, lat, lon, 0, width/2.0, &y, &x, &az);
double dlat = y - lat;
polygon.add_node(0, Point3D(lon - dlon, lat - dlat, 0));
polygon.add_node(0, Point3D(lon + dlon, lat - dlat, 0));
polygon.add_node(0, Point3D(lon + dlon, lat + dlat, 0));
polygon.add_node(0, Point3D(lon - dlon, lat + dlat, 0));
polygon.set_hole_flag(0, 0); // mark as solid
}
void
makePolygon (const Line &line, int width, TGPolygon &polygon)
makePolygon (const Line &line, double width, TGPolygon &polygon)
{
vector<TGPolygon> segment_list;
@ -100,7 +102,7 @@ makePolygon (const Line &line, int width, TGPolygon &polygon)
// Corner 1
// cout << "point = " << i << endl;
geo_direct_wgs_84(0, p1.y(), p1.x(), CLAMP_ANGLE(angle1+90), width/2, &y, &x, &az);
geo_direct_wgs_84(0, p1.y(), p1.x(), CLAMP_ANGLE(angle1+90), width/2.0, &y, &x, &az);
// Sometimes creating the new point can wrap the date line, even if the
// original line does not. This can cause problems later, so lets just
// clip the result to date line and hope that the typical error is very
@ -113,7 +115,7 @@ makePolygon (const Line &line, int width, TGPolygon &polygon)
// cout << "corner 1 = " << Point3D(x, y, 0) << endl;
// Corner 2
geo_direct_wgs_84(0, p2.y(), p2.x(), CLAMP_ANGLE(angle1+90), width/2, &y, &x, &az);
geo_direct_wgs_84(0, p2.y(), p2.x(), CLAMP_ANGLE(angle1+90), width/2.0, &y, &x, &az);
// Sometimes creating the new point can wrap the date line, even if the
// original line does not. This can cause problems later, so lets just
// clip the result to date line and hope that the typical error is very
@ -126,7 +128,7 @@ makePolygon (const Line &line, int width, TGPolygon &polygon)
// cout << "corner 2 = " << Point3D(x, y, 0) << endl;
// Corner 3
geo_direct_wgs_84(0, p2.y(), p2.x(), CLAMP_ANGLE(angle1-90), width/2, &y, &x, &az);
geo_direct_wgs_84(0, p2.y(), p2.x(), CLAMP_ANGLE(angle1-90), width/2.0, &y, &x, &az);
// Sometimes creating the new point can wrap the date line, even if the
// original line does not. This can cause problems later, so lets just
// clip the result to date line and hope that the typical error is very
@ -139,7 +141,7 @@ makePolygon (const Line &line, int width, TGPolygon &polygon)
// cout << "corner 3 = " << Point3D(x, y, 0) << endl;
// Corner 4
geo_direct_wgs_84(0, p1.y(), p1.x(), CLAMP_ANGLE(angle1-90), width/2, &y, &x, &az);
geo_direct_wgs_84(0, p1.y(), p1.x(), CLAMP_ANGLE(angle1-90), width/2.0, &y, &x, &az);
// Sometimes creating the new point can wrap the date line, even if the
// original line does not. This can cause problems later, so lets just
// clip the result to date line and hope that the typical error is very
@ -186,6 +188,7 @@ makePolygon (const Line &line, int width, TGPolygon &polygon)
polygon.add_node(0, segment_list[nSegments-1].get_pt(0, 2));
// cout << "tnode = " << segment_list[nSegments-1].get_pt(0, 2) << endl;
for (i = nSegments - 1; i > 0; i--) {
// cout << "point = " << i << endl;
if (getIntersection(segment_list[i].get_pt(0, 2),
segment_list[i].get_pt(0, 3),
segment_list[i-1].get_pt(0, 2),
@ -200,6 +203,8 @@ makePolygon (const Line &line, int width, TGPolygon &polygon)
}
polygon.add_node(0, segment_list[0].get_pt(0, 3));
// cout << "tnode = " << segment_list[0].get_pt(0, 3) << endl;
polygon.set_hole_flag(0, 0); // mark as solid
}

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

@ -70,7 +70,7 @@ bool getIntersection (const Point3D &p0, const Point3D &p1,
* @param width The width in standard units (meters for FlightGear).
* @param polygon The object that will hold the new polygon.
*/
void makePolygon (const Point3D &p, int width, TGPolygon &polygon);
void makePolygon (const Point3D &p, double width, TGPolygon &polygon);
/**
@ -90,7 +90,7 @@ void makePolygon (const Point3D &p, int width, TGPolygon &polygon);
* @param width The width in standard units (meters for FlightGear).
* @param polygon The object that will hold the new polygon.
*/
void makePolygon (const Line &line, int width, TGPolygon &polygon);
void makePolygon (const Line &line, double width, TGPolygon &polygon);
/**