Merge branch 'jmt/ref_ptr-conv'

diff --git a/Makefile.am b/Makefile.am
index aac4221ef68f94f4fe973685fa4549a7a57f3379..f88767c37d7fb194a480d578987d04cc5ce909c0 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,6 @@ EXTRA_DIST = \
        acinclude.m4 \
        autogen.sh \
        DoxygenMain.cxx \
-       README.MSVC \
        README.zlib \
        README.plib \
        README.OpenAL \

diff --git a/README.MSVC b/README.MSVC
deleted file mode 100644 (file)
index 33a89c2..0000000
--- a/README.MSVC
+++ /dev/null
@@ -1,24 +0,0 @@
-This document describes how to build SimGear using the supplied workspace and
-project files.  
-
-Unpack the SimGear source file into your work directory.  This creates a new
-subdirectory called SimGear-X.Y.Z.  Rename this to SimGear.  Before we can
-build SimGear you must unpack and build the third party libraries metakit and
-zlib.  Sources for these are included in the SimGear/src-libs directory.
-Unpack these into the top level SimGear directory.  At this point your
-directory structure should look something like this:
-
-<work_dir>/
-  SimGear/
-    metakit-x.y.z/
-    simgear/
-    src-libs/
-    zlib-x.y.z/
-
-Now open the SimGear workspace.  This workspace file contains projects for
-building metakit(mklib), SimGear and zlib.  Select each project as the active
-project and build all.  Order is unimportant since there are no dependencies
-between the projects.
-
-The workspace and project files are generated by a perl script with extra
-input from the am2dsp.cfg file.

diff --git a/projects/VC7.1/.cvsignore b/projects/VC7.1/.cvsignore
deleted file mode 100755 (executable)
index 0f890e0..0000000
--- a/projects/VC7.1/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-Debug
-Release
-SimGear.ncb
-SimGear.suo
-*.user

diff --git a/projects/VC7.1/SimGear.sln b/projects/VC7.1/SimGear.sln
deleted file mode 100755 (executable)
index 9683d4d..0000000
--- a/projects/VC7.1/SimGear.sln
+++ /dev/null
@@ -1,21 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 8.00
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SimGear", "SimGear.vcproj", "{22540CD3-D3CA-4C86-A773-80AEEE3ACDED}"
-       ProjectSection(ProjectDependencies) = postProject
-       EndProjectSection
-EndProject
-Global
-       GlobalSection(SolutionConfiguration) = preSolution
-               Debug = Debug
-               Release = Release
-       EndGlobalSection
-       GlobalSection(ProjectConfiguration) = postSolution
-               {22540CD3-D3CA-4C86-A773-80AEEE3ACDED}.Debug.ActiveCfg = Debug|Win32
-               {22540CD3-D3CA-4C86-A773-80AEEE3ACDED}.Debug.Build.0 = Debug|Win32
-               {22540CD3-D3CA-4C86-A773-80AEEE3ACDED}.Release.ActiveCfg = Release|Win32
-               {22540CD3-D3CA-4C86-A773-80AEEE3ACDED}.Release.Build.0 = Release|Win32
-       EndGlobalSection
-       GlobalSection(ExtensibilityGlobals) = postSolution
-       EndGlobalSection
-       GlobalSection(ExtensibilityAddIns) = postSolution
-       EndGlobalSection
-EndGlobal

