fly/flightgear
1
0
Fork 0
Code Activity

Merge branch 'next' into durk-atc

Browse source
This commit is contained in:
Durk Talsma 2011-07-31 19:31:25 +02:00
commit 2c1de98ef3
20 changed files with 42 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/Autopilot/autopilotgroup.cxx
View file

@ -31,6 +31,7 @@
#include <string> #include <string>
#include <vector> #include <vector>
#include <simgear/props/props_io.hxx>
#include <simgear/structure/subsystem_mgr.hxx> #include <simgear/structure/subsystem_mgr.hxx>
#include <simgear/structure/exception.hxx> #include <simgear/structure/exception.hxx>
#include <Main/fg_props.hxx> #include <Main/fg_props.hxx>

1
src/Autopilot/component.cxx
View file

@ -23,6 +23,7 @@
#include "component.hxx" #include "component.hxx"
#include <Main/fg_props.hxx> #include <Main/fg_props.hxx>
#include <simgear/structure/exception.hxx> #include <simgear/structure/exception.hxx>
#include <simgear/props/condition.hxx>
using namespace FGXMLAutopilot; using namespace FGXMLAutopilot;

2
src/Autopilot/component.hxx
View file

@ -28,7 +28,7 @@
#endif #endif
#include <simgear/structure/subsystem_mgr.hxx> #include <simgear/structure/subsystem_mgr.hxx>
#include <simgear/props/condition.hxx> #include <simgear/props/propsfwd.hxx>
namespace FGXMLAutopilot { namespace FGXMLAutopilot {

3
src/Autopilot/digitalcomponent.hxx
View file

@ -25,6 +25,9 @@
#include "component.hxx" #include "component.hxx"
#include <simgear/props/props.hxx>
#include <simgear/props/condition.hxx>
namespace FGXMLAutopilot { namespace FGXMLAutopilot {
/** /**

1
src/Cockpit/panel_io.cxx
View file

@ -29,6 +29,7 @@
#include <simgear/debug/logstream.hxx> #include <simgear/debug/logstream.hxx>
#include <simgear/misc/sg_path.hxx> #include <simgear/misc/sg_path.hxx>
#include <simgear/props/props.hxx> #include <simgear/props/props.hxx>
#include <simgear/props/props_io.hxx>
#include <istream> #include <istream>
#include <fstream> #include <fstream>

1
src/GUI/MapWidget.hxx
View file

@ -1,6 +1,7 @@
#ifndef GUI_MAPWIDGET_HXX #ifndef GUI_MAPWIDGET_HXX
#define GUI_MAPWIDGET_HXX #define GUI_MAPWIDGET_HXX
#include <map>
#include <simgear/compiler.h> #include <simgear/compiler.h>
#include <simgear/math/SGMath.hxx> #include <simgear/math/SGMath.hxx>
#include <simgear/props/props.hxx> #include <simgear/props/props.hxx>

2
src/GUI/dialog.cxx
View file

@ -5,6 +5,8 @@
#endif #endif
#include <simgear/structure/SGBinding.hxx> #include <simgear/structure/SGBinding.hxx>
#include <simgear/props/props_io.hxx>
#include <Scripting/NasalSys.hxx> #include <Scripting/NasalSys.hxx>
#include <Main/fg_os.hxx> #include <Main/fg_os.hxx>

1
src/GUI/gui_funcs.cxx
View file

@ -43,6 +43,7 @@
#include <simgear/misc/sg_path.hxx> #include <simgear/misc/sg_path.hxx>
#include <simgear/screen/screen-dump.hxx> #include <simgear/screen/screen-dump.hxx>
#include <simgear/structure/event_mgr.hxx> #include <simgear/structure/event_mgr.hxx>
#include <simgear/props/props_io.hxx>
#include <Cockpit/panel.hxx> #include <Cockpit/panel.hxx>
#include <Main/globals.hxx> #include <Main/globals.hxx>

1
src/GUI/menubar.cxx
View file

@ -7,6 +7,7 @@
#include <plib/pu.h> #include <plib/pu.h>
#include <simgear/debug/logstream.hxx> #include <simgear/debug/logstream.hxx>
#include <simgear/structure/SGBinding.hxx> #include <simgear/structure/SGBinding.hxx>
#include <simgear/props/props_io.hxx>
#include <Main/globals.hxx> #include <Main/globals.hxx>

1
src/Input/FGEventInput.cxx
View file

@ -28,6 +28,7 @@
#include "FGEventInput.hxx" #include "FGEventInput.hxx"
#include <Main/fg_props.hxx> #include <Main/fg_props.hxx>
#include <simgear/io/sg_file.hxx> #include <simgear/io/sg_file.hxx>
#include <simgear/props/props_io.hxx>
#include <Scripting/NasalSys.hxx> #include <Scripting/NasalSys.hxx>
using simgear::PropertyList; using simgear::PropertyList;

2
src/Input/FGJoystickInput.cxx
View file

@ -23,6 +23,8 @@
// $Id$ // $Id$
#include "FGJoystickInput.hxx" #include "FGJoystickInput.hxx"
#include <simgear/props/props_io.hxx>
#include "FGDeviceConfigurationMap.hxx" #include "FGDeviceConfigurationMap.hxx"
#include <Main/fg_props.hxx> #include <Main/fg_props.hxx>
#include <Scripting/NasalSys.hxx> #include <Scripting/NasalSys.hxx>

1
src/Instrumentation/HUD/HUD.cxx
View file

@ -31,6 +31,7 @@
#include <simgear/constants.h> #include <simgear/constants.h>
#include <simgear/misc/sg_path.hxx> #include <simgear/misc/sg_path.hxx>
#include <simgear/props/props_io.hxx>
#include <osg/GLU> #include <osg/GLU>
#include <Main/globals.hxx> #include <Main/globals.hxx>

1
src/Instrumentation/instrument_mgr.cxx
View file

@ -14,6 +14,7 @@
#include <simgear/structure/exception.hxx> #include <simgear/structure/exception.hxx>
#include <simgear/misc/sg_path.hxx> #include <simgear/misc/sg_path.hxx>
#include <simgear/sg_inlines.h> #include <simgear/sg_inlines.h>
#include <simgear/props/props_io.hxx>
#include <Main/fg_props.hxx> #include <Main/fg_props.hxx>
#include <Main/globals.hxx> #include <Main/globals.hxx>

1
src/Main/fg_commands.cxx
View file

@ -19,6 +19,7 @@
#include <simgear/structure/exception.hxx> #include <simgear/structure/exception.hxx>
#include <simgear/structure/commands.hxx> #include <simgear/structure/commands.hxx>
#include <simgear/props/props.hxx> #include <simgear/props/props.hxx>
#include <simgear/props/props_io.hxx>
#include <simgear/structure/event_mgr.hxx> #include <simgear/structure/event_mgr.hxx>
#include <simgear/sound/soundmgr_openal.hxx> #include <simgear/sound/soundmgr_openal.hxx>
#include <simgear/timing/sg_time.hxx> #include <simgear/timing/sg_time.hxx>

1
src/Main/fg_init.cxx
View file

@ -60,6 +60,7 @@
#include <simgear/misc/sg_dir.hxx> #include <simgear/misc/sg_dir.hxx>
#include <simgear/misc/sgstream.hxx> #include <simgear/misc/sgstream.hxx>
#include <simgear/misc/strutils.hxx> #include <simgear/misc/strutils.hxx>
#include <simgear/props/props_io.hxx>
#include <simgear/misc/interpolator.hxx> #include <simgear/misc/interpolator.hxx>
#include <simgear/scene/material/matlib.hxx> #include <simgear/scene/material/matlib.hxx>

1
src/Main/globals.cxx
View file

@ -36,6 +36,7 @@
#include <simgear/sound/soundmgr_openal.hxx> #include <simgear/sound/soundmgr_openal.hxx>
#include <simgear/misc/ResourceManager.hxx> #include <simgear/misc/ResourceManager.hxx>
#include <simgear/props/propertyObject.hxx> #include <simgear/props/propertyObject.hxx>
#include <simgear/props/props_io.hxx>
#include <Aircraft/controls.hxx> #include <Aircraft/controls.hxx>
#include <Airports/runways.hxx> #include <Airports/runways.hxx>

27
src/Main/renderer.cxx
View file

@ -440,6 +440,13 @@ FGRenderer::init( void )
_cloud_status = fgGetNode("/environment/clouds/status", true); _cloud_status = fgGetNode("/environment/clouds/status", true);
_visibility_m = fgGetNode("/environment/visibility-m", true); _visibility_m = fgGetNode("/environment/visibility-m", true);
bool use_point_sprites = _point_sprites->getBoolValue();
bool enhanced_lighting = _enhanced_lighting->getBoolValue();
bool distance_attenuation = _distance_attenuation->getBoolValue();
SGConfigureDirectionalLights( use_point_sprites, enhanced_lighting,
distance_attenuation );
} }
void void
@ -619,14 +626,17 @@ FGRenderer::update( bool refresh_camera_settings ) {
_splash_alpha->setDoubleValue(sAlpha); _splash_alpha->setDoubleValue(sAlpha);
} }
bool skyblend = _skyblend->getBoolValue(); #if 0 // OSGFIXME
bool use_point_sprites = _point_sprites->getBoolValue(); // OSGFIXME: features no longer available or no longer run-time configurable
bool enhanced_lighting = _enhanced_lighting->getBoolValue(); {
bool distance_attenuation = _distance_attenuation->getBoolValue(); bool use_point_sprites = _point_sprites->getBoolValue();
bool enhanced_lighting = _enhanced_lighting->getBoolValue();
// OSGFIXME bool distance_attenuation = _distance_attenuation->getBoolValue();
SGConfigureDirectionalLights( use_point_sprites, enhanced_lighting,
distance_attenuation ); SGConfigureDirectionalLights( use_point_sprites, enhanced_lighting,
distance_attenuation );
}
#endif
FGLight *l = static_cast<FGLight*>(globals->get_subsystem("lighting")); FGLight *l = static_cast<FGLight*>(globals->get_subsystem("lighting"));
@ -653,6 +663,7 @@ FGRenderer::update( bool refresh_camera_settings ) {
} }
osg::Camera *camera = viewer->getCamera(); osg::Camera *camera = viewer->getCamera();
bool skyblend = _skyblend->getBoolValue();
if ( skyblend ) { if ( skyblend ) {
if ( _textures->getBoolValue() ) { if ( _textures->getBoolValue() ) {

1
src/Sound/fg_fx.cxx
View file

@ -34,6 +34,7 @@
#include <Main/fg_props.hxx> #include <Main/fg_props.hxx>
#include <simgear/props/props.hxx> #include <simgear/props/props.hxx>
#include <simgear/props/props_io.hxx>
#include <simgear/misc/sg_path.hxx> #include <simgear/misc/sg_path.hxx>
#include <simgear/sound/soundmgr_openal.hxx> #include <simgear/sound/soundmgr_openal.hxx>
#include <simgear/sound/xmlsound.hxx> #include <simgear/sound/xmlsound.hxx>

1
utils/fgpanel/panel.hxx
View file

@ -33,6 +33,7 @@
#include <plib/fnt.h> #include <plib/fnt.h>
#include <simgear/props/propsfwd.hxx>
#include <simgear/props/condition.hxx> #include <simgear/props/condition.hxx>
#include <simgear/structure/subsystem_mgr.hxx> #include <simgear/structure/subsystem_mgr.hxx>
#include <simgear/math/interpolater.hxx> #include <simgear/math/interpolater.hxx>

1
utils/fgpanel/panel_io.cxx
View file

@ -35,6 +35,7 @@
#include <simgear/misc/sg_path.hxx> #include <simgear/misc/sg_path.hxx>
#include <simgear/props/props.hxx> #include <simgear/props/props.hxx>
#include <simgear/props/condition.hxx> #include <simgear/props/condition.hxx>
#include <simgear/props/props_io.hxx>
#include "panel.hxx" #include "panel.hxx"
#include "panel_io.hxx" #include "panel_io.hxx"