remove the "terrain-elevation" command again. This is no longer necessary,

[flightgear.git] / src / Scenery / scenery.cxx

diff --git a/src/Scenery/scenery.cxx b/src/Scenery/scenery.cxx
index a4b32d73d0d373e87be6720e68d948c9d782c58c..b24131196e00b9520c55fa6b186f073a0f94cd09 100644 (file)
--- a/src/Scenery/scenery.cxx
+++ b/src/Scenery/scenery.cxx
@@ -65,8 +65,7 @@ public:
 };
 
 // Scenery Management system
-FGScenery::FGScenery() :
-  center(0, 0, 0)
+FGScenery::FGScenery()
 {
     SG_LOG( SG_TERRAIN, SG_INFO, "Initializing scenery subsystem" );
 }
@@ -98,19 +97,6 @@ void FGScenery::init() {
     aircraft_branch->setName( "Aircraft" );
     scene_graph->addChild( aircraft_branch.get() );
 
-    // Lighting
-    gnd_lights_root = new osg::Group;
-    gnd_lights_root->setName( "Ground Lighting Root" );
-
-    vasi_lights_root = new osg::Group;
-    vasi_lights_root->setName( "VASI/PAPI Lighting Root" );
-
-    rwy_lights_root = new osg::Group;
-    rwy_lights_root->setName( "Runway Lighting Root" );
-
-    taxi_lights_root = new osg::Group;
-    taxi_lights_root->setName( "Taxi Lighting Root" );
-
     // Initials values needed by the draw-time object loader
     sgUserDataInit( globals->get_model_lib(), globals->get_fg_root(),
                     globals->get_props(), globals->get_sim_time_sec() );
@@ -128,62 +114,24 @@ void FGScenery::bind() {
 void FGScenery::unbind() {
 }
 
-void FGScenery::set_center( const SGVec3d& p ) {
-    if (center == p)
-      return;
-    center = p;
-    placement_list_type::iterator it = _placement_list.begin();
-    while (it != _placement_list.end()) {
-        (*it)->setSceneryCenter(center);
-        ++it;
-    }
-}
-
-void FGScenery::register_placement_transform(SGPlacementTransform *trans) {
-    _placement_list.push_back(trans);        
-    trans->setSceneryCenter(center);
-}
-
-void FGScenery::unregister_placement_transform(SGPlacementTransform *trans) {
-    placement_list_type::iterator it = _placement_list.begin();
-    while (it != _placement_list.end()) {
-        if ((*it) == trans) {
-            it = _placement_list.erase(it);        
-        } else
-            ++it;
-    }
-}
-
 bool
 FGScenery::get_elevation_m(double lat, double lon, double max_alt,
-                           double& alt, const SGMaterial** material,
-                           bool exact)
+                           double& alt, const SGMaterial** material)
 {
   SGGeod geod = SGGeod::fromDegM(lon, lat, max_alt);
   SGVec3d pos = SGVec3d::fromGeod(geod);
-  return get_cart_elevation_m(pos, 0, alt, material, exact);
+  return get_cart_elevation_m(pos, 0, alt, material);
 }
 
 bool
 FGScenery::get_cart_elevation_m(const SGVec3d& pos, double max_altoff,
-                                double& alt, const SGMaterial** material,
-                                bool exact)
+                                double& alt, const SGMaterial** material)
 {
   if ( norm1(pos) < 1 )
     return false;
 
-  SGVec3d saved_center = center;
-  bool replaced_center = false;
-  if (exact) {
-    if (30*30 < distSqr(pos, center)) {
-      set_center( pos );
-      replaced_center = true;
-    }
-  }
-
-
-  SGVec3d start = pos + max_altoff*normalize(pos) - center;
-  SGVec3d end = - center;
+  SGVec3d start = pos + max_altoff*normalize(pos);
+  SGVec3d end(0, 0, 0);
   
   osgUtil::IntersectVisitor intersectVisitor;
   intersectVisitor.setTraversalMask(SG_NODEMASK_TERRAIN_BIT);
@@ -200,46 +148,32 @@ FGScenery::get_cart_elevation_m(const SGVec3d& pos, double max_altoff,
         = intersectVisitor.getHitList(lineSegment.get())[i];
       SGVec3d point;
       point.osg() = hit.getWorldIntersectPoint();
-      point += center;
       SGGeod geod = SGGeod::fromCart(point);
       double elevation = geod.getElevationM();
       if (alt < elevation) {
         alt = elevation;
-        if (material)
-          *material = globals->get_matlib()->findMaterial(hit.getGeode());
+        if (material) {
+          const osg::StateSet* stateSet = hit.getDrawable()->getStateSet();
+          *material = globals->get_matlib()->findMaterial(stateSet);
+        }
       }
     }
   }
 
-  if (replaced_center)
-    set_center( saved_center );
-  
   return hits;
 }
 
 bool
 FGScenery::get_cart_ground_intersection(const SGVec3d& pos, const SGVec3d& dir,
-                                        SGVec3d& nearestHit, bool exact)
+                                        SGVec3d& nearestHit)
 {
   // We assume that starting positions in the center of the earth are invalid
   if ( norm1(pos) < 1 )
     return false;
 
-  // Well that 'exactness' is somehow problematic, but makes at least sure
-  // that we don't compute that with a cenery center at the other side of
-  // the world ...
-  SGVec3d saved_center = center;
-  bool replaced_center = false;
-  if (exact) {
-    if (30*30 < distSqr(pos, center)) {
-      set_center( pos );
-      replaced_center = true;
-    }
-  }
-
   // Make really sure the direction is normalized, is really cheap compared to
   // computation of ground intersection.
-  SGVec3d start = pos - center;
+  SGVec3d start = pos;
   SGVec3d end = start + 1e5*normalize(dir); // FIXME visibility ???
   
   osgUtil::IntersectVisitor intersectVisitor;
@@ -260,13 +194,10 @@ FGScenery::get_cart_ground_intersection(const SGVec3d& pos, const SGVec3d& dir,
       double newdist = length(start - point);
       if (newdist < dist) {
         dist = newdist;
-        nearestHit = point + center;
+        nearestHit = point;
       }
     }
   }
 
-  if (replaced_center)
-    set_center( saved_center );
-
   return hits;
 }