fly/flightgear
1
0
Fork 0
Code Activity

Fix a problem introduced with the past vector changes.

Browse source 
Fix a potential nan problem with the scenery_available method.

Modified Files:
	src/Scenery/scenery.cxx
This commit is contained in:
frohlich 2009-09-07 18:01:33 +00:00 • committed by Tim Moore
parent 1fa48722b4
commit 690231ff64
1 changed files with 18 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/Scenery/scenery.cxx
View file

@ -157,9 +157,14 @@ FGScenery::get_elevation_m(const SGGeod& geod, double& alt,
std::find(hit.getNodePath().begin(), hit.getNodePath().end(), std::find(hit.getNodePath().begin(), hit.getNodePath().end(),
butNotFrom) != hit.getNodePath().end()) butNotFrom) != hit.getNodePath().end())
continue; continue;
SGVec3d point;
point.osg() = hit.getWorldIntersectPoint(); // We might need the double variant of the intersection point.
SGGeod geod = SGGeod::fromCart(point); // Thus we cannot use the float variant delivered by
// hit.getWorldIntersectPoint() but we have to redo that with osg::Vec3d.
osg::Vec3d point = hit.getLocalIntersectPoint();
if (hit.getMatrix())
point = point*(*hit.getMatrix());
SGGeod geod = SGGeod::fromCart(toSG(point));
double elevation = geod.getElevationM(); double elevation = geod.getElevationM();
if (alt < elevation) { if (alt < elevation) {
alt = elevation; alt = elevation;
@ -209,12 +214,16 @@ FGScenery::get_cart_ground_intersection(const SGVec3d& pos, const SGVec3d& dir,
std::find(hit.getNodePath().begin(), hit.getNodePath().end(), std::find(hit.getNodePath().begin(), hit.getNodePath().end(),
butNotFrom) != hit.getNodePath().end()) butNotFrom) != hit.getNodePath().end())
continue; continue;
SGVec3d point; // We might need the double variant of the intersection point.
point.osg() = hit.getWorldIntersectPoint(); // Thus we cannot use the float variant delivered by
double newdist = length(start - point); // hit.getWorldIntersectPoint() but we have to redo that with osg::Vec3d.
osg::Vec3d point = hit.getLocalIntersectPoint();
if (hit.getMatrix())
point = point*(*hit.getMatrix());
double newdist = length(start - toSG(point));
if (newdist < dist) { if (newdist < dist) {
dist = newdist; dist = newdist;
nearestHit = point; nearestHit = toSG(point);
hits = true; hits = true;
} }
} }
@ -228,7 +237,8 @@ bool FGScenery::scenery_available(const SGGeod& position, double range_m)
if(globals->get_tile_mgr()->scenery_available(position, range_m)) if(globals->get_tile_mgr()->scenery_available(position, range_m))
{ {
double elev; double elev;
get_elevation_m(SGGeod::fromGeodM(position, SG_MAX_ELEVATION_M), elev, 0); if (!get_elevation_m(SGGeod::fromGeodM(position, SG_MAX_ELEVATION_M), elev, 0, 0))
return false;
SGVec3f p = SGVec3f::fromGeod(SGGeod::fromGeodM(position, elev)); SGVec3f p = SGVec3f::fromGeod(SGGeod::fromGeodM(position, elev));
simgear::CheckSceneryVisitor csnv(getPagerSingleton(), p.osg(), range_m); simgear::CheckSceneryVisitor csnv(getPagerSingleton(), p.osg(), range_m);
// currently the PagedLODs will not be loaded by the DatabasePager // currently the PagedLODs will not be loaded by the DatabasePager