diff --git a/projects/VC7.1/SimGear.vcproj b/projects/VC7.1/SimGear.vcproj
deleted file mode 100755 (executable)
index 783ac4d..0000000
--- a/projects/VC7.1/SimGear.vcproj
+++ /dev/null
@@ -1,1383 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-       ProjectType="Visual C++"
-       Version="7.10"
-       Name="SimGear"
-       ProjectGUID="{22540CD3-D3CA-4C86-A773-80AEEE3ACDED}"
-       RootNamespace="SimGear"
-       SccProjectName=""
-       SccLocalPath="">
-       <Platforms>
-               <Platform
-                       Name="Win32"/>
-       </Platforms>
-       <Configurations>
-               <Configuration
-                       Name="Release|Win32"
-                       OutputDirectory=".\Release"
-                       IntermediateDirectory=".\Release"
-                       ConfigurationType="4"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="FALSE"
-                       CharacterSet="2">
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               InlineFunctionExpansion="1"
-                               AdditionalIncludeDirectories="..\..;..\..\simgear;..\..\..\install\msvc71\OpenSceneGraph\include;..\..\..\3rdparty\include;..\..\..\boost_1_36_0"
-                               PreprocessorDefinitions="HAVE_CONFIG_H,NDEBUG,WIN32;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"
-                               StringPooling="TRUE"
-                               RuntimeLibrary="2"
-                               EnableFunctionLevelLinking="TRUE"
-                               RuntimeTypeInfo="TRUE"
-                               PrecompiledHeaderFile=".\Release/SimGear.pch"
-                               AssemblerListingLocation=".\Release/"
-                               ObjectFile=".\Release/"
-                               ProgramDataBaseFileName=".\Release/"
-                               WarningLevel="3"
-                               SuppressStartupBanner="TRUE"
-                               DebugInformationFormat="3"
-                               CompileAs="0"/>
-                       <Tool
-                               Name="VCCustomBuildTool"/>
-                       <Tool
-                               Name="VCLibrarianTool"
-                               OutputFile="Release\SimGear.lib"
-                               SuppressStartupBanner="TRUE"/>
-                       <Tool
-                               Name="VCMIDLTool"/>
-                       <Tool
-                               Name="VCPostBuildEventTool"/>
-                       <Tool
-                               Name="VCPreBuildEventTool"/>
-                       <Tool
-                               Name="VCPreLinkEventTool"/>
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                               PreprocessorDefinitions="NDEBUG"
-                               Culture="1033"/>
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"/>
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"/>
-                       <Tool
-                               Name="VCManagedWrapperGeneratorTool"/>
-                       <Tool
-                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-               </Configuration>
-               <Configuration
-                       Name="Debug|Win32"
-                       OutputDirectory=".\Debug"
-                       IntermediateDirectory=".\Debug"
-                       ConfigurationType="4"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="FALSE"
-                       CharacterSet="2">
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               Optimization="0"
-                               AdditionalIncludeDirectories="..\..;..\..\simgear;..\..\..\install\msvc71\OpenSceneGraph\include;..\..\..\3rdparty\include;..\..\..\boost_1_36_0"
-                               PreprocessorDefinitions="HAVE_CONFIG_H,_DEBUG,WIN32;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"
-                               BasicRuntimeChecks="3"
-                               RuntimeLibrary="3"
-                               RuntimeTypeInfo="TRUE"
-                               PrecompiledHeaderFile=".\Debug/SimGear.pch"
-                               AssemblerListingLocation=".\Debug/"
-                               ObjectFile=".\Debug/"
-                               ProgramDataBaseFileName=".\Debug/"
-                               BrowseInformation="1"
-                               WarningLevel="3"
-                               SuppressStartupBanner="TRUE"
-                               DebugInformationFormat="4"
-                               CompileAs="0"/>
-                       <Tool
-                               Name="VCCustomBuildTool"/>
-                       <Tool
-                               Name="VCLibrarianTool"
-                               OutputFile="Debug\SimGear_d.lib"
-                               SuppressStartupBanner="TRUE"/>
-                       <Tool
-                               Name="VCMIDLTool"/>
-                       <Tool
-                               Name="VCPostBuildEventTool"/>
-                       <Tool
-                               Name="VCPreBuildEventTool"/>
-                       <Tool
-                               Name="VCPreLinkEventTool"/>
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                               PreprocessorDefinitions="_DEBUG"
-                               Culture="1033"/>
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"/>
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"/>
-                       <Tool
-                               Name="VCManagedWrapperGeneratorTool"/>
-                       <Tool
-                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-               </Configuration>
-       </Configurations>
-       <References>
-       </References>
-       <Files>
-               <Filter
-                       Name="Lib_sgbucket"
-                       Filter="">
-                       <File
-                               RelativePath="..\..\simgear\bucket\newbucket.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\bucket\newbucket.hxx">
-                       </File>
-               </Filter>
-               <Filter
-                       Name="Lib_sgdebug"
-                       Filter="">
-                       <File
-                               RelativePath="..\..\simgear\debug\debug_types.h">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\debug\logstream.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\debug\logstream.hxx">
-                       </File>
-               </Filter>
-               <Filter
-                       Name="Lib_sgephem"
-                       Filter="">
-                       <File
-                               RelativePath="..\..\simgear\ephemeris\celestialBody.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\ephemeris\celestialBody.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\ephemeris\ephemeris.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\ephemeris\ephemeris.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\ephemeris\jupiter.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\ephemeris\jupiter.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\ephemeris\mars.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\ephemeris\mars.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\ephemeris\mercury.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\ephemeris\mercury.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\ephemeris\moonpos.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\ephemeris\moonpos.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\ephemeris\neptune.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\ephemeris\neptune.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\ephemeris\pluto.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\ephemeris\saturn.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\ephemeris\saturn.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\ephemeris\star.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\ephemeris\star.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\ephemeris\stardata.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\ephemeris\stardata.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\ephemeris\uranus.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\ephemeris\uranus.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\ephemeris\venus.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\ephemeris\venus.hxx">
-                       </File>
-               </Filter>
-               <Filter
-                       Name="Lib_sgio"
-                       Filter="">
-                       <File
-                               RelativePath="..\..\simgear\io\iochannel.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\io\iochannel.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\io\lowlevel.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\io\lowlevel.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\io\sg_binobj.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\io\sg_binobj.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\io\sg_file.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\io\sg_file.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\io\sg_serial.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\io\sg_serial.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\io\sg_socket.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\io\sg_socket.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\io\sg_socket_udp.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\io\sg_socket_udp.hxx">
-                       </File>
-               </Filter>
-               <Filter
-                       Name="Lib_sgmagvar"
-                       Filter="">
-                       <File
-                               RelativePath="..\..\simgear\magvar\coremag.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\magvar\coremag.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\magvar\magvar.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\magvar\magvar.hxx">
-                       </File>
-               </Filter>
-               <Filter
-                       Name="Lib_sgmath"
-                       Filter="">
-                       <File
-                               RelativePath="..\..\simgear\math\beziercurve.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\math\interpolater.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\math\interpolater.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\math\leastsqs.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\math\leastsqs.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\math\linintp2.h">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\math\linintp2.inl">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\math\localconsts.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\math\point3d.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\math\polar3d.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\math\sg_geodesy.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\math\sg_random.c">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\math\sg_random.h">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\math\sg_types.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\math\SGGeod.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\math\SGGeodesy.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\math\SGGeodesy.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\math\sphrintp.h">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\math\vector.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\math\vector.hxx">
-                       </File>
-               </Filter>
-               <Filter
-                       Name="Lib_sgmisc"
-                       Filter="">
-                       <File
-                               RelativePath="..\..\simgear\misc\interpolator.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\misc\interpolator.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\misc\PathOptions.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\misc\PathOptions.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\misc\sg_path.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\misc\sg_path.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\misc\sgstream.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\misc\sgstream.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\misc\stopwatch.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\misc\strutils.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\misc\strutils.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\misc\tabbed_values.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\misc\tabbed_values.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\misc\texcoord.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\misc\texcoord.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\misc\zfstream.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\misc\zfstream.hxx">
-                       </File>
-               </Filter>
-               <Filter
-                       Name="Lib_sgroute"
-                       Filter="">
-                       <File
-                               RelativePath="..\..\simgear\route\route.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\route\route.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\route\waypoint.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\route\waypoint.hxx">
-                       </File>
-               </Filter>
-               <Filter
-                       Name="Lib_sgscreen"
-                       Filter="">
-                       <File
-                               RelativePath="..\..\simgear\screen\colors.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\screen\extensions.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\screen\extensions.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\screen\GLBitmaps.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\screen\GLBitmaps.h">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\screen\jpgfactory.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\screen\jpgfactory.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\screen\RenderTexture.cpp">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\screen\RenderTexture.h">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\screen\screen-dump.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\screen\screen-dump.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\screen\shader.cpp">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\screen\shader.h">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\screen\tr.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\screen\tr.h">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\screen\win32-printer.h">
-                       </File>
-               </Filter>
-               <Filter
-                       Name="Lib_sgserial"
-                       Filter="">
-                       <File
-                               RelativePath="..\..\simgear\serial\serial.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\serial\serial.hxx">
-                       </File>
-               </Filter>
-               <Filter
-                       Name="Lib_sgsky"
-                       Filter="">
-                       <File
-                               RelativePath="..\..\simgear\scene\sky\bbcache.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\sky\bbcache.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\sky\cloud.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\sky\cloud.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\sky\cloudfield.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\sky\cloudfield.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\sky\CloudShaderGeometry.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\sky\CloudShaderGeometry.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\sky\dome.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\sky\dome.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\sky\moon.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\sky\moon.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\sky\newcloud.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\sky\newcloud.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\sky\oursun.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\sky\oursun.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\sky\sky.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\sky\sky.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\sky\sphere.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\sky\sphere.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\sky\stars.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\sky\stars.hxx">
-                       </File>
-               </Filter>
-               <Filter
-                       Name="Lib_sgtiming"
-                       Filter="">
-                       <File
-                               RelativePath="..\..\simgear\timing\geocoord.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\timing\geocoord.h">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\timing\lowleveltime.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\timing\lowleveltime.h">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\timing\sg_time.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\timing\sg_time.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\timing\timestamp.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\timing\timestamp.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\timing\timezone.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\timing\timezone.h">
-                       </File>
-               </Filter>
-               <Filter
-                       Name="Lib_sgxml"
-                       Filter="">
-                       <File
-                               RelativePath="..\..\simgear\xml\asciitab.h">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\xml\easyxml.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\xml\easyxml.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\xml\hashtable.c">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\xml\hashtable.h">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\xml\iasciitab.h">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\xml\latin1tab.h">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\xml\nametab.h">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\xml\utf8tab.h">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\xml\xmldef.h">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\xml\xmlparse.c">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\xml\xmlparse.h">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\xml\xmlrole.c">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\xml\xmlrole.h">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\xml\xmltok.c">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\xml\xmltok.h">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\xml\xmltok_impl.h">
-                       </File>
-               </Filter>
-               <Filter
-                       Name="Lib_sgprops"
-                       Filter="">
-                       <File
-                               RelativePath="..\..\simgear\props\AtomicChangeListener.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\props\AtomicChangeListener.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\props\ExtendedPropertyAdapter.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\props\condition.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\props\condition.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\props\props.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\props\props.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\props\props_io.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\props\props_io.hxx">
-                       </File>
-               </Filter>
-               <Filter
-                       Name="Lib_sgmodel"
-                       Filter="">
-                       <File
-                               RelativePath="..\..\simgear\scene\model\animation.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\model\animation.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\model\CheckSceneryVisitor.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\model\CheckSceneryVisitor.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\model\model.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\model\model.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\model\modellib.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\model\modellib.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\model\ModelRegistry.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\model\ModelRegistry.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\model\particles.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\model\particles.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\model\persparam.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\model\persparam.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\model\placement.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\model\placement.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\model\SGClipGroup.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\model\SGClipGroup.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\model\SGInteractionAnimation.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\model\SGInteractionAnimation.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\model\SGMaterialAnimation.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\model\SGMaterialAnimation.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\model\SGOffsetTransform.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\model\SGOffsetTransform.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\model\SGPagedLOD.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\model\SGPagedLOD.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\model\SGReaderWriterXML.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\model\SGReaderWriterXML.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\model\SGReaderWriterXMLOptions.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\model\SGRotateTransform.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\model\SGRotateTransform.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\model\SGScaleTransform.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\model\SGScaleTransform.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\model\SGTranslateTransform.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\model\SGTranslateTransform.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\model\shadanim.cxx">
-                       </File>
-               </Filter>
-               <Filter
-                       Name="Lib_sgsound"
-                       Filter="">
-                       <File
-                               RelativePath="..\..\simgear\sound\sample_openal.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\sound\sample_openal.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\sound\soundmgr_openal.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\sound\soundmgr_openal.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\sound\xmlsound.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\sound\xmlsound.hxx">
-                       </File>
-               </Filter>
-               <Filter
-                       Name="Lib_sgmaterial"
-                       Filter="">
-                       <File
-                               RelativePath="..\..\simgear\scene\material\Effect.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\material\Effect.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\material\EffectBuilder.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\material\EffectBuilder.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\material\EffectCullVisitor.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\material\EffectCullVisitor.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\material\EffectGeode.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\material\EffectGeode.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\material\GLPredicate.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\material\GLPredicate.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\material\Noise.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\material\Noise.hxx">
-                       </File>
-
-                       <File
-                               RelativePath="..\..\simgear\scene\material\TextureBuilder.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\material\TextureBuilder.hxx">
-                       </File>
-
-                       <File
-                               RelativePath="..\..\simgear\scene\material\makeEffect.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\material\mat.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\material\mat.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\material\matlib.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\material\matlib.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\material\matmodel.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\material\matmodel.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\material\Pass.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\material\Pass.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\material\Technique.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\material\Technique.hxx">
-                       </File>
-               </Filter>
-               <Filter
-                       Name="Lib_sgtgdb"
-                       Filter="">
-                       <File
-                               RelativePath="..\..\simgear\scene\tgdb\apt_signs.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\tgdb\apt_signs.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\tgdb\GroundLightManager.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\tgdb\GroundLightManager.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\tgdb\obj.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\tgdb\obj.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\tgdb\pt_lights.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\tgdb\pt_lights.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\tgdb\ReaderWriterSTG.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\tgdb\SGModelBin.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\tgdb\SGOceanTile.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\tgdb\SGOceanTile.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\tgdb\SGReaderWriterBTG.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\tgdb\SGReaderWriterBTG.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\tgdb\SGReaderWriterBTGOptions.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\tgdb\SGVasiDrawable.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\tgdb\SGVasiDrawable.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\tgdb\ShaderGeometry.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\tgdb\ShaderGeometry.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\tgdb\TileCache.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\tgdb\TileCache.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\tgdb\TileEntry.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\tgdb\TileEntry.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\tgdb\TreeBin.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\tgdb\TreeBin.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\tgdb\userdata.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\tgdb\userdata.hxx">
-                       </File>
-               </Filter>
-               <Filter
-                       Name="Lib_sgthread"
-                       Filter="">
-                       <File
-                               RelativePath="..\..\simgear\threads\SGGuard.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\threads\SGQueue.hxx">
-                       </File>
-               </Filter>
-               <Filter
-                       Name="Lib_sgstructure"
-                       Filter="">
-                       <File
-                               RelativePath="..\..\simgear\structure\callback.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\structure\commands.cxx">
-                               <FileConfiguration
-                                       Name="Release|Win32">
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                               ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-                               </FileConfiguration>
-                               <FileConfiguration
-                                       Name="Debug|Win32">
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                               ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-                               </FileConfiguration>
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\structure\commands.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\structure\event_mgr.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\structure\event_mgr.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\structure\exception.cxx">
-                               <FileConfiguration
-                                       Name="Release|Win32">
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                               ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-                               </FileConfiguration>
-                               <FileConfiguration
-                                       Name="Debug|Win32">
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                               ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-                               </FileConfiguration>
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\structure\exception.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\structure\OSGVersion.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\structure\SGBinding.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\structure\SGBinding.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\structure\SGExpression.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\structure\SGExpression.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\structure\SGReferenced.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\structure\SGSharedPtr.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\structure\SGSmplhist.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\structure\SGSmplhist.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\structure\SGSmplstat.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\structure\SGSmplstat.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\structure\subsystem_mgr.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\structure\subsystem_mgr.hxx">
-                       </File>
-               </Filter>
-               <Filter
-                       Name="Lib_sgnasal"
-                       Filter="">
-                       <File
-                               RelativePath="..\..\simgear\nasal\bitslib.c">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\nasal\code.c">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\nasal\code.h">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\nasal\codegen.c">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\nasal\data.h">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\nasal\gc.c">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\nasal\hash.c">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\nasal\iolib.c">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\nasal\iolib.h">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\nasal\lex.c">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\nasal\lib.c">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\nasal\mathlib.c">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\nasal\misc.c">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\nasal\nasal.h">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\nasal\parse.c">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\nasal\parse.h">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\nasal\string.c">
-                               <FileConfiguration
-                                       Name="Release|Win32">
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                               Optimization="1"
-                                               InlineFunctionExpansion="1"/>
-                               </FileConfiguration>
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\nasal\thread-win32.c">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\nasal\threadlib.c">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\nasal\utf8lib.c">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\nasal\vector.c">
-                               <FileConfiguration
-                                       Name="Release|Win32">
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                               ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-                               </FileConfiguration>
-                               <FileConfiguration
-                                       Name="Debug|Win32">
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                               ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-                               </FileConfiguration>
-                       </File>
-               </Filter>
-               <Filter
-                       Name="Lib_sgenvironment"
-                       Filter="">
-                       <File
-                               RelativePath="..\..\simgear\environment\metar.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\environment\metar.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\environment\precipitation.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\environment\precipitation.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\environment\visual_enviro.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\environment\visual_enviro.hxx">
-                       </File>
-               </Filter>
-               <Filter
-                       Name="Lib_sgutil"
-                       Filter="">
-                       <File
-                               RelativePath="..\..\simgear\scene\util\CopyOp.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\util\CopyOp.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\util\NodeAndDrawableVisitor.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\util\NodeAndDrawableVisitor.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\util\PrimitiveUtils.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\util\PrimitiveUtils.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\util\QuadTreeBuilder.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\util\QuadTreeBuilder.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\util\RenderConstants.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\util\SGDebugDrawCallback.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\util\SGEnlargeBoundingBox.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\util\SGEnlargeBoundingBox.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\util\SGNodeMasks.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\util\SGSceneFeatures.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\util\SGSceneFeatures.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\util\SGSceneUserData.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\util\SGSceneUserData.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\util\SGStateAttributeVisitor.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\util\SGStateAttributeVisitor.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\util\SGTextureStateAttributeVisitor.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\util\SGTextureStateAttributeVisitor.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\util\SGUpdateVisitor.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\util\SplicingVisitor.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\util\SplicingVisitor.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\util\StateAttributeFactory.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\util\StateAttributeFactory.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\util\UpdateOnceCallback.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\util\UpdateOnceCallback.hxx">
-                       </File>
-               </Filter>
-               <Filter
-                       Name="Lib_sgbvh"
-                       Filter="">
-                       <File
-                               RelativePath="..\..\simgear\scene\bvh\BVHBoundingBoxVisitor.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\bvh\BVHDebugCollectVisitor.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\bvh\BVHGroup.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\bvh\BVHGroup.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\bvh\BVHLineGeometry.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\bvh\BVHLineGeometry.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\bvh\BVHLineSegmentVisitor.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\bvh\BVHLineSegmentVisitor.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\bvh\BVHMotionTransform.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\bvh\BVHMotionTransform.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\bvh\BVHNode.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\bvh\BVHNode.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\bvh\BVHStaticBinary.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\bvh\BVHStaticBinary.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\bvh\BVHStaticData.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\bvh\BVHStaticGeometry.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\bvh\BVHStaticGeometry.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\bvh\BVHStaticGeometryBuilder.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\bvh\BVHStaticLeaf.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\bvh\BVHStaticLeaf.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\bvh\BVHStaticNode.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\bvh\BVHStaticNode.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\bvh\BVHStaticTriangle.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\bvh\BVHStaticTriangle.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\bvh\BVHSubTreeCollector.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\bvh\BVHSubTreeCollector.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\bvh\BVHTransform.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\bvh\BVHTransform.hxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\bvh\BVHVisitor.hxx">
-                       </File>
-               </Filter>
-               <File
-                       RelativePath="..\..\simgear\simgear_config.h-msvc71">
-                       <FileConfiguration
-                               Name="Release|Win32">
-                               <Tool
-                                       Name="VCCustomBuildTool"
-                                       Description="Generation of simgear_config.h"
-                                       CommandLine="copy $(inputPath) $(InputDir)\$(InputName).h
-"
-                                       Outputs="..\..\simgear\simgear_config.h"/>
-                       </FileConfiguration>
-                       <FileConfiguration
-                               Name="Debug|Win32">
-                               <Tool
-                                       Name="VCCustomBuildTool"
-                                       Description="Generation of simgear_config.h"
-                                       CommandLine="copy $(inputPath) $(InputDir)\$(InputName).h
-"
-                                       Outputs="..\..\simgear\simgear_config.h"/>
-                       </FileConfiguration>
-               </File>
-       </Files>
-       <Globals>
-       </Globals>
-</VisualStudioProject>

