]> git.mxchange.org Git - simgear.git/log
simgear.git
14 years agoMerge branch 'zan/stencil' into next
Tim Moore [Wed, 10 Feb 2010 14:48:23 +0000 (15:48 +0100)]
Merge branch 'zan/stencil' into next

14 years agoMerge branch 'ehofman/config' into next
Tim Moore [Wed, 10 Feb 2010 13:56:36 +0000 (14:56 +0100)]
Merge branch 'ehofman/config' into next

14 years agosmall MacOS fix
ehofman [Wed, 10 Feb 2010 08:13:09 +0000 (08:13 +0000)]
small MacOS fix

14 years agosmnall update for MacOS without framework support
ehofman [Tue, 9 Feb 2010 09:28:40 +0000 (09:28 +0000)]
smnall update for MacOS without framework support

14 years agoProperly test for OpenThreads and bail out if it isn't found
ehofman [Tue, 9 Feb 2010 09:26:04 +0000 (09:26 +0000)]
Properly test for OpenThreads and bail out if it isn't found

14 years agoMerge branch 'durk/deadfiles' into next-new
Tim Moore [Sat, 6 Feb 2010 22:15:09 +0000 (23:15 +0100)]
Merge branch 'durk/deadfiles' into next-new

14 years agoimplement a round-robin scheme for random objects to make sure the same type of objec...
ehofman [Mon, 1 Feb 2010 10:05:14 +0000 (10:05 +0000)]
implement a round-robin scheme for random objects to make sure the same type of object is placed at the same spot all the time

14 years ago- Remove reference to dead files.
durk [Sat, 6 Feb 2010 15:13:18 +0000 (15:13 +0000)]
- Remove reference to dead files.

14 years agoUpdate version number.
durk [Fri, 5 Feb 2010 05:37:31 +0000 (05:37 +0000)]
Update version number.

14 years agoMerge branch 'fredb/winfix'
Tim Moore [Thu, 4 Feb 2010 23:23:51 +0000 (00:23 +0100)]
Merge branch 'fredb/winfix'

14 years agoUpdate version numbers
fredb [Thu, 4 Feb 2010 22:07:28 +0000 (22:07 +0000)]
Update version numbers

14 years agoStencil operations for effects
Tim Moore [Fri, 29 Jan 2010 18:07:53 +0000 (19:07 +0100)]
Stencil operations for effects

From Lauri Peltonen

14 years agoMerge branch 'timoore/mat-effect'
Tim Moore [Thu, 28 Jan 2010 09:31:52 +0000 (10:31 +0100)]
Merge branch 'timoore/mat-effect'

14 years agoMerge branch 'freb/mingw'
Tim Moore [Thu, 28 Jan 2010 09:31:40 +0000 (10:31 +0100)]
Merge branch 'freb/mingw'

14 years agoMerge branch 'fredb/winfix'
Tim Moore [Thu, 28 Jan 2010 09:31:11 +0000 (10:31 +0100)]
Merge branch 'fredb/winfix'

14 years agoCreate a different default effect for objects that have material animations
Tim Moore [Wed, 27 Jan 2010 17:34:27 +0000 (18:34 +0100)]
Create a different default effect for objects that have material animations

14 years agoMINGW patch from Benoît Laniel
fredb [Sat, 23 Jan 2010 11:40:02 +0000 (11:40 +0000)]
MINGW patch from Benoît Laniel

14 years agoUpdate MSVC 9 projects
fredb [Fri, 22 Jan 2010 21:31:18 +0000 (21:31 +0000)]
Update MSVC 9 projects

14 years agoUpdate SimGear version
fredb [Fri, 22 Jan 2010 20:57:58 +0000 (20:57 +0000)]
Update SimGear version

14 years agoMerge branch 'ehofman/sound'
Tim Moore [Mon, 25 Jan 2010 13:02:02 +0000 (14:02 +0100)]
Merge branch 'ehofman/sound'

14 years agoMerge branch 'torsten/geoequal'
Tim Moore [Mon, 25 Jan 2010 13:01:52 +0000 (14:01 +0100)]
Merge branch 'torsten/geoequal'

14 years agoMerge branch 'durk/version'
Tim Moore [Mon, 25 Jan 2010 13:00:42 +0000 (14:00 +0100)]
Merge branch 'durk/version'

14 years agoSilently ignore previous errors to prevent halting the program on silly errors
ehofman [Thu, 21 Jan 2010 07:56:14 +0000 (07:56 +0000)]
Silently ignore previous errors to prevent halting the program on silly errors

