fly/terragear
1
0
Fork 0
Code Activity

Convert OffsetPointMiddle to use GSGeod and SGVec3 in linear features

Browse source
This commit is contained in:
Peter Sadrozinski 2012-10-20 14:51:50 -04:00
parent ec750c6732
commit 78a19db02d
3 changed files with 49 additions and 99 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/Airports/GenAirports850/beznode.hxx
View file

@ -85,6 +85,16 @@ inline double CalculateTheta( const SGGeod& p0, const SGGeod& p1, const SGGeod&
return acos( uv_dot / (udist * vdist) ); return acos( uv_dot / (udist * vdist) );
} }
/* cal theta when we have unit vectors */
/* TODO : Use cp to determine right or left turn */
inline double CalculateTheta( const SGVec3d& dirCur, const SGVec3d& dirNext, const SGVec3d& cp )
{
double dp = dot( dirCur, dirNext );
return acos( dp );
}
#define BEZIER_DETAIL (8) #define BEZIER_DETAIL (8)
#define LINE_WIDTH (0.75) #define LINE_WIDTH (0.75)
#define WIREFRAME (1) #define WIREFRAME (1)

135
src/Airports/GenAirports850/linearfeature.cxx
View file

@ -374,124 +374,63 @@ LinearFeature::~LinearFeature()
} }
} }
Point3D LinearFeature::OffsetPointMiddle( const Point3D& prev, const Point3D& cur, const Point3D& next, double offset_by )
{
double offset_dir;
double next_dir;
double az2;
double dist;
double theta;
double pt_x = 0, pt_y = 0;
SGGeod gPrev = prev.toSGGeod(); Point3D LinearFeature::OffsetPointMiddle( const SGGeod& gPrev, const SGGeod& gCur, const SGGeod& gNext, double offset_by )
SGGeod gCur = cur.toSGGeod(); {
SGGeod gNext = next.toSGGeod(); double courseCur, courseNext, courseAvg, theta;
SGVec3d dirCur, dirNext, dirAvg, cp;
double courseOffset, distOffset;
SGGeod pt;
SG_LOG(SG_GENERAL, SG_DEBUG, "Find average angle for contour: prev (" << gPrev << "), " SG_LOG(SG_GENERAL, SG_DEBUG, "Find average angle for contour: prev (" << gPrev << "), "
"cur (" << gCur << "), " "cur (" << gCur << "), "
"next (" << gNext << ")" ); "next (" << gNext << ")" );
// first, find if the line turns left or right ar src
// first, find if the line turns left or right ar src
// for this, take the cross product of the vectors from prev to src, and src to next. // for this, take the cross product of the vectors from prev to src, and src to next.
// if the cross product is negetive, we've turned to the left // if the cross product is negetive, we've turned to the left
// if the cross product is positive, we've turned to the right // if the cross product is positive, we've turned to the right
// if the cross product is 0, then we need to use the direction passed in courseCur = SGGeodesy::courseDeg( gCur, gPrev );
SGVec3d dir1 = prev.toSGVec3d() - cur.toSGVec3d(); dirCur = SGVec3d( sin( courseCur*SGD_DEGREES_TO_RADIANS ), cos( courseCur*SGD_DEGREES_TO_RADIANS ), 0.0f );
dir1 = normalize(dir1);
SGVec3d dir2 = next.toSGVec3d() - cur.toSGVec3d(); courseNext = SGGeodesy::courseDeg( gCur, gNext );
dir2 = normalize(dir2); dirNext = SGVec3d( sin( courseNext*SGD_DEGREES_TO_RADIANS ), cos( courseNext*SGD_DEGREES_TO_RADIANS ), 0.0f );
// Now find the average // Now find the average
SGVec3d avg = dir1 + dir2; dirAvg = normalize( dirCur + dirNext );
avg = normalize(avg); courseAvg = SGMiscd::rad2deg( atan( dirAvg.x()/dirAvg.y() ) );
if (courseAvg < 0) {
courseAvg += 180.0f;
}
// check the turn direction // check the turn direction
SGVec3d cp = cross( dir1, dir2 ); cp = cross( dirCur, dirNext );
SG_LOG(SG_GENERAL, SG_DEBUG, "\tcross product of dir1: " << dir1 << " and dir2: " << dir2 << " is " << cp ); theta = SGMiscd::rad2deg(CalculateTheta( dirCur, dirNext, cp ) );
// calculate the angle between cur->prev and cur->next if ( (abs(theta - 180.0) < 0.1) || (abs(theta) < 0.1) || (isnan(theta)) ) {
theta = SGMiscd::rad2deg(CalculateTheta(prev.toSGGeod(), cur.toSGGeod(), next.toSGGeod())); SG_LOG(SG_GENERAL, SG_DEBUG, "\nLinearFeature: (degenerate case) " << description << ": theta is " << theta );
if ( abs(theta - 180.0) < 0.1 ) // straight line blows up math - offset 90 degree and dist is as given
{ courseOffset = SGMiscd::normalizePeriodic(0, 360, courseNext-90.0);
SG_LOG(SG_GENERAL, SG_DEBUG, "\nLinearFeature: (theta close to 180) " << description << ": theta is " << theta ); distOffset = offset_by;
// find the direction to the next point
geo_inverse_wgs_84( cur.y(), cur.x(), next.y(), next.x(), &next_dir, &az2, &dist);
offset_dir = next_dir - 90.0;
while (offset_dir < 0.0)
{
offset_dir += 360.0;
}
// straight line blows up math - dist should be exactly as given
dist = offset_by;
} }
else if ( abs(theta) < 0.1 ) else {
{ SG_LOG(SG_GENERAL, SG_DEBUG, "\nLinearFeature: (normal case) " << description << ": theta is " << theta );
SG_LOG(SG_GENERAL, SG_DEBUG, "\nLinearFeature: (theta close to 0) " << description << ": theta is " << theta );
// find the direction to the next point
geo_inverse_wgs_84( cur.y(), cur.x(), next.y(), next.x(), &next_dir, &az2, &dist);
offset_dir = next_dir - 90;
while (offset_dir < 0.0)
{
offset_dir += 360.0;
}
// straight line blows up math - dist should be exactly as given
dist = offset_by;
}
else if ( isnan(theta) ) {
SG_LOG(SG_GENERAL, SG_DEBUG, "\nLinearFeature: (theta is NAN) " << description );
// find the direction to the next point
geo_inverse_wgs_84( cur.y(), cur.x(), next.y(), next.x(), &next_dir, &az2, &dist);
offset_dir = next_dir - 90.0;
while (offset_dir < 0.0)
{
offset_dir += 360.0;
}
// straight line blows up math - dist should be exactly as given
dist = offset_by;
}
else
{
SG_LOG(SG_GENERAL, SG_DEBUG, "\nLinearFeature: (theta NOT close to 180) " << description << ": theta is " << theta );
// find the offset angle
geo_inverse_wgs_84( avg.y(), avg.x(), 0.0f, 0.0f, &offset_dir, &az2, &dist);
// if we turned right, reverse the heading
if (cp.z() < 0.0f)
{
offset_dir += 180.0;
}
while (offset_dir >= 360.0)
{
offset_dir -= 360.0;
}
// find the direction to the next point
geo_inverse_wgs_84( cur.y(), cur.x(), next.y(), next.x(), &next_dir, &az2, &dist);
// calculate correct distance for the offset point // calculate correct distance for the offset point
dist = (offset_by)/sin(SGMiscd::deg2rad(next_dir-offset_dir)); if (cp.z() < 0.0f) {
courseOffset = SGMiscd::normalizePeriodic(0, 360, courseAvg+180);
} else {
courseOffset = SGMiscd::normalizePeriodic(0, 360, courseAvg);
}
distOffset = (offset_by)/sin(SGMiscd::deg2rad(courseNext-courseOffset));
} }
SG_LOG(SG_GENERAL, SG_DEBUG, "\theading is " << offset_dir << " distance is " << dist );
// calculate the point from cur // calculate the point from cur
geo_direct_wgs_84( cur.y(), cur.x(), offset_dir, dist, &pt_y, &pt_x, &az2 ); pt = SGGeodesy::direct(gCur, courseOffset, distOffset);
SG_LOG(SG_GENERAL, SG_DEBUG, "\theading is " << courseOffset << " distance is " << distOffset << " point is (" << pt.getLatitudeDeg() << "," << pt.getLongitudeDeg() << ")" );
SG_LOG(SG_GENERAL, SG_DEBUG, "\tpoint is (" << pt_x << "," << pt_y << ")" ); return Point3D::fromSGGeod(pt);
return Point3D(pt_x, pt_y, 0.0f);
} }
Point3D LinearFeature::OffsetPointFirst( const Point3D& cur, const Point3D& next, double offset_by ) Point3D LinearFeature::OffsetPointFirst( const Point3D& cur, const Point3D& next, double offset_by )
@ -722,8 +661,8 @@ int LinearFeature::Finish( bool closed, unsigned int idx )
} }
else else
{ {
cur_outer = OffsetPointMiddle( points[j-1], points[j], points[j+1], offset-width/2.0f ); cur_outer = OffsetPointMiddle( points[j-1].toSGGeod(), points[j].toSGGeod(), points[j+1].toSGGeod(), offset-width/2.0f );
cur_inner = OffsetPointMiddle( points[j-1], points[j], points[j+1], offset+width/2.0f ); cur_inner = OffsetPointMiddle( points[j-1].toSGGeod(), points[j].toSGGeod(), points[j+1].toSGGeod(), offset+width/2.0f );
} }
if ( (prev_inner.x() != 0.0f) && (prev_inner.y() != 0.0f) ) if ( (prev_inner.x() != 0.0f) && (prev_inner.y() != 0.0f) )
@ -822,7 +761,7 @@ int LinearFeature::Finish( bool closed, unsigned int idx )
} }
else else
{ {
cur_outer = OffsetPointMiddle( points[j-1], points[j], points[j+1], offset ); cur_outer = OffsetPointMiddle( points[j-1].toSGGeod(), points[j].toSGGeod(), points[j+1].toSGGeod(), offset );
} }
if ( (prev_outer.x() != 0.0f) && (prev_outer.y() != 0.0f) ) if ( (prev_outer.x() != 0.0f) && (prev_outer.y() != 0.0f) )

3
src/Airports/GenAirports850/linearfeature.hxx
View file

@ -102,9 +102,10 @@ public:
private: private:
Point3D OffsetPointFirst( const Point3D& cur, const Point3D& next, double offset_by ); Point3D OffsetPointFirst( const Point3D& cur, const Point3D& next, double offset_by );
Point3D OffsetPointMiddle( const Point3D& prev, const Point3D& cur, const Point3D& next, double offset_by ); Point3D OffsetPointMiddle( const SGGeod& prev, const SGGeod& cur, const SGGeod& next, double offset_by );
Point3D OffsetPointLast( const Point3D& prev, const Point3D& cur, double offset_by ); Point3D OffsetPointLast( const Point3D& prev, const Point3D& cur, double offset_by );
double offset; double offset;
double width; double width;