fly/flightgear
1
0
Fork 0
Code Activity

Merge branch 'next' of gitorious.org:fg/flightgear into next

Browse source
This commit is contained in:
Torsten Dreyer 2011-01-04 17:21:47 +01:00
commit c859833c63
4 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CMakeLists.txt
View file

@ -99,6 +99,7 @@ find_package(SimGear 2.0.0 REQUIRED)
check_include_file(unistd.h HAVE_UNISTD_H) check_include_file(unistd.h HAVE_UNISTD_H)
check_include_file(sys/time.h HAVE_SYS_TIME_H) check_include_file(sys/time.h HAVE_SYS_TIME_H)
check_include_file(windows.h HAVE_WINDOWS_H)
# definition depends on OSG version # definition depends on OSG version
set(CMAKE_REQUIRED_INCLUDES ${OPENSCENEGRAPH_INCLUDE_DIRS}) set(CMAKE_REQUIRED_INCLUDES ${OPENSCENEGRAPH_INCLUDE_DIRS})
@ -152,7 +153,7 @@ if(WIN32)
# SET(WARNING_FLAGS "${WARNING_FLAGS} /wd${warning}") # SET(WARNING_FLAGS "${WARNING_FLAGS} /wd${warning}")
# endforeach(warning) # endforeach(warning)
set(MSVC_FLAGS "-DNOMINMAX -D_USE_MATH_DEFINES -D_CRT_SECURE_NO_WARNINGS -D__CRT_NONSTDC_NO_WARNINGS") set(MSVC_FLAGS "-DNOMINMAX -D_USE_MATH_DEFINES -D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS -D__CRT_NONSTDC_NO_WARNINGS")
endif(MSVC) endif(MSVC)
set(NOMINMAX 1) set(NOMINMAX 1)

10
src/Airports/simple.cxx
View file

@ -456,9 +456,13 @@ void FGAirport::readTowerData(SGPropertyNode* aRoot)
SGPropertyNode* twrNode = aRoot->getChild("tower")->getChild("twr"); SGPropertyNode* twrNode = aRoot->getChild("tower")->getChild("twr");
double lat = twrNode->getDoubleValue("lat"), double lat = twrNode->getDoubleValue("lat"),
lon = twrNode->getDoubleValue("lon"), lon = twrNode->getDoubleValue("lon"),
elevM = twrNode->getDoubleValue("elev-m"); elevM = twrNode->getDoubleValue("elev-m");
// tower elevation is AGL, not AMSL. Since we don't want to depend on the
_tower_location = SGGeod::fromDegM(lon, lat, elevM); // scenery for a precise terrain elevation, we use the field elevation
// (this is also what the apt.dat code does)
double fieldElevationM = geod().getElevationM();
_tower_location = SGGeod::fromDegM(lon, lat, fieldElevationM + elevM);
} }
bool FGAirport::buildApproach(Waypt* aEnroute, STAR* aSTAR, FGRunway* aRwy, WayptVec& aRoute) bool FGAirport::buildApproach(Waypt* aEnroute, STAR* aSTAR, FGRunway* aRwy, WayptVec& aRoute)

1
src/Include/config_cmake.h.in
View file

@ -17,6 +17,7 @@
#define ENABLE_AUDIO_SUPPORT 1 #define ENABLE_AUDIO_SUPPORT 1
#cmakedefine HAVE_SYS_TIME_H #cmakedefine HAVE_SYS_TIME_H
#cmakedefine HAVE_WINDOWS_H
#cmakedefine HAVE_CULLSETTINGS_CLEAR_MASK #cmakedefine HAVE_CULLSETTINGS_CLEAR_MASK
#define VERSION "@FLIGHTGEAR_VERSION@" #define VERSION "@FLIGHTGEAR_VERSION@"

8
src/Navaids/navrecord.hxx
View file

@ -33,14 +33,6 @@
#define FG_DME_DEFAULT_RANGE 50 // nm #define FG_DME_DEFAULT_RANGE 50 // nm
#define FG_NAV_MAX_RANGE 300 // nm #define FG_NAV_MAX_RANGE 300 // nm
// FIXME - get rid of these, and use the real enum directly
#define FG_NAV_VOR FGPositioned::VOR
#define FG_NAV_NDB FGPositioned::NDB
#define FG_NAV_ILS FGPositioned::ILS
#define FG_NAV_ANY FGPositioned::INVALID
typedef FGPositioned::Type fg_nav_types;
// forward decls // forward decls
class FGRunway; class FGRunway;
class SGPropertyNode; class SGPropertyNode;