fly/flightgear
1
0
Fork 0
Code Activity
8891 commits 1 branch 0 tags 41 MiB
Commit graph

1829 commits

Author SHA1 Message Date
Tim Moore
b692a165fb Remove osgGA/MatrixManipulator include 
From AndersG; the file is gone from recent OSG.
 2010-06-06 23:31:47 +02:00
Torsten Dreyer
c89b18ddbd Ignore generated files 
add generated files to gitignore that has also been in cvsignore
remove generated config.h-msvc* from source control
 2010-06-02 11:27:16 +02:00
Tim Moore
473cea7f17 remove references to osgGA::MatrixManipulator 
This class has been removed in current OSG sources.
 2010-05-31 07:06:55 +02:00
James Turner
ad19acf1c6 Remove C++ autobrake code - this can all be done easier in XML now! 2010-05-29 10:36:23 +01:00
Jeff Taylor
09f3ee6351 Fix fgviewer segfault 
fgviewer crashes when reading weird channel options (which it doesn't use).
Here is a patch which fixes this by adding a pointer check.
 2010-05-23 20:13:09 +02:00
Tim Moore
fcb255d19e Merge branch 'ehofman/sound-reinit' into next 2010-04-12 10:02:01 +02:00
ehofman
5d0d6998d2 Don't forget to resume the sound system after reinit 2010-04-12 10:01:51 +02:00
ehofman
2b83ed9cbe allow reinitializing the sound system by setting /sim/sound/working to false at runtime. 2010-04-12 10:01:28 +02:00
Tim Moore
33aead9a21 Merge branch 'jmt/view' into next 2010-04-03 22:34:15 +02:00
jmt
bc7c3ad4c6 bug99 - Fix case where damping is enabled, but factor is 0. 2010-04-03 22:34:07 +02:00
jmt
a33745e888 Bug #99 - change viewer damping calculation, to work correctly regardless of set/recalc/update ordering per frame. 2010-04-03 22:34:00 +02:00
Tim Moore
2229af9f78 Merge branch 'ehofman/particle' into next 2010-03-28 00:35:35 +01:00
ehofman
e78c56af7d Allow particles to be frozen on pause. 2010-03-28 00:35:28 +01:00
Tim Moore
dba4a69e2c Merge branch 'torsten/commands' into next 2010-03-27 15:45:44 +01:00
torsten
5df9f6a951 Code cleanup: reuse duplicate code. 2010-03-27 15:45:25 +01:00
Tim Moore
7ee645aa20 Merge branch 'timoore/getpath-rebase' into next 2010-03-09 11:25:18 +01:00
Tim Moore
7ff80d11a0 changes for SGPropertyNode::getPath return type 
It's now a std::string.
 2010-03-09 11:24:45 +01:00
Tim Moore
d61d14aa91 Merge branch 'jmt/gui' 2010-02-25 12:04:58 +01:00
Tim Moore
351d1ddb5e Merge branch 'jmt/gui' into next 2010-02-17 07:41:48 +01:00
jmt
4f99561f63 Quiet: reduce log-level of various things from INFO to DEBUG or BULK, and tune the categories/level of some specific messages. 
Commit split by timoore in order to apply most of it to maint branch.
 2010-02-17 07:41:23 +01:00
V Meazza
00a9151b1a Add Stencil Lighting 
Signed-off-by: V Meazza <vivina.meazza@lineone.net>
 2010-02-10 15:54:48 +01:00
Tim Moore
fba05c527f Merge branch 'torsten/track' 2010-02-10 00:45:28 +01:00
Tim Moore
988a6771aa Merge branch 'durk/atcdcl-cond' 
Conflicts:
	src/ATC/trafficcontrol.cxx
	src/Main/Makefile.am
 2010-02-10 00:45:06 +01:00
Tim Moore
3e0489bd91 Merge branch 'torsten/auto' 2010-02-10 00:41:44 +01:00
durk
e54798a8e2 A couple of last-minute patched / bugfixes to mitigate the probability of collisions between user controlled aircraft and AI traffic. 
* AI aircraft distance to user proximity detection works again (lat/lon were inverted).
  * The parking uses by the user aircraft is marked as such to prevent it being reused by an AI aicraft
  * AI aircraft won't receive permission for pushback until the user aircraft is at a fair distance.
 2010-01-31 17:52:43 +01:00
fredb
00e9ad3055 MINGW patch from Benot Laniel 2010-01-25 17:12:04 +01:00
durk
a023700ebe Update base package version check. 2010-01-21 06:30:35 +01:00
Tim Moore
98d8a98ef2 Merge branch 'ehofman/sound' 2010-01-13 07:30:52 +01:00
Tim Moore
a89a28c4e6 Merge branch 'ehofman/version' 2010-01-12 09:16:02 +01:00
Tim Moore
0d9f2e3c95 Merge branch 'topic/pu-crash' 2010-01-11 07:46:27 +01:00
ehofman
8e4d979aca Don't initialize the soundmanager wehn defining --disable-sound. Sound can still be enabled at runtime by setting /sim/sound/working to 'true' 2010-01-10 23:33:57 +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
torsten
78d8e7edfd now that there is a true track property, the magnetic track is nice to have, too. 2010-01-05 22:19:58 +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
1e6ed8db68 Move getLoggingClasses() result buffer to file level. 
Getting it out of the function fixes some corruption problems at program exit.
 2009-12-30 17:34:58 +01:00
ehofman
90e44c6696 Display the (default) OpenAL renderer as well as the OpenAL vendor when requesting the list of sound devices. 2009-12-27 09:33:14 +01:00
Tim Moore
d2c7179cd0 Merge branches 'jmt/aircraft-name' and 'jmt/runway' 2009-12-22 00:16:38 +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
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
ehofman
b0e87c8d6e A better way to stringize the predefined SimGear version number 2009-12-14 22:49:47 +01:00
ehofman
ba77293c10 John Denker: Fancier --version information. 2009-12-14 22:49:42 +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
ehofman
c7ef67df80 add avionics enable/disable and volume control to the sound fx class. 2009-12-03 06:43:40 +01:00
Tim Moore
124713b136 set DYNAMIC variance on gui and hud/2dpanel drawables 2009-12-02 07:28:36 +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
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
a3b66adf51 add a new command line option: --show-sound-devices 2009-11-30 22:44: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
torsten
179a799333 - fix the <condition> element which was no longer working due to an invalid property root 
- allow multiple <autopilot> elements within an aircraft. All autopilot live in an individual FGXMLAutopilot subsystem which run within a subsystem group now.
 2009-11-29 15:56:13 +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
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
97db69cf8f restore listener position with offset 2009-11-19 21:03:05 +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
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
ehofman
fe834dedfb Save a costly SGVec3d::fromGeod() calculation 2009-11-07 08:54:03 +01:00
Tim Moore
ef152ee411 Merge branches 'durk/scenery' and 'ehofman/fog' 2009-11-06 23:39:17 +01:00
ehofman
2d2710d5da pass the geodetic position and view orientation quat to the sky repositioning function 2009-11-05 16:28:11 +01:00
ehofman
ab149d0036 John Denker: 
Add a view debugging functions and represent the viewer quats in the property tree for debugging.

Do a nontrivial calculation, demonstrating how to find the 12:00 orientation given the view and the view offset.  it, and observe that the 12:00 direction does not change when you change the view offset, which is a nontrivial result.

Erik: This already proved to be useful since I now obserbed that the sky and fog coloring code depends on view offset rather that the view orientations. This is why those effects are out of line in some views.
 2009-11-05 16:27:58 +01:00
ehofman
342744fddb Use the proper absolute position for the listener 2009-11-04 23:14:33 +01:00
ehofman
3b5792e7cc minor upodate by John 2009-11-02 23:30:34 +01:00
ehofman
0be434936e John Denker: Simplify redundant code and superfluous variable 2009-11-02 23:30:29 +01:00
ehofman
6e5673de21 Position and orientation fixes for the sound code, thanks to Tim Moore 2009-11-02 23:30:02 +01:00
ehofman
7efed53475 proper sound orientation(?) and comment out velocity since it messes with OpenAL in such a way that volume doesn't work properly anymore 2009-11-01 22:05:56 +01:00
Tim Moore
28d221cd7c Revert lighting "cleanup" for now. 
The osgViewer headlight appears to be critical for enabling lighting.
 2009-10-31 23:00:11 +01:00
ehofman
d2799cd832 another attempt at getting something useful without any result. 2009-10-31 22:57:27 +01:00
Tim Moore
e0a779adb1 fix moon lighting at night 
This hasn't worked since the OSG port was initially checked in. A real
phase-of-the-moon bug!
 2009-10-30 23:12:14 +01:00
ehofman
9535c4e339 Commit the current state of affairs to see if it fixes the position code for others 2009-10-29 23:09:21 +01:00
ehofman
c56c520ab5 initlialize _playing for FGATC. Proper listerner orientation based on view offset. proper velocity orientation 2009-10-28 23:23:53 +01:00
ehofman
290bef5749 MSVC fix 2009-10-26 22:12:10 +01:00
durk
b4eb30a6c5 Revoke url change detection code. 2009-10-26 07:45:04 +01:00
Tim Moore
c563cd034a delete char array with delete[] 2009-10-24 22:50:43 +02:00
durk
904a99714e Two patches: 
1) Fix for the "use custom scenery airport data" property.
2) Make it a little harder for stupid people to make money behind our backs.
 2009-10-24 19:53:03 +02:00
