From 6c52a5ac855e24295471285d1de05eee4502535c Mon Sep 17 00:00:00 2001
From: James Turner <zakalawe@mac.com>
Date: Sat, 30 Jul 2011 10:47:28 +0100
Subject: [PATCH 1/2] Fixes for include-file flattening - condition.hxx no
 longer pulls in props or props_io

---
 src/Autopilot/autopilotgroup.cxx       | 1 +
 src/Autopilot/component.cxx            | 1 +
 src/Autopilot/component.hxx            | 2 +-
 src/Autopilot/digitalcomponent.hxx     | 3 +++
 src/Cockpit/panel_io.cxx               | 1 +
 src/GUI/MapWidget.hxx                  | 1 +
 src/GUI/dialog.cxx                     | 2 ++
 src/GUI/gui_funcs.cxx                  | 1 +
 src/GUI/menubar.cxx                    | 1 +
 src/Input/FGEventInput.cxx             | 1 +
 src/Input/FGJoystickInput.cxx          | 2 ++
 src/Instrumentation/HUD/HUD.cxx        | 1 +
 src/Instrumentation/instrument_mgr.cxx | 1 +
 src/Main/fg_commands.cxx               | 1 +
 src/Main/fg_init.cxx                   | 1 +
 src/Main/globals.cxx                   | 1 +
 src/Sound/fg_fx.cxx                    | 1 +
 utils/fgpanel/panel.hxx                | 1 +
 utils/fgpanel/panel_io.cxx             | 1 +
 19 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/src/Autopilot/autopilotgroup.cxx b/src/Autopilot/autopilotgroup.cxx
index cf06bb4b4..e58cd8fd7 100644
--- a/src/Autopilot/autopilotgroup.cxx
+++ b/src/Autopilot/autopilotgroup.cxx
@@ -31,6 +31,7 @@
 #include <string>
 #include <vector>
 
+#include <simgear/props/props_io.hxx>
 #include <simgear/structure/subsystem_mgr.hxx>
 #include <simgear/structure/exception.hxx>
 #include <Main/fg_props.hxx>
diff --git a/src/Autopilot/component.cxx b/src/Autopilot/component.cxx
index bdf6ecc21..63ee6262a 100644
--- a/src/Autopilot/component.cxx
+++ b/src/Autopilot/component.cxx
@@ -23,6 +23,7 @@
 #include "component.hxx"
 #include <Main/fg_props.hxx>
 #include <simgear/structure/exception.hxx>
+#include <simgear/props/condition.hxx>
 
 using namespace FGXMLAutopilot;
 
diff --git a/src/Autopilot/component.hxx b/src/Autopilot/component.hxx
index 3f8d60352..cf8634a4a 100644
--- a/src/Autopilot/component.hxx
+++ b/src/Autopilot/component.hxx
@@ -28,7 +28,7 @@
 #endif
 
 #include <simgear/structure/subsystem_mgr.hxx>
