Small tweaks to initialization sequence and logic so we can default to

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

diff --git a/src/Scenery/tilemgr.hxx b/src/Scenery/tilemgr.hxx
index de17b1f2dea9c68c1ca99dd514154c42442ff0a5..067fb563f6141e202643dbfdff2153b696fbcad0 100644 (file)
--- a/src/Scenery/tilemgr.hxx
+++ b/src/Scenery/tilemgr.hxx
@@ -31,19 +31,18 @@
 
 #include <simgear/compiler.h>
 
-#include <list>
+#include <queue>
 
 #include <plib/ssg.h>
 
 #include <simgear/bucket/newbucket.hxx>
+#ifdef ENABLE_THREADS
+#  include <simgear/threads/SGQueue.hxx>
+#endif // ENABLE_THREADS
 
-
-FG_USING_STD(list);
-
-
-#define FG_LOCAL_X_Y         81  // max(o->tile_diameter) ** 2
-
-#define FG_SQUARE( X ) ( (X) * (X) )
+#include "FGTileLoader.hxx"
+#include "hitlist.hxx"
+#include "newcache.hxx"
 
 #if defined(USE_MEM) || defined(WIN32)
 #  define FG_MEM_COPY(to,from,n)        memcpy(to, from, n)
@@ -51,17 +50,12 @@ FG_USING_STD(list);
 #  define FG_MEM_COPY(to,from,n)        bcopy(from, to, n)
 #endif
 
-
-class FGLoadRec {
-
-public:
-
-    FGBucket b;
-    int cache_index;
-};
+SG_USING_STD( queue );
 
 
-#define MAX_HITS 100
+// forward declaration
+class FGTileEntry;
+class FGDeferredModel;
 
 
 class FGTileMgr {
@@ -77,49 +71,115 @@ private:
 
     load_state state;
 
-    // pending tile load queue
-    list < FGLoadRec > load_queue;
+    // initialize the cache
+    void initialize_queue();
 
     // schedule a tile for loading
-    int sched_tile( const FGBucket& b );
+    void sched_tile( const SGBucket& b );
+
+    // schedule a needed buckets for loading
+    void schedule_needed();
+
+    // see comment at prep_ssg_nodes()
+    void prep_ssg_node( int idx );
+       
+    FGHitList hit_list;
+
+    SGBucket previous_bucket;
+    SGBucket current_bucket;
+    SGBucket pending;
+       
+    FGTileEntry *current_tile;
+       
+    // x and y distance of tiles to load/draw
+    float vis;
+    int xrange, yrange;
+       
+    // current longitude latitude
+    double longitude;
+    double latitude;
+    double last_longitude;
+    double last_latitude;
+
+    /**
+     * tile cache
+     */
+    FGNewCache tile_cache;
+
+    /**
+     * Queue tiles for loading.
+     */
+    FGTileLoader loader;
+    int counter_hack;
+
+    /**
+     * Work queues.
+     *
+     * attach_queue is the tiles that have been loaded [by the pager]
+     * that can be attached to the scene graph by the render thread.
+     *
+     * model_queue is the set of models that need to be loaded by the
+     * primary render thread.
+     */
+#ifdef 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
+
+public:
 
-    // load a tile
-    void load_tile( const FGBucket& b, int cache_index );
+    /**
+     * Add a loaded tile to the 'attach to the scene graph' queue.
+     */
+    static void ready_to_attach( FGTileEntry *t ) { attach_queue.push( t ); }
 
-    int hitcount;
-    sgdVec3 hit_pts [ MAX_HITS ] ;
+#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
+     */
+    static void model_ready( FGDeferredModel *dm ) { model_queue.push( dm ); }
 
 public:
 
     // Constructor
-    FGTileMgr ( void );
+    FGTileMgr();
 
     // Destructor
-    ~FGTileMgr ( void );
+    ~FGTileMgr();
 
     // Initialize the Tile Manager subsystem
-    int init( void );
+    int init();
 
-    // given the current lon/lat, fill in the array of local chunks.
-    // If the chunk isn't already in the cache, then read it from
-    // disk.
-    int update( void );
+    // 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.
-    double current_elev( double lon, double lat, const Point3D& abs_view_pos );
     void my_ssg_los( string s, ssgBranch *branch, sgdMat4 m, 
-                    const sgdVec3 p, const sgdVec3 dir );
-    bool current_elev_ssg( const Point3D& abs_view_pos, 
-                            const Point3D& view_pos );
-    double current_elev_new( const FGBucket& p );
+                    const sgdVec3 p, const sgdVec3 dir, sgdVec3 normal );
+       
+    void my_ssg_los( ssgBranch *branch, sgdMat4 m, 
+                    const sgdVec3 p, const sgdVec3 dir,
+                    FGHitList *list );
 
+       
     // 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( void );
+    void prep_ssg_nodes();
 };
 
 
@@ -128,5 +188,3 @@ extern FGTileMgr global_tile_mgr;
 
 
 #endif // _TILEMGR_HXX
-
-