]> git.mxchange.org Git - simgear.git/log
simgear.git
12 years agoImproved CMake support for libsvn
ThorstenB [Thu, 4 Aug 2011 17:23:55 +0000 (19:23 +0200)]
Improved CMake support for libsvn
Added missing CMake defines for SVN_CLIENT.
Don't detect libsvn without APR.
When installed, enable libsvn support by default (same as for automake).
When enabled, provide libsvn include dir to libtsync.
gitignore temporary CMake files

12 years agoFurther HTTP improvements, correct proxy support, spec compliance, support for chunke...
James Turner [Thu, 4 Aug 2011 17:03:56 +0000 (18:03 +0100)]
Further HTTP improvements, correct proxy support, spec compliance, support for chunked encoding.

12 years agoOve Kåven: Fix property refcounting for particles
ThorstenB [Mon, 1 Aug 2011 17:47:19 +0000 (19:47 +0200)]
Ove Kåven: Fix property refcounting for particles

12 years agoFurther HTTP improvements, wget-alike test program to check it all behaves!
James Turner [Mon, 1 Aug 2011 08:03:12 +0000 (09:03 +0100)]
Further HTTP improvements, wget-alike test program to check it all behaves!

12 years ago#232: resurrect the "point sprites for runway lights" switch
ThorstenB [Sun, 31 Jul 2011 12:00:48 +0000 (14:00 +0200)]
#232: resurrect the "point sprites for runway lights" switch
Automatic GL/OSG feature detection still not working, since we don't have
a "context" - but at least the manual switch works (on start-up only).

12 years agoOoops, forgot automake
James Turner [Sat, 30 Jul 2011 11:41:54 +0000 (12:41 +0100)]
Ooops, forgot automake

12 years agoClean header dependencies of condition.hxx - introduce a new header, propsfwd.hxx...
James Turner [Sat, 30 Jul 2011 09:48:37 +0000 (10:48 +0100)]
Clean header dependencies of condition.hxx - introduce a new header, propsfwd.hxx, for common case of headers that only need SGPropertyNode_ptr and SGCondition_ptr

12 years agoTweaks to HTTP code, in preparation for using it for metar - especially, test code...
James Turner [Sat, 30 Jul 2011 09:43:49 +0000 (10:43 +0100)]
Tweaks to HTTP code, in preparation for using it for metar - especially, test code for proxies

12 years agoUpdates to random forest:
Stuart Buchanan [Fri, 29 Jul 2011 14:22:24 +0000 (15:22 +0100)]
Updates to random forest:
- Bug fix - use multiple textures per tile
- Graduate LoD so tree cover fades in/out.

12 years agoMerge branch 'next' of git://gitorious.org/fg/simgear into next
Stuart Buchanan [Tue, 26 Jul 2011 21:17:14 +0000 (22:17 +0100)]
Merge branch 'next' of git://gitorious.org/fg/simgear into next

12 years agoDon't rely on simgear/version.h
Torsten Dreyer [Mon, 25 Jul 2011 18:22:57 +0000 (20:22 +0200)]
Don't rely on simgear/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.

12 years agoMerge branch 'next' of git://gitorious.org/fg/simgear into next
Stuart Buchanan [Thu, 21 Jul 2011 17:45:13 +0000 (18:45 +0100)]
Merge branch 'next' of git://gitorious.org/fg/simgear into next

12 years agoMake it compile with gcc-4.6
Mathias Froehlich [Tue, 19 Jul 2011 17:23:09 +0000 (19:23 +0200)]
Make it compile with gcc-4.6

12 years agoMerge branch 'next' of gitorious.org:fg/simgear into next
James Turner [Tue, 19 Jul 2011 16:56:04 +0000 (17:56 +0100)]
Merge branch 'next' of gitorious.org:fg/simgear into next

12 years agoOoof, lurking PLIB reference in the tests
James Turner [Tue, 19 Jul 2011 16:55:40 +0000 (17:55 +0100)]
Ooof, lurking PLIB reference in the tests

12 years agoFix case of SGGeometryTest.cxx
Mathias Froehlich [Tue, 19 Jul 2011 16:54:02 +0000 (18:54 +0200)]
Fix case of SGGeometryTest.cxx

12 years agoEnable more unit-tests via CTest
James Turner [Tue, 19 Jul 2011 16:30:08 +0000 (17:30 +0100)]
Enable more unit-tests via CTest

12 years agoRemove some debug output, fix version.h include path
James Turner [Tue, 19 Jul 2011 13:34:07 +0000 (14:34 +0100)]
Remove some debug output, fix version.h include path

