fly/flightgear
1
0
Fork 0
Code Activity

Modified Files:

Browse source 
src/Scenery/scenery.cxx: Use geodetic down vector for
	ground intersection.
This commit is contained in:
frohlich 2007-07-29 10:51:41 +00:00
parent 17262df51c
commit ed677676c0
1 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/Scenery/scenery.cxx
View file

@ -121,23 +121,24 @@ FGScenery::get_elevation_m(double lat, double lon, double max_alt,
return get_elevation_m(SGGeod::fromDegM(lon, lat, max_alt), alt, material); return get_elevation_m(SGGeod::fromDegM(lon, lat, max_alt), alt, material);
} }
bool
FGScenery::get_elevation_m(const SGGeod& geod,
double& alt, const SGMaterial** material)
{
SGVec3d pos = SGVec3d::fromGeod(geod);
return get_cart_elevation_m(pos, 0, alt, material);
}
bool bool
FGScenery::get_cart_elevation_m(const SGVec3d& pos, double max_altoff, FGScenery::get_cart_elevation_m(const SGVec3d& pos, double max_altoff,
double& alt, const SGMaterial** material) double& alt, const SGMaterial** material)
{ {
if ( norm1(pos) < 1 ) SGGeod geod = SGGeod::fromCart(pos);
return false; geod.setElevationM(geod.getElevationM() + max_altoff);
return get_elevation_m(geod, alt, material);
}
SGVec3d start = pos + max_altoff*normalize(pos); bool
SGVec3d end(0, 0, 0); FGScenery::get_elevation_m(const SGGeod& geod, double& alt,
const SGMaterial** material)
{
SGVec3d start = SGVec3d::fromGeod(geod);
SGGeod geodEnd = geod;
geodEnd.setElevationM(SGMiscd::min(geod.getElevationM() - 10, -10000));
SGVec3d end = SGVec3d::fromGeod(geodEnd);
osgUtil::IntersectVisitor intersectVisitor; osgUtil::IntersectVisitor intersectVisitor;
intersectVisitor.setTraversalMask(SG_NODEMASK_TERRAIN_BIT); intersectVisitor.setTraversalMask(SG_NODEMASK_TERRAIN_BIT);