]> git.mxchange.org Git - simgear.git/log
simgear.git
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 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 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 agoMerge branch 'ehofman/sky'
Tim Moore [Thu, 26 Nov 2009 22:28:34 +0000 (23:28 +0100)]
Merge branch 'ehofman/sky'

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 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 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 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 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 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

14 years agosigh, forgot another alut* at the wrong place.
ehofman [Sun, 18 Oct 2009 18:52:15 +0000 (18:52 +0000)]
sigh, forgot another alut* at the wrong place.

14 years agorestore some part of the code to prevent an untwanted segmentationf fault.
ehofman [Sun, 18 Oct 2009 13:55:21 +0000 (13:55 +0000)]
restore some part of the code to prevent an untwanted segmentationf fault.

14 years agoStart the sound manager in a deactived state. This means the code now has to activate...
ehofman [Sun, 18 Oct 2009 13:44:38 +0000 (13:44 +0000)]
Start the sound manager in a deactived state. This means the code now has to activate it explicitly when desired. A non active state means the update function will no be executed.

14 years agoforward declare Point3D in sg_types.hxx
Tim Moore [Sun, 18 Oct 2009 10:08:42 +0000 (12:08 +0200)]
forward declare Point3D in sg_types.hxx

This avoids sucking in SGMath.hxx -- and therefore a bunch of OSG headers --
into many compilation units.

14 years agoDon't delete the sample data if it wasn't constructed as a file. It's now deleted...
ehofman [Sun, 18 Oct 2009 09:34:24 +0000 (09:34 +0000)]
Don't delete the sample data if it wasn't constructed as a file. It's now deleted when calling free_data() by the owner or in the  destructor.

14 years agorevert to previous version
ehofman [Sun, 18 Oct 2009 08:48:34 +0000 (08:48 +0000)]
revert to previous version

14 years agomake sure update_late isn't executed when dt=0
ehofman [Sat, 17 Oct 2009 13:09:27 +0000 (13:09 +0000)]
make sure update_late isn't executed when dt=0

14 years agodocumentation, licensing, copyright and small api updates.
ehofman [Sat, 17 Oct 2009 12:36:48 +0000 (12:36 +0000)]
documentation, licensing, copyright and small api updates.

14 years agoconvert _relative_pos to a vector of doubles and set the relative offset
ehofman [Fri, 16 Oct 2009 13:19:36 +0000 (13:19 +0000)]
convert _relative_pos to a vector of doubles and set the relative offset

14 years ago_data is not an array of pointer
ehofman [Fri, 16 Oct 2009 11:37:52 +0000 (11:37 +0000)]
_data is not an array of pointer

14 years agoAlut < 1.0 fixes and finaly fix the sound orientation
ehofman [Fri, 16 Oct 2009 09:45:00 +0000 (09:45 +0000)]
Alut < 1.0 fixes and finaly fix the sound orientation

14 years agoInitialization was done much earlier than expected resulting in some sample
ehofman [Thu, 15 Oct 2009 17:08:45 +0000 (17:08 +0000)]
Initialization was done much earlier than expected resulting in some sample
groups not being activated (and sample loading using OpenAL/ALUT functions to
be scheduled before OpenAL was initilialized).

fix alutInit counter
remove left over static declaration fro SGSoundMgr::load

14 years agoadd a debugging statement
ehofman [Thu, 15 Oct 2009 12:33:32 +0000 (12:33 +0000)]
add a debugging statement

14 years agofix for latest changes
ehofman [Thu, 15 Oct 2009 12:00:20 +0000 (12:00 +0000)]
fix for latest changes

14 years agogive the sample class as much info as possible to properly position and orientate...
ehofman [Thu, 15 Oct 2009 09:18:21 +0000 (09:18 +0000)]
give the sample class as much info as possible to properly position and orientate the sounds. unfortunately at this time orientation seems to be from straight behind which means that sounds that have outer-gain set to 0.0 will not be heard yet.

14 years agoAlex Buzin:
ehofman [Mon, 12 Oct 2009 17:22:41 +0000 (17:22 +0000)]
Alex Buzin:
I got an error with the Sunday CVS - FG crashed while exiting .
gdb reports SIGSEGV error at file soundmgr_openal.cxx, line 159.

