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

[flightgear.git] / src / Scenery / tilemgr.hxx

diff --git a/src/Scenery/tilemgr.hxx b/src/Scenery/tilemgr.hxx
index 6e4b30f34e73a74abaeadcb0da13559db2585b59..e274ac98d36b5727c9b0c23a1554eddc377f46da 100644 (file)
--- a/src/Scenery/tilemgr.hxx
+++ b/src/Scenery/tilemgr.hxx
@@ -16,7 +16,7 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //
 // $Id$
 
@@ -36,12 +36,11 @@
 #include <queue>
 
 #include <simgear/bucket/newbucket.hxx>
-#if defined(ENABLE_THREADS) && ENABLE_THREADS
+#if defined(ENABLE_THREADS)
 #  include <simgear/threads/SGQueue.hxx>
 #endif // ENABLE_THREADS
 
 #include "FGTileLoader.hxx"
-#include "hitlist.hxx"
 #include "newcache.hxx"
 
 #if defined(USE_MEM) || defined(WIN32)
@@ -54,8 +53,6 @@ SG_USING_STD( queue );
 
 
 // forward declaration
-class ssgBranch;
-class ssgEntity;
 class FGTileEntry;
 class FGDeferredModel;
 
@@ -80,9 +77,7 @@ private:
     void sched_tile( const SGBucket& b, const bool is_inner_ring );
 
     // schedule a needed buckets for loading
-    void schedule_needed(double visibility_meters, SGBucket curr_bucket);
-
-    FGHitList hit_list;
+    void schedule_needed(double visibility_meters, const SGBucket& curr_bucket);
 
     SGBucket previous_bucket;
     SGBucket current_bucket;
@@ -118,7 +113,7 @@ private:
      * model_queue is the set of models that need to be loaded by the
      * primary render thread.
      */
-#if defined(ENABLE_THREADS) && ENABLE_THREADS
+#if defined(ENABLE_THREADS)
     static SGLockedQueue<FGTileEntry *> attach_queue;
     static SGLockedQueue<FGDeferredModel *> model_queue;
 #else
@@ -127,11 +122,6 @@ private:
 #endif // ENABLE_THREADS
     static queue<FGTileEntry *> delete_queue;
 
-    /**
-     * Tile filter indicator, to implement multipass rendering
-     */
-    static bool tile_filter;
-
 public:
 
     /**
@@ -166,38 +156,24 @@ public:
     // local chunks.  If the chunk isn't already in the cache, then
     // read it from disk.
     int update( double visibility_meters );
-    int update( SGLocation *location, double visibility_meters,
-                sgdVec3 abs_pos_vector );
-
-    int updateCurrentElevAtPos( sgdVec3 abs_pos_vector, double altitude_m,
-                                Point3D center );
-
-    // Determine scenery altitude.  Normally this just happens when we
-    // render the scene, but we'd also like to be able to do this
-    // explicitely.  lat & lon are in radians.  abs_view_pos in
-    // meters.  Returns result in meters.
-    void my_ssg_los( string s, ssgBranch *branch, sgdMat4 m, 
-                    const sgdVec3 p, const sgdVec3 dir, sgdVec3 normal );
-       
-    void my_ssg_los( ssgBranch *branch, sgdMat4 m, 
-                    const sgdVec3 p, const sgdVec3 dir,
-                    FGHitList *list );
+    int update( SGLocation *location, double visibility_meters);
 
     // Prepare the ssg nodes corresponding to each tile.  For each
     // tile, set the ssg transform and update it's range selector
     // based on current visibilty void prep_ssg_nodes( float
     // visibility_meters );
-    void prep_ssg_nodes( SGLocation *location, float visibility_meters );
+    void prep_ssg_nodes(float visibility_meters );
 
     // Set flag with event manager so that non-moving view refreshes
     // tiles...
     void refresh_view_timestamps();
 
-    inline SGBucket get_current_bucket () { return current_bucket; }
-    inline SGBucket get_previous_bucket () { return previous_bucket; }
+    const SGBucket& get_current_bucket () const { return current_bucket; }
 
-    static bool set_tile_filter( bool f );
-    static int tile_filter_cb( ssgEntity *, int );
+    /// Returns true if scenery is avaliable for the given lat, lon position
+    /// within a range of range_m.
+    /// lat and lon are expected to be in degrees.
+    bool scenery_available(double lat, double lon, double range_m);
 };