12 years agoBut of course, Mac lacks malloc.h - so you cstdlib instead. <sigh>
James Turner [Tue, 19 Jul 2011 13:17:05 +0000 (06:17 -0700)]
But of course, Mac lacks malloc.h - so you cstdlib instead. <sigh>

12 years agotest linkage needs librt on Linux. Need to tidy this up on the FG side.
James Turner [Tue, 19 Jul 2011 12:53:13 +0000 (13:53 +0100)]
test linkage needs librt on Linux. Need to tidy this up on the FG side.

12 years agoFix Linux compilation of netChat - explicit include of malloc.h required.
James Turner [Tue, 19 Jul 2011 12:32:39 +0000 (05:32 -0700)]
Fix Linux compilation of netChat - explicit include of malloc.h required.

12 years agoAnd not forgetting VC90 either.
James Turner [Tue, 19 Jul 2011 12:10:01 +0000 (13:10 +0100)]
And not forgetting VC90 either.

12 years agoNot forgetting automake for the moment
James Turner [Tue, 19 Jul 2011 11:56:49 +0000 (12:56 +0100)]
Not forgetting automake for the moment

12 years agoTiny HTTP client layer on top of NetChat - and CTest support for some SimGear tests.
James Turner [Tue, 19 Jul 2011 11:55:55 +0000 (12:55 +0100)]
Tiny HTTP client layer on top of NetChat - and CTest support for some SimGear tests.

12 years agoFix locale setting for Windows
ThorstenB [Mon, 18 Jul 2011 18:29:11 +0000 (20:29 +0200)]
Fix locale setting for Windows

12 years agoClean solution for locale problem.
ThorstenB [Mon, 18 Jul 2011 18:15:50 +0000 (20:15 +0200)]
Clean solution for locale problem.
Changing and reverting the locale isn't thread-safe. Instead, setup the
environment to ensure the active locale sticks to default "C" locale at
any time.

12 years agoMerge branch 'next' of git://gitorious.org/fg/simgear into next
Stuart Buchanan [Mon, 18 Jul 2011 18:11:25 +0000 (19:11 +0100)]
Merge branch 'next' of git://gitorious.org/fg/simgear into next

12 years agoBump to version 2.5.0
Torsten Dreyer [Sun, 17 Jul 2011 09:06:45 +0000 (11:06 +0200)]
Bump to version 2.5.0

12 years agoBump version to 2.4.0
Torsten Dreyer [Sun, 17 Jul 2011 08:46:56 +0000 (10:46 +0200)]
Bump version to 2.4.0

13 years agoMerge branches 'next' and 'next' of git://gitorious.org/fg/simgear into next
Stuart Buchanan [Sun, 3 Jul 2011 18:03:06 +0000 (19:03 +0100)]
Merge branches 'next' and 'next' of git://gitorious.org/fg/simgear into next

13 years agoAlert message formatting.
ThorstenB [Sun, 3 Jul 2011 11:04:00 +0000 (13:04 +0200)]
Alert message formatting.
Avoid log output cluttering due to "missing animation objects".

13 years agoterrasync: some code cleanup - don't use snprintf
Torsten Dreyer [Tue, 28 Jun 2011 11:16:08 +0000 (13:16 +0200)]
terrasync: some code cleanup - don't use snprintf

13 years ago#348: (continued) Missing sound files not reported properly
ThorstenB [Sat, 25 Jun 2011 23:06:07 +0000 (01:06 +0200)]
#348: (continued) Missing sound files not reported properly
Avoid useless "File '' not found." messages for missing sound files.

13 years ago#348: Missing model/texture files not reported properly
ThorstenB [Sat, 25 Jun 2011 22:36:19 +0000 (00:36 +0200)]
#348: Missing model/texture files not reported properly
Whenever resolving a (relative) path to an absolute path with
'findDataFile', check if the result is empty and report original
(relative) path as missing. Otherwise no or a meaningless message is
issued ("File '' not found.").

13 years agoTerrasync: make whitespace in pathnames work under windows
Torsten Dreyer [Fri, 24 Jun 2011 22:04:44 +0000 (00:04 +0200)]
Terrasync: make whitespace in pathnames work under windows

13 years agoDisable support of white-space path for Windows
ThorstenB [Thu, 23 Jun 2011 15:18:37 +0000 (17:18 +0200)]
Disable support of white-space path for Windows
Apparently enclosing white-space paths using '"' doesn't work on Windows.