diff --git a/simgear/math/SGBox.hxx b/simgear/math/SGBox.hxx
index 8024a1318e3911767828bcebf164a983fe36d573..dfa50275b3af0bc95d1036475db3cbad4df4c7d3 100644 (file)
--- a/simgear/math/SGBox.hxx
+++ b/simgear/math/SGBox.hxx
@@ -71,6 +71,14 @@ public:
                      (pt[2] > center[2]) ? _min[2] : _max[2]);
   }
 
+  // return the closest point to pt still in the box
+  template<typename S>
+  SGVec3<T> getClosestPoint(const SGVec3<S>& pt) const
+  {
+    return SGVec3<T>((pt[0] < _min[0]) ? _min[0] : ((_max[0] < pt[0]) ? _max[0] : T(pt[0])),
+                     (pt[1] < _min[1]) ? _min[1] : ((_max[1] < pt[1]) ? _max[1] : T(pt[1])),
+                     (pt[2] < _min[2]) ? _min[2] : ((_max[2] < pt[2]) ? _max[2] : T(pt[2])));
+  }
 
   // Only works for floating point types
   SGVec3<T> getCenter() const

diff --git a/simgear/math/SGIntersect.hxx b/simgear/math/SGIntersect.hxx
index 533bd2dc005db90668737ec250fdd1a64db4ead2..24741f6409bd78dcfeb603525aab6cbd0a474592 100644 (file)
--- a/simgear/math/SGIntersect.hxx
+++ b/simgear/math/SGIntersect.hxx
@@ -38,25 +38,11 @@ intersects(const SGBox<T1>& box, const SGSphere<T2>& sphere)
 {
   if (sphere.empty())
     return false;
-  // Is more or less trivially included in the next tests
-  // if (box.empty())
-  //   return false;
-
-  if (sphere.getCenter().x() < box.getMin().x() - sphere.getRadius())
-    return false;
-  if (sphere.getCenter().y() < box.getMin().y() - sphere.getRadius())
-    return false;
-  if (sphere.getCenter().z() < box.getMin().z() - sphere.getRadius())
+  if (box.empty())
     return false;
 
-  if (box.getMax().x() + sphere.getRadius() < sphere.getCenter().x())
-    return false;
-  if (box.getMax().y() + sphere.getRadius() < sphere.getCenter().y())
-    return false;
-  if (box.getMax().z() + sphere.getRadius() < sphere.getCenter().z())
-    return false;
-
-  return true;
+  SGVec3<T1> closest = box.getClosestPoint(sphere.getCenter());
+  return distSqr(closest, SGVec3<T1>(sphere.getCenter())) <= sphere.getRadius2();
 }
 // make it symmetric
 template<typename T1, typename T2>

