From 22709c74a3b265bf0d37d60fdf2934651e7cc9cf Mon Sep 17 00:00:00 2001 From: Erik Hofman Date: Sat, 28 May 2016 09:57:03 +0200 Subject: [PATCH] Fix the header name change from sample_openal.hxx to sample.hxx --- src/FDM/JSBSim/JSBSim.cxx | 3 ++- src/FDM/JSBSim/models/atmosphere/FGStandardAtmosphere.cpp | 5 ++++- src/Sound/VoiceSynthesizer.hxx | 2 +- src/Sound/beacon.cxx | 2 +- src/Sound/flitevoice.hxx | 2 +- src/Sound/morse.cxx | 2 +- src/Sound/sample_queue.cxx | 2 +- utils/fgelev/CMakeLists.txt | 2 ++ 8 files changed, 13 insertions(+), 7 deletions(-) diff --git a/src/FDM/JSBSim/JSBSim.cxx b/src/FDM/JSBSim/JSBSim.cxx index b2b20c5c7..a93844da4 100644 --- a/src/FDM/JSBSim/JSBSim.cxx +++ b/src/FDM/JSBSim/JSBSim.cxx @@ -502,7 +502,7 @@ void FGJSBsim::unbind() /******************************************************************************/ // Run an iteration of the EOM (equations of motion) - +# include void FGJSBsim::update( double dt ) { if(crashed) { @@ -1311,6 +1311,7 @@ bool FGJSBsim::update_ground_cache(const FGLocation& cart, double* cart_pos, // Compute the potential movement of this aircraft and query for the // ground in this area. double groundCacheRadius = acrad + 2*dt*Propagate->GetUVW().Magnitude(); + cart_pos[0] = cart(1); cart_pos[1] = cart(2); cart_pos[2] = cart(3); diff --git a/src/FDM/JSBSim/models/atmosphere/FGStandardAtmosphere.cpp b/src/FDM/JSBSim/models/atmosphere/FGStandardAtmosphere.cpp index a5f6e8e54..084c96567 100644 --- a/src/FDM/JSBSim/models/atmosphere/FGStandardAtmosphere.cpp +++ b/src/FDM/JSBSim/models/atmosphere/FGStandardAtmosphere.cpp @@ -153,6 +153,9 @@ double FGStandardAtmosphere::GetPressure(double altitude) const double Lmb, Exp, Tmb, deltaH, factor; double numRows = StdAtmosTemperatureTable->GetNumRows(); + if (altitude > 328084) // Karman line + altitude = 328084; + // Iterate through the altitudes to find the current Base Altitude // in the table. That is, if the current altitude (the argument passed in) // is 20000 ft, then the base altitude from the table is 0.0. If the @@ -176,7 +179,7 @@ double FGStandardAtmosphere::GetPressure(double altitude) const factor = Tmb/(Tmb + Lmb*deltaH); pressure = PressureBreakpointVector[b]*pow(factor, Exp); } else { - pressure = PressureBreakpointVector[b]*exp(-Mair*deltaH/(Rstar*Tmb)); + pressure = PressureBreakpointVector[b]*exp(Mair*deltaH/(Rstar*Tmb)); } return pressure; diff --git a/src/Sound/VoiceSynthesizer.hxx b/src/Sound/VoiceSynthesizer.hxx index 17fb4bc1f..246085d9b 100644 --- a/src/Sound/VoiceSynthesizer.hxx +++ b/src/Sound/VoiceSynthesizer.hxx @@ -19,7 +19,7 @@ #ifndef VOICESYNTHESIZER_HXX_ #define VOICESYNTHESIZER_HXX_ -#include +#include #include #include diff --git a/src/Sound/beacon.cxx b/src/Sound/beacon.cxx index 689922932..46f0013a4 100644 --- a/src/Sound/beacon.cxx +++ b/src/Sound/beacon.cxx @@ -24,7 +24,7 @@ #include "beacon.hxx" -#include +#include #include #include diff --git a/src/Sound/flitevoice.hxx b/src/Sound/flitevoice.hxx index ee616e8ed..1b95547fa 100644 --- a/src/Sound/flitevoice.hxx +++ b/src/Sound/flitevoice.hxx @@ -25,7 +25,7 @@ #include "voice.hxx" #include -#include +#include #include class VoiceSynthesizer; diff --git a/src/Sound/morse.cxx b/src/Sound/morse.cxx index 1563841ab..9e4d5eced 100644 --- a/src/Sound/morse.cxx +++ b/src/Sound/morse.cxx @@ -24,7 +24,7 @@ #include "morse.hxx" -#include +#include #include #include diff --git a/src/Sound/sample_queue.cxx b/src/Sound/sample_queue.cxx index f6a1a49b5..7295b341c 100644 --- a/src/Sound/sample_queue.cxx +++ b/src/Sound/sample_queue.cxx @@ -34,7 +34,7 @@ #include
#include -#include +#include FGSampleQueue::FGSampleQueue ( SGSoundMgr *smgr, const std::string &refname ) : last_enabled( true ), diff --git a/utils/fgelev/CMakeLists.txt b/utils/fgelev/CMakeLists.txt index 90b52c001..25756d5d7 100644 --- a/utils/fgelev/CMakeLists.txt +++ b/utils/fgelev/CMakeLists.txt @@ -1,10 +1,12 @@ add_executable(fgelev fgelev.cxx) +message("SIMGEAR_LIBRARIES: ${SIMGEAR_LIBRARIES}") target_link_libraries(fgelev ${SIMGEAR_LIBRARIES} ${OPENSCENEGRAPH_LIBRARIES} ${OPENGL_LIBRARIES} ${SIMGEAR_CORE_LIBRARY_DEPENDENCIES} + ${ZLIB_LIBRARY} ) install(TARGETS fgelev RUNTIME DESTINATION bin) -- 2.39.5