-#include <simgear/props/condition.hxx>
+#include <simgear/props/propsfwd.hxx>
 
 namespace FGXMLAutopilot {
 
diff --git a/src/Autopilot/digitalcomponent.hxx b/src/Autopilot/digitalcomponent.hxx
index 606dd5f8b..afff879ba 100644
--- a/src/Autopilot/digitalcomponent.hxx
+++ b/src/Autopilot/digitalcomponent.hxx
@@ -25,6 +25,9 @@
 
 #include "component.hxx"
 
+#include <simgear/props/props.hxx>
+#include <simgear/props/condition.hxx>
+
 namespace FGXMLAutopilot {
 
 /**
diff --git a/src/Cockpit/panel_io.cxx b/src/Cockpit/panel_io.cxx
index ecd6efd89..754afb30e 100644
--- a/src/Cockpit/panel_io.cxx
+++ b/src/Cockpit/panel_io.cxx
@@ -29,6 +29,7 @@
 #include <simgear/debug/logstream.hxx>
 #include <simgear/misc/sg_path.hxx>
 #include <simgear/props/props.hxx>
+#include <simgear/props/props_io.hxx>
 
 #include <istream>
 #include <fstream>
diff --git a/src/GUI/MapWidget.hxx b/src/GUI/MapWidget.hxx
index ce9333e32..934198603 100644
--- a/src/GUI/MapWidget.hxx
+++ b/src/GUI/MapWidget.hxx
@@ -1,6 +1,7 @@
 #ifndef GUI_MAPWIDGET_HXX
 #define GUI_MAPWIDGET_HXX
 
+#include <map>
 #include <simgear/compiler.h>
 #include <simgear/math/SGMath.hxx>
 #include <simgear/props/props.hxx>
diff --git a/src/GUI/dialog.cxx b/src/GUI/dialog.cxx
index 71d6d7279..364cf5d13 100644
--- a/src/GUI/dialog.cxx
+++ b/src/GUI/dialog.cxx
@@ -5,6 +5,8 @@
 #endif
 
 #include <simgear/structure/SGBinding.hxx>
+#include <simgear/props/props_io.hxx>
+
 #include <Scripting/NasalSys.hxx>
 #include <Main/fg_os.hxx>
 
diff --git a/src/GUI/gui_funcs.cxx b/src/GUI/gui_funcs.cxx
index 06459a8f6..57adcc26e 100644
--- a/src/GUI/gui_funcs.cxx
+++ b/src/GUI/gui_funcs.cxx
@@ -43,6 +43,7 @@
 #include <simgear/misc/sg_path.hxx>
 #include <simgear/screen/screen-dump.hxx>
 #include <simgear/structure/event_mgr.hxx>
+#include <simgear/props/props_io.hxx>
 
 #include <Cockpit/panel.hxx>
 #include <Main/globals.hxx>
diff --git a/src/GUI/menubar.cxx b/src/GUI/menubar.cxx
index 5675b14e4..39d4d53aa 100644
--- a/src/GUI/menubar.cxx
+++ b/src/GUI/menubar.cxx
@@ -7,6 +7,7 @@
 #include <plib/pu.h>
 #include <simgear/debug/logstream.hxx>
 #include <simgear/structure/SGBinding.hxx>
+#include <simgear/props/props_io.hxx>
 
 #include <Main/globals.hxx>
 
diff --git a/src/Input/FGEventInput.cxx b/src/Input/FGEventInput.cxx
index 8bf9f304e..7e8c98944 100644
--- a/src/Input/FGEventInput.cxx
+++ b/src/Input/FGEventInput.cxx
@@ -28,6 +28,7 @@
 #include "FGEventInput.hxx"
 #include <Main/fg_props.hxx>
 #include <simgear/io/sg_file.hxx>
+#include <simgear/props/props_io.hxx>
 #include <Scripting/NasalSys.hxx>
 
 using simgear::PropertyList;
diff --git a/src/Input/FGJoystickInput.cxx b/src/Input/FGJoystickInput.cxx
index 0d0a86ce9..456747647 100644
--- a/src/Input/FGJoystickInput.cxx
+++ b/src/Input/FGJoystickInput.cxx
@@ -23,6 +23,8 @@
 // $Id$
 
 #include "FGJoystickInput.hxx"
+
+#include <simgear/props/props_io.hxx>
 #include "FGDeviceConfigurationMap.hxx"
 #include <Main/fg_props.hxx>
 #include <Scripting/NasalSys.hxx>
diff --git a/src/Instrumentation/HUD/HUD.cxx b/src/Instrumentation/HUD/HUD.cxx
index 6d9e0bd90..d886bc76e 100644
--- a/src/Instrumentation/HUD/HUD.cxx
+++ b/src/Instrumentation/HUD/HUD.cxx
@@ -31,6 +31,7 @@
 
 #include <simgear/constants.h>
 #include <simgear/misc/sg_path.hxx>
+#include <simgear/props/props_io.hxx>
 #include <osg/GLU>
 
 #include <Main/globals.hxx>
diff --git a/src/Instrumentation/instrument_mgr.cxx b/src/Instrumentation/instrument_mgr.cxx
index 58fe89db1..67dfd7623 100644
--- a/src/Instrumentation/instrument_mgr.cxx
+++ b/src/Instrumentation/instrument_mgr.cxx
@@ -14,6 +14,7 @@
 #include <simgear/structure/exception.hxx>
 #include <simgear/misc/sg_path.hxx>
 #include <simgear/sg_inlines.h>
+#include <simgear/props/props_io.hxx>
 
 #include <Main/fg_props.hxx>
 #include <Main/globals.hxx>
diff --git a/src/Main/fg_commands.cxx b/src/Main/fg_commands.cxx
index ef2824089..ee56f9ad8 100644
--- a/src/Main/fg_commands.cxx
+++ b/src/Main/fg_commands.cxx
@@ -19,6 +19,7 @@
 #include <simgear/structure/exception.hxx>
 #include <simgear/structure/commands.hxx>
 #include <simgear/props/props.hxx>
+#include <simgear/props/props_io.hxx>
 #include <simgear/structure/event_mgr.hxx>
 #include <simgear/sound/soundmgr_openal.hxx>
 #include <simgear/timing/sg_time.hxx>
diff --git a/src/Main/fg_init.cxx b/src/Main/fg_init.cxx
index 52a88efdf..c28c9d98e 100644
--- a/src/Main/fg_init.cxx
+++ b/src/Main/fg_init.cxx
@@ -60,6 +60,7 @@
 #include <simgear/misc/sg_dir.hxx>
 #include <simgear/misc/sgstream.hxx>
 #include <simgear/misc/strutils.hxx>
+#include <simgear/props/props_io.hxx>
 
 #include <simgear/misc/interpolator.hxx>
 #include <simgear/scene/material/matlib.hxx>
diff --git a/src/Main/globals.cxx b/src/Main/globals.cxx
index 91af653c0..99f1709da 100644
--- a/src/Main/globals.cxx
+++ b/src/Main/globals.cxx
@@ -36,6 +36,7 @@
 #include <simgear/sound/soundmgr_openal.hxx>
 #include <simgear/misc/ResourceManager.hxx>
 #include <simgear/props/propertyObject.hxx>
+#include <simgear/props/props_io.hxx>
 
 #include <Aircraft/controls.hxx>
 #include <Airports/runways.hxx>
diff --git a/src/Sound/fg_fx.cxx b/src/Sound/fg_fx.cxx
index f60f44114..2953bfe67 100644
--- a/src/Sound/fg_fx.cxx
+++ b/src/Sound/fg_fx.cxx
@@ -34,6 +34,7 @@
 #include <Main/fg_props.hxx>
 
 #include <simgear/props/props.hxx>
+#include <simgear/props/props_io.hxx>
 #include <simgear/misc/sg_path.hxx>
 #include <simgear/sound/soundmgr_openal.hxx>
 #include <simgear/sound/xmlsound.hxx>
diff --git a/utils/fgpanel/panel.hxx b/utils/fgpanel/panel.hxx
index 44ce96a05..6d2962966 100644
--- a/utils/fgpanel/panel.hxx
+++ b/utils/fgpanel/panel.hxx
@@ -33,6 +33,7 @@
 
 #include <plib/fnt.h>
 
+#include <simgear/props/propsfwd.hxx>
 #include <simgear/props/condition.hxx>
 #include <simgear/structure/subsystem_mgr.hxx>
 #include <simgear/math/interpolater.hxx>
diff --git a/utils/fgpanel/panel_io.cxx b/utils/fgpanel/panel_io.cxx
index d0bd6b358..1971d5799 100644
--- a/utils/fgpanel/panel_io.cxx
+++ b/utils/fgpanel/panel_io.cxx
@@ -35,6 +35,7 @@
 #include <simgear/misc/sg_path.hxx>
 #include <simgear/props/props.hxx>
 #include <simgear/props/condition.hxx>
+#include <simgear/props/props_io.hxx>
 
 #include "panel.hxx"
 #include "panel_io.hxx"

From b0a4299d466005c8182e805ed6e9c5e57ddb4f3c Mon Sep 17 00:00:00 2001
From: ThorstenB <brehmt@gmail.com>
Date: Sun, 31 Jul 2011 13:33:11 +0200
Subject: [PATCH 2/2] #232: early propagation of "point sprites for runway
 lights" switch Property value is required early during initialization since
 the feature isn't run-time configurable. Disable run-time calls since it has
 no effect.

---
 src/Main/renderer.cxx | 27 +++++++++++++++++++--------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/src/Main/renderer.cxx b/src/Main/renderer.cxx
index 4902abea0..3d40cf4c1 100644
--- a/src/Main/renderer.cxx
+++ b/src/Main/renderer.cxx
@@ -440,6 +440,13 @@ FGRenderer::init( void )
 
     _cloud_status = fgGetNode("/environment/clouds/status", 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
@@ -619,14 +626,17 @@ FGRenderer::update( bool refresh_camera_settings ) {
         _splash_alpha->setDoubleValue(sAlpha);
     }
 
-    bool skyblend = _skyblend->getBoolValue();
-    bool use_point_sprites = _point_sprites->getBoolValue();
-    bool enhanced_lighting = _enhanced_lighting->getBoolValue();
-    bool distance_attenuation = _distance_attenuation->getBoolValue();
-
-    // OSGFIXME
-    SGConfigureDirectionalLights( use_point_sprites, enhanced_lighting,
-                                  distance_attenuation );
+#if 0 // OSGFIXME
+    // OSGFIXME: features no longer available or no longer run-time configurable
+    {
+        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 );
+    }
+#endif
 
     FGLight *l = static_cast<FGLight*>(globals->get_subsystem("lighting"));
 
@@ -653,6 +663,7 @@ FGRenderer::update( bool refresh_camera_settings ) {
     }
     osg::Camera *camera = viewer->getCamera();
 
+    bool skyblend = _skyblend->getBoolValue();
     if ( skyblend ) {
 	
         if ( _textures->getBoolValue() ) {