diff --git a/simgear/scene/material/matmodel.cxx b/simgear/scene/material/matmodel.cxx
index bdad512eef0add5bf58e2d728169a8c15b20f7ef..93cbd49478dcdc36f635131455fe2f8e2857439f 100644 (file)
--- a/simgear/scene/material/matmodel.cxx
+++ b/simgear/scene/material/matmodel.cxx
@@ -135,14 +135,11 @@ SGMatModel::load_models( SGPropertyNode *prop_root )
 }
 
 osg::Node*
-SGMatModel::get_random_model( SGPropertyNode *prop_root )
+SGMatModel::get_random_model( SGPropertyNode *prop_root, mt seed )
 {
   load_models( prop_root ); // comment this out if preloading models
   int nModels = _models.size();
-  int index = int(sg_random() * nModels);
-  if (index >= nModels)
-    index = 0;
-  return _models[index].get();
+  return _models[mt_rand(&seed) * nModels].get();
 }
 
 double

diff --git a/simgear/scene/material/matmodel.hxx b/simgear/scene/material/matmodel.hxx
index 9d06427a968bd581c569ef34e3a847751ceb1783..3e7d84a973ce06ec265104e5d3be947ee62ac637 100644 (file)
--- a/simgear/scene/material/matmodel.hxx
+++ b/simgear/scene/material/matmodel.hxx
@@ -82,7 +82,7 @@ public:
      *
      * @return A randomly select model from the variants.
      */
