Value
+ prop_collective_ctrl = PropertyManager->GetNode(base_property_name + "/collective-ctrl-rad",true);
+ prop_lateral_ctrl = PropertyManager->GetNode(base_property_name + "/lateral-ctrl-rad",true);
+ prop_longitudinal_ctrl = PropertyManager->GetNode(base_property_name + "/longitudinal-ctrl-rad",true);
+ prop_antitorque_ctrl = PropertyManager->GetNode(base_property_name + "/antitorque-ctrl-rad",true);
+
+ prop_rotorbrake = PropertyManager->GetNode(base_property_name + "/rotorbrake-hp", true);
+ prop_freewheel_factor = PropertyManager->GetNode(base_property_name + "/freewheel-factor", true);
+
+ PropertyManager->Tie( base_property_name + "/dump-flag", &prop_DumpFlag );
+
+ return true;
}
//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
string FGRotor::GetThrusterLabels(int id, string delimeter)
{
- return "";
+
+ std::ostringstream buf;
+
+ buf << Name << " RPM (engine " << id << ")";
+
+ return buf.str();
+
}
//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
string FGRotor::GetThrusterValues(int id, string delimeter)
{
- return "";
+ std::ostringstream buf;
+
+ buf << RPM;
+
+ return buf.str();
}
//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -109,7 +1082,7 @@ void FGRotor::Debug(int from)
if (debug_lvl & 1) { // Standard console startup message output
if (from == 0) { // Constructor
-
+ cout << "\n Rotor Name: " << Name << endl;
}
}
if (debug_lvl & 2 ) { // Instantiation/Destruction notification
@@ -129,4 +1102,6 @@ void FGRotor::Debug(int from)
}
}
}
-}
+
+} // namespace JSBSim
+
diff --git a/src/FDM/JSBSim/models/propulsion/FGRotor.h b/src/FDM/JSBSim/models/propulsion/FGRotor.h
index 6188f40d9..0663fba46 100644
--- a/src/FDM/JSBSim/models/propulsion/FGRotor.h
+++ b/src/FDM/JSBSim/models/propulsion/FGRotor.h
@@ -1,10 +1,10 @@
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
Header: FGRotor.h
- Author: Jon S. Berndt
+ Author: T. Kreitler
Date started: 08/24/00
- ------------- Copyright (C) 2000 Jon S. Berndt (jon@jsbsim.org) -------------
+ ------------- Copyright (C) 2010 T. Kreitler -------------
This program is free software; you can redistribute it and/or modify it under
the terms of the GNU Lesser General Public License as published by the Free Software
@@ -25,7 +25,7 @@
HISTORY
--------------------------------------------------------------------------------
-08/24/00 JSB Created
+01/01/10 T.Kreitler test implementation
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
SENTRY
@@ -39,12 +39,14 @@ INCLUDES
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
#include "FGThruster.h"
+#include "math/FGTable.h"
+#include "math/FGRungeKutta.h"
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
DEFINITIONS
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
-#define ID_ROTOR "$Id$"
+#define ID_ROTOR "$Id: FGRotor.h,v 1.6 2010/06/02 04:05:13 jberndt Exp $"
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
FORWARD DECLARATIONS
@@ -56,7 +58,145 @@ namespace JSBSim {
CLASS DOCUMENTATION
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
-/** Models a rotor (such as for a helicopter); NOT YET IMPLEMENTED.
+/** Models a rotor system. The default configuration consists of main and
+ tail rotor. A practical way to define the positions is to start with an
+ imaginary gear-box near the cg of the vehicle.
+
+ In this case the location in the thruster definition should be
+ approximately equal to the cg defined in the fdm_config/mass_balance
+ section. If the default orientation (roll=pitch=yaw=0) is used the
+ positions of the rotor hubs are now defined relative to the location
+ of the thruster (i.e. the cg-centered body coordinate system).
+
+
+Configuration File Format:
+@code
+
+ {number}
+ {number}
+ {number}
+ {number}
+ {number}
+ {number}
+ {number}
+ {number}
+ {number}
+ {number}
+ {number}
+ {number}
+ {number}
+ {number}
+ {number}
+ {number}
+
+ {number}
+ {number}
+ {number}
+ {number}
+ {number}
+ {number}
+ {number}
+ {number}
+ {number}
+ {number}
+ {number}
+ {number}
+ {number}
+ {number}
+
+ {number}
+ {number}
+
+
+// LENGTH means any of the supported units, same for ANGLE and MOMENT.
+// Xunit-attributes are a hint for currently unsupported units, so
+// values must be provided accordingly.
+
+@endcode
+
+Configuration Parameters:
+
+ Brief description and the symbol frequently found in the literature.
+
+
+ \ - Rotor disk diameter (R).
+ \ - Number of blades (b).
+ \ - Relative height in body coordinate system, thus usually negative.
+ \ - Relative distance in body coordinate system, close to zero
+ for main rotor, and usually negative for the tail rotor.
+ \ - RPM at which the rotor usally operates.
+ \ - Lowest RPM generated by the code, optional.
+ \ - Blade chord, (c).
+ \ - Slope of curve of section lift against section angle of attack,
+ per rad (a).
+ \ - Flapping moment of inertia (I_b).
+ \ - Blade twist from root to tip, (theta_1).
+ \ - Blade mass moment. (Biege/Widerstands-moment)
+ \ - Tip-loss factor. The Blade fraction that produces lift.
+ Value usually ranges between 0.95 - 1.0, optional (B).
+ \ - Moment of inertia for the whole rotor disk, optional.
+ \ - Rotor inflow time constant, sec.
+ \ - Orientation of the rotor shaft, negative angles define
+ a 'forward' tilt. Used by main rotor, optional.
+ \ - Rotor flapping-hinge offset (e).
+
+ Experimental properties
+
+ \ - Flapping hinge cantangle used by tail rotor, optional.
+ \ - Parameter for exponent in ground effect approximation. Value should
+ be in the range 0.2 - 0.35, 0.0 disables, optional.
+ \ - Further adjustment of ground effect.
+
+
+
+Notes:
+
+ The behavior of the rotor is controlled/influenced by 5 inputs.
+ - The power provided by the engine. This is handled by the regular engine controls.
+ - The collective control input. This is read from the fdm property
+ propulsion/engine[x]/collective-ctrl-rad.
+ - The lateral cyclic input. Read from
+ propulsion/engine[x]/lateral-ctrl-rad.
+ - The longitudinal cyclic input. Read from
+ propulsion/engine[x]/longitudinal-ctrl-rad.
+ - The tail collective (aka antitorque, aka pedal) control input. Read from
+ propulsion/engine[x]/antitorque-ctrl-rad.
+
+
+
+ In order to keep the rotor speed constant, use of a RPM-Governor system is encouraged.
+
+ It is possible to use different orientation/locations for the rotor system, but then xhub
+ and zhub are no longer aligned to the body frame and need proper recalculation.
+
+ To model a standalone main rotor just omit the element. If you provide
+ a plain element all tail rotor parameters are estimated.
+
+ The 'sense' parameter from the thruster is interpreted as follows, sense=1 means
+ counter clockwise rotation of the main rotor, as viewed from above. This is as a far
+ as I know more popular than clockwise rotation, which is defined by setting sense to
+ -1 (to be honest, I'm just 99.9% sure that the orientation is handled properly).
+
+ Concerning coaxial designs: By providing the 'variant' attribute with value 'coaxial'
+ a Kamov-style rotor is modeled - i.e. the rotor produces no torque.
+
+
+References:
+
+
+ - /SH79/
- Shaugnessy, J. D., Deaux, Thomas N., and Yenni, Kenneth R.,
+ "Development and Validation of a Piloted Simulation of a
+ Helicopter and External Sling Load", NASA TP-1285, 1979.
+ - /BA41/
- Bailey,F.J.,Jr., "A Simplified Theoretical Method of Determining
+ the Characteristics of a Lifting Rotor in Forward Flight", NACA Rep.716, 1941.
+ - /AM50/
- Amer, Kenneth B.,"Theory of Helicopter Damping in Pitch or Roll and a
+ Comparison With Flight Measurements", NACA TN-2136, 1950.
+ - /TA77/
- Talbot, Peter D., Corliss, Lloyd D., "A Mathematical Force and Moment
+ Model of a UH-1H Helicopter for Flight Dynamics Simulations", NASA TM-73,254, 1977.
+
+
+ @author Thomas Kreitler
+ @version $Id: FGRotor.h,v 1.6 2010/06/02 04:05:13 jberndt Exp $
*/
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -65,18 +205,197 @@ CLASS DECLARATION
class FGRotor : public FGThruster {
+ enum eRotorFlags {eNone=0, eMain=1, eTail=2, eCoaxial=4, eRotCW=8} ;
+ struct rotor {
+
+ virtual ~rotor();
+ void zero();
+ void configure(int f, const rotor *xmain = NULL);
+
+ // assist in parameter retrieval
+ double cnf_elem(const string& ename, double default_val=0.0, const string& unit = "", bool tell=false);
+ double cnf_elem(const string& ename, double default_val=0.0, bool tell=false);
+
+ // rotor dynamics
+ void calc_flow_and_thrust(double dt, double rho, double theta_0, double Uw, double Ww, double flow_scale = 1.0);
+
+ void calc_torque(double rho, double theta_0);
+ void calc_coning_angle(double rho, double theta_0);
+ void calc_flapping_angles(double rho, double theta_0, const FGColumnVector3 &pqr_fus_w);
+ void calc_drag_and_side_forces(double rho, double theta_0);
+
+ // transformations
+ FGColumnVector3 hub_vel_body2ca( const FGColumnVector3 &uvw, const FGColumnVector3 &pqr,
+ double a_ic = 0.0 , double b_ic = 0.0 );
+ FGColumnVector3 fus_angvel_body2ca( const FGColumnVector3 &pqr);
+
+ FGColumnVector3 body_forces(double a_ic = 0.0 , double b_ic = 0.0 );
+ FGColumnVector3 body_moments(FGColumnVector3 F_h, double a_ic = 0.0 , double b_ic = 0.0 );
+
+ // bookkeeping
+ int flags ;
+ Element *parent ;
+
+ // used in flow calculation
+ // FGRK4 rk ; // use this after checking
+ FGRKFehlberg rk ;
+ int reports ;
+
+ // configuration parameters
+ double Radius ;
+ int BladeNum ;
+ double RelDistance_xhub ;
+ double RelShift_yhub ;
+ double RelHeight_zhub ;
+ double NominalRPM ;
+ double MinRPM ;
+ double BladeChord ;
+ double LiftCurveSlope ;
+ double BladeFlappingMoment ;
+ double BladeTwist ;
+ double BladeMassMoment ;
+ double TipLossB ;
+ double PolarMoment ;
+ double InflowLag ;
+ double ShaftTilt ;
+ double HingeOffset ;
+ double HingeOffset_hover ;
+ double CantAngleD3 ;
+
+ double theta_shaft ;
+ double phi_shaft ;
+
+ // derived parameters
+ double LockNumberByRho ;
+ double solidity ; // aka sigma
+ double RpmRatio ; // main_to_tail, hmm
+ double R[5] ; // Radius powers
+ double B[6] ; // TipLossB powers
+
+ FGMatrix33 BodyToShaft ; // [S]T, see /SH79/ eqn(17,18)
+ FGMatrix33 ShaftToBody ; // [S]
+
+ // dynamic values
+ double ActualRPM ;
+ double Omega ; // must be > 0
+ double beta_orient ;
+ double a0 ; // coning angle (rad)
+ double a_1, b_1, a_dw ;
+ double a1s, b1s ; // cyclic flapping relative to shaft axes, /SH79/ eqn(43)
+ double H_drag, J_side ;
+
+ double Torque ;
+ double Thrust ;
+ double Ct ;
+ double lambda ; // inflow ratio
+ double mu ; // tip-speed ratio
+ double nu ; // induced inflow ratio
+ double v_induced ; // always positive [ft/s]
+
+ // results
+ FGColumnVector3 force ;
+ FGColumnVector3 moment ;
+
+
+ // declare the problem function
+ class dnuFunction : public FGRungeKuttaProblem {
+ public:
+ void update_params(rotor *r, double ct_t01, double fs, double w);
+ private:
+ double pFunc(double x, double y);
+ // some shortcuts
+ double k_sat, ct_lambda, k_wor, k_theta, mu2, k_flowscale;
+ } flowEquation;
+
+
+ };
+
+
public:
- /// Constructor
- FGRotor(FGFDMExec *FDMExec, Element* rotor_element, int num);
+ /** Constructor
+ @param exec pointer to executive structure
+ @param rotor_element pointer to XML element in the config file
+ @param num the number of this rotor */
+ FGRotor(FGFDMExec *exec, Element* rotor_element, int num);
+
/// Destructor
~FGRotor();
+ void SetRPM(double rpm) {RPM = rpm;}
+
+ /** Calculates forces and moments created by the rotor(s) and updates
+ vFn,vMn state variables. RPM changes are handled inside, too.
+ The RPM change is based on estimating the torque provided by the engine.
+
+ @param PowerAvailable here this is the thrust (not power) provided by a turbine
+ @return PowerAvailable */
double Calculate(double);
+
+ double GetRPM(void) const { return RPM; }
+ double GetDiameter(void) { return mr.Radius*2.0; }
+
+ // Stubs. Right now this rotor-to-engine interface is just a hack.
+ double GetTorque(void) { return 0.0; /* return mr.Torque;*/ }
+ double GetPowerRequired(void);
+
+ // Stubs. Only main rotor RPM is returned
string GetThrusterLabels(int id, string delimeter);
string GetThrusterValues(int id, string delimeter);
private:
+
+ bool bind(void);
+
+ double RPM;
+ double Sense; // default is counter clockwise rotation of the main rotor (viewed from above)
+ bool tailRotorPresent;
+
void Debug(int from);
+
+ FGPropertyManager* PropertyManager;
+
+ rotor mr;
+ rotor tr;
+
+ Filter damp_hagl;
+
+ double rho;
+
+ double effective_tail_col; // /SH79/ eqn(47)
+
+ double ground_effect_exp;
+ double ground_effect_shift;
+
+ double hover_threshold;
+ double hover_scale;
+
+ // fdm imported controls
+ FGPropertyManager* prop_collective_ctrl;
+ FGPropertyManager* prop_lateral_ctrl;
+ FGPropertyManager* prop_longitudinal_ctrl;
+ FGPropertyManager* prop_antitorque_ctrl;
+
+ FGPropertyManager* prop_freewheel_factor;
+ FGPropertyManager* prop_rotorbrake;
+
+ // fdm export ...
+ double prop_inflow_ratio_lambda;
+ double prop_advance_ratio_mu;
+ double prop_inflow_ratio_induced_nu;
+ double prop_mr_torque;
+ double prop_coning_angle;
+
+ double prop_theta_downwash;
+ double prop_phi_downwash;
+
+ double prop_thrust_coefficient;
+ double prop_lift_coefficient;
+
+ double dt; // deltaT doesn't do the thing
+
+ // devel/debug stuff
+ int prop_DumpFlag; // causes 1-time dump on stdout
+
};
}
//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/src/FDM/JSBSim/models/propulsion/FGTank.cpp b/src/FDM/JSBSim/models/propulsion/FGTank.cpp
index f05831b73..c9d38dab8 100644
--- a/src/FDM/JSBSim/models/propulsion/FGTank.cpp
+++ b/src/FDM/JSBSim/models/propulsion/FGTank.cpp
@@ -48,7 +48,7 @@ using namespace std;
namespace JSBSim {
-static const char *IdSrc = "$Id$";
+static const char *IdSrc = "$Id: FGTank.cpp,v 1.28 2010/01/24 19:26:04 jberndt Exp $";
static const char *IdHdr = ID_TANK;
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -66,6 +66,7 @@ FGTank::FGTank(FGFDMExec* exec, Element* el, int tank_number)
InitialTemperature = Temperature = -9999.0;
Ixx = Iyy = Izz = 0.0;
Radius = Contents = Standpipe = Length = InnerRadius = 0.0;
+ InitialStandpipe = 0.0;
Capacity = 0.00001;
Priority = InitialPriority = 1;
PropertyManager = Exec->GetPropertyManager();
diff --git a/src/FDM/JSBSim/models/propulsion/FGTank.h b/src/FDM/JSBSim/models/propulsion/FGTank.h
index 55930543f..12e7e5fc9 100644
--- a/src/FDM/JSBSim/models/propulsion/FGTank.h
+++ b/src/FDM/JSBSim/models/propulsion/FGTank.h
@@ -52,7 +52,7 @@ INCLUDES
DEFINITIONS
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
-#define ID_TANK "$Id$"
+#define ID_TANK "$Id: FGTank.h,v 1.21 2010/02/05 05:53:00 jberndt Exp $"
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
FORWARD DECLARATIONS
@@ -195,6 +195,9 @@ public:
/// Destructor
~FGTank();
+ enum TankType {ttUNKNOWN, ttFUEL, ttOXIDIZER};
+ enum GrainType {gtUNKNOWN, gtCYLINDRICAL, gtENDBURNING};
+
/** Removes fuel from the tank.
This function removes fuel from a tank. If the tank empties, it is
deselected.
@@ -275,6 +278,8 @@ public:
const FGColumnVector3 GetXYZ(void);
const double GetXYZ(int idx);
+ const GrainType GetGrainType(void) {return grainType;}
+
double Fill(double amount);
void SetContents(double amount);
void SetContentsGallons(double gallons);
@@ -282,9 +287,6 @@ public:
void SetStandpipe(double amount) { Standpipe = amount; }
void SetSelected(bool sel) { sel==true ? SetPriority(1):SetPriority(0); }
- enum TankType {ttUNKNOWN, ttFUEL, ttOXIDIZER};
- enum GrainType {gtUNKNOWN, gtCYLINDRICAL, gtENDBURNING};
-
private:
TankType Type;
GrainType grainType;
diff --git a/src/FDM/JSBSim/models/propulsion/FGThruster.cpp b/src/FDM/JSBSim/models/propulsion/FGThruster.cpp
index 32a508ee1..064177a2b 100644
--- a/src/FDM/JSBSim/models/propulsion/FGThruster.cpp
+++ b/src/FDM/JSBSim/models/propulsion/FGThruster.cpp
@@ -45,7 +45,7 @@ using namespace std;
namespace JSBSim {
-static const char *IdSrc = "$Id$";
+static const char *IdSrc = "$Id: FGThruster.cpp,v 1.12 2009/10/24 22:59:30 jberndt Exp $";
static const char *IdHdr = ID_THRUSTER;
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/src/FDM/JSBSim/models/propulsion/FGThruster.h b/src/FDM/JSBSim/models/propulsion/FGThruster.h
index 886b678dc..118005f5a 100644
--- a/src/FDM/JSBSim/models/propulsion/FGThruster.h
+++ b/src/FDM/JSBSim/models/propulsion/FGThruster.h
@@ -46,7 +46,7 @@ INCLUDES
DEFINITIONS
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
-#define ID_THRUSTER "$Id$"
+#define ID_THRUSTER "$Id: FGThruster.h,v 1.15 2009/10/24 22:59:30 jberndt Exp $"
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
FORWARD DECLARATIONS
@@ -74,7 +74,7 @@ CLASS DOCUMENTATION
1.57 (pi/2) results in no thrust at all.
@author Jon Berndt
- @version $Id$
+ @version $Id: FGThruster.h,v 1.15 2009/10/24 22:59:30 jberndt Exp $
*/
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/src/FDM/JSBSim/models/propulsion/FGTurbine.cpp b/src/FDM/JSBSim/models/propulsion/FGTurbine.cpp
index b690d72f0..c61667b4b 100644
--- a/src/FDM/JSBSim/models/propulsion/FGTurbine.cpp
+++ b/src/FDM/JSBSim/models/propulsion/FGTurbine.cpp
@@ -42,15 +42,16 @@ INCLUDES
#include
#include
#include "FGTurbine.h"
-#include "FGState.h"
-#include "models/FGPropulsion.h"
#include "FGThruster.h"
+#include "models/FGPropulsion.h"
+#include "models/FGAuxiliary.h"
+#include "models/FGAtmosphere.h"
using namespace std;
namespace JSBSim {
-static const char *IdSrc = "$Id$";
+static const char *IdSrc = "$Id: FGTurbine.cpp,v 1.27 2010/05/24 11:26:37 jberndt Exp $";
static const char *IdHdr = ID_TURBINE;
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -118,7 +119,7 @@ double FGTurbine::Calculate(void)
TAT = (Auxiliary->GetTotalTemperature() - 491.69) * 0.5555556;
double qbar = Auxiliary->Getqbar();
- dt = State->Getdt() * Propulsion->GetRate();
+ dt = FDMExec->GetDeltaT() * Propulsion->GetRate();
ThrottlePos = FCS->GetThrottlePos(EngineNumber);
if (ThrottlePos > 1.0) {
AugmentCmd = ThrottlePos - 1.0;
@@ -145,7 +146,7 @@ double FGTurbine::Calculate(void)
if (!Running && Cutoff && Starter) {
if (phase == tpOff) phase = tpSpinUp;
- }
+ }
// start
if ((Starter == true) || (qbar > 30.0)) {
@@ -223,7 +224,7 @@ double FGTurbine::Run()
if (!Augmentation) {
correctedTSFC = TSFC * sqrt(T/389.7) * (0.84 + (1-N2norm)*(1-N2norm));
- FuelFlow_pph = Seek(&FuelFlow_pph, thrust * correctedTSFC, 1000.0, 100000);
+ FuelFlow_pph = Seek(&FuelFlow_pph, thrust * correctedTSFC, 1000.0, 10000.0);
if (FuelFlow_pph < IdleFF) FuelFlow_pph = IdleFF;
NozzlePosition = Seek(&NozzlePosition, 1.0 - N2norm, 0.8, 0.8);
thrust = thrust * (1.0 - BleedDemand);
@@ -388,7 +389,7 @@ double FGTurbine::Trim()
double FGTurbine::CalcFuelNeed(void)
{
- double dT = State->Getdt() * Propulsion->GetRate();
+ double dT = FDMExec->GetDeltaT() * Propulsion->GetRate();
FuelFlowRate = FuelFlow_pph / 3600.0; // Calculates flow in lbs/sec from lbs/hr
FuelExpended = FuelFlowRate * dT; // Calculates fuel expended in this time step
return FuelExpended;
@@ -539,12 +540,12 @@ void FGTurbine::bindmodel()
//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
int FGTurbine::InitRunning(void) {
- State->SuspendIntegration();
+ FDMExec->SuspendIntegration();
Cutoff=false;
Running=true;
N2=IdleN2;
Calculate();
- State->ResumeIntegration();
+ FDMExec->ResumeIntegration();
return phase==tpRun;
}
diff --git a/src/FDM/JSBSim/models/propulsion/FGTurbine.h b/src/FDM/JSBSim/models/propulsion/FGTurbine.h
index 9eebc335d..1fff92c67 100644
--- a/src/FDM/JSBSim/models/propulsion/FGTurbine.h
+++ b/src/FDM/JSBSim/models/propulsion/FGTurbine.h
@@ -42,7 +42,7 @@ INCLUDES
#include "FGEngine.h"
-#define ID_TURBINE "$Id$"
+#define ID_TURBINE "$Id: FGTurbine.h,v 1.18 2009/10/24 22:59:30 jberndt Exp $"
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
FORWARD DECLARATIONS
@@ -146,7 +146,7 @@ CLASS DOCUMENTATION
/engine/direct.xml
@author David P. Culp
- @version "$Id$"
+ @version "$Id: FGTurbine.h,v 1.18 2009/10/24 22:59:30 jberndt Exp $"
*/
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/src/FDM/JSBSim/models/propulsion/FGTurboProp.cpp b/src/FDM/JSBSim/models/propulsion/FGTurboProp.cpp
index 9ebef96df..f384877fc 100755
--- a/src/FDM/JSBSim/models/propulsion/FGTurboProp.cpp
+++ b/src/FDM/JSBSim/models/propulsion/FGTurboProp.cpp
@@ -44,16 +44,15 @@ INCLUDES
#include
#include
#include "FGTurboProp.h"
-
#include "FGPropeller.h"
-#include "FGState.h"
+#include "models/FGPropulsion.h"
#include "models/FGAuxiliary.h"
using namespace std;
namespace JSBSim {
-static const char *IdSrc = "$Id$";
+static const char *IdSrc = "$Id: FGTurboProp.cpp,v 1.16 2010/02/25 05:21:36 jberndt Exp $";
static const char *IdHdr = ID_TURBOPROP;
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -162,7 +161,7 @@ bool FGTurboProp::Load(FGFDMExec* exec, Element *el)
double FGTurboProp::Calculate(void)
{
TAT = (Auxiliary->GetTotalTemperature() - 491.69) * 0.5555556;
- dt = State->Getdt() * Propulsion->GetRate();
+ dt = FDMExec->GetDeltaT() * Propulsion->GetRate();
ThrottleCmd = FCS->GetThrottleCmd(EngineNumber);
@@ -406,7 +405,7 @@ double FGTurboProp::Start(void)
double FGTurboProp::CalcFuelNeed(void)
{
- double dT = State->Getdt() * Propulsion->GetRate();
+ double dT = FDMExec->GetDeltaT() * Propulsion->GetRate();
FuelFlowRate = FuelFlow_pph / 3600.0;
FuelExpended = FuelFlowRate * dT;
return FuelExpended;
@@ -505,12 +504,12 @@ string FGTurboProp::GetEngineValues(const string& delimiter)
int FGTurboProp::InitRunning(void)
{
- State->SuspendIntegration();
+ FDMExec->SuspendIntegration();
Cutoff=false;
Running=true;
N2=16.0;
Calculate();
- State->ResumeIntegration();
+ FDMExec->ResumeIntegration();
return phase==tpRun;
}
diff --git a/src/FDM/JSBSim/models/propulsion/FGTurboProp.h b/src/FDM/JSBSim/models/propulsion/FGTurboProp.h
index cb10f85b9..66febb191 100755
--- a/src/FDM/JSBSim/models/propulsion/FGTurboProp.h
+++ b/src/FDM/JSBSim/models/propulsion/FGTurboProp.h
@@ -46,7 +46,7 @@ INCLUDES
#include "input_output/FGXMLElement.h"
#include "math/FGTable.h"
-#define ID_TURBOPROP "$Id$"
+#define ID_TURBOPROP "$Id: FGTurboProp.h,v 1.11 2009/10/26 03:48:42 jberndt Exp $"
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
FORWARD DECLARATIONS
diff --git a/src/FDM/SP/MagicCarpet.cxx b/src/FDM/SP/MagicCarpet.cxx
index 44bffd0ef..822c1aa89 100644
--- a/src/FDM/SP/MagicCarpet.cxx
+++ b/src/FDM/SP/MagicCarpet.cxx
@@ -115,4 +115,5 @@ void FGMagicCarpet::update( double dt ) {
_update_ground_elev_at_pos();
_set_Sea_level_radius( sl_radius * SG_METER_TO_FEET);
_set_Altitude( get_Altitude() + climb );
+ _set_Altitude_AGL( get_Altitude() - get_Runway_altitude() );
}
diff --git a/src/FDM/fdm_shell.cxx b/src/FDM/fdm_shell.cxx
index 0d52e5aa3..bec319c09 100644
--- a/src/FDM/fdm_shell.cxx
+++ b/src/FDM/fdm_shell.cxx
@@ -68,13 +68,14 @@ FDMShell::~FDMShell()
void FDMShell::init()
{
_props = globals->get_props();
+ fgSetBool("/sim/fdm-initialized", false);
createImplementation();
}
void FDMShell::reinit()
{
if (_impl) {
- fgSetBool("/sim/signals/fdm-initialized", false);
+ fgSetBool("/sim/fdm-initialized", false);
evil_global_fdm_state = NULL;
_impl->unbind();
delete _impl;
@@ -122,6 +123,7 @@ void FDMShell::update(double dt)
_impl->bind();
evil_global_fdm_state = _impl;
+ fgSetBool("/sim/fdm-initialized", true);
fgSetBool("/sim/signals/fdm-initialized", true);
}
}
diff --git a/src/Main/fg_init.cxx b/src/Main/fg_init.cxx
index 090be2619..6f2f48411 100644
--- a/src/Main/fg_init.cxx
+++ b/src/Main/fg_init.cxx
@@ -57,6 +57,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -499,68 +500,153 @@ do_options (int argc, char ** argv)
fgParseArgs(argc, argv);
}
-
-static string fgFindAircraftPath( const SGPath &path, const string &aircraft,
- SGPropertyNode *cache, int depth = 0 )
+template
+void fgFindAircraftInDir(const SGPath& dirPath, T* obj, bool (T::*pred)(const SGPath& p))
{
- const int MAXDEPTH = 1;
-
- ulDirEnt* dire;
- ulDir *dirp = ulOpenDir(path.str().c_str());
- if (dirp == NULL) {
- cerr << "Unable to open aircraft directory '" << path.str() << '\'' << endl;
- exit(-1);
+ if (!dirPath.exists()) {
+ SG_LOG(SG_GENERAL, SG_WARN, "fgFindAircraftInDir: no such path:" << dirPath.str());
+ return;
+ }
+
+ bool recurse = true;
+ simgear::Dir dir(dirPath);
+ simgear::PathList setFiles(dir.children(simgear::Dir::TYPE_FILE, "-set.xml"));
+ simgear::PathList::iterator p;
+ for (p = setFiles.begin(); p != setFiles.end(); ++p) {
+ // check file name ends with -set.xml
+
+ // if we found a -set.xml at this level, don't recurse any deeper
+ recurse = false;
+
+ bool done = (obj->*pred)(*p);
+ if (done) {
+ return;
}
-
- string result;
- while ((dire = ulReadDir(dirp)) != NULL) {
- if (dire->d_isdir) {
- if (depth > MAXDEPTH)
- continue;
-
- if (!strcmp("CVS", dire->d_name) || !strcmp(".", dire->d_name)
- || !strcmp("..", dire->d_name) || !strcmp("AI", dire->d_name))
- continue;
-
- SGPath next = path;
- next.append(dire->d_name);
-
- result = fgFindAircraftPath( next, aircraft, cache, depth + 1 );
- if ( ! result.empty() )
- break;
-
- } else {
- int len = strlen(dire->d_name);
- if (len < 9 || strcmp(dire->d_name + len - 8, "-set.xml"))
- continue;
-
- // create cache node
- int i = 0;
- while (1)
- if (!cache->getChild("aircraft", i++, false))
- break;
-
- SGPropertyNode *n, *entry = cache->getChild("aircraft", --i, true);
-
- n = entry->getNode("file", true);
- n->setStringValue(dire->d_name);
- n->setAttribute(SGPropertyNode::USERARCHIVE, true);
-
- n = entry->getNode("path", true);
- n->setStringValue(path.str().c_str());
- n->setAttribute(SGPropertyNode::USERARCHIVE, true);
-
- if ( boost::equals(dire->d_name, aircraft.c_str(), is_iequal()) ) {
- result = path.str();
- break;
- }
- }
+ } // of -set.xml iteration
+
+ if (recurse) {
+ simgear::PathList subdirs(dir.children(simgear::Dir::TYPE_DIR | simgear::Dir::NO_DOT_OR_DOTDOT));
+ for (p = subdirs.begin(); p != subdirs.end(); ++p) {
+ if (p->file() == "CVS") {
+ continue;
+ }
+
+ fgFindAircraftInDir(*p, obj, pred);
}
-
- ulCloseDir(dirp);
- return result;
+ } // of recursive case
}
+class FindAndCacheAircraft
+{
+public:
+ FindAndCacheAircraft(SGPropertyNode* autoSave)
+ {
+ _cache = autoSave->getNode("sim/startup/path-cache", true);
+ }
+
+ bool loadAircraft()
+ {
+ std::string aircraft = fgGetString( "/sim/aircraft", "");
+ if (aircraft.empty()) {
+ SG_LOG(SG_GENERAL, SG_ALERT, "no aircraft specified");
+ return false;
+ }
+
+ _searchAircraft = aircraft + "-set.xml";
+ if (!checkCache()) {
+ // prepare cache for re-scan
+ SGPropertyNode *n = _cache->getNode("fg-root", true);
+ n->setStringValue(globals->get_fg_root().c_str());
+ n->setAttribute(SGPropertyNode::USERARCHIVE, true);
+ _cache->removeChildren("aircraft");
+
+ SGPath aircraftDir(globals->get_fg_root());
+ aircraftDir.append("Aircraft");
+
+ fgFindAircraftInDir(aircraftDir, this, &FindAndCacheAircraft::checkAircraft);
+ }
+
+ if (_foundPath.str().empty()) {
+ SG_LOG(SG_GENERAL, SG_ALERT, "Cannot find specified aircraft: " << aircraft );
+ return false;
+ }
+
+ SG_LOG(SG_GENERAL, SG_INFO, "Loading aircraft -set file from:" << _foundPath.str());
+ fgSetString( "/sim/aircraft-dir", _foundPath.dir().c_str());
+ if (!_foundPath.exists()) {
+ SG_LOG(SG_GENERAL, SG_ALERT, "Unable to find -set file:" << _foundPath.str());
+ return false;
+ }
+
+ try {
+ readProperties(_foundPath.str(), globals->get_props());
+ } catch ( const sg_exception &e ) {
+ SG_LOG(SG_INPUT, SG_ALERT, "Error reading aircraft: " << e.getFormattedMessage());
+ return false;
+ }
+
+ return true;
+ }
+
+private:
+ bool checkCache()
+ {
+ if (globals->get_fg_root() != _cache->getStringValue("fg-root", "")) {
+ return false; // cache mismatch
+ }
+
+ vector cache = _cache->getChildren("aircraft");
+ for (unsigned int i = 0; i < cache.size(); i++) {
+ const char *name = cache[i]->getStringValue("file", "");
+ if (!boost::equals(_searchAircraft, name, is_iequal())) {
+ continue;
+ }
+
+ SGPath xml(cache[i]->getStringValue("path", ""));
+ xml.append(name);
+ if (xml.exists()) {
+ _foundPath = xml;
+ return true;
+ }
+
+ return false;
+ } // of aircraft in cache iteration
+
+ return false;
+ }
+
+ bool checkAircraft(const SGPath& p)
+ {
+ // create cache node
+ int i = 0;
+ while (1) {
+ if (!_cache->getChild("aircraft", i++, false))
+ break;
+ }
+
+ SGPropertyNode *n, *entry = _cache->getChild("aircraft", --i, true);
+
+ std::string fileName(p.file());
+ n = entry->getNode("file", true);
+ n->setStringValue(fileName);
+ n->setAttribute(SGPropertyNode::USERARCHIVE, true);
+
+ n = entry->getNode("path", true);
+ n->setStringValue(p.dir());
+ n->setAttribute(SGPropertyNode::USERARCHIVE, true);
+
+ if ( boost::equals(fileName, _searchAircraft.c_str(), is_iequal()) ) {
+ _foundPath = p;
+ return true;
+ }
+
+ return false;
+ }
+
+ std::string _searchAircraft;
+ SGPath _foundPath;
+ SGPropertyNode* _cache;
+};
// Read in configuration (file and command line)
bool fgInitConfig ( int argc, char **argv ) {
@@ -606,77 +692,22 @@ bool fgInitConfig ( int argc, char **argv ) {
home->setAttribute(SGPropertyNode::WRITE, false);
config.append( "autosave.xml" );
- SG_LOG(SG_INPUT, SG_INFO, "Reading user settings from " << config.str());
- try {
- readProperties(config.str(), &autosave, SGPropertyNode::USERARCHIVE);
- } catch (...) {
- SG_LOG(SG_INPUT, SG_DEBUG, "First time reading user settings");
+ if (config.exists()) {
+ SG_LOG(SG_INPUT, SG_INFO, "Reading user settings from " << config.str());
+ try {
+ readProperties(config.str(), &autosave, SGPropertyNode::USERARCHIVE);
+ } catch (sg_exception& e) {
+ SG_LOG(SG_INPUT, SG_WARN, "failed to read user settings:" << e.getMessage()
+ << "(from " << e.getOrigin() << ")");
+ }
}
- SG_LOG(SG_INPUT, SG_DEBUG, "Finished Reading user settings");
}
- SGPropertyNode *cache_root = autosave.getNode("sim/startup/path-cache", true);
-
-
+
// Scan user config files and command line for a specified aircraft.
fgInitFGAircraft(argc, argv);
-
- string aircraft = fgGetString( "/sim/aircraft", "" );
- if ( aircraft.size() > 0 ) {
- SGPath aircraft_search( globals->get_fg_root() );
- aircraft_search.append( "Aircraft" );
-
- string aircraft_set = aircraft + "-set.xml";
- string result;
-
- // check if the *-set.xml file is already in the cache
- if (globals->get_fg_root() == cache_root->getStringValue("fg-root", "")) {
- vector cache = cache_root->getChildren("aircraft");
- for (unsigned int i = 0; i < cache.size(); i++) {
- const char *name = cache[i]->getStringValue("file", "");
- if (boost::equals(aircraft_set, name, is_iequal())) {
- const char *path = cache[i]->getStringValue("path", "");
- SGPath xml(path);
- xml.append(name);
- if (xml.exists())
- result = path;
- break;
- }
- }
- }
-
- if (result.empty()) {
- // prepare cache for rescan
- SGPropertyNode *n = cache_root->getNode("fg-root", true);
- n->setStringValue(globals->get_fg_root().c_str());
- n->setAttribute(SGPropertyNode::USERARCHIVE, true);
- cache_root->removeChildren("aircraft");
-
- result = fgFindAircraftPath( aircraft_search, aircraft_set, cache_root );
- }
-
- if ( !result.empty() ) {
- fgSetString( "/sim/aircraft-dir", result.c_str() );
- SGPath full_name( result );
- full_name.append( aircraft_set );
-
- SG_LOG(SG_INPUT, SG_INFO, "Reading default aircraft: " << aircraft
- << " from " << full_name.str());
- try {
- readProperties( full_name.str(), globals->get_props() );
- } catch ( const sg_exception &e ) {
- string message = "Error reading default aircraft: ";
- message += e.getFormattedMessage();
- SG_LOG(SG_INPUT, SG_ALERT, message);
- exit(2);
- }
- } else {
- SG_LOG( SG_INPUT, SG_ALERT, "Cannot find specified aircraft: "
- << aircraft );
- return false;
- }
-
- } else {
- SG_LOG( SG_INPUT, SG_ALERT, "No default aircraft specified" );
+ FindAndCacheAircraft f(&autosave);
+ if (!f.loadAircraft()) {
+ return false;
}
copyProperties(&autosave, globals->get_props());
@@ -1707,3 +1738,114 @@ void doSimulatorReset(void) // from gui_local.cxx -- TODO merge with fgReInitSu
master_freeze->setBoolValue(false);
}
+///////////////////////////////////////////////////////////////////////////////
+// helper object to implement the --show-aircraft command.
+// resides here so we can share the fgFindAircraftInDir template above,
+// and hence ensure this command lists exectly the same aircraft as the normal
+// loading path.
+class ShowAircraft
+{
+public:
+ ShowAircraft()
+ {
+ _minStatus = getNumMaturity(fgGetString("/sim/aircraft-min-status", "all"));
+ }
+
+
+ void show(const SGPath& path)
+ {
+ fgFindAircraftInDir(path, this, &ShowAircraft::processAircraft);
+
+ std::sort(_aircraft.begin(), _aircraft.end(), ciLessLibC());
+ SG_LOG( SG_GENERAL, SG_ALERT, "" ); // To popup the console on Windows
+ cout << "Available aircraft:" << endl;
+ for ( unsigned int i = 0; i < _aircraft.size(); i++ ) {
+ cout << _aircraft[i] << endl;
+ }
+ }
+
+private:
+ bool processAircraft(const SGPath& path)
+ {
+ SGPropertyNode root;
+ try {
+ readProperties(path.str(), &root);
+ } catch (sg_exception& e) {
+ return false;
+ }
+
+ int maturity = 0;
+ string descStr(" ");
+ descStr += path.file();
+
+ SGPropertyNode *node = root.getNode("sim");
+ if (node) {
+ SGPropertyNode* desc = node->getNode("description");
+ // if a status tag is found, read it in
+ if (node->hasValue("status")) {
+ maturity = getNumMaturity(node->getStringValue("status"));
+ }
+
+ if (desc) {
+ if (descStr.size() <= 27+3) {
+ descStr.append(29+3-descStr.size(), ' ');
+ } else {
+ descStr += '\n';
+ descStr.append( 32, ' ');
+ }
+ descStr += desc->getStringValue();
+ }
+ } // of have 'sim' node
+
+ if (maturity < _minStatus) {
+ return false;
+ }
+
+ _aircraft.push_back(descStr);
+ return false;
+ }
+
+
+ int getNumMaturity(const char * str)
+ {
+ // changes should also be reflected in $FG_ROOT/data/options.xml &
+ // $FG_ROOT/data/Translations/string-default.xml
+ const char* levels[] = {"alpha","beta","early-production","production"};
+
+ if (!strcmp(str, "all")) {
+ return 0;
+ }
+
+ for (size_t i=0; i<(sizeof(levels)/sizeof(levels[0]));i++)
+ if (strcmp(str,levels[i])==0)
+ return i;
+
+ return 0;
+ }
+
+ // recommended in Meyers, Effective STL when internationalization and embedded
+ // NULLs aren't an issue. Much faster than the STL or Boost lex versions.
+ struct ciLessLibC : public std::binary_function
+ {
+ bool operator()(const std::string &lhs, const std::string &rhs) const
+ {
+ return strcasecmp(lhs.c_str(), rhs.c_str()) < 0 ? 1 : 0;
+ }
+ };
+
+ int _minStatus;
+ string_list _aircraft;
+};
+
+void fgShowAircraft(const SGPath &path)
+{
+ ShowAircraft s;
+ s.show(path);
+
+#ifdef _MSC_VER
+ cout << "Hit a key to continue..." << endl;
+ cin.get();
+#endif
+}
+
+
diff --git a/src/Main/fg_init.hxx b/src/Main/fg_init.hxx
index 58b48a8c2..da68ab2e2 100644
--- a/src/Main/fg_init.hxx
+++ b/src/Main/fg_init.hxx
@@ -30,6 +30,7 @@
// forward decls
class SGPropertyNode;
class SGTime;
+class SGPath;
// Read in configuration (files and command line optoins) but only set
// fg_root
@@ -86,6 +87,14 @@ SGTime *fgInitTime();
// set up a time offset (aka warp) if one is specified
void fgInitTimeOffset();
+/*
+ * Search in the current directory, and in on directory deeper
+ * for -set.xml configuration files and show the aircaft name
+ * and the contents of the tag in a sorted manner.
+ *
+ * @parampath the directory to search for configuration files
+ */
+void fgShowAircraft(const SGPath &path);
#endif // _FG_INIT_HXX
diff --git a/src/Main/globals.cxx b/src/Main/globals.cxx
index 1ae7c81d2..ad3808919 100644
--- a/src/Main/globals.cxx
+++ b/src/Main/globals.cxx
@@ -26,6 +26,7 @@
#include
#include
+#include
#include
#include
#include
@@ -189,7 +190,8 @@ void FGGlobals::set_fg_root (const string &root) {
n->setAttribute(SGPropertyNode::WRITE, false);
}
-void FGGlobals::set_fg_scenery (const string &scenery) {
+void FGGlobals::set_fg_scenery (const string &scenery)
+{
SGPath s;
if (scenery.empty()) {
s.set( fg_root );
@@ -201,38 +203,35 @@ void FGGlobals::set_fg_scenery (const string &scenery) {
fg_scenery.clear();
for (unsigned i = 0; i < path_list.size(); i++) {
+ SGPath path(path_list[i]);
+ if (!path.exists()) {
+ SG_LOG(SG_GENERAL, SG_WARN, "scenery path not found:" << path.str());
+ continue;
+ }
- ulDir *d = ulOpenDir( path_list[i].c_str() );
- if (d == NULL)
- continue;
- ulCloseDir( d );
-
- SGPath pt( path_list[i] ), po( path_list[i] );
- pt.append("Terrain");
- po.append("Objects");
-
- ulDir *td = ulOpenDir( pt.c_str() );
- ulDir *od = ulOpenDir( po.c_str() );
-
- // "Terrain" and "Airports" directory don't exist. add directory as is
- // otherwise, automatically append either Terrain, Objects, or both
- //if (td == NULL && od == NULL)
- fg_scenery.push_back( path_list[i] );
- //else {
- if (td != NULL) {
- fg_scenery.push_back( pt.str() );
- ulCloseDir( td );
- }
- if (od != NULL) {
- fg_scenery.push_back( po.str() );
- ulCloseDir( od );
- }
- //}
+ simgear::Dir dir(path);
+ SGPath terrainDir(dir.file("Terrain"));
+ SGPath objectsDir(dir.file("Objects"));
+
+ // this code used to add *either* the base dir, OR add the
+ // Terrain and Objects subdirs, but the conditional logic was commented
+ // out, such that all three dirs are added. Unfortunately there's
+ // no information as to why the change was made.
+ fg_scenery.push_back(path.str());
+
+ if (terrainDir.exists()) {
+ fg_scenery.push_back(terrainDir.str());
+ }
+
+ if (objectsDir.exists()) {
+ fg_scenery.push_back(objectsDir.str());
+ }
+
// insert a marker for FGTileEntry::load(), so that
// FG_SCENERY=A:B becomes list ["A/Terrain", "A/Objects", "",
// "B/Terrain", "B/Objects", ""]
fg_scenery.push_back("");
- }
+ } // of path list iteration
}
diff --git a/src/Main/main.cxx b/src/Main/main.cxx
index 15e677d9a..07c10598a 100644
--- a/src/Main/main.cxx
+++ b/src/Main/main.cxx
@@ -427,7 +427,7 @@ static void fgMainLoop( void ) {
// END Tile Manager udpates
if (!scenery_loaded && globals->get_tile_mgr()->isSceneryLoaded()
- && fgGetBool("sim/signals/fdm-initialized")) {
+ && fgGetBool("sim/fdm-initialized")) {
fgSetBool("sim/sceneryloaded",true);
if (fgGetBool("/sim/sound/working")) {
globals->get_soundmgr()->activate();
diff --git a/src/Main/options.cxx b/src/Main/options.cxx
index 2263a991c..e3dd7ab38 100644
--- a/src/Main/options.cxx
+++ b/src/Main/options.cxx
@@ -29,6 +29,7 @@
#include
#include
#include
+#include
#include // rint()
#include
@@ -39,20 +40,12 @@
#include
#include
-#include
-
#include
#include
#include
#include
#include
#include
-
-// #include
-// #include
-// #include
-// #include
-
#include
#include
@@ -1649,7 +1642,7 @@ fgParseArgs (int argc, char **argv)
fgOptLogLevel( "alert" );
SGPath path( globals->get_fg_root() );
path.append("Aircraft");
- fgShowAircraft(path, true);
+ fgShowAircraft(path);
exit(0);
} else if (result == FG_OPTIONS_SHOW_SOUND_DEVICES) {
@@ -1854,135 +1847,3 @@ fgUsage (bool verbose)
cin.get();
#endif
}
-
-// A simple function to return an integer depending on the position
-// of the status string within the array in order to determine the hierarchy.
-unsigned int getNumMaturity(const char * str)
-{
- // changes should also be reflected in $FG_ROOT/data/options.xml &
- // $FG_ROOT/data/Translations/string-default.xml
- const char* levels[] = {"alpha","beta","early-production","production"};
-
- for (size_t i=0; i<(sizeof(levels)/sizeof(levels[0]));i++)
- if (strcmp(str,levels[i])==0)
- return i;
-
- return 0;
-};
-
-
-static void fgSearchAircraft(const SGPath &path, string_list &aircraft,
- bool recursive)
-{
-
- ulDirEnt* dire;
- ulDir *dirp = ulOpenDir(path.str().c_str());
- if (dirp == NULL) {
- cerr << "Unable to open aircraft directory '" << path.str() << '\'' << endl;
- exit(-1);
- }
-
- while ((dire = ulReadDir(dirp)) != NULL) {
- char *ptr;
-
- if (dire->d_isdir) {
- if (recursive && strcmp("CVS", dire->d_name)
- && strcmp(".", dire->d_name) && strcmp("..", dire->d_name))
- {
- SGPath next = path;
- next.append(dire->d_name);
-
- fgSearchAircraft(next, aircraft, true);
- }
- } else if ((ptr = strstr(dire->d_name, "-set.xml")) && (ptr[8] == '\0')) {
-
- SGPath afile = path;
- afile.append(dire->d_name);
-
- *ptr = '\0';
-
- SGPropertyNode root;
- try {
- readProperties(afile.str(), &root);
- } catch (...) {
- continue;
- }
-
- SGPropertyNode *desc = NULL;
- SGPropertyNode *status = NULL;
-
- SGPropertyNode *node = root.getNode("sim");
- if (node) {
- desc = node->getNode("description");
- // if a status tag is found, read it in
- if (node->hasValue("status"))
- status = node->getNode("status");
- }
-
- //additionally display status information where it is available
-
- string descStr(" ");
- descStr += dire->d_name;
- if (desc) {
- if (descStr.size() <= 27+3) {
- descStr.append(29+3-descStr.size(), ' ');
- } else {
- descStr += '\n';
- descStr.append( 32, ' ');
- }
- descStr += desc->getStringValue();
- }
-
- SGPropertyNode * required_status
- = fgGetNode ("/sim/aircraft-min-status", true);
-
- // If the node holds the value "all", then there wasn't any status
- // level specified, so we simply go ahead and output ALL aircraft
- if (strcmp(required_status->getStringValue(),"all")==0) {
- aircraft.push_back(descStr);
- }
- else
- {
- // If the node doesn't hold "all" as its value, then we are supposed
- // to show only aircraft meeting specific status (development status)
- // requirements:
-
- if (node->hasValue("status")) {
- //Compare (minimally) required status level with actual aircraft status:
- if ( getNumMaturity(status->getStringValue() ) >=
- getNumMaturity(required_status->getStringValue() ) )
- aircraft.push_back(descStr); }
-
- }
-
-
- }
- }
-
- ulCloseDir(dirp);
-}
-
-/*
- * Search in the current directory, and in on directory deeper
- * for -set.xml configuration files and show the aircaft name
- * and the contents of the tag in a sorted manner.
- *
- * @parampath the directory to search for configuration files
- * @param recursive defines whether the directory should be searched recursively
- */
-void fgShowAircraft(const SGPath &path, bool recursive) {
- string_list aircraft;
-
- fgSearchAircraft( path, aircraft, recursive );
-
- sort(aircraft.begin(), aircraft.end());
- SG_LOG( SG_GENERAL, SG_ALERT, "" ); // To popup the console on Windows
- cout << "Available aircraft:" << endl;
- for ( unsigned int i = 0; i < aircraft.size(); i++ ) {
- cout << aircraft[i] << endl;
- }
-#ifdef _MSC_VER
- cout << "Hit a key to continue..." << endl;
- cin.get();
-#endif
-}
diff --git a/src/Main/options.hxx b/src/Main/options.hxx
index 2bdb86da5..4ad8b133d 100644
--- a/src/Main/options.hxx
+++ b/src/Main/options.hxx
@@ -33,6 +33,5 @@ extern void fgSetDefaults ();
extern void fgParseArgs (int argc, char ** argv);
extern void fgParseOptions (const string &file_path);
extern void fgUsage (bool verbose = false);
-extern void fgShowAircraft(const SGPath &path, bool recursive);
#endif /* _OPTIONS_HXX */
diff --git a/src/Time/light.cxx b/src/Time/light.cxx
index 1f24bef4e..2145f0845 100644
--- a/src/Time/light.cxx
+++ b/src/Time/light.cxx
@@ -326,6 +326,7 @@ void FGLight::update_adj_fog_color () {
}
double hor_rotation, vert_rotation;
+ static float gamma = system_gamma;
// first determine the difference between our view angle and local
// direction to the sun
@@ -340,8 +341,8 @@ void FGLight::update_adj_fog_color () {
//
SGVec4f color = thesky->get_scene_color();
- gamma_restore_rgb( _fog_color.data() );
- gamma_restore_rgb( _sky_color.data() );
+ gamma_restore_rgb( _fog_color.data(), gamma );
+ gamma_restore_rgb( _sky_color.data(), gamma );
// Calculate the fog color in the direction of the sun for
// sunrise/sunset effects.
@@ -367,15 +368,17 @@ void FGLight::update_adj_fog_color () {
float rf2 = avf * pow(rf1*rf1, 1/sif) * 1.0639;
float rf3 = 1.0 - rf2;
+ gamma = system_gamma * (0.9 - sif*avf);
+
_adj_fog_color[0] = rf3 * _fog_color[0] + rf2 * s_red;
_adj_fog_color[1] = rf3 * _fog_color[1] + rf2 * s_green;
_adj_fog_color[2] = rf3 * _fog_color[2] + rf2 * s_blue;
- gamma_correct_rgb( _adj_fog_color.data() );
+ gamma_correct_rgb( _adj_fog_color.data(), gamma);
// make sure the colors have their original value before they are being
// used by the rest of the program.
//
- gamma_correct_rgb( _fog_color.data() );
- gamma_correct_rgb( _sky_color.data() );
+ gamma_correct_rgb( _fog_color.data(), gamma );
+ gamma_correct_rgb( _sky_color.data(), gamma );
}