fly/flightgear
1
0
Fork 0
Code Activity

Fix the header name change from sample_openal.hxx to sample.hxx

Browse source
This commit is contained in:
Erik Hofman 2016-05-28 09:57:03 +02:00
parent f25304ace5
commit ea6e1c9854
8 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/FDM/JSBSim/JSBSim.cxx
View file

@ -502,7 +502,7 @@ void FGJSBsim::unbind()
/******************************************************************************/ /******************************************************************************/
// Run an iteration of the EOM (equations of motion) // Run an iteration of the EOM (equations of motion)
# include <fenv.h>
void FGJSBsim::update( double dt ) void FGJSBsim::update( double dt )
{ {
if(crashed) { 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 // Compute the potential movement of this aircraft and query for the
// ground in this area. // ground in this area.
double groundCacheRadius = acrad + 2*dt*Propagate->GetUVW().Magnitude(); double groundCacheRadius = acrad + 2*dt*Propagate->GetUVW().Magnitude();
cart_pos[0] = cart(1); cart_pos[0] = cart(1);
cart_pos[1] = cart(2); cart_pos[1] = cart(2);
cart_pos[2] = cart(3); cart_pos[2] = cart(3);

5
src/FDM/JSBSim/models/atmosphere/FGStandardAtmosphere.cpp
View file

@ -153,6 +153,9 @@ double FGStandardAtmosphere::GetPressure(double altitude) const
double Lmb, Exp, Tmb, deltaH, factor; double Lmb, Exp, Tmb, deltaH, factor;
double numRows = StdAtmosTemperatureTable->GetNumRows(); double numRows = StdAtmosTemperatureTable->GetNumRows();
if (altitude > 328084) // Karman line
altitude = 328084;
// Iterate through the altitudes to find the current Base Altitude // Iterate through the altitudes to find the current Base Altitude
// in the table. That is, if the current altitude (the argument passed in) // 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 // 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); factor = Tmb/(Tmb + Lmb*deltaH);
pressure = PressureBreakpointVector[b]*pow(factor, Exp); pressure = PressureBreakpointVector[b]*pow(factor, Exp);
} else { } else {
pressure = PressureBreakpointVector[b]*exp(-Mair*deltaH/(Rstar*Tmb)); pressure = PressureBreakpointVector[b]*exp(Mair*deltaH/(Rstar*Tmb));
} }
return pressure; return pressure;

2
src/Sound/VoiceSynthesizer.hxx
View file

@ -19,7 +19,7 @@
#ifndef VOICESYNTHESIZER_HXX_ #ifndef VOICESYNTHESIZER_HXX_
#define VOICESYNTHESIZER_HXX_ #define VOICESYNTHESIZER_HXX_
#include <simgear/sound/sample_openal.hxx> #include <simgear/sound/sample.hxx>
#include <simgear/threads/SGQueue.hxx> #include <simgear/threads/SGQueue.hxx>
#include <string> #include <string>

2
src/Sound/beacon.cxx
View file

@ -24,7 +24,7 @@
#include "beacon.hxx" #include "beacon.hxx"
#include <simgear/sound/sample_openal.hxx> #include <simgear/sound/sample.hxx>
#include <simgear/structure/exception.hxx> #include <simgear/structure/exception.hxx>
#include <simgear/debug/logstream.hxx> #include <simgear/debug/logstream.hxx>

2
src/Sound/flitevoice.hxx
View file

@ -25,7 +25,7 @@
#include "voice.hxx" #include "voice.hxx"
#include <simgear/sound/soundmgr_openal.hxx> #include <simgear/sound/soundmgr_openal.hxx>
#include <simgear/sound/sample_openal.hxx> #include <simgear/sound/sample.hxx>
#include <simgear/threads/SGQueue.hxx> #include <simgear/threads/SGQueue.hxx>
class VoiceSynthesizer; class VoiceSynthesizer;

2
src/Sound/morse.cxx
View file

@ -24,7 +24,7 @@
#include "morse.hxx" #include "morse.hxx"
#include <simgear/sound/sample_openal.hxx> #include <simgear/sound/sample.hxx>
#include <cstring> #include <cstring>
#include <stdlib.h> #include <stdlib.h>

2
src/Sound/sample_queue.cxx
View file

@ -34,7 +34,7 @@
#include <Main/fg_props.hxx> #include <Main/fg_props.hxx>
#include <simgear/sound/soundmgr_openal.hxx> #include <simgear/sound/soundmgr_openal.hxx>
#include <simgear/sound/sample_openal.hxx> #include <simgear/sound/sample.hxx>
FGSampleQueue::FGSampleQueue ( SGSoundMgr *smgr, const std::string &refname ) : FGSampleQueue::FGSampleQueue ( SGSoundMgr *smgr, const std::string &refname ) :
last_enabled( true ), last_enabled( true ),

2
utils/fgelev/CMakeLists.txt
View file

@ -1,10 +1,12 @@
add_executable(fgelev fgelev.cxx) add_executable(fgelev fgelev.cxx)
message("SIMGEAR_LIBRARIES: ${SIMGEAR_LIBRARIES}")
target_link_libraries(fgelev target_link_libraries(fgelev
${SIMGEAR_LIBRARIES} ${SIMGEAR_LIBRARIES}
${OPENSCENEGRAPH_LIBRARIES} ${OPENSCENEGRAPH_LIBRARIES}
${OPENGL_LIBRARIES} ${OPENGL_LIBRARIES}
${SIMGEAR_CORE_LIBRARY_DEPENDENCIES} ${SIMGEAR_CORE_LIBRARY_DEPENDENCIES}
${ZLIB_LIBRARY}
) )
install(TARGETS fgelev RUNTIME DESTINATION bin) install(TARGETS fgelev RUNTIME DESTINATION bin)