13 years agoImprove upate interval after failed updates.
ThorstenB [Thu, 23 Jun 2011 15:14:36 +0000 (17:14 +0200)]
Improve upate interval after failed updates.

13 years agoFix bug #346: httpd broken
Torsten Dreyer [Wed, 22 Jun 2011 20:40:23 +0000 (22:40 +0200)]
Fix bug #346: httpd broken

Fix bug introduced by myself in
commit b06e38699a4467cf99bdcfee6e906082e104b86a

13 years agoBad boundary check. Add missing parentheses.
ThorstenB [Wed, 22 Jun 2011 07:16:27 +0000 (09:16 +0200)]
Bad boundary check. Add missing parentheses.

13 years agofix #353: svn doesn't like stray path separators
ThorstenB [Mon, 20 Jun 2011 20:46:46 +0000 (22:46 +0200)]
fix #353: svn doesn't like stray path separators

13 years agoImprove error handling and avoid refresh nuisances.
ThorstenB [Mon, 20 Jun 2011 20:10:07 +0000 (22:10 +0200)]
Improve error handling and avoid refresh nuisances.
Ignore errors due to missing (ocean-)scenery data on SVN server.
For now, only refresh scenery tiles when ocean is replaced by actual
scenery data after download.

13 years agoImprove external SVN support.
ThorstenB [Mon, 20 Jun 2011 20:05:37 +0000 (22:05 +0200)]
Improve external SVN support.
Support white-space paths when calling external SVN utility.
Support optional configuration of absolute path to SVN utility.

13 years agoCompile built-in svn in MSVC if 32-bit target is selected
Frederic Bouvier [Wed, 15 Jun 2011 06:13:37 +0000 (08:13 +0200)]
Compile built-in svn in MSVC if 32-bit target is selected

13 years agoMelchior FRANZ: fix SGPropertyNode::LAST_USED_ATTRIBUTE
ThorstenB [Tue, 14 Jun 2011 19:49:42 +0000 (21:49 +0200)]
Melchior FRANZ: fix SGPropertyNode::LAST_USED_ATTRIBUTE
fixes commit c782a32076016f2c3c01b4fd437b024dc77806e9,
(also see 38494a48d83f194e151d2fea2726e60725478c12 :) )

13 years agoCsaba Halasz: fix SGTimerQueue so tasks can remove themselves properly
ThorstenB [Mon, 13 Jun 2011 12:13:48 +0000 (14:13 +0200)]
Csaba Halasz: fix SGTimerQueue so tasks can remove themselves properly
fixes commit c033979130b1c5822c5e9fc55bffc09632d5a48f

13 years agoIntroduce "PRESERVE" flag to protect properties on sim reset.
ThorstenB [Sun, 12 Jun 2011 18:32:13 +0000 (20:32 +0200)]
Introduce "PRESERVE" flag to protect properties on sim reset.
Some specific properties need protection and shouldn't be restored to their
original values on sim-reset.

13 years agoAdd optional attribute condition to "copyProperties".
ThorstenB [Sun, 12 Jun 2011 11:41:38 +0000 (13:41 +0200)]
Add optional attribute condition to "copyProperties".
Option to only copy properties with specific attribute values.
Default is copy all (as before).

13 years agoMake some properties read-only to avoid sim-reset issues.
ThorstenB [Sun, 12 Jun 2011 11:31:23 +0000 (13:31 +0200)]
Make some properties read-only to avoid sim-reset issues.
Do not loose internal statistics/state on sim-reset

13 years agoAdd missing CMake module for built-in svn-client support.
ThorstenB [Sun, 12 Jun 2011 08:08:16 +0000 (10:08 +0200)]
Add missing CMake module for built-in svn-client support.
Thanks to Martin for spotting this.

13 years agoAdded missing terrsync make+header files...
ThorstenB [Sat, 11 Jun 2011 21:58:00 +0000 (23:58 +0200)]
Added missing terrsync make+header files...

13 years agoConvert terrasync into a subsystem.
ThorstenB [Sat, 11 Jun 2011 21:22:26 +0000 (23:22 +0200)]
Convert terrasync into a subsystem.
Fixed scenery tile refresh method.
Simgear automake makefiles with libsvn detection.
Simgear CMake support for libsvn (may not work :) )

13 years agoCopied original terrasync sources
ThorstenB [Sat, 11 Jun 2011 20:55:57 +0000 (22:55 +0200)]
Copied original terrasync sources

