Tim Moore
15b6c431c0
Merge branch 'timoore/merge-effects'
2009-12-20 12:05:07 +01:00
Tim Moore
b5c46a8d59
Merge branch 'ehofman/sound'
2009-12-20 11:11:16 +01:00
Tim Moore
17df9cc459
Change boost version to 1.37 again
...
boost/tr1 doesn't support unordered_map before, and I don't want to
test for it myself.
2009-12-20 10:34:07 +01:00
Tim Moore
b4f58ef24e
Drop boost version back to 1.34
2009-12-20 10:34:07 +01:00
Tim Moore
cb0472f33e
updated documentation of effects
...
Still a work in progress...
2009-12-20 10:34:07 +01:00
Tim Moore
fcd3348ae6
bump boost version to 1.37
2009-12-20 10:34:07 +01:00
Tim Moore
6acd657a05
Attach an empty shader program to the scene graph root
...
This establishes a default state of using the OpenGL fixed function pipeline.
Otherwise a shader program from a state set can leak into state sets that don't
use shaders at all.
2009-12-20 10:34:07 +01:00
Tim Moore
9a94b26609
Changes for animated effects
2009-12-20 10:34:07 +01:00
Tim Moore
3abe700dc8
Move the property expression code back to simgear.
2009-12-20 10:34:07 +01:00
Tim Moore
c4e62cc69f
Don't allocate string temporaries for comparisons.
2009-12-20 10:34:07 +01:00
ehofman
61ffbf4615
activate atc settings in the sound mixer dialog
2009-12-12 00:12:19 +01:00
Tim Moore
9bc4c938d2
Clean up autoconf test for osg::CullSettings::CLEAR_MASK
2009-12-10 07:26:52 +01:00
ehofman
641f000860
Activate external-view checkbox for avionics
2009-12-09 08:16:48 +01:00
ehofman
168dc6ff92
if volume is too low, skip the function entirely
2009-12-09 08:16:39 +01:00
ehofman
0dc35c8d38
John Denker:
...
Suggestion: It might be helpful to promote each of
the .c files to .cxx.
Rationale:
-- The configure/makefile system handles CFLAGS
differently from CXXFLAGS.
-- It is important for the *info programs to
compiled and run in exactly the same environment
as the main fgfs program. Some users depend on
compiler or linker flags such as rpath that
strongly affect the results of the *info programs.
-- There is no downside; you code compiles just
fine as-is under the c++ compiler.
second part of the original commit, for ehofman/sound
2009-12-09 08:15:37 +01:00
Tim Moore
6324d5a03d
Change int to unsigned in sound device traversal
2009-12-07 06:59:04 +01:00
ehofman
c7ef67df80
add avionics enable/disable and volume control to the sound fx class.
2009-12-03 06:43:40 +01:00
ehofman
e657a53b32
Turned out a tied proeprty can't be used as a user archive, use a different one
2009-12-01 19:12:56 +01:00
ehofman
2c617798d5
The problem with the current test is that HAVE_CULLSETTINGS_CLEAR_MASK is always defined, either with a value of 1 or a value of 0 while the test in the code checks for '#if defined(HAVE_CULLSETTINGS_CLEAR_MASK)'
2009-12-01 19:12:05 +01:00
ehofman
86cd525200
update to allow selection of a new sound device
2009-11-30 22:45:33 +01:00
ehofman
fde1a925fe
Change of thoughts since it makes life easier:
...
/sim/sound/working enable/disable the use of OpenAL
/sin/sound/enabled master mute/unmute
2009-11-30 22:45:23 +01:00
ehofman
64de526267
Fix for older OpenAL versions.
2009-11-30 22:45:07 +01:00
ehofman
a3b66adf51
add a new command line option: --show-sound-devices
2009-11-30 22:44:57 +01:00
ehofman
b4b3f62717
add alcinfo instead.
2009-11-30 09:38:57 +01:00
Tim Moore
78ebe9424b
Add HAVE_CULLSETTINGS_CLEAR_MASK to configure.ac and check it in camera code
...
This works around a behavior / interface change in OSG post 2.9.6.
2009-11-30 09:29:07 +01:00
Csaba Halasz
4fc7105675
Update camera inheritance masks because of OSG changeset 10838
2009-11-30 07:00:43 +01:00
ehofman
3a4892cede
New Property layout:
...
/sim/sound/enabled enable/disable the use of OpenAL
/sin/sound/pause master mute, effects all SampleGroups
/sim/sound/volume master volume
/sim/sound/effects/enabled enable/disable (mute) sound fx
/sim/sound/effects/volume effects volume
/sim/sound/chatter/enabled enable/disable (mute) atc chatter
/sim/sound/chatter/volume chatter (sample queue) volume
2009-11-29 15:57:37 +01:00
ehofman
3abb7afa45
List all available playback devices under '/sim/sound/devcies'
2009-11-29 15:57:17 +01:00
ehofman
ef4814599d
* Fix --disable-sound
...
* Add a new command line option: --sound-device=""
This makes OpenAL use the sepcified audio device instead of the default
output device. (Look for playback devices when calling openal-info of alcinfo)
2009-11-29 15:57:02 +01:00
Tim Moore
6fcd9f967b
Merge branch 'luff/kln89'
2009-11-27 06:41:43 +01:00
Tim Moore
e503591af4
Merge branch 'jmt/gps'
...
Conflicts:
src/Instrumentation/gps.cxx
2009-11-27 06:40:47 +01:00
Tim Moore
8933486a56
Merge branch 'jmt/dialog'
2009-11-26 23:32:38 +01:00
Tim Moore
b39599f578
Merge branch 'ehofman/sky'
2009-11-26 23:32:20 +01:00
Tim Moore
ad9366ed99
Merge branch 'ehofman/jsbsim'
2009-11-26 23:31:59 +01:00
Tim Moore
8e820977be
Merge branches 'csaba/commlist' and 'csaba/recip'
2009-11-26 23:31:45 +01:00
ehofman
3d19352f13
proper listener velocity calculation, this has no effect yet but is required when other models start emitting sounds.
2009-11-24 14:22:54 +01:00
ehofman
934ce52a23
Tie samplegroup 'avionics' to the listener, just in case no other device is created that does it.
2009-11-19 23:09:49 +01:00
ehofman
97db69cf8f
restore listener position with offset
2009-11-19 21:03:05 +01:00
jmt
33058511de
Dave Perry:
...
Allows using a nasal filter to smoothly park the gs needle when out
of range or frequency changes to a station w/o gs.
2009-11-15 01:31:42 +01:00
ehofman
0578b06a0c
temporarily remove listener (viewer) and source offsets. they mess things up
2009-11-12 23:01:41 +01:00
ehofman
96b7939947
put the debugging quat strings as doubles under /sim/current-view/debug instead.
2009-11-11 17:49:42 +01:00
ehofman
769bac95e3
put the debugging quat strings as doubles under /sim/current-view/debug instead.
2009-11-11 17:49:42 +01:00
ehofman
742aec2f32
Pass the north-east-down velocty directly to the sample_group and do the calculations there.
2009-11-10 16:29:51 +01:00
ehofman
db3a4b0753
fix a typo
2009-11-10 06:56:16 +01:00
ehofman
d5b9f552dd
Add a description of the 'type' tag
2009-11-10 06:56:05 +01:00
ehofman
2bc7dc685b
allow sound effects in the configuration file to be added to the 'avionics' sample group by setting '<type>avionics</type>'.
2009-11-10 06:55:46 +01:00
ehofman
af6da1d3c1
sun postition fixes
...
Was: allow sound effects in the configuration file to be added to the 'avionics' sample group by setting '<type>avionics</type>'.
but this change obviously snuck in with that.
2009-11-10 06:54:57 +01:00
ehofman
7c1314954f
Remove old MSVC6.0 files that doen't work anymore
2009-11-09 10:43:51 +01:00
Tim Moore
8117134879
don't define constant objects in header files
2009-11-09 10:24:46 +01:00
ehofman
e750dc368d
John Denker:
...
Together with previous patch, make view reference frame, view offset,
and current view visible in property tree.
Also some comments about the concepts behind these variables.
2009-11-09 10:07:42 +01:00
