Menu
▾
▴
[Flightgear-commitlogs] FlightGear branch, next, updated. 11320e6b008eb85b8dff66a137f671743cc04580
|
From: Flightgear-commitlogs <ma...@hy...> - 2011-03-23 23:14:13
|
The branch, next has been updated
- Log -----------------------------------------------------------------
commit 11320e6b008eb85b8dff66a137f671743cc04580
Author: ThorstenB
Date: Wed Mar 23 23:52:36 2011 +0100
Bertrand Coconnier: Fix instant replay with JSBSim aircraft (bug #294)
Avoid re-trim to be triggered by property listeners during instant
replay (when the FDM is suspended).
commit 38226af24ec01e8f0a20d7fd73ef838a69f6ef25
Author: ThorstenB
Date: Wed Mar 23 23:09:02 2011 +0100
Improve timing statistics
Enable/disable and print statistics at run-time.
Configurable intervals and filters.
commit b4c47b06d50d055f363f14677a7d4d052af9a981
Author: ThorstenB
Date: Wed Mar 23 22:50:56 2011 +0100
Drop unnecessary include dependency.
Make Csaba happy...
commit 189457f2af9ac3ec748c32a7403f06702852fd17
Author: ThorstenB
Date: Wed Mar 23 22:49:18 2011 +0100
Minor namespace issue
using "using" in the .cxx now :)
- Summary -------------------------------------------------------------
src/Environment/realwx_ctrl.cxx | 1 +
src/FDM/JSBSim/JSBSim.cxx | 56 ++++++++++++++++++++++++++++++++-------
src/FDM/JSBSim/JSBSim.hxx | 6 ++++
src/Main/main.cxx | 31 +++++++++++++++++++++
src/Sound/voiceplayer.cxx | 6 ----
5 files changed, 84 insertions(+), 16 deletions(-)
- Diff ----------------------------------------------------------------
diff --git a/src/Environment/realwx_ctrl.cxx b/src/Environment/realwx_ctrl.cxx
index 03db5a8..621fb11 100644
--- a/src/Environment/realwx_ctrl.cxx
+++ b/src/Environment/realwx_ctrl.cxx
@@ -40,6 +40,7 @@
#include <simgear/threads/SGQueue.hxx>
#endif
+using simgear::PropertyList;
namespace Environment {
diff --git a/src/FDM/JSBSim/JSBSim.cxx b/src/FDM/JSBSim/JSBSim.cxx
index 0eb2188..e2d98b6 100644
--- a/src/FDM/JSBSim/JSBSim.cxx
+++ b/src/FDM/JSBSim/JSBSim.cxx
@@ -570,6 +570,22 @@ void FGJSBsim::update( double dt )
/******************************************************************************/
+void FGJSBsim::suspend()
+{
+ fdmex->Hold();
+ SGSubsystem::suspend();
+}
+
+/******************************************************************************/
+
+void FGJSBsim::resume()
+{
+ fdmex->Resume();
+ SGSubsystem::resume();
+}
+
+/******************************************************************************/
+
// Convert from the FGInterface struct to the JSBsim generic_ struct
bool FGJSBsim::copy_to_JSBsim()
@@ -1011,7 +1027,9 @@ void FGJSBsim::set_Latitude(double lat)
_set_Sea_level_radius( sea_level_radius_meters * SG_METER_TO_FEET );
fgic->SetSeaLevelRadiusFtIC( sea_level_radius_meters * SG_METER_TO_FEET );
fgic->SetLatitudeRadIC( lat_geoc );
- needTrim=true;
+
+ if (!fdmex->Holding())
+ needTrim=true;
}
@@ -1024,7 +1042,9 @@ void FGJSBsim::set_Longitude(double lon)
update_ic();
fgic->SetLongitudeRadIC( lon );
- needTrim=true;
+
+ if (!fdmex->Holding())
+ needTrim=true;
}
// Sets the altitude above sea level.
@@ -1049,7 +1069,9 @@ void FGJSBsim::set_Altitude(double alt)
"Terrain elevation: " << FGInterface::get_Runway_altitude() * SG_METER_TO_FEET );
fgic->SetLatitudeRadIC( lat_geoc );
fgic->SetAltitudeASLFtIC(alt);
- needTrim=true;
+
+ if (!fdmex->Holding())
+ needTrim=true;
}
void FGJSBsim::set_V_calibrated_kts(double vc)
@@ -1061,7 +1083,9 @@ void FGJSBsim::set_V_calibrated_kts(double vc)
update_ic();
fgic->SetVcalibratedKtsIC(vc);
- needTrim=true;
+
+ if (!fdmex->Holding())
+ needTrim=true;
}
void FGJSBsim::set_Mach_number(double mach)
@@ -1073,7 +1097,9 @@ void FGJSBsim::set_Mach_number(double mach)
update_ic();
fgic->SetMachIC(mach);
- needTrim=true;
+
+ if (!fdmex->Holding())
+ needTrim=true;
}
void FGJSBsim::set_Velocities_Local( double north, double east, double down )
@@ -1088,7 +1114,9 @@ void FGJSBsim::set_Velocities_Local( double north, double east, double down )
fgic->SetVNorthFpsIC(north);
fgic->SetVEastFpsIC(east);
fgic->SetVDownFpsIC(down);
- needTrim=true;
+
+ if (!fdmex->Holding())
+ needTrim=true;
}
void FGJSBsim::set_Velocities_Wind_Body( double u, double v, double w)
@@ -1103,7 +1131,9 @@ void FGJSBsim::set_Velocities_Wind_Body( double u, double v, double w)
fgic->SetUBodyFpsIC(u);
fgic->SetVBodyFpsIC(v);
fgic->SetWBodyFpsIC(w);
- needTrim=true;
+
+ if (!fdmex->Holding())
+ needTrim=true;
}
//Euler angles
@@ -1119,7 +1149,9 @@ void FGJSBsim::set_Euler_Angles( double phi, double theta, double psi )
fgic->SetThetaRadIC(theta);
fgic->SetPhiRadIC(phi);
fgic->SetPsiRadIC(psi);
- needTrim=true;
+
+ if (!fdmex->Holding())
+ needTrim=true;
}
//Flight Path
@@ -1137,7 +1169,9 @@ void FGJSBsim::set_Climb_Rate( double roc)
if( !(fabs(roc) > 1 && fabs(fgic->GetFlightPathAngleRadIC()) < 0.01) ) {
fgic->SetClimbRateFpsIC(roc);
}
- needTrim=true;
+
+ if (!fdmex->Holding())
+ needTrim=true;
}
void FGJSBsim::set_Gamma_vert_rad( double gamma)
@@ -1148,7 +1182,9 @@ void FGJSBsim::set_Gamma_vert_rad( double gamma)
if( !(fabs(gamma) < 0.01 && fabs(fgic->GetClimbRateFpsIC()) > 1) ) {
fgic->SetFlightPathAngleRadIC(gamma);
}
- needTrim=true;
+
+ if (!fdmex->Holding())
+ needTrim=true;
}
void FGJSBsim::init_gear(void )
diff --git a/src/FDM/JSBSim/JSBSim.hxx b/src/FDM/JSBSim/JSBSim.hxx
index a01146b..ca52f92 100644
--- a/src/FDM/JSBSim/JSBSim.hxx
+++ b/src/FDM/JSBSim/JSBSim.hxx
@@ -113,6 +113,12 @@ public:
/// Unbind properties
void unbind();
+ /// Suspend integration
+ void suspend();
+
+ /// Resume integration
+ void resume();
+
/// @name Position Parameter Set
//@{
/** Set geocentric latitude
diff --git a/src/Main/main.cxx b/src/Main/main.cxx
index 677d0f3..33bb062 100644
--- a/src/Main/main.cxx
+++ b/src/Main/main.cxx
@@ -121,6 +121,15 @@ static void fgMainLoop( void ) {
static SGPropertyNode_ptr frame_signal
= fgGetNode("/sim/signals/frame", true);
+ static SGPropertyNode_ptr _statisticsFlag
+ = fgGetNode("/sim/timing-statistics/enabled", true);
+ static SGPropertyNode_ptr _statisticsInterval
+ = fgGetNode("/sim/timing-statistics/interval-s", true);
+ static SGPropertyNode_ptr _statiticsMinJitter
+ = fgGetNode("/sim/timing-statistics/min-jitter-ms", true);
+ static SGPropertyNode_ptr _statiticsMinTime
+ = fgGetNode("/sim/timing-statistics/min-time-ms", true);
+
frame_signal->fireValueChanged();
SGCloudLayer::enable_bump_mapping = fgGetBool("/sim/rendering/bump-mapping");
@@ -206,6 +215,28 @@ static void fgMainLoop( void ) {
simgear::sleepForMSec(500);
}
}
+
+ // print timing statistics
+ static bool _lastStatisticsFlag = false;
+ if (_lastStatisticsFlag != _statisticsFlag->getBoolValue())
+ {
+ // flag has changed, update subsystem manager
+ _lastStatisticsFlag = _statisticsFlag->getBoolValue();
+ globals->get_subsystem_mgr()->collectDebugTiming(_lastStatisticsFlag);
+ }
+ if (_lastStatisticsFlag)
+ {
+ static double elapsed = 0;
+ elapsed += real_dt;
+ if (elapsed >= _statisticsInterval->getDoubleValue())
+ {
+ // print and reset timing statistics
+ globals->get_subsystem_mgr()->printTimingStatistics(_statiticsMinTime->getDoubleValue(),
+ _statiticsMinJitter->getDoubleValue());
+ elapsed = 0;
+ }
+ }
+
simgear::AtomicChangeListener::fireChangeListeners();
SG_LOG( SG_ALL, SG_DEBUG, "" );
diff --git a/src/Sound/voiceplayer.cxx b/src/Sound/voiceplayer.cxx
index 1a839cf..054a771 100644
--- a/src/Sound/voiceplayer.cxx
+++ b/src/Sound/voiceplayer.cxx
@@ -42,12 +42,6 @@
using std::string;
-#if defined( HAVE_VERSION_H ) && HAVE_VERSION_H
-# include <Include/version.h>
-#else
-# include <Include/no_version.h>
-#endif
-
#include "voiceplayer.hxx"
///////////////////////////////////////////////////////////////////////////////
-----------------------------------------------------------------------
FlightGear
|