14 years agodefine _device so testForALCError can use it initialized..
ehofman [Wed, 20 Jan 2010 13:51:37 +0000 (13:51 +0000)]
define _device so testForALCError can use it initialized..

14 years agoLet the version number reflect the current state of the release process.
durk [Tue, 19 Jan 2010 20:48:49 +0000 (20:48 +0000)]
Let the version number reflect the current state of the release process.

14 years agoChange version in comment
fredb [Sun, 17 Jan 2010 12:14:47 +0000 (12:14 +0000)]
Change version in comment

14 years agoUpdate simgear config.h version
fredb [Sun, 17 Jan 2010 12:05:29 +0000 (12:05 +0000)]
Update simgear config.h version

14 years agoUpdate MSVC 9 project
fredb [Sun, 17 Jan 2010 12:00:20 +0000 (12:00 +0000)]
Update MSVC 9 project

14 years agoWin32 fixes
fredb [Sun, 17 Jan 2010 11:59:49 +0000 (11:59 +0000)]
Win32 fixes

14 years agoMerge branch 'ehofman/sound'
Tim Moore [Sat, 16 Jan 2010 22:49:36 +0000 (23:49 +0100)]
Merge branch 'ehofman/sound'

14 years agotest for an AL or ALC error before calling an ALUT function.
ehofman [Wed, 13 Jan 2010 14:29:59 +0000 (14:29 +0000)]
test for an AL or ALC error before calling an ALUT function.

14 years agoMerge branch 'ehofman/sound'
Tim Moore [Wed, 13 Jan 2010 06:57:35 +0000 (07:57 +0100)]
Merge branch 'ehofman/sound'

14 years agoMerge branch 'tat/framework'
Tim Moore [Wed, 13 Jan 2010 06:57:30 +0000 (07:57 +0100)]
Merge branch 'tat/framework'

14 years agoMerge branch 'ehofman/subsys'
Tim Moore [Mon, 11 Jan 2010 06:15:11 +0000 (07:15 +0100)]
Merge branch 'ehofman/subsys'

14 years agoMerge branch 'jester/aptsign'
Tim Moore [Mon, 11 Jan 2010 06:14:51 +0000 (07:14 +0100)]
Merge branch 'jester/aptsign'

14 years agoMerge branch 'timoore/effects'
Tim Moore [Mon, 11 Jan 2010 06:14:23 +0000 (07:14 +0100)]
Merge branch 'timoore/effects'

14 years agoMerge branch 'jmt/geodistance'
Tim Moore [Mon, 11 Jan 2010 06:10:46 +0000 (07:10 +0100)]
Merge branch 'jmt/geodistance'

14 years agoTatsuhiro Nishioka:
ehofman [Tue, 5 Jan 2010 11:23:42 +0000 (11:23 +0000)]
Tatsuhiro Nishioka:
These patches fixes minor bug in addition to providing --with-openal-framework and --with-cocoa-framework.
Now you can use your own version of OpenAL.framework for selecting various audio output device.
Plus, you can build FG/SG on Snow Leopard with cocoa configuration.

14 years agoCsaba Halasz:
torsten [Mon, 4 Jan 2010 19:51:54 +0000 (19:51 +0000)]
Csaba Halasz:
Fix airport signs by reverting to rev 1.22 of apt_sign.cxx. Tweaked a little to handle missing materials better.

14 years agoMacOS returns an unsopported AL error when a file is not found, work around this.
ehofman [Mon, 4 Jan 2010 14:53:26 +0000 (14:53 +0000)]
MacOS returns an unsopported AL error when a file is not found, work around this.

14 years agoadd "operator == ()" to SGGeod and SGGeoc
torsten [Sat, 2 Jan 2010 16:40:06 +0000 (16:40 +0000)]
add "operator == ()" to SGGeod and SGGeoc

14 years agoAllow geocentric distance computations to return radians.
jmt [Thu, 31 Dec 2009 16:48:03 +0000 (16:48 +0000)]
Allow geocentric distance computations to return radians.

14 years agofix up some merge weirdness
Tim Moore [Fri, 1 Jan 2010 12:32:03 +0000 (13:32 +0100)]
fix up some merge weirdness

14 years agoAlso unbind subsystem groups in reverse order and destruct them in reverse order...
ehofman [Thu, 31 Dec 2009 10:14:56 +0000 (10:14 +0000)]
Also unbind subsystem groups in reverse order and destruct them in reverse order to be consistent.