-    osg::Node *get_random_model( SGPropertyNode *prop_root );
+    osg::Node *get_random_model( SGPropertyNode *prop_root, mt seed );
 
 
     /**

diff --git a/simgear/scene/tgdb/obj.cxx b/simgear/scene/tgdb/obj.cxx
index dec3c6c4f5acaa5eb78efc27240f1f1b86090cec..fd6d42e29e13d5c5d6d6f077123622057514e8d4 100644 (file)
--- a/simgear/scene/tgdb/obj.cxx
+++ b/simgear/scene/tgdb/obj.cxx
@@ -611,7 +611,7 @@ SGLoadBTG(const std::string& path, SGMaterialLib *matlib, bool calc_lights, bool
              i < tileGeometryBin.randomModels.getNumModels(); i++) {
           SGMatModelBin::MatModel obj
             = tileGeometryBin.randomModels.getMatModel(i);
-          osg::Node* node = sgGetRandomModel(obj.model);
+          osg::Node* node = sgGetRandomModel(obj.model, seed);
         
           // Create a matrix to place the object in the correct
           // location, and then apply the rotation matrix created

diff --git a/simgear/scene/tgdb/userdata.cxx b/simgear/scene/tgdb/userdata.cxx
index 11d69e12f7fafa64f66a66cf1aaa816843cc6bff..6aa71821f14f679388984d1ec99f1ee3e0b47214 100644 (file)
--- a/simgear/scene/tgdb/userdata.cxx
+++ b/simgear/scene/tgdb/userdata.cxx
@@ -60,8 +60,8 @@ void sgUserDataInit( SGPropertyNode *p ) {
     root_props = p;
 }
 
-osg::Node* sgGetRandomModel(SGMatModel *obj) {
-   return obj->get_random_model( root_props );
+osg::Node* sgGetRandomModel(SGMatModel *obj, mt seed) {
+   return obj->get_random_model( root_props, seed );
  }
 
 namespace simgear

diff --git a/simgear/scene/tgdb/userdata.hxx b/simgear/scene/tgdb/userdata.hxx
index ab0a6a559c2e64e41d6a4716f23d35efb267263c..fa5209e679024d29b3d9933531b6c3b989c97e76 100644 (file)
--- a/simgear/scene/tgdb/userdata.hxx
+++ b/simgear/scene/tgdb/userdata.hxx
@@ -26,6 +26,7 @@
 #define _SG_USERDATA_HXX
 
 #include <simgear/compiler.h>
+#include <simgear/math/sg_random.h>
 
 #include <osg/Node>
 
@@ -42,7 +43,7 @@ void sgUserDataInit(SGPropertyNode *p);
 /**
  * Get a random model.
  */
