From: James Turner <zakalawe@mac.com>
Date: Fri, 1 Oct 2010 08:33:31 +0000 (+0100)
Subject: Get rid of FGGeneral; expose equivlanet values via properties.
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=1afd4e602ee4e949cf651d50169e6a15700bd96b;p=flightgear.git

Get rid of FGGeneral; expose equivlanet values via properties.
---

diff --git a/src/Cockpit/cockpit.cxx b/src/Cockpit/cockpit.cxx
index a2f542cbc..c8afc29c6 100644
--- a/src/Cockpit/cockpit.cxx
+++ b/src/Cockpit/cockpit.cxx
@@ -37,8 +37,6 @@
 #include <simgear/props/props.hxx>
 #include <simgear/timing/sg_time.hxx>
 
-#include <Include/general.hxx>
-
 #include <Main/globals.hxx>
 #include <Main/fg_props.hxx>
 #include <Main/viewmgr.hxx>
@@ -198,7 +196,7 @@ float get_sideslip( void )
 
 float get_frame_rate( void )
 {
-    return general.get_frame_rate();
+    return fgGetInt("/sim/frame-rate");
 }
 
 float get_fov( void )
diff --git a/src/GUI/gui.cxx b/src/GUI/gui.cxx
index 2e8305ba4..1ae94dbb0 100644
--- a/src/GUI/gui.cxx
+++ b/src/GUI/gui.cxx
@@ -39,7 +39,6 @@
 
 #include <plib/pu.h>
 
-#include <Include/general.hxx>
 #include <Main/main.hxx>
 #include <Main/globals.hxx>
 #include <Main/fg_props.hxx>
diff --git a/src/Instrumentation/wxradar.cxx b/src/Instrumentation/wxradar.cxx
index 8a27057fe..f32e12605 100644
--- a/src/Instrumentation/wxradar.cxx
+++ b/src/Instrumentation/wxradar.cxx
@@ -58,7 +58,6 @@ using std::setfill;
 #include <Cockpit/panel.hxx>
 #include <Cockpit/hud.hxx>
 
-#include <Include/general.hxx>
 #include "instrument_mgr.hxx"
 #include "od_gauge.hxx"
 #include "wxradar.hxx"
diff --git a/src/Main/fg_init.cxx b/src/Main/fg_init.cxx
index 7d1b82fd8..38c4d8ee5 100644
--- a/src/Main/fg_init.cxx
+++ b/src/Main/fg_init.cxx
@@ -88,7 +88,6 @@
 #include <Cockpit/panel_io.hxx>
 
 #include <GUI/new_gui.hxx>
-#include <Include/general.hxx>
 #include <Input/input.hxx>
 #include <Instrumentation/instrument_mgr.hxx>
 #include <Model/acmodel.hxx>
diff --git a/src/Main/fg_os_osgviewer.cxx b/src/Main/fg_os_osgviewer.cxx
index 726c868a9..26ecbd266 100644
--- a/src/Main/fg_os_osgviewer.cxx
+++ b/src/Main/fg_os_osgviewer.cxx
@@ -46,7 +46,6 @@
 #include <osgViewer/ViewerEventHandlers>
 #include <osgViewer/Viewer>
 
-#include <Include/general.hxx>
 #include <Scenery/scenery.hxx>
 #include "fg_os.hxx"
 #include "fg_props.hxx"
diff --git a/src/Main/main.cxx b/src/Main/main.cxx
index 03637612e..2522e69dd 100644
--- a/src/Main/main.cxx
+++ b/src/Main/main.cxx
@@ -50,7 +50,6 @@
 #include <simgear/math/sg_random.h>
 
 #include <Time/light.hxx>
-#include <Include/general.hxx>
 #include <Aircraft/replay.hxx>
 #include <Cockpit/cockpit.hxx>
 #include <Cockpit/hud.hxx>
@@ -87,9 +86,6 @@ using namespace flightgear;
 
 using std::cerr;
 
-// This is a record containing a bit of global housekeeping information
-FGGeneral general;
-
 // Specify our current idle function state.  This is used to run all
 // our initializations out of the idle callback so that we can get a
 // splash screen up and running right away.
@@ -277,21 +273,23 @@ struct GeneralInitOperation : public GraphicsContextOperation
     }
     void run(osg::GraphicsContext* gc)
     {
-        general.set_glVendor( (char *)glGetString ( GL_VENDOR ) );
-        general.set_glRenderer( (char *)glGetString ( GL_RENDERER ) );
-        general.set_glVersion( (char *)glGetString ( GL_VERSION ) );
-        SG_LOG( SG_GENERAL, SG_INFO, general.get_glVendor() );
-        SG_LOG( SG_GENERAL, SG_INFO, general.get_glRenderer() );
-        SG_LOG( SG_GENERAL, SG_INFO, general.get_glVersion() );
+        SGPropertyNode* simRendering = fgGetNode("/sim/rendering");
+        
+        simRendering->setStringValue("gl-vendor", (char*) glGetString(GL_VENDOR));
+        SG_LOG( SG_GENERAL, SG_INFO, glGetString(GL_VENDOR));
+        
+        simRendering->setStringValue("gl-renderer", (char*) glGetString(GL_RENDERER));
+        SG_LOG( SG_GENERAL, SG_INFO, glGetString(GL_RENDERER));
+        
+        simRendering->setStringValue("gl-version", (char*) glGetString(GL_VERSION));
+        SG_LOG( SG_GENERAL, SG_INFO, glGetString(GL_VERSION));
 
         GLint tmp;
         glGetIntegerv( GL_MAX_TEXTURE_SIZE, &tmp );
-        general.set_glMaxTexSize( tmp );
-        SG_LOG ( SG_GENERAL, SG_INFO, "Max texture size = " << tmp );
+        simRendering->setIntValue("max-texture-size", tmp);
 
         glGetIntegerv( GL_DEPTH_BITS, &tmp );
-        general.set_glDepthBits( tmp );
-        SG_LOG ( SG_GENERAL, SG_INFO, "Depth buffer bits = " << tmp );
+        simRendering->setIntValue("depth-buffer-bits", tmp);
     }
 };
 
diff --git a/src/Main/renderer.cxx b/src/Main/renderer.cxx
index a3d6d9886..0cb00c5ab 100644
--- a/src/Main/renderer.cxx
+++ b/src/Main/renderer.cxx
@@ -93,7 +93,6 @@
 #include <Instrumentation/HUD/HUD.hxx>
 #include <Environment/precipitation_mgr.hxx>
 
-#include <Include/general.hxx>
 #include "splash.hxx"
 #include "renderer.hxx"
 #include "main.hxx"