14 years agounbind in reverse order to try to prevent order dependency problems.
ehofman [Tue, 29 Dec 2009 14:28:21 +0000 (14:28 +0000)]
unbind in reverse order to try to prevent order dependency problems.

14 years agoRearrange alut error checking a bit
ehofman [Tue, 29 Dec 2009 09:47:04 +0000 (09:47 +0000)]
Rearrange alut error checking a bit

14 years agoXML encodings: support 'ASCII' as an alias for 'US-ASCII'
jmt [Mon, 28 Dec 2009 20:57:57 +0000 (20:57 +0000)]
XML encodings: support 'ASCII' as an alias for 'US-ASCII'

14 years agokeep a pointer to the OpenAL vendor and renderer for reference
ehofman [Sat, 26 Dec 2009 10:07:37 +0000 (10:07 +0000)]
keep a pointer to the OpenAL vendor and renderer for reference

14 years agoMerge branch 'timoore/effects'
Tim Moore [Sun, 20 Dec 2009 15:07:00 +0000 (16:07 +0100)]
Merge branch 'timoore/effects'

Conflicts:
simgear/scene/model/model.cxx
simgear/scene/sky/newcloud.cxx

14 years agoMerge branch 'ehofman/sound'
Tim Moore [Sun, 20 Dec 2009 09:40:26 +0000 (10:40 +0100)]
Merge branch 'ehofman/sound'

Changed include of SGQuat.hxx to SGMath.hxx in
sound/sample_openal.cxx; somehow this happened in a merge commit when
the sound branch was merged to next.

14 years agoproper typecasting
ehofman [Mon, 14 Dec 2009 19:43:19 +0000 (19:43 +0000)]
proper typecasting

14 years agodon't render an EffectGeode if there is no valid technique
Tim Moore [Mon, 14 Dec 2009 05:52:00 +0000 (06:52 +0100)]
don't render an EffectGeode if there is no valid technique

Normal geometry has a default effect; geometry with no default effect
is unlikely to look correct with no state set applied. This fixes the
problem of clouds being displayed as multi-colored rectangles when
shader effects are turned off.

14 years agofix a typo.
ehofman [Wed, 9 Dec 2009 13:56:12 +0000 (13:56 +0000)]
fix a typo.

14 years agoDon't assign the buffer data to the sample in case it is a file. Test for result...
ehofman [Wed, 9 Dec 2009 10:09:41 +0000 (10:09 +0000)]
Don't assign the buffer data to the sample in case it is a file. Test for result when calling load()

14 years agoFix crash in SGSoundMgr::stop(): do not try to erase buffer items one at a time
ehofman [Wed, 9 Dec 2009 09:38:07 +0000 (09:38 +0000)]
Fix crash in SGSoundMgr::stop(): do not try to erase buffer items one at a time

14 years agoadd alcSuspendContext and alcProcessContext again to prevent sound artifacts on hardw...
ehofman [Sun, 6 Dec 2009 09:56:01 +0000 (09:56 +0000)]
add alcSuspendContext and alcProcessContext again to prevent sound artifacts on hardware accelerated soundcards.

14 years agocheck if suspend, resume and volume changed much from the previous value before setti...
ehofman [Wed, 2 Dec 2009 09:32:20 +0000 (09:32 +0000)]
check if suspend, resume and volume changed much from the previous value before setting them.

14 years agoFix runtime switching of sound devices.
ehofman [Wed, 2 Dec 2009 08:32:59 +0000 (08:32 +0000)]
Fix runtime switching of sound devices.

14 years agoUpdates to allow runtime chaning of the sound device
ehofman [Mon, 30 Nov 2009 14:22:40 +0000 (14:22 +0000)]
Updates to allow runtime chaning of the sound device

14 years agotake locks out of ModelRegistry
Tim Moore [Sun, 29 Nov 2009 21:54:02 +0000 (22:54 +0100)]
take locks out of ModelRegistry

They should be unnecessary and were causing deadlock with Effects that
load images.

14 years agoAdd a function to retreive all available playback devices.
ehofman [Sat, 28 Nov 2009 13:31:04 +0000 (13:31 +0000)]
Add a function to retreive all available playback devices.

14 years agoinitialize volume to a proper value
ehofman [Sat, 28 Nov 2009 12:59:40 +0000 (12:59 +0000)]
initialize volume to a proper value

