fly/flightgear
1
0
Fork 0
Code Activity

Get rid of FGGeneral; expose equivlanet values via properties.

Browse source
This commit is contained in:
James Turner 2010-10-01 09:33:31 +01:00
parent af4e47179e
commit 1afd4e602e
7 changed files with 13 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Cockpit/cockpit.cxx
View file

@ -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 )

1
src/GUI/gui.cxx
View file

@ -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>

1
src/Instrumentation/wxradar.cxx
View file

@ -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"

1
src/Main/fg_init.cxx
View file

@ -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>

1
src/Main/fg_os_osgviewer.cxx
View file

@ -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"

26
src/Main/main.cxx
View file

@ -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);
}
};

1
src/Main/renderer.cxx
View file

@ -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"