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 a6cfeb5b719280d9c34dff17abdd4b74b4bdde5e..e274ac98d36b5727c9b0c23a1554eddc377f46da 100644 (file)
--- a/src/Scenery/tilemgr.hxx
+++ b/src/Scenery/tilemgr.hxx
@@ -2,7 +2,7 @@
 //
 // Written by Curtis Olson, started January 1998.
 //
-// Copyright (C) 1997  Curtis L. Olson  - curt@infoplane.com
+// Copyright (C) 1997  Curtis L. Olson  - http://www.flightgear.org/~curt
 //
 // This program is free software; you can redistribute it and/or
 // modify it under the terms of the GNU General Public License as
@@ -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$
 
@@ -30,18 +30,17 @@
 #endif                                   
 
 #include <simgear/compiler.h>
+#include <simgear/math/point3d.hxx>
+#include <simgear/scene/model/location.hxx>
 
 #include <queue>
 
-#include <plib/ssg.h>
-
 #include <simgear/bucket/newbucket.hxx>
-#ifdef 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)
@@ -50,6 +49,8 @@
 #  define FG_MEM_COPY(to,from,n)        bcopy(from, to, n)
 #endif
 
+SG_USING_STD( queue );
+
 
 // forward declaration
 class FGTileEntry;
@@ -73,19 +74,10 @@ private:
     void initialize_queue();
 
     // schedule a tile for loading
-    void sched_tile( const SGBucket& b );
+    void sched_tile( const SGBucket& b, const bool is_inner_ring );
 
     // schedule a needed buckets for loading
-    void schedule_needed();
-
-    // see comment at prep_ssg_nodes()
-    void prep_ssg_node( int idx );
-       
-    // int hitcount;
-    // sgdVec3 hit_pts [ MAX_HITS ] ;
-
-    // ssgEntity *last_hit;
-    FGHitList hit_list;
+    void schedule_needed(double visibility_meters, const SGBucket& curr_bucket);
 
     SGBucket previous_bucket;
     SGBucket current_bucket;
@@ -100,8 +92,7 @@ private:
     // current longitude latitude
     double longitude;
     double latitude;
-    double last_longitude;
-    double last_latitude;
+    double altitude_m;
 
     /**
      * tile cache
@@ -112,7 +103,6 @@ private:
      * Queue tiles for loading.
      */
     FGTileLoader loader;
-    int counter_hack;
 
     /**
      * Work queues.
@@ -123,13 +113,14 @@ private:
      * model_queue is the set of models that need to be loaded by the
      * primary render thread.
      */
-#ifdef ENABLE_THREADS
+#if defined(ENABLE_THREADS)
     static SGLockedQueue<FGTileEntry *> attach_queue;
     static SGLockedQueue<FGDeferredModel *> model_queue;
 #else
     static queue<FGTileEntry *> attach_queue;
     static queue<FGDeferredModel *> model_queue;
 #endif // ENABLE_THREADS
+    static queue<FGTileEntry *> delete_queue;
 
 public:
 
@@ -138,13 +129,6 @@ public:
      */
     static void ready_to_attach( FGTileEntry *t ) { attach_queue.push( t ); }
 
-#ifdef WISH_PLIB_WAS_THREADED // but it isn't
-    /**
-     * Tile is detatched from scene graph and is ready to delete
-     */
-    inline void ready_to_delete( FGTileEntry *t ) { loader.remove( t ); }
-#endif
-
     /**
      * Add a pending model to the 'deferred model load' queue
      */
@@ -161,33 +145,36 @@ public:
     // Initialize the Tile Manager subsystem
     int init();
 
+    // Update the various queues maintained by the tilemagr (private
+    // internal function, do not call directly.)
+    void update_queues();
+
+    // get state of all the scenery loading queues
+    bool all_queues_empty();
+
     // given the current lon/lat (in degrees), fill in the array of
     // local chunks.  If the chunk isn't already in the cache, then
     // read it from disk.
-    int update( double lon, double lat );
-
-    // 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( double visibility_meters );
+    int update( SGLocation *location, double visibility_meters);
 
-    bool current_elev_ssg( sgdVec3 abs_view_pos, double *terrain_elev );
-       
-    // Prepare the ssg nodes ... for each tile, set it's proper
-    // transform and update it's range selector based on current
-    // visibilty
-    void prep_ssg_nodes();
-};
+    // 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(float visibility_meters );
 
+    // Set flag with event manager so that non-moving view refreshes
+    // tiles...
+    void refresh_view_timestamps();
 
-// the tile manager
-extern FGTileMgr global_tile_mgr;
+    const SGBucket& get_current_bucket () const { return current_bucket; }
+
+    /// 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);
+};
 
 
 #endif // _TILEMGR_HXX