1
0
Fork 0
Commit graph

8382 commits

Author SHA1 Message Date
durk
16dd34839f Replacement code for ATCDCL functions are in ATC/atcutils.[ch]xx. Thanks to Alex Buzin for reporting. 2010-01-21 06:25:19 +01:00
durk
d8ae90801a Some additional changes to ensure that FlightGear at least compiles after configuring with --disable-atcdcl. Some substitution code is added in ATC/atcutils.cxx and ATC/atcutils.hxx. Note that the new code doesn't run properly yet. Instead, it is just meant to identify which parts need replacement. Getting that to work will be the next step. 2010-01-05 22:21:49 +01:00
durk
8114d1d899 Conditional compilation of ATCDCL module. Use --disable-atcdcl to try building flightgear without ATCDCL code. 2009-12-30 17:44:06 +01:00
Tim Moore
d2c7179cd0 Merge branches 'jmt/aircraft-name' and 'jmt/runway' 2009-12-22 00:16:38 +01:00
Tim Moore
bb419b588c Merge branch 'durk/traffic' 2009-12-22 00:15:13 +01:00
Tim Moore
50c1fe2d3e Merge branch 'ehofman/jsbsim' 2009-12-22 00:14:09 +01:00
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
jmt
106aa02b76 Case-insensitive aircraft names, for the startup arg, so 'C172', 'F16', etc work. 2009-12-07 07:00:01 +01:00
Tim Moore
6324d5a03d Change int to unsigned in sound device traversal 2009-12-07 06:59:04 +01:00
jmt
e9a9ad6478 Fix displaced threshold handling when using in-scenery definitions of runways. 2009-12-07 00:13:57 +01:00
durk
bfd3efde5c Allow flights that arrive at their departure airport. 2009-12-07 00:12:28 +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
ehofman
1e744a2582 Csaba Halasz: Pass file name to xml parser for error reporting from JSBSim. 2009-11-29 15:54:22 +01:00
ehofman
7af1f496e8 PreLoad and PostLoad also from a separate file. 2009-11-29 15:53:57 +01:00
ehofman
30e535bc7b Sync. withn JSBSim CVS 2009-11-29 15:53:31 +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