13 years agoAdd method to reload specific scenery tiles.
ThorstenB [Thu, 9 Jun 2011 20:24:08 +0000 (22:24 +0200)]
Add method to reload specific scenery tiles.

13 years agoAdded guarded blocking deque class.
ThorstenB [Wed, 8 Jun 2011 21:39:24 +0000 (23:39 +0200)]
Added guarded blocking deque class.
So, what are we going to do with it... ;-)

13 years agoDo not crash on exporting some EffectGeodes.
Mathias Froehlich [Wed, 8 Jun 2011 11:42:30 +0000 (13:42 +0200)]
Do not crash on exporting some EffectGeodes.

13 years agofix #314: Nasal not working on i386/32bit systems with gcc>=4.5.x
ThorstenB [Thu, 2 Jun 2011 08:05:10 +0000 (10:05 +0200)]
fix #314: Nasal not working on i386/32bit systems with gcc>=4.5.x
Change magic Nasal reftag to encode a quiet NaN (qNaN) instead of a
signaling NaN (sNaN), since sNaNs cannot pass cleanly through an FPU
(an sNaN is always converted to a qNaN, even by simple FPU load/store
instructions). gcc 4.5.x uses float load/store operations more
aggressively to move our 64bit Nasal variables (naRef) around.

Signed-off-by: Andy Ross
13 years agogcc warning fix: remove unused variable
Torsten Dreyer [Tue, 31 May 2011 13:53:25 +0000 (15:53 +0200)]
gcc warning fix: remove unused variable

13 years agofixed #260: Scale animation also scales color
ThorstenB [Sun, 29 May 2011 16:40:19 +0000 (18:40 +0200)]
fixed #260: Scale animation also scales color
Added missing normalization. Thanks to Lauri for analysing this.