-osg::Node* sgGetRandomModel(SGMatModel *obj);
+osg::Node* sgGetRandomModel(SGMatModel *obj, mt seed);
 
 namespace simgear
 {

diff --git a/simgear/screen/extensions.hxx b/simgear/screen/extensions.hxx
index d7999bc62cc0d1d0627dd47e8811b467e2405071..e1871068faa0cb1aa736d9ff7d9a542a874f3f8d 100644 (file)
--- a/simgear/screen/extensions.hxx
+++ b/simgear/screen/extensions.hxx
@@ -202,7 +202,7 @@ typedef void (APIENTRY * glClientActiveTextureProc)(GLenum texture);
 #define GL_RGB_SCALE_ARB                                       0x8573
 #define GL_ADD_SIGNED_ARB                                      0x8574
 #define GL_INTERPOLATE_ARB                                     0x8575
-#define GL_SUBTRACT_ARB                       0x84E7
+#define GL_SUBTRACT_ARB                                                0x84E7
 #define GL_CONSTANT_ARB                                                0x8576
 #define GL_PRIMARY_COLOR_ARB                                   0x8577
 #define GL_PREVIOUS_ARB                                                0x8578
@@ -766,6 +766,62 @@ typedef void (APIENTRY * glGetVertexAttribivProc) (GLuint index, GLenum pname, G
 typedef void (APIENTRY * glGetVertexAttribPointervProc) (GLuint index, GLenum pname, GLvoid* *pointer);
 typedef GLboolean (APIENTRY * glIsProgramProc) (GLuint program);
 
+/*
+ * EXT_framebuffer_objects
+ */
+#ifndef GL_EXT_framebuffer_object
+#define GL_EXT_framebuffer_object 1
+#define GL_NONE_EXT                                            0
+#define GL_FRAMEBUFFER_EXT                                     0x8D40
+#define GL_RENDERBUFFER_EXT                                    0x8D41
+#define GL_RGBA4_EXT                                           0x8056
+#define GL_RGB5_A1_EXT                                         0x8057
+#define GL_RGB565_EXT                                          0x8D62
+#define GL_DEPTH_COMPONENT16_EXT                               0x81A5
+#define GL_RENDERBUFFER_WIDTH_EXT                              0x8D42
+#define GL_RENDERBUFFER_HEIGHT_EXT                             0x8D43
+#define GL_RENDERBUFFER_INTERNAL_FORMAT_EXT                    0x8D44
+#define GL_RENDERBUFFER_RED_SIZE_EXT                           0x8D50
+#define GL_RENDERBUFFER_GREEN_SIZE_EXT                         0x8D51
+#define GL_RENDERBUFFER_BLUE_SIZE_EXT                          0x8D52
+#define GL_RENDERBUFFER_ALPHA_SIZE_EXT                         0x8D53
+#define GL_RENDERBUFFER_DEPTH_SIZE_EXT                         0x8D54
+#define GL_RENDERBUFFER_STENCIL_SIZE_EXT                       0x8D55
+#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE_EXT              0x8CD0
+#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME_EXT              0x8CD1
+#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL_EXT            0x8CD2
+#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE_EXT    0x8CD3
+#define GL_COLOR_ATTACHMENT0_EXT                               0x8CE0
+#define GL_DEPTH_ATTACHMENT_EXT                                        0x8D00
+#define GL_STENCIL_ATTACHMENT_EXT                              0x8D20
+#define GL_FRAMEBUFFER_COMPLETE_EXT                            0x8CD5
+#define GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_EXT               0x8CD6
+#define GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_EXT       0x8CD7
+#define GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT               0x8CD9
+#define GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT                  0x8CDA
+#define GL_FRAMEBUFFER_UNSUPPORTED_EXT                         0x8CDD
+#define GL_FRAMEBUFFER_BINDING_EXT                             0x8CA6
+#define GL_RENDERBUFFER_BINDING_EXT                            0x8CA7
+#define GL_MAX_RENDERBUFFER_SIZE_EXT                           0x84E8
+#define GL_INVALID_FRAMEBUFFER_OPERATION_EXT                   0x0506
+#endif
+
+typedef GLboolean (APIENTRY * glIsRenderbufferProc) (GLuint renderbuffer);
+typedef void (APIENTRY * glBindRenderbufferProc) (GLenum target, GLuint renderbuffer);
+typedef void (APIENTRY * glDeleteRenderbuffersProc) (GLsizei n, const GLuint* renderbuffers);
+typedef void (APIENTRY * glGenRenderbuffersProc) (GLsizei n, GLuint* renderbuffers);
+typedef void (APIENTRY * glRenderbufferStorageProc) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height);
+typedef void (APIENTRY * glGetRenderbufferParameterivProc) (GLenum target, GLenum pname, GLint* params);
+typedef GLboolean (APIENTRY * glIsFramebufferProc) (GLuint framebuffer);
+typedef void (APIENTRY * glBindFramebufferProc) (GLenum target, GLuint framebuffer);
+typedef void (APIENTRY * glDeleteFramebuffersProc) (GLsizei n, const GLuint* framebuffers);
+typedef void (APIENTRY * glGenFramebuffersProc) (GLsizei n, GLuint* framebuffers);
+typedef GLenum (APIENTRY * glCheckFramebufferStatusProc) (GLenum target);
+typedef void (APIENTRY * glFramebufferRenderbufferProc) (GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
+typedef void (APIENTRY * glFramebufferTexture2DProc) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
+typedef void (APIENTRY * glGetFramebufferAttachmentParameterivProc) (GLenum target, GLenum attachment, GLenum pname, GLint* params);
+typedef void (APIENTRY * glGenerateMipmapProc) (GLenum target);
+
 /*
  * ARB_shader_objects
  */

diff --git a/simgear/sound/soundmgr_openal.cxx b/simgear/sound/soundmgr_openal.cxx
index e372f3cc5fd0551bfb73ddd85fa627ae3f3cb4cc..16d9e7948f9c6ca8e08562d17430887ec688a0bd 100644 (file)
--- a/simgear/sound/soundmgr_openal.cxx
+++ b/simgear/sound/soundmgr_openal.cxx
@@ -30,7 +30,7 @@
 #endif
 
 #if defined( __APPLE__ )
-# include <OpenAL/alut.h>
+# include <ALUT/alut.h>
 #else
 # include <AL/alut.h>
 #endif
@@ -45,10 +45,17 @@
 #include <simgear/misc/sg_path.hxx>
 #include <simgear/math/SGMath.hxx>
 
+using std::string;
+
 extern bool isNaN(float *v);
 
 #define MAX_SOURCES    128
 
+
+#ifndef ALC_ALL_DEVICES_SPECIFIER
+# define ALC_ALL_DEVICES_SPECIFIER     0x1013
+#endif
+
 //
 // Sound Manager
 //
@@ -81,6 +88,8 @@ SGSoundMgr::SGSoundMgr() :
         }
     }
     _alut_init++;
