]> git.mxchange.org Git - simgear.git/log
simgear.git
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 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

14 years agoremove CopyPolicy from ModelRegistry
Tim Moore [Sun, 20 Sep 2009 07:29:05 +0000 (09:29 +0200)]
remove CopyPolicy from ModelRegistry

Put the responsibility for copying a loaded model directly in
SGReaderWriterXML.

14 years agotemporarily remove listener (viewer) and source offsets. they mess things up
ehofman [Thu, 12 Nov 2009 20:41:19 +0000 (20:41 +0000)]
temporarily remove listener (viewer) and source offsets. they mess things up

14 years agofix typo
Tim Moore [Tue, 10 Nov 2009 21:10:57 +0000 (22:10 +0100)]
fix typo

14 years agoalso recalculate the velocity in update_pos_and_orienation, so pass the north-east...
ehofman [Tue, 10 Nov 2009 14:28:28 +0000 (14:28 +0000)]
also recalculate the velocity in update_pos_and_orienation, so pass the north-east-down velocity directly and orientate position, orientation and velocity to OpenGL/OpenAL frames (x-right, y-up and z-back)

14 years agoallow sound effects in the configuration file to be added to the 'avionics' sample...
ehofman [Mon, 9 Nov 2009 10:28:21 +0000 (10:28 +0000)]
allow sound effects in the configuration file to be added to the 'avionics' sample group by setting '<type>avionics</type>'.

14 years agoMove propertyExpression code from flightgear to simgear
Tim Moore [Mon, 9 Nov 2009 12:28:11 +0000 (13:28 +0100)]
Move propertyExpression code from flightgear to simgear

Also add a function (possibly redundant) to access the global property
root.

14 years agoProperty system optimizations
Tim Moore [Thu, 5 Nov 2009 08:06:18 +0000 (09:06 +0100)]
Property system optimizations

Profiling startup with the new effects code exposed some performance
gotchas. The objective is to reduce allocation of std::string
temporaries, especially when looking up node path names. Also, I
changed some paths to initialize strings with strings instead of char *;
this causes less allocation, at least with glibc. Also, eliminate
the old version of find_node and its helper functions by writing the
template version of find_node_aux to handle an explicit index
parameter.

Also, add const char[] as an internal property type

This doesn't actually add a new type to the property system, but allows using
character arrays as arguments to certain templates.

14 years agoRemove old MSVC6.0 files that doen't work anymore
ehofman [Mon, 9 Nov 2009 09:23:00 +0000 (09:23 +0000)]
Remove old MSVC6.0 files that doen't work anymore

14 years agoOops, it was the scenery up vector, not the viewer up vector
ehofman [Thu, 5 Nov 2009 16:58:48 +0000 (16:58 +0000)]
Oops, it was the scenery up vector, not the viewer up vector

14 years agoSave a costly SGVec3d::fromGeod() calculation
ehofman [Thu, 5 Nov 2009 13:46:15 +0000 (13:46 +0000)]
Save a costly SGVec3d::fromGeod() calculation

14 years agopass the geodetic position and view orientation to the sky reposition function
ehofman [Thu, 5 Nov 2009 12:48:16 +0000 (12:48 +0000)]
pass the geodetic position and view orientation to the sky reposition function

14 years agosmall fixes
ehofman [Wed, 4 Nov 2009 10:25:59 +0000 (10:25 +0000)]
small fixes

14 years agofix directional sound orientation
ehofman [Tue, 3 Nov 2009 11:42:32 +0000 (11:42 +0000)]
fix directional sound orientation

14 years agoadjust to recent changes
ehofman [Tue, 3 Nov 2009 10:16:46 +0000 (10:16 +0000)]
adjust to recent changes

14 years agosome small fixes
ehofman [Tue, 3 Nov 2009 09:59:19 +0000 (09:59 +0000)]
some small fixes

14 years agoRemove more unneeded code and properly set relative position and sound direction
ehofman [Mon, 2 Nov 2009 21:38:39 +0000 (21:38 +0000)]
Remove more unneeded code and properly set relative position and sound direction

14 years agoSmall code reorganization, mostly removing unneeded code
ehofman [Mon, 2 Nov 2009 11:39:37 +0000 (11:39 +0000)]
Small code reorganization, mostly removing unneeded code

14 years agoPosition and orientation fixes thanks to Tim Moore (finaly). Code optimizations by...
ehofman [Mon, 2 Nov 2009 10:31:05 +0000 (10:31 +0000)]
Position and orientation fixes thanks to Tim Moore (finaly). Code optimizations by moving code over from SGSoundSample to SGSampleGroup which means it will only run once for every sample group instead of once for every sample.

14 years agosilently clip pitch and gain to their maximum values
ehofman [Sun, 1 Nov 2009 17:34:25 +0000 (17:34 +0000)]
silently clip pitch and gain to their maximum values

14 years agoproper orientation(?) and comment out relative position and direction code since...
ehofman [Sun, 1 Nov 2009 14:51:10 +0000 (14:51 +0000)]
proper orientation(?) and comment out relative position and direction code since it messes with OpenAL in such a way that volume doesn't work properly anymore

14 years agoanother attempt at getting something useful without any result.
ehofman [Sat, 31 Oct 2009 14:18:41 +0000 (14:18 +0000)]
another attempt at getting something useful without any result.

14 years agofix a typo
ehofman [Sat, 31 Oct 2009 08:53:55 +0000 (08:53 +0000)]
fix a typo