13 years agoscreen shot fixes (issue #127 related)
ThorstenB [Sat, 28 May 2011 21:09:06 +0000 (23:09 +0200)]
screen shot fixes (issue #127 related)
Provide proper return status when screen grabbing.
Allow tasks to remove themselves (return task entries to the queue _before_
executig them)

13 years agoMerge branch 'next' of gitorious.org:fg/simgear into next
Torsten Dreyer [Sat, 28 May 2011 08:20:03 +0000 (10:20 +0200)]
Merge branch 'next' of gitorious.org:fg/simgear into next

13 years ago(Re)fix bug #285, textranslate broken
Torsten Dreyer [Sat, 28 May 2011 08:17:19 +0000 (10:17 +0200)]
(Re)fix bug #285, textranslate broken

Due to fingertrouble, I removed the check for _step == 0 which
this patch re-adds.

Also, make this function look more like a template by not using
0.0 - constants.

13 years agoMinor compiler version detection issue.
ThorstenB [Fri, 27 May 2011 20:30:18 +0000 (22:30 +0200)]
Minor compiler version detection issue.
Well, almost prepared for gcc 5.0 now ;-).

13 years agoMake multicast sockets work under windows
Torsten Dreyer [Fri, 27 May 2011 19:06:06 +0000 (21:06 +0200)]
Make multicast sockets work under windows

msdn article 737550 states that "the preferred method is to call the
bind function to associate a socket with a local IP address and then
join the multicast group. Although this order of operations is not
mandatory, it is strongly recommended".
Since binding to the multicast address seems to fail, let's try binding
to INADDR_ANY and joint thereafter.

13 years agoignore cmake generated files
Torsten Dreyer [Wed, 25 May 2011 17:21:08 +0000 (19:21 +0200)]
ignore cmake generated files

13 years agoFix bug #285 textranslate and scroll animation with negative numbers
Torsten Dreyer [Wed, 25 May 2011 17:14:09 +0000 (19:14 +0200)]
Fix bug #285 textranslate and scroll animation with negative numbers

rewrite SGStepExpression::apply_mods so it creates the same step
for negative numbers as it does for positive numbers.

13 years agoPort version-defined-in-a-file logic over from fg.
James Turner [Sat, 21 May 2011 13:56:10 +0000 (14:56 +0100)]
Port version-defined-in-a-file logic over from fg.

13 years agoBump Simgear version to 2.3.0 - should have been done after 2.2.0 was branched, oops...
James Turner [Sat, 21 May 2011 13:12:31 +0000 (14:12 +0100)]
Bump Simgear version to 2.3.0 - should have been done after 2.2.0 was branched, oops. Will refactor this lot to use a single 'version' file like FG, soon.

13 years agoFix 3D cloud elevation
Stuart Buchanan [Sat, 14 May 2011 20:13:05 +0000 (21:13 +0100)]
Fix 3D cloud elevation

13 years agoAlso remove visual_enviro.cxx from the VC90 build.
ThorstenB [Sat, 7 May 2011 17:40:01 +0000 (19:40 +0200)]
Also remove visual_enviro.cxx from the VC90 build.

13 years agoAlso remove visual_enviro.cxx from the cmake build system.
Mathias Froehlich [Sat, 7 May 2011 16:32:44 +0000 (18:32 +0200)]
Also remove visual_enviro.cxx from the cmake build system.

13 years agoRemove unused class SGEnviro
Torsten Dreyer [Fri, 6 May 2011 12:10:04 +0000 (14:10 +0200)]
Remove unused class SGEnviro

This class and their source files visual_enviro.[h|c]xx were
unused since OSG transition. It's only functionality was to
keep a variable for the enable-state of rendering of precipitation.
This has now been moved to SGPrecipitation.

13 years agofix typo
Torsten Dreyer [Fri, 6 May 2011 11:07:21 +0000 (13:07 +0200)]
fix typo

13 years agoFix a crash on exit. The SGEnviro destructor was attempting to delete an
Curtis L. Olson [Tue, 3 May 2011 18:24:57 +0000 (13:24 -0500)]
Fix a crash on exit.  The SGEnviro destructor was attempting to delete an
object that had already been deleted by the sound manager.  Since SGEnviro
doesn't own this object, I removed the delete from it's destructor.

13 years agoConsistency fix - remove a warning under MSVC
Frederic Bouvier [Tue, 26 Apr 2011 18:42:42 +0000 (20:42 +0200)]
Consistency fix - remove a warning under MSVC

13 years agoCompile under MSVC
Frederic Bouvier [Tue, 26 Apr 2011 17:45:40 +0000 (19:45 +0200)]
Compile under MSVC

13 years agoImprovements to the global 3D clouds system
Torsten Dreyer [Sat, 23 Apr 2011 18:56:28 +0000 (20:56 +0200)]
Improvements to the global 3D clouds system

Stuart Buchanan:
Improvements to the global 3D clouds system
- clouds now move with the wind
- bug causing cloud coverage to be less than it should have been fixed
- support for adding 3D clouds with an fg_command.

(https://gitorious.org/fg/flightgear/merge_requests/1554)

13 years agoLauri Peltonen's patch to increase the number of rings and bands of the sky dome
Erik Hofman [Sat, 16 Apr 2011 09:32:34 +0000 (11:32 +0200)]
Lauri Peltonen's patch to increase the number of rings and bands of the sky dome

13 years agoAdd multicast support for sockets
Torsten Dreyer [Wed, 13 Apr 2011 16:43:28 +0000 (18:43 +0200)]
Add multicast support for sockets

13 years agoEnable OSG cache (default) and option to disable.
ThorstenB [Sun, 3 Apr 2011 16:56:09 +0000 (18:56 +0200)]
Enable OSG cache (default) and option to disable.
(also requires flightgear update)

13 years agoMinor event manager clean-up/simplification.
ThorstenB [Sun, 3 Apr 2011 15:39:23 +0000 (17:39 +0200)]
Minor event manager clean-up/simplification.
(Mainly disliked the "delete this;" concept :) ).

13 years agoImprove subsystem manager's timing statistics
ThorstenB [Wed, 23 Mar 2011 22:12:13 +0000 (23:12 +0100)]
Improve subsystem manager's timing statistics
Option to print statistics at run-time.
Convenient filter parameters to show subsystems with jitter or excessive
execution time only.

13 years agoKeep PropertyList outside global namespace
ThorstenB [Wed, 23 Mar 2011 21:30:42 +0000 (22:30 +0100)]
Keep PropertyList outside global namespace
Avoids conflict with FG's GUI widget "PropertyList"...
(don't use "using..." in header files since namespaces become useless then)

13 years agoAvoid some memory leaks in derived classes due to non-virtual destructors.
ThorstenB [Sat, 19 Mar 2011 13:50:18 +0000 (14:50 +0100)]
Avoid some memory leaks in derived classes due to non-virtual destructors.

13 years agoAvoid nuisance sounds in initial update loop.
ThorstenB [Sat, 19 Mar 2011 13:48:58 +0000 (14:48 +0100)]
Avoid nuisance sounds in initial update loop.
Stop all "in-transit" sounds effects from triggering in the first update
loop when their initial property value is "1".

13 years agoCatch dangling property ties.
ThorstenB [Mon, 7 Mar 2011 18:32:20 +0000 (19:32 +0100)]
Catch dangling property ties.
It's bad when tied properties are not untied before removing the tied property list.
We could try to "untie" the properties in the destructor - but that usually
caused weird mem access errors, since the tied properties will access
a no longer existing object (the very object whose destruction called the
TiedPropertyList destructor...). => so just add a warning and a nagging trap :)

13 years agoChange cloudfield::addCloud interface,
ThorstenB [Mon, 7 Mar 2011 18:26:37 +0000 (19:26 +0100)]
Change cloudfield::addCloud interface,
so it's more obvious that "addCloud" won't keep a reference to SGNewCloud.

13 years agoReplace occurrences of osgDB::findDataFile with SGModelLib wrapper
ThorstenB [Sun, 6 Mar 2011 21:38:44 +0000 (22:38 +0100)]
Replace occurrences of osgDB::findDataFile with SGModelLib wrapper
which considers separate aircraft dirs (--fg-aircraft).

13 years agoMerge remote branch 'origin/releases/2.2.0' into next
ThorstenB [Fri, 4 Mar 2011 21:52:21 +0000 (22:52 +0100)]
Merge remote branch 'origin/releases/2.2.0' into next

13 years agoFix TextureBuilder to work with --fg-aircraft dirs.
ThorstenB [Fri, 4 Mar 2011 21:50:32 +0000 (22:50 +0100)]
Fix TextureBuilder to work with --fg-aircraft dirs.
Avoid direct use of osgDB to search for files. Using SGModelLib
instead to also search fg-aircraft dirs.

13 years agoAdd missing META_Object to SGReaderWriterXMLOptions (needed for proper cloning)
Csaba Halasz [Tue, 1 Mar 2011 19:57:09 +0000 (20:57 +0100)]
Add missing META_Object to SGReaderWriterXMLOptions (needed for proper cloning)

13 years agoDon't depend on props.hxx
Torsten Dreyer [Sun, 27 Feb 2011 19:35:44 +0000 (20:35 +0100)]
Don't depend on props.hxx

There is no reference to anything defined in props.hxx, so remove
the dependency here.

13 years agoAdd strutils::starts_with and strutils::ends_with
Torsten Dreyer [Sun, 20 Feb 2011 14:29:06 +0000 (15:29 +0100)]
Add strutils::starts_with and strutils::ends_with

13 years agoMerge remote branch 'origin/releases/2.2.0' into next
ThorstenB [Sat, 19 Feb 2011 10:59:10 +0000 (11:59 +0100)]
Merge remote branch 'origin/releases/2.2.0' into next

13 years ago#83: John Denker: Set correct file modes
ThorstenB [Sat, 19 Feb 2011 10:54:10 +0000 (11:54 +0100)]
#83: John Denker: Set correct file modes
Sources shouldn't be executable.

13 years agoMerge branch 'releases/2.2.0' into next
Tim Moore [Thu, 17 Feb 2011 10:40:47 +0000 (11:40 +0100)]
Merge branch 'releases/2.2.0' into next

13 years agofix SGPagedLOD change for 2.8.3
Tim Moore [Thu, 17 Feb 2011 10:39:52 +0000 (11:39 +0100)]
fix SGPagedLOD change for 2.8.3

One more try...

13 years agoMerge branch 'releases/2.2.0' into next
Tim Moore [Wed, 16 Feb 2011 15:54:35 +0000 (16:54 +0100)]
Merge branch 'releases/2.2.0' into next

13 years agodon't assume that OSG 2.8.3 has PagedLOD options
Tim Moore [Wed, 16 Feb 2011 15:46:24 +0000 (16:46 +0100)]
don't assume that OSG 2.8.3 has PagedLOD options

I was confused by my git svn import of the OSG tree.

13 years agoMerge branch 'releases/2.2.0' into next
Tim Moore [Tue, 15 Feb 2011 11:52:03 +0000 (12:52 +0100)]
Merge branch 'releases/2.2.0' into next

Conflicts:
simgear/scene/model/SGPagedLOD.cxx

13 years agoaccomodate changes to osgDB::DatabasePager interface
Tim Moore [Tue, 15 Feb 2011 11:28:03 +0000 (12:28 +0100)]
accomodate changes to osgDB::DatabasePager interface

The change was introduced in OSG SVN revision 12080. Note: that
revision has a bug that causes fgfs to crash. The bug is fixed in
revision 12170.