14 years agoSmall bugfix
ehofman [Sat, 28 Nov 2009 10:48:17 +0000 (10:48 +0000)]
Small bugfix

14 years agoMake it possible to specify a different device name
ehofman [Sat, 28 Nov 2009 10:37:02 +0000 (10:37 +0000)]
Make it possible to specify a different device name

14 years agoRevert boost requirement to 1.37
Tim Moore [Sun, 29 Nov 2009 11:42:10 +0000 (12:42 +0100)]
Revert boost requirement to 1.37

I don't want to get into testing for tr1::unordered_map, and the
boost compatibility doesn't exist in 1.34.

14 years agoMerge branch 'ehofman/sky'
Tim Moore [Thu, 26 Nov 2009 22:28:34 +0000 (23:28 +0100)]
Merge branch 'ehofman/sky'

14 years agofix a memory leak in newcloud.cxx
Tim Moore [Thu, 26 Nov 2009 15:30:46 +0000 (16:30 +0100)]
fix a memory leak in newcloud.cxx

14 years agoa slightly more readable version of the test
ehofman [Thu, 26 Nov 2009 13:05:44 +0000 (13:05 +0000)]
a slightly more readable version of the test

14 years agoAlso test for older versions of OpenAL-Sample
ehofman [Thu, 26 Nov 2009 12:19:57 +0000 (12:19 +0000)]
Also test for older versions of OpenAL-Sample

14 years agoUse an effect for 3d clouds
Tim Moore [Thu, 26 Nov 2009 10:40:41 +0000 (11:40 +0100)]
Use an effect for 3d clouds

14 years agoSupport for shader program attributes in effects
Tim Moore [Thu, 26 Nov 2009 10:39:34 +0000 (11:39 +0100)]
Support for shader program attributes in effects

Also, use a hash table for the effect shader program cache.

14 years agoBetter error reporting for effects
Tim Moore [Thu, 26 Nov 2009 10:32:00 +0000 (11:32 +0100)]
Better error reporting for effects

Throw an exception when an undefine attribute value is found in an effect.

Also, fix a typo in TexEnvCombine operand attributes.

14 years agoadd a property debugging function
Tim Moore [Thu, 26 Nov 2009 09:38:31 +0000 (10:38 +0100)]
add a property debugging function

14 years agoDon't forget to apply the doppler adjustment factor to the listener velocity also
ehofman [Mon, 23 Nov 2009 11:54:33 +0000 (11:54 +0000)]
Don't forget to apply the doppler adjustment factor to the listener velocity also

14 years agotest for implementations with 'bad' doppler effects and adjust for it.
ehofman [Mon, 23 Nov 2009 10:32:26 +0000 (10:32 +0000)]
test for implementations with 'bad' doppler effects and adjust for it.

14 years agofix test programs
ehofman [Mon, 23 Nov 2009 10:31:53 +0000 (10:31 +0000)]
fix test programs

14 years agoproper listener velocity calculation, this has no effect yet but is required when...
ehofman [Mon, 23 Nov 2009 09:35:12 +0000 (09:35 +0000)]
proper listener velocity calculation, this has no effect yet but is required when other models start emitting sounds.

14 years agoadd depth attribute to Effect
Tim Moore [Mon, 23 Nov 2009 08:15:47 +0000 (09:15 +0100)]
add depth attribute to Effect

14 years agoDrop required Boost version from 1.37 to 1.34
Tim Moore [Sun, 22 Nov 2009 21:55:56 +0000 (22:55 +0100)]
Drop required Boost version from 1.37 to 1.34

Use boost/tr1 to bring in std::tr1::unordered_map instead of the Boost
version.

14 years agoMove tree shaders to an effect
Tim Moore [Sat, 21 Nov 2009 23:32:51 +0000 (00:32 +0100)]
Move tree shaders to an effect

Also, improve effect hash keys.

14 years agoEffect file support for GL_VERTEX_PROGRAM_TWO_SIDE and POINT_SIZE
Tim Moore [Sat, 21 Nov 2009 23:27:53 +0000 (00:27 +0100)]
Effect file support for GL_VERTEX_PROGRAM_TWO_SIDE and POINT_SIZE

14 years agoshader language predicate
Tim Moore [Fri, 20 Nov 2009 21:58:59 +0000 (22:58 +0100)]
shader language predicate

14 years agothe wrong name also mislead me: rotate velocity to the proper quat
ehofman [Thu, 19 Nov 2009 15:29:34 +0000 (15:29 +0000)]
the wrong name also mislead me: rotate velocity to the proper quat