ehofman
f9445874a0 Don't make the SoundManager a memebr of the subsystem manager; It needs to be initialized very early and destroyed as late as possible. That doesn't work as a subsystem meber onless some sort of priority scheme gets implemented. Get rid of auto_ptr which doesn work for the samples either. 2009-10-24 19:51:39 +02:00
ehofman
afb0ada81f Make sure the unbind method is called for all registered subsystems proir to deleting the subsystem manager. 2009-10-20 00:00:08 +02:00
ehofman
73d4b78396 explicitly activate the sound manager 2009-10-18 18:19:52 +02:00
ehofman
a9b3fc7a56 move some of the sound postion and orientation calculations over to the sample class which also makes the main code nice and clean 2009-10-16 11:24:10 +02:00
Tim Moore
21122fa03e Merge branches 'jmt/brakes' and 'jmt/dump' 2009-10-12 11:05:36 +02:00
ehofman
b582c118bd 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 2009-10-12 07:58:11 +02:00
ehofman
33e816abb9 Split up FGFX into a dedicated effects class (FGFX) and a sample queue class. Register the sample queue cass as 'queue' at the SoundManager and tie it to the listener position. 2009-10-08 10:38:10 +02:00
ehofman
5107a9d07f (try to) properly align model and viewer 2009-10-07 08:23:41 +02:00
ehofman
b64259b295 allow disabling sound completely (note: openal gets initialized but shuts down a bit later leaving the soundmanager to handle only very specific commands). At this time by specifying '--prop:/sim/sound/enabled=false', not sure why '--disable-sound' doesn't work properly 2009-10-06 10:23:15 +02:00
ehofman
446b200edc Add the Sound Manager before any other subsystem that uses it. This makes sure the SoundMgr is available at construction time which makes the code much cleaner. Call the update_last() after any other class 2009-10-06 10:23:03 +02:00
ehofman
86f462933d Initial commit of the new sound system, expect more updates to follow 2009-10-06 10:22:09 +02:00
Tim Moore
5f134cdec8 Merge branch 'topic/atis' into merge/master-atis 2009-10-06 10:21:19 +02:00
Tim Moore
8b10bb12f5 Merge branches 'jmt/navradio', 'jmt/cleanup' and 'torsten/gps-fix' 2009-10-01 15:17:24 +02:00
jmt
4d67c69462 A generic, configurable autobrake system. Not fully features yet, but works quite nicely in the 777, including RTO modes and auto-disengage on pilot input. 2009-09-21 22:51:40 +02:00
jmt
0dbf2de0b6 Remove audio update from main.cxx, back to FGFX (but keep the timing-dependent piece done artificially late) 2009-09-20 00:20:17 +02:00
jmt
0c8c8380b1 Break viewmgr.hxx dependency on on viewer.hxx. 2009-09-20 00:20:17 +02:00