return attribute mask as unsigned

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

diff --git a/src/Scenery/scenery.cxx b/src/Scenery/scenery.cxx
index 26f49e4c932b5226ebe6dfe34e1a320f6eb1419c..84c5b9fad2d2e1006c7a12e2be67d32f6f00275f 100644 (file)
--- a/src/Scenery/scenery.cxx
+++ b/src/Scenery/scenery.cxx
@@ -30,6 +30,7 @@
 
 #include <osgUtil/IntersectVisitor>
 
+#include <simgear/constants.h>
 #include <simgear/debug/logstream.hxx>
 #include <simgear/scene/tgdb/userdata.hxx>
 #include <simgear/math/sg_geodesy.hxx>
@@ -37,11 +38,15 @@
 #include <simgear/scene/material/matlib.hxx>
 #include <simgear/scene/util/SGNodeMasks.hxx>
 #include <simgear/scene/util/SGSceneUserData.hxx>
+#include <simgear/scene/model/CheckSceneryVisitor.hxx>
 
 #include <Main/fg_props.hxx>
 
+#include "tilemgr.hxx"
 #include "scenery.hxx"
 
+using namespace flightgear;
+
 class FGGroundPickCallback : public SGPickCallback {
 public:
   virtual bool buttonPressed(int button, const Info& info)
@@ -70,12 +75,11 @@ FGScenery::FGScenery()
     SG_LOG( SG_TERRAIN, SG_INFO, "Initializing scenery subsystem" );
 }
 
-
-// Initialize the Scenery Management system
 FGScenery::~FGScenery() {
 }
 
 
+// Initialize the Scenery Management system
 void FGScenery::init() {
     // Scene graph root
     scene_graph = new osg::Group;
@@ -97,22 +101,8 @@ 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() );
+    sgUserDataInit( globals->get_props() );
 }
 
 
@@ -129,24 +119,29 @@ void FGScenery::unbind() {
 
 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_elevation_m(SGGeod::fromDegM(lon, lat, max_alt), 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;
+  SGGeod geod = SGGeod::fromCart(pos);
+  geod.setElevationM(geod.getElevationM() + max_altoff);
+  return get_elevation_m(geod, alt, material);
+}
 
-  SGVec3d start = pos + max_altoff*normalize(pos);
-  SGVec3d end(0, 0, 0);
+bool
+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;
   intersectVisitor.setTraversalMask(SG_NODEMASK_TERRAIN_BIT);
@@ -167,8 +162,10 @@ FGScenery::get_cart_elevation_m(const SGVec3d& pos, double max_altoff,
       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);
+        }
       }
     }
   }
@@ -178,7 +175,7 @@ FGScenery::get_cart_elevation_m(const SGVec3d& pos, double max_altoff,
 
 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 )
@@ -214,3 +211,28 @@ FGScenery::get_cart_ground_intersection(const SGVec3d& pos, const SGVec3d& dir,
 
   return hits;
 }
+
+bool FGScenery::scenery_available(double lat, double lon, double range_m)
+{
+  if(globals->get_tile_mgr()->scenery_available(lat, lon, range_m))
+  {
+    double elev;
+    get_elevation_m(lat, lon, SG_MAX_ELEVATION_M, elev, 0);
+    SGVec3f p = SGVec3f::fromGeod(SGGeod::fromDegM(lon,lat,elev));
+    simgear::CheckSceneryVisitor csnv(getPagerSingleton(), p.osg(), 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
+    get_scene_graph()->accept(csnv);
+    if(!csnv.isLoaded())
+        return false;
+    return true;
+  }
+  return false;
+}
+
+SceneryPager* FGScenery::getPagerSingleton()
+{
+    static osg::ref_ptr<SceneryPager> pager = new SceneryPager;
+    return pager.get();
+}