+#else
+  #error ALUT 1.1 required, ALUT 1.0 is no longer supported, please upgrade
 #endif
 }
 

diff --git a/simgear/sound/soundmgr_openal.hxx b/simgear/sound/soundmgr_openal.hxx
index 9b9e0a126fd52e8b979f763d4f8681d38bd19589..749d84272bffd28f78e313f96d9819a058c375e7 100644 (file)
--- a/simgear/sound/soundmgr_openal.hxx
+++ b/simgear/sound/soundmgr_openal.hxx
@@ -35,32 +35,19 @@
 #ifndef _SG_SOUNDMGR_OPENAL_HXX
 #define _SG_SOUNDMGR_OPENAL_HXX 1
 
-#ifndef __cplusplus
-# error This library requires C++
-#endif
-
 #include <string>
 #include <vector>
 #include <map>
 
 #if defined(__APPLE__)
-# define AL_ILLEGAL_ENUM AL_INVALID_ENUM
-# define AL_ILLEGAL_COMMAND AL_INVALID_OPERATION
 # include <OpenAL/al.h>
 # include <OpenAL/alc.h>
-# include <OpenAL/alut.h>
 #elif defined(OPENALSDK)
 # include <al.h>
 # include <alc.h>
-# include <AL/alut.h> 
 #else
 # include <AL/al.h>
 # include <AL/alc.h>