14 years agomake the relative positions fixed against the body again.
ehofman [Wed, 18 Nov 2009 13:49:25 +0000 (13:49 +0000)]
make the relative positions fixed against the body again.

14 years agoSet to default distance attenuation function but change the parameters a but for...
ehofman [Tue, 17 Nov 2009 13:06:32 +0000 (13:06 +0000)]
Set to default distance attenuation function but change the parameters a but for better sound effects (and most of all quieter sounds at greta distance

14 years agoWhat do you know, the real problem turned out to be the distance attenuation function..
ehofman [Mon, 16 Nov 2009 13:32:34 +0000 (13:32 +0000)]
What do you know, the real problem turned out to be the distance attenuation function..

14 years agodescend into Effects to find default material animation values
Tim Moore [Mon, 16 Nov 2009 21:43:41 +0000 (22:43 +0100)]
descend into Effects to find default material animation values

14 years agoadd a transparent texture for effects
Tim Moore [Mon, 16 Nov 2009 21:42:46 +0000 (22:42 +0100)]
add a transparent texture for effects

This is used as a default texture for the chrome animation.

Also, fix a typo in creating combiners.

14 years agoMake MultiChangeListener derive publicly from SGPropertyChangeListener
Tim Moore [Mon, 16 Nov 2009 21:39:56 +0000 (22:39 +0100)]
Make MultiChangeListener derive publicly from SGPropertyChangeListener

Otherwise it doesn't work as a listener!

14 years agoWhen instantiating effects, copy user data of any created nodes.
Tim Moore [Sun, 15 Nov 2009 22:51:08 +0000 (23:51 +0100)]
When instantiating effects, copy user data of any created nodes.

This bug was the cause of the huge memory consumption / death reported at some places:
the BVH data on "raw" .ac models (random objects) was dropped on the floor.

14 years agoBump boost version to 1.37
Tim Moore [Sun, 15 Nov 2009 00:17:34 +0000 (01:17 +0100)]
Bump boost version to 1.37

14 years agooptimize creation and sharing of effects
Tim Moore [Fri, 13 Nov 2009 13:59:29 +0000 (14:59 +0100)]
optimize creation and sharing of effects

Implement equality test and hash for for property trees.  In an
Effect, make a hash table of Effects that inherit from it keyed on
their unmerged property tree. Using that, makeEffect() should return a
single Effect for given property tree description. Animations may
change that in the future...

14 years agoEffects in models working for transparent materials and chrome animation
Tim Moore [Fri, 16 Oct 2009 10:54:46 +0000 (12:54 +0200)]
Effects in models working for transparent materials and chrome animation

Implementation of animated effect values via the property system.

Add names for TexEnvCombine attributes

14 years agoMove Texture unit builder into TexBuilder.cxx
Tim Moore [Fri, 16 Oct 2009 10:55:44 +0000 (12:55 +0200)]
Move Texture unit builder into TexBuilder.cxx

Do the refactoring necessary to make that work.

14 years agoEffects for models
Tim Moore [Tue, 8 Sep 2009 11:09:05 +0000 (13:09 +0200)]
Effects for models

Basically working, at last. Among other things, create effects in
 models loaded directly from .ac files; this can happen, for example,
with the random models from the materials library.

14 years agoSplicing visitor for rewriting scene graphs with a minimum of copying
Tim Moore [Mon, 9 Nov 2009 15:57:19 +0000 (16:57 +0100)]
Splicing visitor for rewriting scene graphs with a minimum of copying

14 years agoDump texture attributes of StateSet into effect property tree
Tim Moore [Tue, 8 Sep 2009 10:59:58 +0000 (12:59 +0200)]
Dump texture attributes of StateSet into effect property tree

Also, decode blend function.

14 years agogetStateAttribute utility function
Tim Moore [Tue, 8 Sep 2009 10:53:33 +0000 (12:53 +0200)]
getStateAttribute utility function

This provides a concise, typesafe way to get attributes from osg::StateSet.

Also, blew away BackRefInserter.

14 years agoAdd support for blend functions and alpha test functions in effects
Tim Moore [Tue, 25 Aug 2009 14:01:11 +0000 (16:01 +0200)]
Add support for blend functions and alpha test functions in effects

14 years agowip for effects in models
Tim Moore [Sat, 15 Aug 2009 12:00:51 +0000 (14:00 +0200)]
wip for effects in models

multi-index for effect attributes