Make FGAircraftModel behave like a standarrd subsystem.

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

diff --git a/src/Scenery/scenery.cxx b/src/Scenery/scenery.cxx
index b9b77ca258550434ce06e04a9c8f2ae33cd4a6cd..cfa0eb72a2d388b46f63b24a1b68a380ca371d9d 100644 (file)
--- a/src/Scenery/scenery.cxx
+++ b/src/Scenery/scenery.cxx
@@ -33,8 +33,6 @@
 #include <simgear/constants.h>
 #include <simgear/debug/logstream.hxx>
 #include <simgear/scene/tgdb/userdata.hxx>
-#include <simgear/math/sg_geodesy.hxx>
-#include <simgear/scene/model/placementtrans.hxx>
 #include <simgear/scene/material/matlib.hxx>
 #include <simgear/scene/util/SGNodeMasks.hxx>
 #include <simgear/scene/util/SGSceneUserData.hxx>
@@ -46,6 +44,7 @@
 #include "scenery.hxx"
 
 using namespace flightgear;
+using namespace simgear;
 
 class FGGroundPickCallback : public SGPickCallback {
 public:
@@ -119,16 +118,18 @@ void FGScenery::unbind() {
 
 bool
 FGScenery::get_cart_elevation_m(const SGVec3d& pos, double max_altoff,
-                                double& alt, const SGMaterial** material)
+                                double& alt, const SGMaterial** material,
+                                const osg::Node* butNotFrom)
 {
   SGGeod geod = SGGeod::fromCart(pos);
   geod.setElevationM(geod.getElevationM() + max_altoff);
-  return get_elevation_m(geod, alt, material);
+  return get_elevation_m(geod, alt, material, butNotFrom);
 }
 
 bool
 FGScenery::get_elevation_m(const SGGeod& geod, double& alt,
-                           const SGMaterial** material)
+                           const SGMaterial** material,
+                           const osg::Node* butNotFrom)
 {
   SGVec3d start = SGVec3d::fromGeod(geod);
 
@@ -139,26 +140,34 @@ FGScenery::get_elevation_m(const SGGeod& geod, double& alt,
   osgUtil::IntersectVisitor intersectVisitor;
   intersectVisitor.setTraversalMask(SG_NODEMASK_TERRAIN_BIT);
   osg::ref_ptr<osg::LineSegment> lineSegment;
-  lineSegment = new osg::LineSegment(start.osg(), end.osg());
+  lineSegment = new osg::LineSegment(toOsg(start), toOsg(end));
   intersectVisitor.addLineSegment(lineSegment.get());
   get_scene_graph()->accept(intersectVisitor);
-  bool hits = intersectVisitor.hits();
-  if (hits) {
+  bool hits = false;
+  if (intersectVisitor.hits()) {
     int nHits = intersectVisitor.getNumHits(lineSegment.get());
     alt = -SGLimitsd::max();
     for (int i = 0; i < nHits; ++i) {
       const osgUtil::Hit& hit
         = intersectVisitor.getHitList(lineSegment.get())[i];
-      SGVec3d point;
-      point.osg() = hit.getWorldIntersectPoint();
-      SGGeod geod = SGGeod::fromCart(point);
+      if (butNotFrom &&
+          std::find(hit.getNodePath().begin(), hit.getNodePath().end(),
+                    butNotFrom) != hit.getNodePath().end())
+          continue;
+
+      // We might need the double variant of the intersection 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();
       if (alt < elevation) {
         alt = elevation;
-        if (material) {
-          const osg::StateSet* stateSet = hit.getDrawable()->getStateSet();
-          *material = SGMaterialLib::findMaterial(stateSet);
-        }
+        hits = true;
+        if (material)
+          *material = SGMaterialLib::findMaterial(hit.getGeode());
       }
     }
   }
@@ -168,7 +177,8 @@ FGScenery::get_elevation_m(const SGGeod& geod, double& alt,
 
 bool
 FGScenery::get_cart_ground_intersection(const SGVec3d& pos, const SGVec3d& dir,
-                                        SGVec3d& nearestHit)
+                                        SGVec3d& nearestHit,
+                                        const osg::Node* butNotFrom)
 {
   // We assume that starting positions in the center of the earth are invalid
   if ( norm1(pos) < 1 )
@@ -182,22 +192,31 @@ FGScenery::get_cart_ground_intersection(const SGVec3d& pos, const SGVec3d& dir,
   osgUtil::IntersectVisitor intersectVisitor;
   intersectVisitor.setTraversalMask(SG_NODEMASK_TERRAIN_BIT);
   osg::ref_ptr<osg::LineSegment> lineSegment;
-  lineSegment = new osg::LineSegment(start.osg(), end.osg());
+  lineSegment = new osg::LineSegment(toOsg(start), toOsg(end));
   intersectVisitor.addLineSegment(lineSegment.get());
   get_scene_graph()->accept(intersectVisitor);
-  bool hits = intersectVisitor.hits();
-  if (hits) {
+  bool hits = false;
+  if (intersectVisitor.hits()) {
     int nHits = intersectVisitor.getNumHits(lineSegment.get());
     double dist = SGLimitsd::max();
     for (int i = 0; i < nHits; ++i) {
       const osgUtil::Hit& hit
         = intersectVisitor.getHitList(lineSegment.get())[i];
-      SGVec3d point;
-      point.osg() = hit.getWorldIntersectPoint();
-      double newdist = length(start - point);
+      if (butNotFrom &&
+          std::find(hit.getNodePath().begin(), hit.getNodePath().end(),
+                    butNotFrom) != hit.getNodePath().end())
+          continue;
+      // We might need the double variant of the intersection 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());
+      double newdist = length(start - toSG(point));
       if (newdist < dist) {
         dist = newdist;
-        nearestHit = point;
+        nearestHit = toSG(point);
+        hits = true;
       }
     }
   }
@@ -210,9 +229,10 @@ bool FGScenery::scenery_available(const SGGeod& position, double range_m)
   if(globals->get_tile_mgr()->scenery_available(position, range_m))
   {
     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));
-    simgear::CheckSceneryVisitor csnv(getPagerSingleton(), p.osg(), range_m);
+    simgear::CheckSceneryVisitor csnv(getPagerSingleton(), toOsg(p), range_m);
     // currently the PagedLODs will not be loaded by the DatabasePager
     // while the splashscreen is there, so CheckSceneryVisitor force-loads
     // missing objects in the main thread
@@ -229,3 +249,4 @@ SceneryPager* FGScenery::getPagerSingleton()
     static osg::ref_ptr<SceneryPager> pager = new SceneryPager;
     return pager.get();
 }
+