Clean fg_init.hxx

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

diff --git a/src/Scenery/tilemgr.hxx b/src/Scenery/tilemgr.hxx
index 31a8a443c4be853030891aa28f93c9c8c5affe52..6b415e53b6e8a94401ea83e2a8bb4860b009afd3 100644 (file)
--- a/src/Scenery/tilemgr.hxx
+++ b/src/Scenery/tilemgr.hxx
@@ -24,40 +24,20 @@
 #ifndef _TILEMGR_HXX
 #define _TILEMGR_HXX
 
-
-#ifndef __cplusplus                                                          
-# error This library requires C++
-#endif                                   
-
 #include <simgear/compiler.h>
-#include <simgear/math/point3d.hxx>
-#include <simgear/scene/model/location.hxx>
-
-#include <queue>
 
 #include <simgear/bucket/newbucket.hxx>
-#if defined(ENABLE_THREADS)
-#  include <simgear/threads/SGQueue.hxx>
-#endif // ENABLE_THREADS
-
-#include "FGTileLoader.hxx"
-#include "newcache.hxx"
+#include <simgear/scene/tgdb/TileEntry.hxx>
+#include <simgear/scene/tgdb/TileCache.hxx>
 
-#if defined(USE_MEM) || defined(WIN32)
-#  define FG_MEM_COPY(to,from,n)        memcpy(to, from, n)
-#else
-#  define FG_MEM_COPY(to,from,n)        bcopy(from, to, n)
-#endif
+class SGReaderWriterBTGOptions;
 
-SG_USING_STD( queue );
+namespace osg
+{
+class Node;
+}
 
-
-// forward declaration
-class FGTileEntry;
-class FGDeferredModel;
-
-
-class FGTileMgr {
+class FGTileMgr : public simgear::ModelLoadHelper {
 
 private:
 
@@ -82,86 +62,38 @@ private:
     SGBucket previous_bucket;
     SGBucket current_bucket;
     SGBucket pending;
-       
-    FGTileEntry *current_tile;
-       
+    osg::ref_ptr<SGReaderWriterBTGOptions> _options;
+
     // x and y distance of tiles to load/draw
     float vis;
     int xrange, yrange;
-       
+
     // current longitude latitude
     double longitude;
     double latitude;
-    double altitude_m;
 
     /**
      * tile cache
      */
-    FGNewCache tile_cache;
-
-    /**
-     * Queue tiles for loading.
-     */
-    FGTileLoader loader;
-
-    /**
-     * 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.
-     */
-#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;
-
-    /**
-     * Tile filter indicator, to implement multipass rendering
-     */
-    static bool tile_filter;
-
-public:
-
-    /**
-     * Add a loaded tile to the 'attach to the scene graph' queue.
-     */
-    static void ready_to_attach( FGTileEntry *t ) { attach_queue.push( t ); }
-
-    /**
-     * Add a pending model to the 'deferred model load' queue
-     */
-    static void model_ready( FGDeferredModel *dm ) { model_queue.push( dm ); }
+    simgear::TileCache tile_cache;
 
 public:
-
-    // Constructor
     FGTileMgr();
 
-    // Destructor
     ~FGTileMgr();
 
-    // Initialize the Tile Manager subsystem
+    // Initialize the Tile Manager
     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 visibility_meters );
-    int update( SGLocation *location, double visibility_meters);
+    int update( const SGGeod& 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
@@ -169,18 +101,18 @@ public:
     // 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();
-
     const SGBucket& get_current_bucket () const { return current_bucket; }
 
-    static bool set_tile_filter( bool f );
-
     /// 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);
+    bool scenery_available(const SGGeod& position, double range_m);
+
+    // Load a model for a tile
+    osg::Node* loadTileModel(const string& modelPath, bool cacheModel);
+
+    // Returns true if all the tiles in the tile cache have been loaded
+    bool isSceneryLoaded();
 };