fly/flightgear
1
0
Fork 0
Code Activity

Merge branch 'next' of D:\Git_New\flightgear into next

Browse source
This commit is contained in:
Vivian Meazza 2010-11-14 22:24:00 +00:00
commit f51f15eb50
100 changed files with 163 additions and 349 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
.cvsignore
View file

@ -1,24 +0,0 @@
Makefile
Makefile.in
TODO
TODO.gui
aclocal.m4
autom4te.cache
confdefs.h
config.cache
config.log
config.status
configure
confstatKYCAXU
do-config.sh
gmon.out
www
.cdtproject
.project
config.guess
config.sub
depcomp
INSTALL
install-sh
missing
mkinstalldirs

32
configure.ac
View file

@ -1,7 +1,11 @@
dnl Process this file with autogen.sh to produce a working configure
dnl script.
AC_INIT
AC_INIT(FlightGear, m4_esyscmd([cat ./version | tr -d '\n']), [http://www.flightgear.org])
dnl Ensure touching the version causes autoconf to re-run
AC_SUBST([CONFIGURE_DEPENDENCIES], ['$(top_srcdir)/version'])
AC_CONFIG_SRCDIR([src/Airports/simple.cxx])
dnl Require at least automake 2.52
@ -10,7 +14,31 @@ AC_PREREQ(2.52)
dnl Initialize the automake stuff
dnl set the $host variable based on local machine/os
AC_CANONICAL_TARGET
AM_INIT_AUTOMAKE(FlightGear, 2.0.0)
AM_INIT_AUTOMAKE([dist-bzip2])
# variables for version.h
AC_DEFINE([HAVE_VERSION_H], 1, [Set if version.h is generated])
# are we running under Hudson? (defines BUILD_ID, BUILD_NUMBER in the environment)
if test "x$BUILD_ID" != "x" ; then
AC_SUBST([HUDSON_BUILD_ID], $BUILD_ID)
AC_SUBST([HUDSON_BUILD_NUMBER], $BUILD_NUMBER)
else
AC_SUBST([HUDSON_BUILD_ID], [none])
AC_SUBST([HUDSON_BUILD_NUMBER], 0)
fi
AC_CHECK_PROG([HAVE_GIT], git, 1)
if test "x$HAVE_GIT" != "x" ; then
# git might be installed, but we might be building from a tarball
if git rev-parse ; then
AC_SUBST([REVISION], `git rev-parse HEAD`)
else
AC_SUBST([REVISION], [none])
fi
else
AC_SUBST([REVISION], [none])
fi
dnl Checks for programs.
AC_PROG_MAKE_SET

4
docs-mini/README.MSVC
View file

@ -93,8 +93,8 @@ Typical setup should decompose into the following steps :
It is also possible to compile a Debug version. This is only useful when hacking the code because
a Debug version is way slower than the Release one.
The 64bit build is only available to people having the Professional edition of Visual Studio 2008. In that case, 14. above should be :
14. Add <any_directory_on_any_drive>/install/msvc90-64/OpenSceneGraph/bin and <any_directory_on_any_drive>/3rdParty.x64/bin to your PATH environment variable
The 64bit build is only available to people having the Professional edition of Visual Studio 2008. In that case, 15. above should be :
15. Add <any_directory_on_any_drive>/install/msvc90-64/OpenSceneGraph/bin and <any_directory_on_any_drive>/3rdParty.x64/bin to your PATH environment variable
When the manual build works, it is possible to start it from the command line. This is useful
when setting up a build server or automating the process of retrieving the code and building

8
man/.cvsignore
View file

@ -1,8 +0,0 @@
Makefile
Makefile.in
est-epsilon.1
fgfs.1
fgjs.1
gl-info.1
js_demo.1
pstest.1

BIN
package/Win-NSIS/fg-install-header.bmp Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 324 KiB

38
package/Win-NSIS/flightgear-nightly.nsi
View file

@ -5,11 +5,16 @@
!define /file OSGSoNumber $%TEMP%\osg-so-number.txt
!define /file OSGVersion $%TEMP%\osg-version.txt
!define /file FGVersion flightgear\version
!echo "osg-so is ${OSGSoNumber}"
Name "FlightGear Nightly"
OutFile fgfs_win32_nightly.exe
OutFile fgfs_win32_nightly_${FGVersion}.exe
; use LZMA for best compression
SetCompressor /FINAL /SOLID lzma
SetCompressorDictSize 64
InstallDir $PROGRAMFILES\FlightGear-nightly
@ -27,18 +32,29 @@ AutoCloseWindow true
!define ThirdPartyBinDir "3rdParty\bin"
!define MUI_ICON "flightgear\projects\VC90\flightgear.ico"
!define MUI_UNICON "flightgear\projects\VC90\flightgear.ico"
!define MUI_HEADERIMAGE
!define MUI_HEADERIMAGE_RIGHT
;!define MUI_HEADERIMAGE_BITMAP "logo.bmp" ; optional
!define MUI_ABORTWARNING
!define MUI_HEADERIMAGE_BITMAP "flightgear\package\Win-NSIS\fg-install-header.bmp" ; optional
;!define MUI_WELCOMEFINISHPAGE_BITMAP "welcome.bmp"
;!define MUI_UNWELCOMEFINISHPAGE_BITMAP "welcome.bmp"
!insertmacro MUI_PAGE_WELCOME
;!insertmacro MUI_PAGE_LICENSE "License.txt"
; include GPL license page
!insertmacro MUI_PAGE_LICENSE "flightgear\Copying"
!insertmacro MUI_PAGE_DIRECTORY
!insertmacro MUI_PAGE_INSTFILES
!define MUI_FINISHPAGE_RUN $INSTDIR\fgrun.exe
!define MUI_FINISHPAGE_RUN_TEXT "Run FlightGear now"
!insertmacro MUI_PAGE_FINISH
!insertmacro MUI_UNPAGE_CONFIRM
!insertmacro MUI_UNPAGE_INSTFILES
@ -77,19 +93,25 @@ Section "" ;No components page, name is not important
SetOutPath $INSTDIR\osgPlugins-${OSGVersion}
File ${OSGPluginsDir}\osgdb_ac.dll
File ${OSGPluginsDir}\osgdb_osg.dll
File ${OSGPluginsDir}\osgdb_3ds.dll
File ${OSGPluginsDir}\osgdb_mdl.dll
File ${OSGPluginsDir}\osgdb_jpeg.dll
File ${OSGPluginsDir}\osgdb_rgb.dll
File ${OSGPluginsDir}\osgdb_png.dll
File ${OSGPluginsDir}\osgdb_txf.dll
Exec '"$INSTDIR\fgrun.exe" --silent --fg-exe="$INSTDIR\fgfs.exe" --ts-exe="$INSTDIR\terrasync.exe" '
CreateDirectory "$SMPROGRAMS\FlightGear"
CreateShortCut "$SMPROGRAMS\FlightGear\FlightGear-nightly.lnk" "$INSTDIR\fgrun.exe"
CreateShortCut "$SMPROGRAMS\FlightGear-nightly.lnk" "$INSTDIR\fgrun.exe"
WriteUninstaller "$INSTDIR\FlightGear_Uninstall.exe"
WriteRegStr HKLM ${UninstallKey} "DisplayName" "FlightGear Nightly"
WriteRegStr HKLM ${UninstallKey} "DisplayVersion" "2.1"
WriteRegStr HKLM ${UninstallKey} "DisplayVersion" "${FGVersion}"
WriteRegStr HKLM ${UninstallKey} "UninstallString" "$INSTDIR\FlightGear_Uninstall.exe"
WriteRegStr HKLM ${UninstallKey} "UninstallPath" "$INSTDIR\FlightGear_Uninstall.exe"
WriteRegDWORD HKLM ${UninstallKey} "NoModify" 1
@ -105,7 +127,9 @@ Section "Uninstall"
SetShellVarContext all
Delete "$SMPROGRAMS\FlightGear-nightly.lnk"
Delete "$SMPROGRAMS\FlightGear\FlightGear-nightly.lnk"
; only delete the FlightGear group if it's empty
RMDir "$SMPROGRAMS\FlightGear"
RMDir /r "$INSTDIR"

4
package/mac/build-mac-nightly-dmg.rb
View file

@ -3,7 +3,7 @@
require 'ERB'
$osgLibs = ['osgFX', 'osgParticle', 'osg', 'osgGA', 'osgText', 'osgUtil', 'osgSim', 'osgViewer', 'osgDB']
$osgPlugins = ['ac', 'osg', 'freetype', 'qt', 'imageio', 'rgb', 'txf']
$osgPlugins = ['ac', 'osg', 'freetype', 'qt', 'imageio', 'rgb', 'txf', 'mdl', '3ds']
def runOsgVersion(option)
env = "export DYLD_LIBRARY_PATH=#{Dir.pwd}/dist/lib"
@ -53,6 +53,8 @@ resourcesDir=contents+"/Resources"
osgPluginsDir=contents+"/PlugIns/osgPlugins-#{osgVersion}"
volName="\"FlightGear Nightly Build\""
VERSION = File.read("#{srcDir}/version").strip
puts "Creating directory structure"
`mkdir -p #{macosDir}`
`mkdir -p #{frameworksDir}`

2
package/mac/nightly.plist.in
View file

@ -15,7 +15,7 @@
<key>CFBundleIdentifier</key>
<string>org.flightgear.FlightGear</string>
<key>CFBundleVersion</key>
<string>2.0</string>
<string><%= VERSION %></string>
<key>CFBundleShortVersionString</key>
<string>unstable nightly build</string>
<key>LSMinimumSystemVersion</key>

5
projects/VC90/.cvsignore
View file

@ -1,5 +0,0 @@
FlightGear.ncb
FlightGear.suo
Win32
x64
publish

3
projects/VC90/FlightGear/.cvsignore
View file

@ -1,3 +0,0 @@
*.user
x64
Win32

8
projects/VC90/FlightGear/FlightGear.vcproj
View file

@ -48,7 +48,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\src;..\..\..\src\include;..\..\..\..\SimGear;..\..\..\src\FDM\JSBSim;..\..\..\..\install\msvc90\OpenSceneGraph\include;..\..\..\..\3rdParty\include;..\..\..\..\boost_1_44_0"
PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;HAVE_CONFIG_H;FGFS;ENABLE_AUDIO_SUPPORT;_FG_NDEBUG;ENABLE_THREADS=1;FG_ENABLE_MULTIPASS_CLOUDS;ENABLE_SP_FMDS;_USE_MATH_DEFINES;FG_JPEG_SERVER;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"
PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;HAVE_CONFIG_H;FGFS;ENABLE_AUDIO_SUPPORT;_FG_NDEBUG;ENABLE_THREADS=1;FG_ENABLE_MULTIPASS_CLOUDS;ENABLE_SP_FMDS;_USE_MATH_DEFINES;FG_JPEG_SERVER;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;HAVE_VERSION_H=$(HAVE_VERSION_H)0"
StringPooling="true"
BasicRuntimeChecks="0"
RuntimeLibrary="3"
@ -137,7 +137,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\src;..\..\..\src\include;..\..\..\..\SimGear;..\..\..\src\FDM\JSBSim;..\..\..\..\install\msvc90-64\OpenSceneGraph\include;..\..\..\..\3rdParty.x64\include;..\..\..\..\boost_1_44_0"
PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;HAVE_CONFIG_H;FGFS;ENABLE_AUDIO_SUPPORT;_FG_NDEBUG;ENABLE_THREADS=1;FG_ENABLE_MULTIPASS_CLOUDS;ENABLE_SP_FMDS;_USE_MATH_DEFINES;FG_JPEG_SERVER;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;PU_USE_NATIVE"
PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;HAVE_CONFIG_H;FGFS;ENABLE_AUDIO_SUPPORT;_FG_NDEBUG;ENABLE_THREADS=1;FG_ENABLE_MULTIPASS_CLOUDS;ENABLE_SP_FMDS;_USE_MATH_DEFINES;FG_JPEG_SERVER;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;PU_USE_NATIVE;HAVE_VERSION_H=$(HAVE_VERSION_H)0"
StringPooling="true"
BasicRuntimeChecks="0"
RuntimeLibrary="3"
@ -225,7 +225,7 @@
Name="VCCLCompilerTool"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\..\src;..\..\..\src\include;..\..\..\src\FDM\JSBSim;..\..\..\..\SimGear;..\..\..\..\install\msvc90\OpenSceneGraph\include;..\..\..\..\3rdParty\include;..\..\..\..\boost_1_44_0"
PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;HAVE_CONFIG_H;FGFS;ENABLE_AUDIO_SUPPORT;_FG_NDEBUG;ENABLE_THREADS=1;FG_ENABLE_MULTIPASS_CLOUDS;ENABLE_SP_FMDS;_USE_MATH_DEFINES;FG_JPEG_SERVER;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"
PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;HAVE_CONFIG_H;FGFS;ENABLE_AUDIO_SUPPORT;_FG_NDEBUG;ENABLE_THREADS=1;FG_ENABLE_MULTIPASS_CLOUDS;ENABLE_SP_FMDS;_USE_MATH_DEFINES;FG_JPEG_SERVER;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;HAVE_VERSION_H=$(HAVE_VERSION_H)0"
StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
@ -313,7 +313,7 @@
Name="VCCLCompilerTool"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\..\src;..\..\..\src\include;..\..\..\src\FDM\JSBSim;..\..\..\..\SimGear;..\..\..\..\install\msvc90-64\OpenSceneGraph\include;..\..\..\..\3rdParty.x64\include;..\..\..\..\boost_1_44_0"
PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;HAVE_CONFIG_H;FGFS;ENABLE_AUDIO_SUPPORT;_FG_NDEBUG;ENABLE_THREADS=1;FG_ENABLE_MULTIPASS_CLOUDS;ENABLE_SP_FMDS;_USE_MATH_DEFINES;FG_JPEG_SERVER;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;PU_USE_NATIVE"
PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;HAVE_CONFIG_H;FGFS;ENABLE_AUDIO_SUPPORT;_FG_NDEBUG;ENABLE_THREADS=1;FG_ENABLE_MULTIPASS_CLOUDS;ENABLE_SP_FMDS;_USE_MATH_DEFINES;FG_JPEG_SERVER;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;PU_USE_NATIVE;HAVE_VERSION_H=$(HAVE_VERSION_H)0"
StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"

3
projects/VC90/GPSsmooth/.cvsignore
View file

@ -1,3 +0,0 @@
*.user
x64
Win32

3
projects/VC90/MIDGsmooth/.cvsignore
View file

@ -1,3 +0,0 @@
*.user
x64
Win32

3
projects/VC90/UGsmooth/.cvsignore
View file

@ -1,3 +0,0 @@
*.user
x64
Win32

3
projects/VC90/fgadmin/.cvsignore
View file

@ -1,3 +0,0 @@
*.user
Win32
x64

3
projects/VC90/fgjs/.cvsignore
View file

@ -1,3 +0,0 @@
*.user
x64
Win32

3
projects/VC90/fgviewer/.cvsignore
View file

@ -1,3 +0,0 @@
*.user
x64
Win32

3
projects/VC90/metar/.cvsignore
View file

@ -1,3 +0,0 @@
*.user
x64
Win32

3
projects/VC90/terrasync/.cvsignore
View file

@ -1,3 +0,0 @@
*.user
x64
Win32

3
projects/VC90/xmlgrep/.cvsignore
View file

@ -1,3 +0,0 @@
*.user
x64
Win32

3
projects/VC90/yasim/.cvsignore
View file

@ -1,3 +0,0 @@
*.user
x64
Win32

2
scripts/.cvsignore
View file

@ -1,2 +0,0 @@
Makefile
Makefile.in

5
scripts/debug/.cvsignore
View file

@ -1,5 +0,0 @@
Makefile
Makefile.in
core*
fgfs.supp
.gdbinit

2
scripts/example/.cvsignore
View file

@ -1,2 +0,0 @@
Makefile
Makefile.in

2
scripts/java/.cvsignore
View file

@ -1,2 +0,0 @@
Makefile
Makefile.in

2
scripts/java/FGClient/.cvsignore
View file

@ -1,2 +0,0 @@
Makefile
Makefile.in

2
scripts/java/FGClient/docs/.cvsignore
View file

@ -1,2 +0,0 @@
Makefile
Makefile.in

2
scripts/java/FGClient/docs/javadoc/.cvsignore
View file

@ -1,2 +0,0 @@
Makefile
Makefile.in

2
scripts/java/FGClient/src/.cvsignore
View file

@ -1,2 +0,0 @@
Makefile
Makefile.in

2
scripts/perl/.cvsignore
View file

@ -1,2 +0,0 @@
Makefile
Makefile.in

2
scripts/perl/dafif/.cvsignore
View file

@ -1,2 +0,0 @@
Makefile
Makefile.in

2
scripts/perl/examples/.cvsignore
View file

@ -1,2 +0,0 @@
Makefile
Makefile.in

2
scripts/perl/scenery/.cvsignore
View file

@ -1,2 +0,0 @@
Makefile
Makefile.in

2
scripts/python/.cvsignore
View file

@ -1,2 +0,0 @@
Makefile
Makefile.in

2
src/.cvsignore
View file

@ -1,2 +0,0 @@
Makefile
Makefile.in

3
src/AIModel/.cvsignore
View file

@ -1,3 +0,0 @@
.deps
Makefile
Makefile.in

7
src/AIModel/AIBase.cxx
View file

@ -60,6 +60,7 @@ FGAIBase::FGAIBase(object_type ot) :
model_removed( fgGetNode("/ai/models/model-removed", true) ),
manager( NULL ),
fp( NULL ),
_installed(false),
_impact_lat(0),
_impact_lon(0),
_impact_elev(0),
@ -198,7 +199,7 @@ bool FGAIBase::init(bool search_in_AI_path) {
string f;
if(search_in_AI_path)
{
// setup a modified Options strucutre, with only the $fg-root/AI defined;
// setup a modified Options structure, with only the $fg-root/AI defined;
// we'll check that first, then give the normal search logic a chance.
// this ensures that models in AI/ are preferred to normal models, where
// both exist.
@ -217,6 +218,8 @@ bool FGAIBase::init(bool search_in_AI_path) {
if(f.empty())
f = fgGetString("/sim/multiplay/default-model", default_model);
else
_installed = true;
model = load3DModel(f, props);
@ -229,6 +232,8 @@ bool FGAIBase::init(bool search_in_AI_path) {
} else if (!model_path.empty()) {
SG_LOG(SG_INPUT, SG_WARN, "AIBase: Could not load model " << model_path);
// not properly installed...
_installed = false;
}
setDie(false);

1
src/AIModel/AIBase.hxx
View file

@ -193,6 +193,7 @@ protected:
bool invisible;
bool no_roll;
bool serviceable;
bool _installed;
int _subID;
double life;

7
src/AIModel/AIMultiplayer.cxx
View file

@ -63,7 +63,12 @@ bool FGAIMultiplayer::init(bool search_in_AI_path) {
isTanker = true;
// cout << "isTanker " << isTanker << " " << mCallSign <<endl;
}
return FGAIBase::init(search_in_AI_path);
// load model
bool result = FGAIBase::init(search_in_AI_path);
// propagate installation state (used by MP pilot list)
props->setBoolValue("model-installed", _installed);
return result;
}
void FGAIMultiplayer::bind() {

3
src/ATC/.cvsignore
View file

@ -1,3 +0,0 @@
.deps
Makefile.in
Makefile

2
src/ATCDCL/.cvsignore
View file

@ -1,2 +0,0 @@
Makefile
Makefile.in

3
src/Aircraft/.cvsignore
View file

@ -1,3 +0,0 @@
.deps
Makefile
Makefile.in

2
src/Aircraft/controls.cxx
View file

@ -877,7 +877,7 @@ void FGControls::unbind ()
"/controls/engines/engine[%d]/starter", index);
fgUntie(name);
snprintf(name, MAX_NAME_LEN,
"/controls/engines/engine[%d]/fuel_pump", index);
"/controls/engines/engine[%d]/fuel-pump", index);
fgUntie(name);
snprintf(name, MAX_NAME_LEN,
"/controls/engines/engine[%d]/fire-switch", index);

6
src/Airports/.cvsignore
View file

@ -1,6 +0,0 @@
.deps
Makefile
Makefile.in
calc_loc
genrunways
gensimple

3
src/Autopilot/.cvsignore
View file

@ -1,3 +0,0 @@
.deps
Makefile
Makefile.in

3
src/Cockpit/.cvsignore
View file

@ -1,3 +0,0 @@
.deps
Makefile
Makefile.in

3
src/Cockpit/built_in/.cvsignore
View file

@ -1,3 +0,0 @@
.deps
Makefile
Makefile.in

3
src/Environment/.cvsignore
View file

@ -1,3 +0,0 @@
.deps
Makefile
Makefile.in

5
src/FDM/.cvsignore
View file

@ -1,5 +0,0 @@
.deps
Makefile
Makefile.in
engine
pstest

3
src/FDM/ExternalNet/.cvsignore
View file

@ -1,3 +0,0 @@
.deps
Makefile
Makefile.in

3
src/FDM/ExternalPipe/.cvsignore
View file

@ -1,3 +0,0 @@
.deps
Makefile
Makefile.in

5
src/FDM/JSBSim/.cvsignore
View file

@ -1,5 +0,0 @@
.deps
Makefile
Makefile.in
config.h
testJSBsim

3
src/FDM/JSBSim/initialization/.cvsignore
View file

@ -1,3 +0,0 @@
.deps
Makefile
Makefile.in

3
src/FDM/JSBSim/input_output/.cvsignore
View file

@ -1,3 +0,0 @@
.deps
Makefile
Makefile.in

3
src/FDM/JSBSim/math/.cvsignore
View file

@ -1,3 +0,0 @@
.deps
Makefile
Makefile.in

3
src/FDM/JSBSim/models/.cvsignore
View file

@ -1,3 +0,0 @@
.deps
Makefile
Makefile.in

3
src/FDM/JSBSim/models/atmosphere/.cvsignore
View file

@ -1,3 +0,0 @@
.deps
Makefile
Makefile.in

3
src/FDM/JSBSim/models/flight_control/.cvsignore
View file

@ -1,3 +0,0 @@
.deps
Makefile
Makefile.in

3
src/FDM/JSBSim/models/propulsion/.cvsignore
View file

@ -1,3 +0,0 @@
.deps
Makefile
Makefile.in

3
src/FDM/LaRCsim/.cvsignore
View file

@ -1,3 +0,0 @@
.deps
Makefile
Makefile.in

3
src/FDM/SP/.cvsignore
View file

@ -1,3 +0,0 @@
.deps
Makefile
Makefile.in

3
src/FDM/UIUCModel/.cvsignore
View file

@ -1,3 +0,0 @@
.deps
Makefile
Makefile.in

5
src/FDM/YASim/.cvsignore
View file

@ -1,5 +0,0 @@
.deps
Makefile
Makefile.in
proptest
yasim

4
src/GUI/.cvsignore
View file

@ -1,4 +0,0 @@
.deps
Makefile
Makefile.in
layout-test

9
src/Include/.cvsignore
View file

@ -1,9 +0,0 @@
.deps
Makefile
Makefile.in
config.h
config.h.in
stamp-h
stamp-h.in
stamp-h1
version.h

16
src/Include/no_version.h Normal file
View file

@ -0,0 +1,16 @@
#ifndef FG_NO_VERSION_H
#define FG_NO_VERSION_H
// version.h is generated by the build system for official builds of
// FlightGear. To avoid complicating the life of regular developers,
// especially on Windows, we set HAVE_VERSION_H if version.h is generated.
// If that define is not set, we include this file instead, which provides
// placeholder values instead.
#define FLIGHTGEAR_VERSION "development " __DATE__
#define HUDSON_BUILD_NUMBER 0
#define HUDSON_BUILD_ID "none"
#define REVISION "unknown"
#endif

3
src/Include/version.h.in
View file

@ -28,5 +28,8 @@
#define FLIGHTGEAR_VERSION "@VERSION@"
#define HUDSON_BUILD_NUMBER @HUDSON_BUILD_NUMBER@
#define HUDSON_BUILD_ID "@HUDSON_BUILD_ID@"
#define REVISION "@REVISION@"
#endif // _FLIGHTGEAR_VERSION_H

5
src/Input/.cvsignore
View file

@ -1,5 +0,0 @@
.deps
Makefile
Makefile.in
fgjs
js_demo

3
src/Instrumentation/.cvsignore
View file

@ -1,3 +0,0 @@
.deps
Makefile
Makefile.in

3
src/Instrumentation/HUD/.cvsignore
View file

@ -1,3 +0,0 @@
.deps
Makefile
Makefile.in

3
src/Instrumentation/KLN89/.cvsignore
View file

@ -1,3 +0,0 @@
.deps
Makefile
Makefile.in

6
src/Instrumentation/mk_viii.cxx
View file

@ -76,9 +76,13 @@ using std::string;
#include <Airports/runways.hxx>
#include <Airports/simple.hxx>
#ifndef _MSC_VER
#if defined( HAVE_VERSION_H ) && HAVE_VERSION_H
# include <Include/version.h>
#else
# include <Include/no_version.h>
#endif
#include <Main/fg_props.hxx>
#include <Main/globals.hxx>
#include "instrument_mgr.hxx"

7
src/Main/.cvsignore
View file

@ -1,7 +0,0 @@
.deps
Makefile
Makefile.in
fgfs
metar
runfgfs
runfgfs.bat

2
src/Main/Makefile.am
View file

@ -135,4 +135,4 @@ metar_LDADD = \
-lz $(base_LIBS)
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src -I$(top_builddir)/src

2
src/Main/fg_init.cxx
View file

@ -820,7 +820,7 @@ static void fgApplyStartOffset(const SGGeod& aStartPos, double aHeading, double
}
// Set current_options lon/lat given an airport id and heading (degrees)
static bool fgSetPosFromAirportIDandHdg( const string& id, double tgt_hdg ) {
bool fgSetPosFromAirportIDandHdg( const string& id, double tgt_hdg ) {
if ( id.empty() )
return false;

29
src/Main/globals.cxx
View file

@ -56,7 +56,7 @@
#include "fg_props.hxx"
#include "fg_io.hxx"
class AircraftResourceProvider : public simgear::ResourceProvider
class AircraftResourceProvider : public simgear::ResourceProvider
{
public:
AircraftResourceProvider() :
@ -74,28 +74,27 @@ public:
// test against the aircraft-dir property
const char* aircraftDir = fgGetString("/sim/aircraft-dir");
string_list aircraftDirPieces(sgPathBranchSplit(aircraftDir));
if (aircraftDirPieces.empty() || (aircraftDirPieces.back() != pieces[1])) {
return SGPath(); // current aircraft-dir does not match resource aircraft
}
SGPath r(aircraftDir);
for (unsigned int i=2; i<pieces.size(); ++i) {
r.append(pieces[i]);
}
if (r.exists()) {
SG_LOG(SG_IO, SG_INFO, "found path:" << aResource << " via /sim/aircraft-dir: " << r.str());
return r;
if (!aircraftDirPieces.empty() && (aircraftDirPieces.back() == pieces[1])) {
// current aircraft-dir matches resource aircraft
SGPath r(aircraftDir);
for (unsigned int i=2; i<pieces.size(); ++i) {
r.append(pieces[i]);
}
if (r.exists()) {
SG_LOG(SG_IO, SG_INFO, "found path:" << aResource << " via /sim/aircraft-dir: " << r.str());
return r;
}
}
// try each aircaft dir in turn
// try each aircraft dir in turn
std::string res(aResource, 9); // resource path with 'Aircraft/' removed
const string_list& dirs(globals->get_aircraft_paths());
string_list::const_iterator it = dirs.begin();
for (; it != dirs.end(); ++it) {
SGPath p(*it, res);
if (p.exists()) {
SG_LOG(SG_IO, SG_INFO, "found path:" << aResource << " in aircraft dir: " << r.str());
SG_LOG(SG_IO, SG_INFO, "found path:" << aResource << " in aircraft dir: " << *it);
return p;
}
} // of aircraft path iteration

26
src/Main/main.cxx
View file

@ -46,7 +46,7 @@
#include <simgear/structure/event_mgr.hxx>
#include <simgear/props/AtomicChangeListener.hxx>
#include <simgear/props/props.hxx>
#include <simgear/timing/sg_time.hxx>
//#include <simgear/timing/sg_time.hxx>
#include <simgear/math/sg_random.h>
#include <simgear/io/raw_socket.hxx>
@ -469,8 +469,30 @@ static void fgIdleFunction ( void ) {
"Subsystem initialization failed ..." );
exit(-1);
}
fgSplashProgress("setting up time & renderer");
// Torsten Dreyer:
// ugly hack for automatic runway selection on startup based on
// metar data. Makes startup.nas obsolete and guarantees the same
// runway selection as for AI traffic. However, this code belongs to
// somewhere(?) else - if I only new where...
if( true == fgGetBool( "/environment/metar/valid" ) ) {
// the realwx_ctrl fetches metar in the foreground on init,
// If it was able to fetch a metar or one was given on the commandline,
// the valid flag is set here, otherwise it is false
double hdg = fgGetDouble( "/environment/metar/base-wind-dir-deg", 9999.0 );
string apt = fgGetString( "/sim/startup/options/airport" );
string rwy = fgGetString( "/sim/startup/options/runway" );
double strthdg = fgGetDouble( "/sim/startup/options/heading-deg", 9999.0 );
string parkpos = fgGetString( "/sim/presets/parkpos" );
bool onground = fgGetBool( "/sim/presets/onground", false );
// don't check for wind-speed < 1kt, this belongs to the runway-selection code
// the other logic is taken from former startup.nas
if( hdg < 360.0 && apt.length() > 0 && strthdg > 360.0 && rwy.length() == 0 && onground && parkpos.length() == 0 ) {
extern bool fgSetPosFromAirportIDandHdg( const string& id, double tgt_hdg );
fgSetPosFromAirportIDandHdg( apt, hdg );
}
}
fgSplashProgress("setting up time & renderer");
} else if ( idle_state == 8 ) {
idle_state = 1000;

16
src/Main/options.cxx
View file

@ -64,8 +64,10 @@ using std::cout;
using std::cerr;
using std::endl;
#ifndef VERSION
#define VERSION "CVS "__DATE__
#if defined( HAVE_VERSION_H ) && HAVE_VERSION_H
# include <Include/version.h>
#else
# include <Include/no_version.h>
#endif
#define NEW_DEFAULT_MODEL_HZ 120
@ -233,6 +235,12 @@ fgSetDefaults ()
fgSetString("/sim/multiplay/txhost", "0");
fgSetInt("/sim/multiplay/rxport", 0);
fgSetInt("/sim/multiplay/txport", 0);
fgSetString("/sim/version/flightgear", FLIGHTGEAR_VERSION);
//fgSetString("/sim/version/simgear", FLIGHTGEAR_VERSION);
fgSetString("/sim/version/revision", REVISION);
fgSetInt("/sim/version/build-number", HUDSON_BUILD_NUMBER);
fgSetString("/sim/version/build-id", HUDSON_BUILD_ID);
}
static bool
@ -1208,7 +1216,9 @@ fgOptParking( const char *arg )
static int
fgOptVersion( const char *arg )
{
cerr << "FlightGear version: " << VERSION << endl;
cerr << "FlightGear version: " << FLIGHTGEAR_VERSION << endl;
cerr << "Revision: " << REVISION << endl;
cerr << "Build-Id: " << HUDSON_BUILD_ID << endl;
cerr << "FG_ROOT=" << globals->get_fg_root() << endl;
cerr << "FG_HOME=" << fgGetString("/sim/fg-home") << endl;
cerr << "FG_SCENERY=";

3
src/Model/.cvsignore
View file

@ -1,3 +0,0 @@
.deps
Makefile
Makefile.in

3
src/MultiPlayer/.cvsignore
View file

@ -1,3 +0,0 @@
.deps
Makefile.in
Makefile

4
src/Navaids/.cvsignore
View file

@ -1,4 +0,0 @@
.deps
Makefile
Makefile.in
testnavs

3
src/Network/.cvsignore
View file

@ -1,3 +0,0 @@
.deps
Makefile
Makefile.in

3
src/Scenery/.cvsignore
View file

@ -1,3 +0,0 @@
.deps
Makefile
Makefile.in

3
src/Scripting/.cvsignore
View file

@ -1,3 +0,0 @@
.deps
Makefile
Makefile.in

3
src/Sound/.cvsignore
View file

@ -1,3 +0,0 @@
.deps
Makefile
Makefile.in

3
src/Systems/.cvsignore
View file

@ -1,3 +0,0 @@
.deps
Makefile
Makefile.in

3
src/Time/.cvsignore
View file

@ -1,3 +0,0 @@
.deps
Makefile
Makefile.in

3
src/Traffic/.cvsignore
View file

@ -1,3 +0,0 @@
.deps
Makefile
Makefile.in

11
tests/.cvsignore
View file

@ -1,11 +0,0 @@
.deps
Makefile
Makefile.in
est-epsilon
al-info
gl-info
test-env-map
test-gethostname
test-mktime
test-text
test-up

2
utils/.cvsignore
View file

@ -1,2 +0,0 @@
Makefile
Makefile.in

6
utils/GPSsmooth/.cvsignore
View file

@ -1,6 +0,0 @@
Makefile
Makefile.in
.deps
GPSsmooth
MIDGsmooth
UGsmooth

7
utils/Modeller/.cvsignore
View file

@ -1,7 +0,0 @@
.deps
3dconvert
Makefile
Makefile.in
animassist
threedconvert
normalmap

4
utils/TerraSync/.cvsignore
View file

@ -1,4 +0,0 @@
.deps
Makefile
Makefile.in
terrasync

8
utils/fgadmin/.cvsignore
View file

@ -1,8 +0,0 @@
Makefile
Makefile.in
aclocal.m4
autom4te.cache
build
configure
config.log
config.status

6
utils/fgadmin/src/.cvsignore
View file

@ -1,6 +0,0 @@
.deps
Makefile
Makefile.in
config.h.in
fgadmin
stamp-h1

4
utils/fgviewer/.cvsignore
View file

@ -1,4 +0,0 @@
.deps
Makefile
Makefile.in
fgviewer

4
utils/gui/.cvsignore
View file

@ -1,4 +0,0 @@
genfonts
Makefile.in
Makefile
.deps

4
utils/js_server/.cvsignore
View file

@ -1,4 +0,0 @@
.deps
Makefile
Makefile.in
js_server

4
utils/xmlgrep/.cvsignore
View file

@ -1,4 +0,0 @@
.deps
Makefile
Makefile.in
xmlgrep

1
version Normal file
View file

@ -0,0 +1 @@
2.2.0