14 years agofix a gcc version test
ehofman [Sat, 31 Oct 2009 08:46:46 +0000 (08:46 +0000)]
fix a gcc version test

14 years agoMacOS X fix
ehofman [Sat, 31 Oct 2009 08:41:07 +0000 (08:41 +0000)]
MacOS X fix

14 years agoadd relative pos back in
ehofman [Fri, 30 Oct 2009 12:59:53 +0000 (12:59 +0000)]
add relative pos back in

14 years agopass the float pointer to the isNaN function instead of the SGVec3 type
ehofman [Thu, 29 Oct 2009 17:03:16 +0000 (17:03 +0000)]
pass the float pointer to the isNaN function instead of the SGVec3 type

14 years agomultiply quats in the right order
ehofman [Thu, 29 Oct 2009 14:58:02 +0000 (14:58 +0000)]
multiply quats in the right order

14 years agoCommit the current state of affairs to see if it fixes the position code for others
ehofman [Thu, 29 Oct 2009 13:33:52 +0000 (13:33 +0000)]
Commit the current state of affairs to see if it fixes the position code for others

14 years agoanother test program, using real world locations
ehofman [Thu, 29 Oct 2009 12:53:20 +0000 (12:53 +0000)]
another test program, using real world locations

14 years agoFix a bug where a sample was removed from the sample list before it was stopped....
ehofman [Wed, 28 Oct 2009 14:27:47 +0000 (14:27 +0000)]
Fix a bug where a sample was removed from the sample list before it was stopped. Proper listener orientation when inside the airplane (need to find a good solution for outside view).

14 years agoalso test for NaN in listener code
ehofman [Tue, 27 Oct 2009 12:21:56 +0000 (12:21 +0000)]
also test for NaN in listener code

14 years agosmall code reorganization and addition of debugging tests.
ehofman [Tue, 27 Oct 2009 12:10:42 +0000 (12:10 +0000)]
small code reorganization and addition of debugging tests.

14 years agoFGViewer::recalcLookFrom turned out to be an excellent source of information for...
ehofman [Mon, 26 Oct 2009 21:06:45 +0000 (21:06 +0000)]
FGViewer::recalcLookFrom turned out to be an excellent source of information for prosition and orientation

14 years agore-enable sound positioning and velocity, test for NaN's and print a message when...
ehofman [Mon, 26 Oct 2009 10:47:31 +0000 (10:47 +0000)]
re-enable sound positioning and velocity, test for NaN's and print a message when it happens (debugging, should be removed later on).

14 years agomove all isnan() declarations from sample_group.cxx to compiler.h since it's too...
ehofman [Mon, 26 Oct 2009 09:05:19 +0000 (09:05 +0000)]
move all isnan() declarations from sample_group.cxx to compiler.h since it's too important not to have available everywhere.

14 years agoMore include SGMath.hxx to keep MSVC happy
Tim Moore [Tue, 20 Oct 2009 08:18:15 +0000 (10:18 +0200)]
More include SGMath.hxx to keep MSVC happy

14 years agoUse shared pointers for any reference to SGSoundSample, fix the constructor of SGSoun...
ehofman [Sat, 24 Oct 2009 12:57:11 +0000 (12:57 +0000)]
Use shared pointers for any reference to SGSoundSample, fix the constructor of SGSoundSample where data is supplied by the calling program.

14 years agoget rid of aut_ptr, it only works with objects that can destroyed with delete (and...
ehofman [Sat, 24 Oct 2009 08:18:09 +0000 (08:18 +0000)]
get rid of aut_ptr, it only works with objects that can destroyed with delete (and not even delete[]) which is too limited. take drastic actions to find the sound-not-playing-bug: set all positions and orientations to default all the time.

14 years ago.. and remove some debugging code
ehofman [Thu, 22 Oct 2009 12:11:06 +0000 (12:11 +0000)]
.. and remove some debugging code

14 years agorevert some test code
ehofman [Thu, 22 Oct 2009 12:10:35 +0000 (12:10 +0000)]
revert some test code

14 years agoshould use free instead of delete for malloced data.
ehofman [Thu, 22 Oct 2009 12:07:56 +0000 (12:07 +0000)]
should use free instead of delete for malloced data.

14 years agoa few more temporarty debugging statements
ehofman [Thu, 22 Oct 2009 08:58:40 +0000 (08:58 +0000)]
a few more temporarty debugging statements

14 years agofix a memory leak and add some temporary debugging statements.
ehofman [Thu, 22 Oct 2009 08:32:04 +0000 (08:32 +0000)]
fix a memory leak and add some temporary debugging statements.

14 years agoUpdates to the test utilies.
ehofman [Wed, 21 Oct 2009 16:52:02 +0000 (16:52 +0000)]
Updates to the test utilies.

14 years agoFix a pause situation where more code was executed than expected. Unbind an OpenAL...
ehofman [Tue, 20 Oct 2009 11:31:00 +0000 (11:31 +0000)]
Fix a pause situation where more code was executed than expected. Unbind an OpenAL buffer from an OpenAL source when requested to stop playing.

14 years agouse auto_ptr instead
ehofman [Mon, 19 Oct 2009 14:09:21 +0000 (14:09 +0000)]
use auto_ptr instead

14 years agodo not yet add the relative sound position to the absolute position, it's generating...
ehofman [Mon, 19 Oct 2009 10:40:13 +0000 (10:40 +0000)]
do not yet add the relative sound position to the absolute position, it's generating NaN's at the moment. Fix a bunch of other small bugs