Error was fixed by changing lines 157-159 from:
        buffer_map_iterator buffers_current = _buffers.begin();
        buffer_map_iterator buffers_end = _buffers.end();
        for ( ; buffers_current != buffers_end; ++buffers_current ) {
to :
        buffer_map_iterator buffers_current;
        while(_buffers.size()){
            buffers_current = _buffers.begin();

14 years agoMerge branches 'toresten/geofix', 'jmt/lcase', 'stuart/clouds' and 'jmt/dump'
Tim Moore [Mon, 12 Oct 2009 08:03:00 +0000 (10:03 +0200)]
Merge branches 'toresten/geofix', 'jmt/lcase', 'stuart/clouds' and 'jmt/dump'

14 years agoproper naming is everything
ehofman [Sun, 11 Oct 2009 08:47:49 +0000 (08:47 +0000)]
proper naming is everything

14 years agoCorrect (and verrified) position, orientation and velocity vector. Todo: proper sound...
ehofman [Sun, 11 Oct 2009 13:38:27 +0000 (13:38 +0000)]
Correct (and verrified) position, orientation and velocity vector. Todo: proper sound orientation (the all face forward using the airplane orientation now) and disabling doppler effect when tied to the listener

14 years agoOpenAL buffer management; add a buffer cache to prevent loading the same sample in...
ehofman [Fri, 9 Oct 2009 09:00:53 +0000 (09:00 +0000)]
OpenAL buffer management; add a buffer cache to prevent loading the same sample in memory twice. Especially useful to save memory for multi-aircraft configurations and (later) for AI models.

14 years agoadd the option to tie a SampleGroup to the listener position and orientation
ehofman [Wed, 7 Oct 2009 12:54:47 +0000 (12:54 +0000)]
add the option to tie a SampleGroup to the listener position and orientation

14 years agoalut pre-1.0 doesn't support aletGetError but then again, this function doesn't get...
ehofman [Wed, 7 Oct 2009 07:31:14 +0000 (07:31 +0000)]
alut pre-1.0 doesn't support aletGetError but then again, this function doesn't get called in that case either so just comment it out at build time

14 years agoUpdate the screen-dump code to use osgDB, and hence write out files in more common...
jmt [Tue, 6 Oct 2009 20:05:46 +0000 (20:05 +0000)]
Update the screen-dump code to use osgDB, and hence write out files in more common formats (PNG, JPEG, etc). The PPM writing code is retained for the moment, in case someone other than FG is relying upon it.

14 years agofix a typo
ehofman [Tue, 6 Oct 2009 12:11:33 +0000 (12:11 +0000)]
fix a typo

14 years ago(try to) properly align model and viewer
ehofman [Tue, 6 Oct 2009 12:09:28 +0000 (12:09 +0000)]
(try to) properly align model and viewer

14 years agodefault listener (master volume) default to 0.0 to save some ugly code in FlightGear
ehofman [Mon, 5 Oct 2009 13:42:12 +0000 (13:42 +0000)]
default listener (master volume) default to 0.0 to save some ugly code in FlightGear

14 years agoadd the alc.h header file vor OpenAL context related code
ehofman [Mon, 5 Oct 2009 11:10:40 +0000 (11:10 +0000)]
add the alc.h header file vor OpenAL context related code

14 years agoRename update() to update_late() for the sound manager to be able to initialize it...
ehofman [Mon, 5 Oct 2009 08:56:40 +0000 (08:56 +0000)]
Rename update() to update_late() for the sound manager to be able to initialize it before any other class that uses it. This will allow the SoundManager to be safely accessed in the constructor of those classes.

14 years agoInitial commit of the new sound system, expect more updates to follow
ehofman [Sun, 4 Oct 2009 13:52:27 +0000 (13:52 +0000)]
Initial commit of the new sound system, expect more updates to follow

14 years agoStuart Buchanan:
durk [Fri, 2 Oct 2009 05:44:25 +0000 (05:44 +0000)]
Stuart Buchanan:
   Improvements to the cloudsystem:
        - A new xml format
        - Texture indexing based on the position of the sprite in the cloud
          mass, allowing more control over the texture set.
        - Improved fog and shading
        - Better sprite distribution
        - A more natural distribution of clouds, so no more obvious grids.

14 years agoBack out convertToLowerCase function
Tim Moore [Wed, 30 Sep 2009 22:31:36 +0000 (00:31 +0200)]
Back out convertToLowerCase function

It brought in an OSG dependency; we'll just use boost::to_lower_copy instead.

14 years agoMerge branch 'jmt/lcase' into next
Tim Moore [Mon, 28 Sep 2009 21:51:07 +0000 (23:51 +0200)]
Merge branch 'jmt/lcase' into next

14 years agoMerge branch 'master' into next
Tim Moore [Mon, 28 Sep 2009 21:50:56 +0000 (23:50 +0200)]
Merge branch 'master' into next