-# include <AL/alut.h>
-#endif
-
-#ifndef ALC_ALL_DEVICES_SPECIFIER
-# define ALC_ALL_DEVICES_SPECIFIER     0x1013
 #endif
 
 #include <simgear/compiler.h>
@@ -68,9 +55,6 @@
 #include <simgear/math/SGMathFwd.hxx>
 
 #include "sample_group.hxx"
-#include "sample_openal.hxx"
-
-using std::string;
 
 struct refUint {
     unsigned int refctr;
@@ -81,11 +65,11 @@ struct refUint {
     ~refUint() {};
 };
 
-typedef std::map < string, refUint > buffer_map;
+typedef std::map < std::string, refUint > buffer_map;
 typedef buffer_map::iterator buffer_map_iterator;
 typedef buffer_map::const_iterator  const_buffer_map_iterator;
 
-typedef std::map < string, SGSharedPtr<SGSampleGroup> > sample_group_map;
+typedef std::map < std::string, SGSharedPtr<SGSampleGroup> > sample_group_map;
 typedef sample_group_map::iterator sample_group_map_iterator;
 typedef sample_group_map::const_iterator const_sample_group_map_iterator;
 
@@ -133,21 +117,21 @@ public:
      * @param refname Reference name of the sample group
      * @return true if successful, false otherwise
      */
-    bool add( SGSampleGroup *sgrp, const string& refname );
+    bool add( SGSampleGroup *sgrp, const std::string& refname );
 
     /** 
      * Remove a sample group from the sound manager.
      * @param refname Reference name of the sample group to remove
      * @return true if successful, false otherwise
      */
-    bool remove( const string& refname );
+    bool remove( const std::string& refname );
 
     /**
      * Test if a specified sample group is registered at the sound manager
      * @param refname Reference name of the sample group test for
      * @return true if the specified sample group exists
      */
-    bool exists( const string& refname );
+    bool exists( const std::string& refname );
 
     /**
      * Find a specified sample group in the sound manager
@@ -287,13 +271,13 @@ public:
     /**
      * Get a list of available playback devices.
      */
-    vector<const char*> get_available_devices();
+    std::vector<const char*> get_available_devices();
 
     /**
      * Get the current OpenAL vendor or rendering backend.
      */
-    const string& get_vendor() { return _vendor; }
-    const string& get_renderer() { return _renderer; }
+    const std::string& get_vendor() { return _vendor; }
+    const std::string& get_renderer() { return _renderer; }
 
 private:
     static int _alut_init;
@@ -323,17 +307,17 @@ private:
     sample_group_map _sample_groups;
     buffer_map _buffers;
 
-    vector<ALuint> _free_sources;
-    vector<ALuint> _sources_in_use;
+    std::vector<ALuint> _free_sources;
+    std::vector<ALuint> _sources_in_use;
 
     bool _bad_doppler;
-    string _renderer;
-    string _vendor;
+    std::string _renderer;
+    std::string _vendor;
 
-    bool testForALError(string s);
-    bool testForALCError(string s);
-    bool testForALUTError(string s);
-    bool testForError(void *p, string s);
+    bool testForALError(std::string s);
+    bool testForALCError(std::string s);
+    bool testForALUTError(std::string s);
+    bool testForError(void *p, std::string s);
 
     void update_pos_and_orientation();
     void update_sample_config( SGSampleGroup *sound );