Merge branch 'next' of git://gitorious.org/fg/flightgear into next
This commit is contained in:
Erik Hofman
commit
2ea50c63bb
122 changed files with 1616 additions and 1405 deletions
24
.cvsignore
24
.cvsignore
|
|
@ -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
32
configure.ac
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
@ -106,6 +106,9 @@ it in a scheduled task. To do that :
|
|||
64bit environment (Vista 64-bit or Windows7 64-bit)
|
||||
You should see : "Setting environment for using Microsoft Visual Studio 2008 x86 tools."
|
||||
printed in the console
|
||||
( To start 64-bit build, the right environment is set with :
|
||||
"C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\vcvarsall.bat" amd64
|
||||
)
|
||||
3. cd to the FlightGear project directory :
|
||||
D:
|
||||
cd \FGFSDevel\FlightGear\projects\VC90 (for example)
|
||||
|
|
|
|||
|
|
@ -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
BIN
package/Win-NSIS/fg-install-header.bmp
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 324 KiB |
139
package/Win-NSIS/flightgear-nightly.nsi
Normal file
139
package/Win-NSIS/flightgear-nightly.nsi
Normal file
|
|
@ -0,0 +1,139 @@
|
|||
!include "MUI.nsh"
|
||||
|
||||
!system 'osgversion --so-number > %TEMP%\osg-so-number.txt'
|
||||
!system 'osgversion --version-number > %TEMP%\osg-version.txt'
|
||||
|
||||
!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_${FGVersion}.exe
|
||||
|
||||
; use LZMA for best compression
|
||||
SetCompressor /FINAL /SOLID lzma
|
||||
SetCompressorDictSize 64
|
||||
|
||||
InstallDir $PROGRAMFILES\FlightGear-nightly
|
||||
|
||||
; Request admin privileges for Windows Vista
|
||||
RequestExecutionLevel highest
|
||||
|
||||
; don't hang around
|
||||
AutoCloseWindow true
|
||||
|
||||
!define UninstallKey "Software\Microsoft\Windows\CurrentVersion\Uninstall\FlightGear-nightly"
|
||||
!define FGBinDir "flightgear\projects\VC90\Win32\Release"
|
||||
!define FGRunBinDir "fgrun\msvc\9.0\Win32\Release"
|
||||
!define OSGInstallDir "install\msvc90\OpenSceneGraph"
|
||||
!define OSGPluginsDir "${OSGInstallDir}\bin\osgPlugins-${OSGVersion}"
|
||||
|
||||
!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 "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
|
||||
; 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
|
||||
|
||||
!insertmacro MUI_LANGUAGE "English"
|
||||
|
||||
; The stuff to install
|
||||
Section "" ;No components page, name is not important
|
||||
|
||||
SetShellVarContext all
|
||||
; Set output path to the installation directory.
|
||||
SetOutPath $INSTDIR
|
||||
|
||||
File ${FGBinDir}\fgfs.exe
|
||||
File ${FGBinDir}\fgjs.exe
|
||||
File ${FGBinDir}\terrasync.exe
|
||||
File ${FGRunBinDir}\fgrun.exe
|
||||
|
||||
File ${OSGInstallDir}\bin\osg${OSGSoNumber}-osg.dll
|
||||
File ${OSGInstallDir}\bin\osg${OSGSoNumber}-osgDB.dll
|
||||
File ${OSGInstallDir}\bin\osg${OSGSoNumber}-osgGA.dll
|
||||
File ${OSGInstallDir}\bin\osg${OSGSoNumber}-osgParticle.dll
|
||||
File ${OSGInstallDir}\bin\osg${OSGSoNumber}-osgText.dll
|
||||
File ${OSGInstallDir}\bin\osg${OSGSoNumber}-osgUtil.dll
|
||||
File ${OSGInstallDir}\bin\osg${OSGSoNumber}-osgViewer.dll
|
||||
File ${OSGInstallDir}\bin\osg${OSGSoNumber}-osgSim.dll
|
||||
File ${OSGInstallDir}\bin\osg${OSGSoNumber}-osgFX.dll
|
||||
|
||||
File ${OSGInstallDir}\bin\ot12-OpenThreads.dll
|
||||
|
||||
File ${ThirdPartyBinDir}\*.dll
|
||||
|
||||
; VC runtime redistributables
|
||||
File "$%VCINSTALLDIR%\redist\x86\Microsoft.VC90.CRT\*.dll"
|
||||
|
||||
File /r ${FGRunBinDir}\locale
|
||||
|
||||
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"
|
||||
|
||||
|
||||
WriteUninstaller "$INSTDIR\FlightGear_Uninstall.exe"
|
||||
|
||||
WriteRegStr HKLM ${UninstallKey} "DisplayName" "FlightGear Nightly"
|
||||
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
|
||||
WriteRegDWORD HKLM ${UninstallKey} "NoRepair" 1
|
||||
WriteRegStr HKLM ${UninstallKey} "URLInfoAbout" "http://www.flightgear.org/"
|
||||
|
||||
SectionEnd
|
||||
|
||||
|
||||
|
||||
Section "Uninstall"
|
||||
|
||||
SetShellVarContext all
|
||||
|
||||
|
||||
Delete "$SMPROGRAMS\FlightGear\FlightGear-nightly.lnk"
|
||||
; only delete the FlightGear group if it's empty
|
||||
RMDir "$SMPROGRAMS\FlightGear"
|
||||
|
||||
RMDir /r "$INSTDIR"
|
||||
|
||||
DeleteRegKey HKLM ${UninstallKey}
|
||||
|
||||
SectionEnd
|
||||
|
||||
|
|
@ -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"
|
||||
|
|
@ -40,7 +40,7 @@ end
|
|||
prefixDir=Dir.pwd + "/dist"
|
||||
dmgDir=Dir.pwd + "/image"
|
||||
srcDir=Dir.pwd + "/flightgear"
|
||||
dmgPath = Dir.pwd + "/fg_mac_nightly.dmg"
|
||||
|
||||
|
||||
puts "Erasing previous image dir"
|
||||
`rm -rf #{dmgDir}`
|
||||
|
|
@ -53,6 +53,10 @@ resourcesDir=contents+"/Resources"
|
|||
osgPluginsDir=contents+"/PlugIns/osgPlugins-#{osgVersion}"
|
||||
volName="\"FlightGear Nightly Build\""
|
||||
|
||||
VERSION = File.read("#{srcDir}/version").strip
|
||||
|
||||
dmgPath = Dir.pwd + "/fg_mac_nightly_#{VERSION}.dmg"
|
||||
|
||||
puts "Creating directory structure"
|
||||
`mkdir -p #{macosDir}`
|
||||
`mkdir -p #{frameworksDir}`
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -100,7 +100,7 @@
|
|||
</Midl>
|
||||
<ClCompile>
|
||||
<Optimization>Disabled</Optimization>
|
||||
<AdditionalIncludeDirectories>..\..\..\src;..\..\..\src\include;..\..\..\..\SimGear;..\..\..\src\FDM\JSBSim;..\..\..\..\install\msvc100\OpenSceneGraph\include;..\..\..\..\3rdParty\include;..\..\..\..\boost_1_43_0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<AdditionalIncludeDirectories>..\..\..\src;..\..\..\src\include;..\..\..\..\SimGear;..\..\..\src\FDM\JSBSim;..\..\..\..\install\msvc100\OpenSceneGraph\include;..\..\..\..\3rdParty\include;..\..\..\..\boost_1_44_0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<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)</PreprocessorDefinitions>
|
||||
<StringPooling>true</StringPooling>
|
||||
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
|
||||
|
|
@ -121,7 +121,7 @@
|
|||
<AdditionalDependencies>opengl32.lib;glu32.lib;winmm.lib;wsock32.lib;sg_d.lib;net_d.lib;pui_d.lib;puaux_d.lib;fnt_d.lib;js_d.lib;ul_d.lib;zlibd.lib;OpenAL32.lib;ALut.lib;osgd.lib;osgDBd.lib;osgUtild.lib;osgViewerd.lib;osgGAd.lib;osgTextd.lib;osgParticled.lib;OpenThreadsd.lib;libjpegd.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<OutputFile>$(OutDir)fgfs.exe</OutputFile>
|
||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
||||
<AdditionalLibraryDirectories>..\..\..\..\install\msvc100\OpenSceneGraph\lib;..\..\..\..\3rdParty\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
||||
<AdditionalLibraryDirectories>..\..\..\..\install\msvc100\OpenSceneGraph\lib;..\..\..\..\3rdParty\lib;..\..\..\..\boost_1_44_0\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
||||
<IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
|
||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
<SubSystem>Console</SubSystem>
|
||||
|
|
@ -138,7 +138,7 @@
|
|||
</Midl>
|
||||
<ClCompile>
|
||||
<Optimization>Disabled</Optimization>
|
||||
<AdditionalIncludeDirectories>..\..\..\src;..\..\..\src\include;..\..\..\..\SimGear;..\..\..\src\FDM\JSBSim;..\..\..\..\install\msvc100-64\OpenSceneGraph\include;..\..\..\..\3rdParty.x64\include;..\..\..\..\boost_1_43_0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<AdditionalIncludeDirectories>..\..\..\src;..\..\..\src\include;..\..\..\..\SimGear;..\..\..\src\FDM\JSBSim;..\..\..\..\install\msvc100-64\OpenSceneGraph\include;..\..\..\..\3rdParty.x64\include;..\..\..\..\boost_1_44_0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<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)</PreprocessorDefinitions>
|
||||
<StringPooling>true</StringPooling>
|
||||
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
|
||||
|
|
@ -158,7 +158,7 @@
|
|||
<AdditionalDependencies>opengl32.lib;glu32.lib;winmm.lib;wsock32.lib;sg_d.lib;net_d.lib;pui_d.lib;puaux_d.lib;fnt_d.lib;js_d.lib;ul_d.lib;zlibd.lib;OpenAL32.lib;ALut.lib;osgd.lib;osgDBd.lib;osgUtild.lib;osgViewerd.lib;osgGAd.lib;osgTextd.lib;osgParticled.lib;OpenThreadsd.lib;libjpegd.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<OutputFile>$(OutDir)fgfs.exe</OutputFile>
|
||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
||||
<AdditionalLibraryDirectories>..\..\..\..\install\msvc100-64\OpenSceneGraph\lib;..\..\..\..\3rdParty.x64\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
||||
<AdditionalLibraryDirectories>..\..\..\..\install\msvc100-64\OpenSceneGraph\lib;..\..\..\..\3rdParty.x64\lib;..\..\..\..\boost_1_44_0\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
||||
<IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
|
||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
<SubSystem>Console</SubSystem>
|
||||
|
|
@ -175,7 +175,7 @@
|
|||
</Midl>
|
||||
<ClCompile>
|
||||
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
|
||||
<AdditionalIncludeDirectories>..\..\..\src;..\..\..\src\include;..\..\..\src\FDM\JSBSim;..\..\..\..\SimGear;..\..\..\..\install\msvc100\OpenSceneGraph\include;..\..\..\..\3rdParty\include;..\..\..\..\boost_1_43_0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<AdditionalIncludeDirectories>..\..\..\src;..\..\..\src\include;..\..\..\src\FDM\JSBSim;..\..\..\..\SimGear;..\..\..\..\install\msvc100\OpenSceneGraph\include;..\..\..\..\3rdParty\include;..\..\..\..\boost_1_44_0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<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)</PreprocessorDefinitions>
|
||||
<StringPooling>true</StringPooling>
|
||||
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
|
||||
|
|
@ -195,7 +195,7 @@
|
|||
<AdditionalDependencies>opengl32.lib;glu32.lib;winmm.lib;wsock32.lib;sg.lib;net.lib;pui.lib;puAux.lib;fnt.lib;js.lib;ul.lib;zlib.lib;OpenAL32.lib;ALut.lib;osg.lib;osgDB.lib;osgUtil.lib;osgViewer.lib;osgGA.lib;osgText.lib;osgParticle.lib;OpenThreads.lib;libjpeg.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<OutputFile>$(OutDir)fgfs.exe</OutputFile>
|
||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
||||
<AdditionalLibraryDirectories>..\..\..\..\install\msvc100\OpenSceneGraph\lib;..\..\..\..\3rdParty\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
||||
<AdditionalLibraryDirectories>..\..\..\..\install\msvc100\OpenSceneGraph\lib;..\..\..\..\3rdParty\lib;..\..\..\..\boost_1_44_0\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
||||
<IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
|
||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
<SubSystem>Console</SubSystem>
|
||||
|
|
@ -212,7 +212,7 @@
|
|||
</Midl>
|
||||
<ClCompile>
|
||||
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
|
||||
<AdditionalIncludeDirectories>..\..\..\src;..\..\..\src\include;..\..\..\src\FDM\JSBSim;..\..\..\..\SimGear;..\..\..\..\install\msvc100-64\OpenSceneGraph\include;..\..\..\..\3rdParty.x64\include;..\..\..\..\boost_1_43_0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<AdditionalIncludeDirectories>..\..\..\src;..\..\..\src\include;..\..\..\src\FDM\JSBSim;..\..\..\..\SimGear;..\..\..\..\install\msvc100-64\OpenSceneGraph\include;..\..\..\..\3rdParty.x64\include;..\..\..\..\boost_1_44_0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<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)</PreprocessorDefinitions>
|
||||
<StringPooling>true</StringPooling>
|
||||
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
|
||||
|
|
@ -231,7 +231,7 @@
|
|||
<AdditionalDependencies>opengl32.lib;glu32.lib;winmm.lib;wsock32.lib;sg.lib;net.lib;pui.lib;puAux.lib;fnt.lib;js.lib;ul.lib;zlib.lib;OpenAL32.lib;ALut.lib;osg.lib;osgDB.lib;osgUtil.lib;osgViewer.lib;osgGA.lib;osgText.lib;osgParticle.lib;OpenThreads.lib;libjpeg.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<OutputFile>$(OutDir)fgfs.exe</OutputFile>
|
||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
||||
<AdditionalLibraryDirectories>..\..\..\..\install\msvc100-64\OpenSceneGraph\lib;..\..\..\..\3rdParty.x64\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
||||
<AdditionalLibraryDirectories>..\..\..\..\install\msvc100-64\OpenSceneGraph\lib;..\..\..\..\3rdParty.x64\lib;..\..\..\..\boost_1_44_0\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
||||
<IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
|
||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
<SubSystem>Console</SubSystem>
|
||||
|
|
|
|||
|
|
@ -89,7 +89,7 @@
|
|||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<ClCompile>
|
||||
<Optimization>Disabled</Optimization>
|
||||
<AdditionalIncludeDirectories>..\..\..\src;..\..\..\..\SimGear;..\..\..\..\install\msvc100\OpenSceneGraph\include;..\..\..\..\3rdParty\include;..\..\..\..\boost_1_43_0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<AdditionalIncludeDirectories>..\..\..\src;..\..\..\..\SimGear;..\..\..\..\install\msvc100\OpenSceneGraph\include;..\..\..\..\3rdParty\include;..\..\..\..\boost_1_44_0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;NOMINMAX;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<MinimalRebuild>true</MinimalRebuild>
|
||||
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
|
||||
|
|
@ -118,7 +118,7 @@
|
|||
</Midl>
|
||||
<ClCompile>
|
||||
<Optimization>Disabled</Optimization>
|
||||
<AdditionalIncludeDirectories>..\..\..\src;..\..\..\..\SimGear;..\..\..\..\install\msvc100-64\OpenSceneGraph\include;..\..\..\..\3rdParty.x64\include;..\..\..\..\boost_1_43_0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<AdditionalIncludeDirectories>..\..\..\src;..\..\..\..\SimGear;..\..\..\..\install\msvc100-64\OpenSceneGraph\include;..\..\..\..\3rdParty.x64\include;..\..\..\..\boost_1_44_0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;NOMINMAX;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<MinimalRebuild>true</MinimalRebuild>
|
||||
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
|
||||
|
|
@ -143,7 +143,7 @@
|
|||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||
<ClCompile>
|
||||
<AdditionalIncludeDirectories>..\..\..\src;..\..\..\..\SimGear;..\..\..\..\install\msvc100\OpenSceneGraph\include;..\..\..\..\3rdParty\include;..\..\..\..\boost_1_43_0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<AdditionalIncludeDirectories>..\..\..\src;..\..\..\..\SimGear;..\..\..\..\install\msvc100\OpenSceneGraph\include;..\..\..\..\3rdParty\include;..\..\..\..\boost_1_44_0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;NOMINMAX;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
|
||||
<RuntimeTypeInfo>true</RuntimeTypeInfo>
|
||||
|
|
@ -171,7 +171,7 @@
|
|||
<TargetEnvironment>X64</TargetEnvironment>
|
||||
</Midl>
|
||||
<ClCompile>
|
||||
<AdditionalIncludeDirectories>..\..\..\src;..\..\..\..\SimGear;..\..\..\..\install\msvc100-64\OpenSceneGraph\include;..\..\..\..\3rdParty.x64\include;..\..\..\..\boost_1_43_0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<AdditionalIncludeDirectories>..\..\..\src;..\..\..\..\SimGear;..\..\..\..\install\msvc100-64\OpenSceneGraph\include;..\..\..\..\3rdParty.x64\include;..\..\..\..\boost_1_44_0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;NOMINMAX;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
|
||||
<RuntimeTypeInfo>true</RuntimeTypeInfo>
|
||||
|
|
|
|||
|
|
@ -90,7 +90,7 @@
|
|||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<ClCompile>
|
||||
<Optimization>Disabled</Optimization>
|
||||
<AdditionalIncludeDirectories>..\..\..\src;..\..\..\..\SimGear;..\..\..\..\install\msvc100\OpenSceneGraph\include;..\..\..\..\3rdParty\include;..\..\..\..\boost_1_43_0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<AdditionalIncludeDirectories>..\..\..\src;..\..\..\..\SimGear;..\..\..\..\install\msvc100\OpenSceneGraph\include;..\..\..\..\3rdParty\include;..\..\..\..\boost_1_44_0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;NOMINMAX;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<MinimalRebuild>true</MinimalRebuild>
|
||||
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
|
||||
|
|
@ -119,7 +119,7 @@
|
|||
</Midl>
|
||||
<ClCompile>
|
||||
<Optimization>Disabled</Optimization>
|
||||
<AdditionalIncludeDirectories>..\..\..\src;..\..\..\..\SimGear;..\..\..\..\install\msvc100-64\OpenSceneGraph\include;..\..\..\..\3rdParty.x64\include;..\..\..\..\boost_1_43_0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<AdditionalIncludeDirectories>..\..\..\src;..\..\..\..\SimGear;..\..\..\..\install\msvc100-64\OpenSceneGraph\include;..\..\..\..\3rdParty.x64\include;..\..\..\..\boost_1_44_0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;NOMINMAX;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
|
||||
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
|
||||
|
|
@ -143,7 +143,7 @@
|
|||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||
<ClCompile>
|
||||
<AdditionalIncludeDirectories>..\..\..\src;..\..\..\..\SimGear;..\..\..\..\install\msvc100\OpenSceneGraph\include;..\..\..\..\3rdParty\include;..\..\..\..\boost_1_43_0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<AdditionalIncludeDirectories>..\..\..\src;..\..\..\..\SimGear;..\..\..\..\install\msvc100\OpenSceneGraph\include;..\..\..\..\3rdParty\include;..\..\..\..\boost_1_44_0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;NOMINMAX;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
|
||||
<RuntimeTypeInfo>true</RuntimeTypeInfo>
|
||||
|
|
@ -173,7 +173,7 @@
|
|||
<TargetEnvironment>X64</TargetEnvironment>
|
||||
</Midl>
|
||||
<ClCompile>
|
||||
<AdditionalIncludeDirectories>..\..\..\src;..\..\..\..\SimGear;..\..\..\..\install\msvc100-64\OpenSceneGraph\include;..\..\..\..\3rdParty.x64\include;..\..\..\..\boost_1_43_0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<AdditionalIncludeDirectories>..\..\..\src;..\..\..\..\SimGear;..\..\..\..\install\msvc100-64\OpenSceneGraph\include;..\..\..\..\3rdParty.x64\include;..\..\..\..\boost_1_44_0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;NOMINMAX;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
|
||||
<RuntimeTypeInfo>true</RuntimeTypeInfo>
|
||||
|
|
|
|||
|
|
@ -89,7 +89,7 @@
|
|||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<ClCompile>
|
||||
<Optimization>Disabled</Optimization>
|
||||
<AdditionalIncludeDirectories>..\..\..\..\SimGear;..\..\..\..\install\msvc100\OpenSceneGraph\include;..\..\..\..\boost_1_43_0;..\..\..\..\3rdParty\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<AdditionalIncludeDirectories>..\..\..\..\SimGear;..\..\..\..\install\msvc100\OpenSceneGraph\include;..\..\..\..\boost_1_44_0;..\..\..\..\3rdParty\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<MinimalRebuild>true</MinimalRebuild>
|
||||
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
|
||||
|
|
@ -102,7 +102,7 @@
|
|||
</ClCompile>
|
||||
<Link>
|
||||
<AdditionalDependencies>opengl32.lib;osgd.lib;osgDBd.lib;osgViewerd.lib;osgGAd.lib;openthreadsd.lib;osgParticled.lib;osgUtild.lib;osgTextd.lib;ul_d.lib;sg_d.lib;zlibd.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<AdditionalLibraryDirectories>..\..\..\..\install\msvc100\OpenSceneGraph\lib;..\..\..\..\3rdParty\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
||||
<AdditionalLibraryDirectories>..\..\..\..\install\msvc100\OpenSceneGraph\lib;..\..\..\..\3rdParty\lib;..\..\..\..\boost_1_44_0\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
<ProgramDatabaseFile>$(OutDir)fgviewer.pdb</ProgramDatabaseFile>
|
||||
<SubSystem>Console</SubSystem>
|
||||
|
|
@ -119,7 +119,7 @@
|
|||
</Midl>
|
||||
<ClCompile>
|
||||
<Optimization>Disabled</Optimization>
|
||||
<AdditionalIncludeDirectories>..\..\..\..\SimGear;..\..\..\..\install\msvc100-64\OpenSceneGraph\include;..\..\..\..\boost_1_43_0;..\..\..\..\3rdParty.x64\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<AdditionalIncludeDirectories>..\..\..\..\SimGear;..\..\..\..\install\msvc100-64\OpenSceneGraph\include;..\..\..\..\boost_1_44_0;..\..\..\..\3rdParty.x64\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<MinimalRebuild>true</MinimalRebuild>
|
||||
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
|
||||
|
|
@ -132,7 +132,7 @@
|
|||
</ClCompile>
|
||||
<Link>
|
||||
<AdditionalDependencies>opengl32.lib;osgd.lib;osgDBd.lib;osgViewerd.lib;osgGAd.lib;openthreadsd.lib;osgParticled.lib;osgUtild.lib;osgTextd.lib;ul_d.lib;sg_d.lib;zlibd.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<AdditionalLibraryDirectories>..\..\..\..\install\msvc100-64\OpenSceneGraph\lib;..\..\..\..\3rdParty.x64\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
||||
<AdditionalLibraryDirectories>..\..\..\..\install\msvc100-64\OpenSceneGraph\lib;..\..\..\..\3rdParty.x64\lib;..\..\..\..\boost_1_44_0\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
<ProgramDatabaseFile>$(OutDir)fgviewer.pdb</ProgramDatabaseFile>
|
||||
<SubSystem>Console</SubSystem>
|
||||
|
|
@ -145,7 +145,7 @@
|
|||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||
<ClCompile>
|
||||
<AdditionalIncludeDirectories>..\..\..\..\SimGear;..\..\..\..\install\msvc100\OpenSceneGraph\include;..\..\..\..\boost_1_43_0;..\..\..\..\3rdParty\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<AdditionalIncludeDirectories>..\..\..\..\SimGear;..\..\..\..\install\msvc100\OpenSceneGraph\include;..\..\..\..\boost_1_44_0;..\..\..\..\3rdParty\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
|
||||
<RuntimeTypeInfo>true</RuntimeTypeInfo>
|
||||
|
|
@ -157,7 +157,7 @@
|
|||
</ClCompile>
|
||||
<Link>
|
||||
<AdditionalDependencies>opengl32.lib;osg.lib;osgDB.lib;osgViewer.lib;osgGA.lib;openthreads.lib;osgParticle.lib;osgUtil.lib;osgText.lib;ul.lib;sg.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<AdditionalLibraryDirectories>..\..\..\..\install\msvc100\OpenSceneGraph\lib;..\..\..\..\3rdParty\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
||||
<AdditionalLibraryDirectories>..\..\..\..\install\msvc100\OpenSceneGraph\lib;..\..\..\..\3rdParty\lib;..\..\..\..\boost_1_44_0\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
<SubSystem>Console</SubSystem>
|
||||
<OptimizeReferences>true</OptimizeReferences>
|
||||
|
|
@ -174,7 +174,7 @@
|
|||
<TargetEnvironment>X64</TargetEnvironment>
|
||||
</Midl>
|
||||
<ClCompile>
|
||||
<AdditionalIncludeDirectories>..\..\..\..\SimGear;..\..\..\..\install\msvc100-64\OpenSceneGraph\include;..\..\..\..\boost_1_43_0;..\..\..\..\3rdParty.x64\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<AdditionalIncludeDirectories>..\..\..\..\SimGear;..\..\..\..\install\msvc100-64\OpenSceneGraph\include;..\..\..\..\boost_1_44_0;..\..\..\..\3rdParty.x64\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
|
||||
<RuntimeTypeInfo>true</RuntimeTypeInfo>
|
||||
|
|
@ -185,7 +185,7 @@
|
|||
</ClCompile>
|
||||
<Link>
|
||||
<AdditionalDependencies>opengl32.lib;osg.lib;osgDB.lib;osgViewer.lib;osgGA.lib;openthreads.lib;osgParticle.lib;osgUtil.lib;osgText.lib;ul.lib;sg.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<AdditionalLibraryDirectories>..\..\..\..\install\msvc100-64\OpenSceneGraph\lib;..\..\..\..\3rdParty.x64\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
||||
<AdditionalLibraryDirectories>..\..\..\..\install\msvc100-64\OpenSceneGraph\lib;..\..\..\..\3rdParty.x64\lib;..\..\..\..\boost_1_44_0\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
<SubSystem>Console</SubSystem>
|
||||
<OptimizeReferences>true</OptimizeReferences>
|
||||
|
|
|
|||
|
|
@ -89,7 +89,7 @@
|
|||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<ClCompile>
|
||||
<Optimization>Disabled</Optimization>
|
||||
<AdditionalIncludeDirectories>..\..\..\src;..\..\..\..\SimGear;..\..\..\..\install\msvc100\OpenSceneGraph\include;..\..\..\..\3rdParty\include;..\..\..\..\boost_1_43_0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<AdditionalIncludeDirectories>..\..\..\src;..\..\..\..\SimGear;..\..\..\..\install\msvc100\OpenSceneGraph\include;..\..\..\..\3rdParty\include;..\..\..\..\boost_1_44_0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;NOMINMAX;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<MinimalRebuild>true</MinimalRebuild>
|
||||
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
|
||||
|
|
@ -118,7 +118,7 @@
|
|||
</Midl>
|
||||
<ClCompile>
|
||||
<Optimization>Disabled</Optimization>
|
||||
<AdditionalIncludeDirectories>..\..\..\src;..\..\..\..\SimGear;..\..\..\..\install\msvc100-64\OpenSceneGraph\include;..\..\..\..\3rdParty.x64\include;..\..\..\..\boost_1_43_0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<AdditionalIncludeDirectories>..\..\..\src;..\..\..\..\SimGear;..\..\..\..\install\msvc100-64\OpenSceneGraph\include;..\..\..\..\3rdParty.x64\include;..\..\..\..\boost_1_44_0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;NOMINMAX;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<MinimalRebuild>true</MinimalRebuild>
|
||||
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
|
||||
|
|
@ -143,7 +143,7 @@
|
|||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||
<ClCompile>
|
||||
<AdditionalIncludeDirectories>..\..\..\src;..\..\..\..\SimGear;..\..\..\..\install\msvc100\OpenSceneGraph\include;..\..\..\..\3rdParty\include;..\..\..\..\boost_1_43_0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<AdditionalIncludeDirectories>..\..\..\src;..\..\..\..\SimGear;..\..\..\..\install\msvc100\OpenSceneGraph\include;..\..\..\..\3rdParty\include;..\..\..\..\boost_1_44_0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;NOMINMAX;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
|
||||
<RuntimeTypeInfo>true</RuntimeTypeInfo>
|
||||
|
|
@ -171,7 +171,7 @@
|
|||
<TargetEnvironment>X64</TargetEnvironment>
|
||||
</Midl>
|
||||
<ClCompile>
|
||||
<AdditionalIncludeDirectories>..\..\..\src;..\..\..\..\SimGear;..\..\..\..\install\msvc100-64\OpenSceneGraph\include;..\..\..\..\3rdParty.x64\include;..\..\..\..\boost_1_43_0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<AdditionalIncludeDirectories>..\..\..\src;..\..\..\..\SimGear;..\..\..\..\install\msvc100-64\OpenSceneGraph\include;..\..\..\..\3rdParty.x64\include;..\..\..\..\boost_1_44_0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;NOMINMAX;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
|
||||
<RuntimeTypeInfo>true</RuntimeTypeInfo>
|
||||
|
|
|
|||
|
|
@ -1,5 +0,0 @@
|
|||
FlightGear.ncb
|
||||
FlightGear.suo
|
||||
Win32
|
||||
x64
|
||||
publish
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
*.user
|
||||
x64
|
||||
Win32
|
||||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -1,3 +0,0 @@
|
|||
*.user
|
||||
x64
|
||||
Win32
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
*.user
|
||||
x64
|
||||
Win32
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
*.user
|
||||
x64
|
||||
Win32
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
*.user
|
||||
Win32
|
||||
x64
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
*.user
|
||||
x64
|
||||
Win32
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
*.user
|
||||
x64
|
||||
Win32
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
*.user
|
||||
x64
|
||||
Win32
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
*.user
|
||||
x64
|
||||
Win32
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
*.user
|
||||
x64
|
||||
Win32
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
*.user
|
||||
x64
|
||||
Win32
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
Makefile
|
||||
Makefile.in
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
Makefile
|
||||
Makefile.in
|
||||
core*
|
||||
fgfs.supp
|
||||
.gdbinit
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
Makefile
|
||||
Makefile.in
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
Makefile
|
||||
Makefile.in
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
Makefile
|
||||
Makefile.in
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
Makefile
|
||||
Makefile.in
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
Makefile
|
||||
Makefile.in
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
Makefile
|
||||
Makefile.in
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
Makefile
|
||||
Makefile.in
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
Makefile
|
||||
Makefile.in
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
Makefile
|
||||
Makefile.in
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
Makefile
|
||||
Makefile.in
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
Makefile
|
||||
Makefile.in
|
||||
25
scripts/tools/version.bat
Normal file
25
scripts/tools/version.bat
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
|
||||
REM
|
||||
|
||||
ECHO OFF
|
||||
|
||||
SET /P FLIGHTGEAR_VERSION=<version
|
||||
|
||||
SET HUDSON_BUILD_NUMBER=0
|
||||
SET HUDSON_BUILD_ID=none
|
||||
SET REVISION=none
|
||||
|
||||
IF DEFINED BUILD_ID SET HUDSON_BUILD_ID=%BUILD_ID%
|
||||
IF DEFINED BUILD_NUMBER SET HUDSON_BUILD_NUMBER=%BUILD_NUMBER%
|
||||
|
||||
SET Header=src\Include\version.h
|
||||
|
||||
ECHO // version.h generated by version.bat on %DATE% > %Header%
|
||||
|
||||
ECHO #define FLIGHTGEAR_VERSION "%FLIGHTGEAR_VERSION%" >> %Header%
|
||||
ECHO #define HUDSON_BUILD_ID "%HUDSON_BUILD_ID%" >> %Header%
|
||||
ECHO #define HUDSON_BUILD_NUMBER %HUDSON_BUILD_NUMBER% >> %Header%
|
||||
ECHO #define REVISION "%REVISION%" >> %Header%
|
||||
|
||||
|
||||
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
Makefile
|
||||
Makefile.in
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
.deps
|
||||
Makefile
|
||||
Makefile.in
|
||||
|
|
@ -420,14 +420,12 @@ void FGAIAircraft::getGroundElev(double dt) {
|
|||
}
|
||||
|
||||
double range = 500.0;
|
||||
if (!globals->get_tile_mgr()->scenery_available(pos, range)) {
|
||||
// Try to shedule tiles for that position.
|
||||
globals->get_tile_mgr()->schedule_tiles_at( pos, range );
|
||||
if (globals->get_tile_mgr()->schedule_scenery(pos, range, 5.0))
|
||||
{
|
||||
double alt;
|
||||
if (getGroundElevationM(SGGeod::fromGeodM(pos, 20000), alt, 0))
|
||||
tgt_altitude_ft = alt * SG_METER_TO_FEET;
|
||||
}
|
||||
|
||||
double alt;
|
||||
if (getGroundElevationM(SGGeod::fromGeodM(pos, 20000), alt, 0))
|
||||
tgt_altitude_ft = alt * SG_METER_TO_FEET;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -193,6 +193,7 @@ protected:
|
|||
bool invisible;
|
||||
bool no_roll;
|
||||
bool serviceable;
|
||||
bool _installed;
|
||||
int _subID;
|
||||
|
||||
double life;
|
||||
|
|
|
|||
|
|
@ -35,7 +35,6 @@
|
|||
#include <Main/viewer.hxx>
|
||||
|
||||
#include <Scenery/scenery.hxx>
|
||||
#include <Scenery/tilemgr.hxx>
|
||||
|
||||
#include "AIEscort.hxx"
|
||||
|
||||
|
|
|
|||
|
|
@ -26,7 +26,6 @@
|
|||
|
||||
#include <Main/viewer.hxx>
|
||||
#include <Scenery/scenery.hxx>
|
||||
#include <Scenery/tilemgr.hxx>
|
||||
#include <Airports/dynamics.hxx>
|
||||
|
||||
#include "AIGroundVehicle.hxx"
|
||||
|
|
|
|||
|
|
@ -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() {
|
||||
|
|
|
|||
|
|
@ -1,3 +0,0 @@
|
|||
.deps
|
||||
Makefile.in
|
||||
Makefile
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
Makefile
|
||||
Makefile.in
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
.deps
|
||||
Makefile
|
||||
Makefile.in
|
||||
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -1,6 +0,0 @@
|
|||
.deps
|
||||
Makefile
|
||||
Makefile.in
|
||||
calc_loc
|
||||
genrunways
|
||||
gensimple
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
.deps
|
||||
Makefile
|
||||
Makefile.in
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
.deps
|
||||
Makefile
|
||||
Makefile.in
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
.deps
|
||||
Makefile
|
||||
Makefile.in
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
.deps
|
||||
Makefile
|
||||
Makefile.in
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
.deps
|
||||
Makefile
|
||||
Makefile.in
|
||||
engine
|
||||
pstest
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
.deps
|
||||
Makefile
|
||||
Makefile.in
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
.deps
|
||||
Makefile
|
||||
Makefile.in
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
.deps
|
||||
Makefile
|
||||
Makefile.in
|
||||
config.h
|
||||
testJSBsim
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
.deps
|
||||
Makefile
|
||||
Makefile.in
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
.deps
|
||||
Makefile
|
||||
Makefile.in
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
.deps
|
||||
Makefile
|
||||
Makefile.in
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
.deps
|
||||
Makefile
|
||||
Makefile.in
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
.deps
|
||||
Makefile
|
||||
Makefile.in
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
.deps
|
||||
Makefile
|
||||
Makefile.in
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
.deps
|
||||
Makefile
|
||||
Makefile.in
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
.deps
|
||||
Makefile
|
||||
Makefile.in
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
.deps
|
||||
Makefile
|
||||
Makefile.in
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
.deps
|
||||
Makefile
|
||||
Makefile.in
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
.deps
|
||||
Makefile
|
||||
Makefile.in
|
||||
proptest
|
||||
yasim
|
||||
|
|
@ -113,7 +113,7 @@ void FDMShell::update(double dt)
|
|||
double lon = fgGetDouble("/sim/presets/longitude-deg");
|
||||
double lat = fgGetDouble("/sim/presets/latitude-deg");
|
||||
|
||||
double range = 1000.0; // in metres
|
||||
double range = 100.0; // in meters
|
||||
SGGeod geod = SGGeod::fromDeg(lon, lat);
|
||||
if (globals->get_scenery()->scenery_available(geod, range)) {
|
||||
SG_LOG(SG_FLIGHT, SG_INFO, "Scenery loaded, will init FDM");
|
||||
|
|
|
|||
|
|
@ -328,7 +328,7 @@ FGGroundCache::prepare_ground_cache(double startSimTime, double endSimTime,
|
|||
SGGeod geodPt = SGGeod::fromCart(pt);
|
||||
// Don't blow away the cache ground_radius and stuff if there's no
|
||||
// scenery
|
||||
if (!globals->get_tile_mgr()->scenery_available(geodPt, rad)) {
|
||||
if (!globals->get_tile_mgr()->schedule_scenery(geodPt, rad, 1.0)) {
|
||||
SG_LOG(SG_FLIGHT, SG_WARN, "prepare_ground_cache(): scenery_available "
|
||||
"returns false at " << geodPt << " " << pt << " " << rad);
|
||||
return false;
|
||||
|
|
|
|||
|
|
@ -1,4 +0,0 @@
|
|||
.deps
|
||||
Makefile
|
||||
Makefile.in
|
||||
layout-test
|
||||
|
|
@ -49,6 +49,7 @@ extern void guiErrorMessage(const char *txt, const sg_throwable &throwable);
|
|||
extern bool fgDumpSnapShot();
|
||||
extern void fgDumpSceneGraph();
|
||||
extern void fgDumpTerrainBranch();
|
||||
extern void fgPrintVisibleSceneInfoCommand();
|
||||
|
||||
extern puFont guiFnt;
|
||||
extern fntTexFont *guiFntHandle;
|
||||
|
|
|
|||
|
|
@ -555,5 +555,22 @@ void fgDumpTerrainBranch()
|
|||
}
|
||||
}
|
||||
|
||||
void fgPrintVisibleSceneInfoCommand()
|
||||
{
|
||||
static const SGPropertyNode *master_freeze
|
||||
= fgGetNode("/sim/freeze/master");
|
||||
|
||||
bool freeze = master_freeze->getBoolValue();
|
||||
if ( !freeze ) {
|
||||
fgSetBool("/sim/freeze/master", true);
|
||||
}
|
||||
|
||||
flightgear::printVisibleSceneInfo(globals->get_renderer());
|
||||
|
||||
if ( !freeze ) {
|
||||
fgSetBool("/sim/freeze/master", false);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -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
16
src/Include/no_version.h
Normal 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
|
||||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -1,5 +0,0 @@
|
|||
.deps
|
||||
Makefile
|
||||
Makefile.in
|
||||
fgjs
|
||||
js_demo
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
.deps
|
||||
Makefile
|
||||
Makefile.in
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
.deps
|
||||
Makefile
|
||||
Makefile.in
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
.deps
|
||||
Makefile
|
||||
Makefile.in
|
||||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -1,7 +0,0 @@
|
|||
.deps
|
||||
Makefile
|
||||
Makefile.in
|
||||
fgfs
|
||||
metar
|
||||
runfgfs
|
||||
runfgfs.bat
|
||||
|
|
@ -477,9 +477,15 @@ void CameraGroup::setCameraCullMasks(Node::NodeMask nm)
|
|||
continue;
|
||||
if (info->farCamera.valid() && info->farCamera->getNodeMask() != 0) {
|
||||
info->camera->setCullMask(nm & ~simgear::BACKGROUND_BIT);
|
||||
info->camera->setCullMaskLeft(nm & ~simgear::BACKGROUND_BIT);
|
||||
info->camera->setCullMaskRight(nm & ~simgear::BACKGROUND_BIT);
|
||||
info->farCamera->setCullMask(nm);
|
||||
info->farCamera->setCullMaskLeft(nm);
|
||||
info->farCamera->setCullMaskRight(nm);
|
||||
} else {
|
||||
info->camera->setCullMask(nm);
|
||||
info->camera->setCullMaskLeft(nm);
|
||||
info->camera->setCullMaskRight(nm);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -31,7 +31,6 @@
|
|||
#include <GUI/new_gui.hxx>
|
||||
#include <GUI/dialog.hxx>
|
||||
#include <Aircraft/replay.hxx>
|
||||
#include <Scenery/tilemgr.hxx>
|
||||
#include <Scenery/scenery.hxx>
|
||||
#include <Scripting/NasalSys.hxx>
|
||||
#include <Sound/sample_queue.hxx>
|
||||
|
|
@ -518,6 +517,13 @@ do_dump_terrain_branch (const SGPropertyNode*)
|
|||
return true;
|
||||
}
|
||||
|
||||
static bool
|
||||
do_print_visible_scene_info(const SGPropertyNode*)
|
||||
{
|
||||
fgPrintVisibleSceneInfoCommand();
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Built-in command: hires capture screen.
|
||||
*/
|
||||
|
|
@ -1488,6 +1494,7 @@ static struct {
|
|||
{ "release-cockpit-button", do_release_cockpit_button },
|
||||
{ "dump-scenegraph", do_dump_scene_graph },
|
||||
{ "dump-terrainbranch", do_dump_terrain_branch },
|
||||
{ "print-visible-scene", do_print_visible_scene_info },
|
||||
{ "reload-shaders", do_reload_shaders },
|
||||
{ 0, 0 } // zero-terminated
|
||||
};
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
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;
|
||||
}
|
||||
}
|
||||
|
||||
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
|
||||
|
|
|
|||
|
|
@ -46,9 +46,10 @@
|
|||
#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>
|
||||
#include <simgear/misc/sg_sleep.hxx>
|
||||
|
||||
#include <Time/light.hxx>
|
||||
#include <Aircraft/replay.hxx>
|
||||
|
|
@ -187,16 +188,24 @@ static void fgMainLoop( void ) {
|
|||
}
|
||||
#endif
|
||||
|
||||
// END Tile Manager udpates
|
||||
// END Tile Manager updates
|
||||
bool scenery_loaded = fgGetBool("sim/sceneryloaded");
|
||||
if (!scenery_loaded && globals->get_tile_mgr()->isSceneryLoaded()
|
||||
&& fgGetBool("sim/fdm-initialized")) {
|
||||
fgSetBool("sim/sceneryloaded",true);
|
||||
if (fgGetBool("/sim/sound/working")) {
|
||||
globals->get_soundmgr()->activate();
|
||||
if (!scenery_loaded)
|
||||
{
|
||||
if (globals->get_tile_mgr()->isSceneryLoaded()
|
||||
&& fgGetBool("sim/fdm-initialized")) {
|
||||
fgSetBool("sim/sceneryloaded",true);
|
||||
if (fgGetBool("/sim/sound/working")) {
|
||||
globals->get_soundmgr()->activate();
|
||||
}
|
||||
globals->get_props()->tie("/sim/sound/devices/name",
|
||||
SGRawValueFunctions<const char *>(0, fgSetNewSoundDevice), false);
|
||||
}
|
||||
else
|
||||
{
|
||||
// be nice to loader threads while waiting for initial scenery, reduce to 2fps
|
||||
simgear::sleepForMSec(500);
|
||||
}
|
||||
globals->get_props()->tie("/sim/sound/devices/name",
|
||||
SGRawValueFunctions<const char *>(0, fgSetNewSoundDevice), false);
|
||||
}
|
||||
simgear::AtomicChangeListener::fireChangeListeners();
|
||||
|
||||
|
|
@ -469,8 +478,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;
|
||||
|
|
|
|||
|
|
@ -56,7 +56,9 @@
|
|||
#include "util.hxx"
|
||||
#include "viewmgr.hxx"
|
||||
#include <Main/viewer.hxx>
|
||||
|
||||
#include <simgear/version.h>
|
||||
#include <osg/Version>
|
||||
|
||||
using std::string;
|
||||
using std::sort;
|
||||
|
|
@ -64,8 +66,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 +237,13 @@ 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", SG_STRINGIZE(SIMGEAR_VERSION));
|
||||
fgSetString("/sim/version/openscenegraph", osgGetVersion());
|
||||
fgSetString("/sim/version/revision", REVISION);
|
||||
fgSetInt("/sim/version/build-number", HUDSON_BUILD_NUMBER);
|
||||
fgSetString("/sim/version/build-id", HUDSON_BUILD_ID);
|
||||
}
|
||||
|
||||
static bool
|
||||
|
|
@ -985,6 +996,7 @@ fgOptVisibilityMeters( const char *arg )
|
|||
{
|
||||
double visibility = atof( arg );
|
||||
fgDefaultWeatherValue("visibility-m", visibility);
|
||||
fgSetDouble("/environment/visibility-m", visibility);
|
||||
return FG_OPTIONS_OK;
|
||||
}
|
||||
|
||||
|
|
@ -993,6 +1005,7 @@ fgOptVisibilityMiles( const char *arg )
|
|||
{
|
||||
double visibility = atof( arg ) * 5280.0 * SG_FEET_TO_METER;
|
||||
fgDefaultWeatherValue("visibility-m", visibility);
|
||||
fgSetDouble("/environment/visibility-m", visibility);
|
||||
return FG_OPTIONS_OK;
|
||||
}
|
||||
|
||||
|
|
@ -1208,7 +1221,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=";
|
||||
|
|
|
|||
|
|
@ -29,11 +29,18 @@
|
|||
|
||||
#include <simgear/compiler.h>
|
||||
|
||||
#include <algorithm>
|
||||
#include <iostream>
|
||||
#include <map>
|
||||
#include <vector>
|
||||
#include <typeinfo>
|
||||
|
||||
#include <osg/ref_ptr>
|
||||
#include <osg/AlphaFunc>
|
||||
#include <osg/BlendFunc>
|
||||
#include <osg/Camera>
|
||||
#include <osg/CullFace>
|
||||
#include <osg/CullStack>
|
||||
#include <osg/Depth>
|
||||
#include <osg/Fog>
|
||||
#include <osg/Group>
|
||||
|
|
@ -85,7 +92,6 @@
|
|||
#include <Model/acmodel.hxx>
|
||||
#include <Scenery/scenery.hxx>
|
||||
#include <Scenery/redout.hxx>
|
||||
#include <Scenery/tilemgr.hxx>
|
||||
#include <GUI/new_gui.hxx>
|
||||
#include <Instrumentation/HUD/HUD.hxx>
|
||||
#include <Environment/precipitation_mgr.hxx>
|
||||
|
|
@ -823,5 +829,207 @@ fgDumpNodeToFile(osg::Node* node, const char* filename)
|
|||
{
|
||||
return osgDB::writeNodeFile(*node, filename);
|
||||
}
|
||||
|
||||
namespace flightgear
|
||||
{
|
||||
using namespace osg;
|
||||
|
||||
class VisibleSceneInfoVistor : public NodeVisitor, CullStack
|
||||
{
|
||||
public:
|
||||
VisibleSceneInfoVistor()
|
||||
: NodeVisitor(CULL_VISITOR, TRAVERSE_ACTIVE_CHILDREN)
|
||||
{
|
||||
setCullingMode(CullSettings::SMALL_FEATURE_CULLING
|
||||
| CullSettings::VIEW_FRUSTUM_CULLING);
|
||||
setComputeNearFarMode(CullSettings::DO_NOT_COMPUTE_NEAR_FAR);
|
||||
}
|
||||
|
||||
VisibleSceneInfoVistor(const VisibleSceneInfoVistor& rhs)
|
||||
{
|
||||
}
|
||||
|
||||
META_NodeVisitor("flightgear","VisibleSceneInfoVistor")
|
||||
|
||||
typedef std::map<const std::string,int> InfoMap;
|
||||
|
||||
void getNodeInfo(Node* node)
|
||||
{
|
||||
const char* typeName = typeid(*node).name();
|
||||
classInfo[typeName]++;
|
||||
const std::string& nodeName = node->getName();
|
||||
if (!nodeName.empty())
|
||||
nodeInfo[nodeName]++;
|
||||
}
|
||||
|
||||
void dumpInfo()
|
||||
{
|
||||
using namespace std;
|
||||
typedef vector<InfoMap::iterator> FreqVector;
|
||||
cout << "class info:\n";
|
||||
FreqVector classes;
|
||||
for (InfoMap::iterator itr = classInfo.begin(), end = classInfo.end();
|
||||
itr != end;
|
||||
++itr)
|
||||
classes.push_back(itr);
|
||||
sort(classes.begin(), classes.end(), freqComp);
|
||||
for (FreqVector::iterator itr = classes.begin(), end = classes.end();
|
||||
itr != end;
|
||||
++itr) {
|
||||
cout << (*itr)->first << " " << (*itr)->second << "\n";
|
||||
}
|
||||
cout << "\nnode info:\n";
|
||||
FreqVector nodes;
|
||||
for (InfoMap::iterator itr = nodeInfo.begin(), end = nodeInfo.end();
|
||||
itr != end;
|
||||
++itr)
|
||||
nodes.push_back(itr);
|
||||
|
||||
sort (nodes.begin(), nodes.end(), freqComp);
|
||||
for (FreqVector::iterator itr = nodes.begin(), end = nodes.end();
|
||||
itr != end;
|
||||
++itr) {
|
||||
cout << (*itr)->first << " " << (*itr)->second << "\n";
|
||||
}
|
||||
cout << endl;
|
||||
}
|
||||
|
||||
void doTraversal(Camera* camera, Node* root, Viewport* viewport)
|
||||
{
|
||||
ref_ptr<RefMatrix> projection
|
||||
= createOrReuseMatrix(camera->getProjectionMatrix());
|
||||
ref_ptr<RefMatrix> mv = createOrReuseMatrix(camera->getViewMatrix());
|
||||
if (!viewport)
|
||||
viewport = camera->getViewport();
|
||||
if (viewport)
|
||||
pushViewport(viewport);
|
||||
pushProjectionMatrix(projection.get());
|
||||
pushModelViewMatrix(mv.get(), Transform::ABSOLUTE_RF);
|
||||
root->accept(*this);
|
||||
popModelViewMatrix();
|
||||
popProjectionMatrix();
|
||||
if (viewport)
|
||||
popViewport();
|
||||
dumpInfo();
|
||||
}
|
||||
|
||||
void apply(Node& node)
|
||||
{
|
||||
if (isCulled(node))
|
||||
return;
|
||||
pushCurrentMask();
|
||||
getNodeInfo(&node);
|
||||
traverse(node);
|
||||
popCurrentMask();
|
||||
}
|
||||
void apply(Group& node)
|
||||
{
|
||||
if (isCulled(node))
|
||||
return;
|
||||
pushCurrentMask();
|
||||
getNodeInfo(&node);
|
||||
traverse(node);
|
||||
popCurrentMask();
|
||||
}
|
||||
|
||||
void apply(Transform& node)
|
||||
{
|
||||
if (isCulled(node))
|
||||
return;
|
||||
pushCurrentMask();
|
||||
ref_ptr<RefMatrix> matrix = createOrReuseMatrix(*getModelViewMatrix());
|
||||
node.computeLocalToWorldMatrix(*matrix,this);
|
||||
pushModelViewMatrix(matrix.get(), node.getReferenceFrame());
|
||||
getNodeInfo(&node);
|
||||
traverse(node);
|
||||
popModelViewMatrix();
|
||||
popCurrentMask();
|
||||
}
|
||||
|
||||
void apply(Camera& camera)
|
||||
{
|
||||
// Save current cull settings
|
||||
CullSettings saved_cull_settings(*this);
|
||||
|
||||
// set cull settings from this Camera
|
||||
setCullSettings(camera);
|
||||
// inherit the settings from above
|
||||
inheritCullSettings(saved_cull_settings, camera.getInheritanceMask());
|
||||
|
||||
// set the cull mask.
|
||||
unsigned int savedTraversalMask = getTraversalMask();
|
||||
bool mustSetCullMask = (camera.getInheritanceMask()
|
||||
& osg::CullSettings::CULL_MASK) == 0;
|
||||
if (mustSetCullMask)
|
||||
setTraversalMask(camera.getCullMask());
|
||||
|
||||
osg::RefMatrix* projection = 0;
|
||||
osg::RefMatrix* modelview = 0;
|
||||
|
||||
if (camera.getReferenceFrame()==osg::Transform::RELATIVE_RF) {
|
||||
if (camera.getTransformOrder()==osg::Camera::POST_MULTIPLY) {
|
||||
projection = createOrReuseMatrix(*getProjectionMatrix()
|
||||
*camera.getProjectionMatrix());
|
||||
modelview = createOrReuseMatrix(*getModelViewMatrix()
|
||||
* camera.getViewMatrix());
|
||||
}
|
||||
else { // pre multiply
|
||||
projection = createOrReuseMatrix(camera.getProjectionMatrix()
|
||||
* (*getProjectionMatrix()));
|
||||
modelview = createOrReuseMatrix(camera.getViewMatrix()
|
||||
* (*getModelViewMatrix()));
|
||||
}
|
||||
} else {
|
||||
// an absolute reference frame
|
||||
projection = createOrReuseMatrix(camera.getProjectionMatrix());
|
||||
modelview = createOrReuseMatrix(camera.getViewMatrix());
|
||||
}
|
||||
if (camera.getViewport())
|
||||
pushViewport(camera.getViewport());
|
||||
|
||||
pushProjectionMatrix(projection);
|
||||
pushModelViewMatrix(modelview, camera.getReferenceFrame());
|
||||
|
||||
traverse(camera);
|
||||
|
||||
// restore the previous model view matrix.
|
||||
popModelViewMatrix();
|
||||
|
||||
// restore the previous model view matrix.
|
||||
popProjectionMatrix();
|
||||
|
||||
if (camera.getViewport()) popViewport();
|
||||
|
||||
// restore the previous traversal mask settings
|
||||
if (mustSetCullMask)
|
||||
setTraversalMask(savedTraversalMask);
|
||||
|
||||
// restore the previous cull settings
|
||||
setCullSettings(saved_cull_settings);
|
||||
}
|
||||
|
||||
protected:
|
||||
// sort in reverse
|
||||
static bool freqComp(const InfoMap::iterator& lhs, const InfoMap::iterator& rhs)
|
||||
{
|
||||
return lhs->second > rhs->second;
|
||||
}
|
||||
InfoMap classInfo;
|
||||
InfoMap nodeInfo;
|
||||
};
|
||||
|
||||
bool printVisibleSceneInfo(FGRenderer* renderer)
|
||||
{
|
||||
osgViewer::Viewer* viewer = renderer->getViewer();
|
||||
VisibleSceneInfoVistor vsv;
|
||||
Viewport* vp = 0;
|
||||
if (!viewer->getCamera()->getViewport() && viewer->getNumSlaves() > 0) {
|
||||
const View::Slave& slave = viewer->getSlave(0);
|
||||
vp = slave._camera->getViewport();
|
||||
}
|
||||
vsv.doTraversal(viewer->getCamera(), viewer->getSceneData(), vp);
|
||||
return true;
|
||||
}
|
||||
}
|
||||
// end of renderer.cxx
|
||||
|
||||
|
|
|
|||
|
|
@ -81,4 +81,9 @@ protected:
|
|||
bool fgDumpSceneGraphToFile(const char* filename);
|
||||
bool fgDumpTerrainBranchToFile(const char* filename);
|
||||
|
||||
namespace flightgear
|
||||
{
|
||||
bool printVisibleSceneInfo(FGRenderer* renderer);
|
||||
}
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -1,3 +0,0 @@
|
|||
.deps
|
||||
Makefile
|
||||
Makefile.in
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
.deps
|
||||
Makefile.in
|
||||
Makefile
|
||||
|
|
@ -536,127 +536,144 @@ FGMultiplayMgr::SendMyPosition(const FGExternalMotionData& motionInfo)
|
|||
return;
|
||||
}
|
||||
|
||||
MsgBuf msgBuf;
|
||||
static MsgBuf msgBuf;
|
||||
static unsigned msgLen = 0;
|
||||
T_PositionMsg* PosMsg = msgBuf.posMsg();
|
||||
|
||||
strncpy(PosMsg->Model, fgGetString("/sim/model/path"), MAX_MODEL_NAME_LEN);
|
||||
PosMsg->Model[MAX_MODEL_NAME_LEN - 1] = '\0';
|
||||
|
||||
PosMsg->time = XDR_encode_double (motionInfo.time);
|
||||
PosMsg->lag = XDR_encode_double (motionInfo.lag);
|
||||
for (unsigned i = 0 ; i < 3; ++i)
|
||||
PosMsg->position[i] = XDR_encode_double (motionInfo.position(i));
|
||||
SGVec3f angleAxis;
|
||||
motionInfo.orientation.getAngleAxis(angleAxis);
|
||||
for (unsigned i = 0 ; i < 3; ++i)
|
||||
PosMsg->orientation[i] = XDR_encode_float (angleAxis(i));
|
||||
for (unsigned i = 0 ; i < 3; ++i)
|
||||
PosMsg->linearVel[i] = XDR_encode_float (motionInfo.linearVel(i));
|
||||
for (unsigned i = 0 ; i < 3; ++i)
|
||||
PosMsg->angularVel[i] = XDR_encode_float (motionInfo.angularVel(i));
|
||||
for (unsigned i = 0 ; i < 3; ++i)
|
||||
PosMsg->linearAccel[i] = XDR_encode_float (motionInfo.linearAccel(i));
|
||||
for (unsigned i = 0 ; i < 3; ++i)
|
||||
PosMsg->angularAccel[i] = XDR_encode_float (motionInfo.angularAccel(i));
|
||||
|
||||
xdr_data_t* ptr = msgBuf.properties();
|
||||
std::vector<FGPropertyData*>::const_iterator it;
|
||||
it = motionInfo.properties.begin();
|
||||
//cout << "OUTPUT PROPERTIES\n";
|
||||
xdr_data_t* msgEnd = msgBuf.propsEnd();
|
||||
while (it != motionInfo.properties.end() && ptr + 2 < msgEnd) {
|
||||
|
||||
// First element is the ID. Write it out when we know we have room for
|
||||
// the whole property.
|
||||
xdr_data_t id = XDR_encode_uint32((*it)->id);
|
||||
// The actual data representation depends on the type
|
||||
switch ((*it)->type) {
|
||||
case simgear::props::INT:
|
||||
case simgear::props::BOOL:
|
||||
case simgear::props::LONG:
|
||||
*ptr++ = id;
|
||||
*ptr++ = XDR_encode_uint32((*it)->int_value);
|
||||
//cout << "Prop:" << (*it)->id << " " << (*it)->type << " "<< (*it)->int_value << "\n";
|
||||
break;
|
||||
case simgear::props::FLOAT:
|
||||
case simgear::props::DOUBLE:
|
||||
*ptr++ = id;
|
||||
*ptr++ = XDR_encode_float((*it)->float_value);
|
||||
//cout << "Prop:" << (*it)->id << " " << (*it)->type << " "<< (*it)->float_value << "\n";
|
||||
break;
|
||||
case simgear::props::STRING:
|
||||
case simgear::props::UNSPECIFIED:
|
||||
{
|
||||
// String is complicated. It consists of
|
||||
// The length of the string
|
||||
// The string itself
|
||||
// Padding to the nearest 4-bytes.
|
||||
const char* lcharptr = (*it)->string_value;
|
||||
|
||||
if (lcharptr != 0)
|
||||
{
|
||||
// Add the length
|
||||
////cout << "String length: " << strlen(lcharptr) << "\n";
|
||||
uint32_t len = strlen(lcharptr);
|
||||
if (len > MAX_TEXT_SIZE)
|
||||
len = MAX_TEXT_SIZE;
|
||||
// XXX This should not be using 4 bytes per character!
|
||||
// If there's not enough room for this property, drop it
|
||||
// on the floor.
|
||||
if (ptr + 2 + ((len + 3) & ~3) > msgEnd)
|
||||
goto escape;
|
||||
//cout << "String length unint32: " << len << "\n";
|
||||
*ptr++ = id;
|
||||
*ptr++ = XDR_encode_uint32(len);
|
||||
if (len != 0)
|
||||
{
|
||||
// Now the text itself
|
||||
// XXX This should not be using 4 bytes per character!
|
||||
int lcount = 0;
|
||||
while ((*lcharptr != '\0') && (lcount < MAX_TEXT_SIZE))
|
||||
{
|
||||
*ptr++ = XDR_encode_int8(*lcharptr);
|
||||
lcharptr++;
|
||||
lcount++;
|
||||
}
|
||||
|
||||
//cout << "Prop:" << (*it)->id << " " << (*it)->type << " " << len << " " << (*it)->string_value;
|
||||
|
||||
// Now pad if required
|
||||
while ((lcount % 4) != 0)
|
||||
{
|
||||
*ptr++ = XDR_encode_int8(0);
|
||||
lcount++;
|
||||
//cout << "0";
|
||||
}
|
||||
|
||||
//cout << "\n";
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
// Nothing to encode
|
||||
*ptr++ = id;
|
||||
*ptr++ = XDR_encode_uint32(0);
|
||||
//cout << "Prop:" << (*it)->id << " " << (*it)->type << " 0\n";
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
||||
default:
|
||||
//cout << " Unknown Type: " << (*it)->type << "\n";
|
||||
*ptr++ = id;
|
||||
*ptr++ = XDR_encode_float((*it)->float_value);;
|
||||
//cout << "Prop:" << (*it)->id << " " << (*it)->type << " "<< (*it)->float_value << "\n";
|
||||
break;
|
||||
}
|
||||
|
||||
++it;
|
||||
if (fgGetBool("/sim/freeze/replay-state", true))
|
||||
{
|
||||
// do not send position updates during replay
|
||||
for (unsigned i = 0 ; i < 3; ++i)
|
||||
{
|
||||
// no movement during replay
|
||||
PosMsg->linearVel[i] = XDR_encode_float (0.0);
|
||||
PosMsg->angularVel[i] = XDR_encode_float (0.0);
|
||||
PosMsg->linearAccel[i] = XDR_encode_float (0.0);
|
||||
PosMsg->angularAccel[i] = XDR_encode_float (0.0);
|
||||
}
|
||||
// all other data remains unchanged (resend last state)
|
||||
}
|
||||
escape:
|
||||
unsigned msgLen = reinterpret_cast<char*>(ptr) - msgBuf.Msg;
|
||||
FillMsgHdr(msgBuf.msgHdr(), POS_DATA_ID, msgLen);
|
||||
mSocket->sendto(msgBuf.Msg, msgLen, 0, &mServer);
|
||||
else
|
||||
{
|
||||
PosMsg->time = XDR_encode_double (motionInfo.time);
|
||||
PosMsg->lag = XDR_encode_double (motionInfo.lag);
|
||||
for (unsigned i = 0 ; i < 3; ++i)
|
||||
PosMsg->position[i] = XDR_encode_double (motionInfo.position(i));
|
||||
SGVec3f angleAxis;
|
||||
motionInfo.orientation.getAngleAxis(angleAxis);
|
||||
for (unsigned i = 0 ; i < 3; ++i)
|
||||
PosMsg->orientation[i] = XDR_encode_float (angleAxis(i));
|
||||
for (unsigned i = 0 ; i < 3; ++i)
|
||||
PosMsg->linearVel[i] = XDR_encode_float (motionInfo.linearVel(i));
|
||||
for (unsigned i = 0 ; i < 3; ++i)
|
||||
PosMsg->angularVel[i] = XDR_encode_float (motionInfo.angularVel(i));
|
||||
for (unsigned i = 0 ; i < 3; ++i)
|
||||
PosMsg->linearAccel[i] = XDR_encode_float (motionInfo.linearAccel(i));
|
||||
for (unsigned i = 0 ; i < 3; ++i)
|
||||
PosMsg->angularAccel[i] = XDR_encode_float (motionInfo.angularAccel(i));
|
||||
|
||||
xdr_data_t* ptr = msgBuf.properties();
|
||||
std::vector<FGPropertyData*>::const_iterator it;
|
||||
it = motionInfo.properties.begin();
|
||||
//cout << "OUTPUT PROPERTIES\n";
|
||||
xdr_data_t* msgEnd = msgBuf.propsEnd();
|
||||
while (it != motionInfo.properties.end() && ptr + 2 < msgEnd) {
|
||||
|
||||
// First element is the ID. Write it out when we know we have room for
|
||||
// the whole property.
|
||||
xdr_data_t id = XDR_encode_uint32((*it)->id);
|
||||
// The actual data representation depends on the type
|
||||
switch ((*it)->type) {
|
||||
case simgear::props::INT:
|
||||
case simgear::props::BOOL:
|
||||
case simgear::props::LONG:
|
||||
*ptr++ = id;
|
||||
*ptr++ = XDR_encode_uint32((*it)->int_value);
|
||||
//cout << "Prop:" << (*it)->id << " " << (*it)->type << " "<< (*it)->int_value << "\n";
|
||||
break;
|
||||
case simgear::props::FLOAT:
|
||||
case simgear::props::DOUBLE:
|
||||
*ptr++ = id;
|
||||
*ptr++ = XDR_encode_float((*it)->float_value);
|
||||
//cout << "Prop:" << (*it)->id << " " << (*it)->type << " "<< (*it)->float_value << "\n";
|
||||
break;
|
||||
case simgear::props::STRING:
|
||||
case simgear::props::UNSPECIFIED:
|
||||
{
|
||||
// String is complicated. It consists of
|
||||
// The length of the string
|
||||
// The string itself
|
||||
// Padding to the nearest 4-bytes.
|
||||
const char* lcharptr = (*it)->string_value;
|
||||
|
||||
if (lcharptr != 0)
|
||||
{
|
||||
// Add the length
|
||||
////cout << "String length: " << strlen(lcharptr) << "\n";
|
||||
uint32_t len = strlen(lcharptr);
|
||||
if (len > MAX_TEXT_SIZE)
|
||||
len = MAX_TEXT_SIZE;
|
||||
// XXX This should not be using 4 bytes per character!
|
||||
// If there's not enough room for this property, drop it
|
||||
// on the floor.
|
||||
if (ptr + 2 + ((len + 3) & ~3) > msgEnd)
|
||||
goto escape;
|
||||
//cout << "String length unint32: " << len << "\n";
|
||||
*ptr++ = id;
|
||||
*ptr++ = XDR_encode_uint32(len);
|
||||
if (len != 0)
|
||||
{
|
||||
// Now the text itself
|
||||
// XXX This should not be using 4 bytes per character!
|
||||
int lcount = 0;
|
||||
while ((*lcharptr != '\0') && (lcount < MAX_TEXT_SIZE))
|
||||
{
|
||||
*ptr++ = XDR_encode_int8(*lcharptr);
|
||||
lcharptr++;
|
||||
lcount++;
|
||||
}
|
||||
|
||||
//cout << "Prop:" << (*it)->id << " " << (*it)->type << " " << len << " " << (*it)->string_value;
|
||||
|
||||
// Now pad if required
|
||||
while ((lcount % 4) != 0)
|
||||
{
|
||||
*ptr++ = XDR_encode_int8(0);
|
||||
lcount++;
|
||||
//cout << "0";
|
||||
}
|
||||
|
||||
//cout << "\n";
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
// Nothing to encode
|
||||
*ptr++ = id;
|
||||
*ptr++ = XDR_encode_uint32(0);
|
||||
//cout << "Prop:" << (*it)->id << " " << (*it)->type << " 0\n";
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
||||
default:
|
||||
//cout << " Unknown Type: " << (*it)->type << "\n";
|
||||
*ptr++ = id;
|
||||
*ptr++ = XDR_encode_float((*it)->float_value);;
|
||||
//cout << "Prop:" << (*it)->id << " " << (*it)->type << " "<< (*it)->float_value << "\n";
|
||||
break;
|
||||
}
|
||||
|
||||
++it;
|
||||
}
|
||||
escape:
|
||||
msgLen = reinterpret_cast<char*>(ptr) - msgBuf.Msg;
|
||||
FillMsgHdr(msgBuf.msgHdr(), POS_DATA_ID, msgLen);
|
||||
}
|
||||
if (msgLen>0)
|
||||
mSocket->sendto(msgBuf.Msg, msgLen, 0, &mServer);
|
||||
SG_LOG(SG_NETWORK, SG_DEBUG, "FGMultiplayMgr::SendMyPosition");
|
||||
} // FGMultiplayMgr::SendMyPosition()
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +0,0 @@
|
|||
.deps
|
||||
Makefile
|
||||
Makefile.in
|
||||
testnavs
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
.deps
|
||||
Makefile
|
||||
Makefile.in
|
||||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue