properly add librt when clock_gettime is used

[flightgear.git] / src / Main / renderer.hxx

diff --git a/src/Main/renderer.hxx b/src/Main/renderer.hxx
index 5fd8e9b36f652fdb91735920215e276017602ca3..d3b96bbd93038e2d44b0430395f60998470e5488 100644 (file)
--- a/src/Main/renderer.hxx
+++ b/src/Main/renderer.hxx
@@ -3,6 +3,8 @@
 #define __FG_RENDERER_HXX 1
 
 #include <simgear/scene/util/SGPickCallback.hxx>
+#include <simgear/props/props.hxx>
+#include <simgear/timing/timestamp.hxx>
 
 #include <osg/ref_ptr>
 
@@ -33,7 +35,6 @@ class FGEventHandler;
 }
 
 class SGSky;
-extern SGSky *thesky;
 
 class FGRenderer {
 
@@ -45,18 +46,16 @@ public:
     void splashinit();
     void init();
 
-    static void resize(int width, int height );
+    void setupView();
 
-    // calling update( refresh_camera_settings = false ) will not
-    // touch window or camera settings.  This is useful for the tiled
-    // renderer which needs to set the view frustum itself.
-    static void update( bool refresh_camera_settings );
-    inline static void update() { update( true ); }
+    void resize(int width, int height );
 
+    void update();
+  
     /** Just pick into the scene and return the pick callbacks on the way ...
      */
-    static bool pick( std::vector<SGSceneryPick>& pickList,
-                      const osgGA::GUIEventAdapter* ea );
+    bool pick( std::vector<SGSceneryPick>& pickList,
+               const osgGA::GUIEventAdapter* ea );
 
     /** Get and set the OSG Viewer object, if any.
      */
@@ -73,12 +72,29 @@ public:
     */
     void addCamera(osg::Camera* camera, bool useSceneData);
 
+    SGSky* getSky() const { return _sky; }
+    
 protected:
     osg::ref_ptr<osgViewer::Viewer> viewer;
     osg::ref_ptr<flightgear::FGEventHandler> eventHandler;
+    SGPropertyNode_ptr _scenery_loaded,_scenery_override;
+    SGPropertyNode_ptr _skyblend, _splash_alpha;
+    SGPropertyNode_ptr _point_sprites, _enhanced_lighting, _distance_attenuation;
+    SGPropertyNode_ptr _textures;
+    SGPropertyNode_ptr _cloud_status, _visibility_m; 
+    SGPropertyNode_ptr _xsize, _ysize;
+    SGPropertyNode_ptr _panel_hotspots, _sim_delta_sec, _horizon_effect, _altitude_ft;
+    SGPropertyNode_ptr _virtual_cockpit;
+    SGTimeStamp _splash_time;
+    SGSky* _sky;
 };
 
 bool fgDumpSceneGraphToFile(const char* filename);
 bool fgDumpTerrainBranchToFile(const char* filename);
 
+namespace flightgear
+{
+bool printVisibleSceneInfo(FGRenderer* renderer);
+}
+
 #endif