1
0
Fork 0
Commit graph

1944 commits

Author SHA1 Message Date
Torsten Dreyer
4371a18771 resurrection of /sim/rendering/draw-otw 2010-10-26 21:20:01 +02:00
James Turner
0e53e2cbb1 PLIB net removed from FlightGear 2010-10-24 07:10:51 +01:00
James Turner
984900d84d Make v2 HUD a top-level subsystem, so it can be reinit()ed correctly. 2010-10-24 07:10:02 +01:00
James Turner
957a59e57a Investigating an intermittent shutdown crash; fix deletion of AIManager. 2010-10-23 19:09:08 +01:00
James Turner
d573cb43a0 Move three more subsystems into the init + update scheme - fixes some crashes found by papillion. 2010-10-22 16:44:37 +01:00
James Turner
f5c2c630eb Remove references to old (unused) airways code 2010-10-20 17:54:16 +01:00
James Turner
dd2eec7bd8 Airways/procedures code - add new data structures to store waypoints and
procedures, and routing algorithms, and modify the GPS, route manager and
WaypointList to use the new objects.
2010-10-20 09:02:02 +01:00
James Turner
9b2cea33e8 Remove uneccessary explicit update of FGLight 2010-10-05 23:17:32 +01:00
James Turner
0c342308eb Make MultiPlayer a well-behaved subsystem. 2010-10-05 23:17:32 +01:00
James Turner
d39841d2df Make FGAircraftModel behave like a standarrd subsystem. 2010-10-05 23:17:32 +01:00
James Turner
0beab94cb5 Make the tile-manager a well-behaved SGSubsystem 2010-10-01 19:09:19 +01:00
James Turner
1afd4e602e Get rid of FGGeneral; expose equivlanet values via properties. 2010-10-01 09:33:31 +01:00
James Turner
af4e47179e Kill off fgRequestRedraw 2010-09-30 23:13:11 +01:00
James Turner
84b45683fc Refactor exit code, so the osgViewer gets 'done'. 2010-09-30 23:13:11 +01:00
James Turner
f969504e6b Tidy fg_commands header. 2010-09-30 23:10:00 +01:00
Torsten Dreyer
5c6fe95259 Environment controller overhaul
This is the initial commit for a reworked environment controller.
The main intention is to decouple the individual modules like
metar fetch, metar properties, environment interpolation etc.
to make it easier for other weather module developers to modify
environment settings.
As a side effect, the dialogs for weather-scenario, weather-conditions,
clouds and precipitations have been merged into a single dialog
2010-09-11 16:11:35 +02:00
James Turner
7227973e2f Don't expect an 'Aircraft' sub-directory within each aircraft-dir. 2010-09-08 11:01:26 +01:00
James Turner
e8b0bb872a Register the aircraft resource provider. 2010-09-06 22:57:48 +01:00
James Turner
8330449c5f Pass current-dir into XMLSound
(and update to revised SGSoundSample ctor)
2010-09-06 09:28:28 +01:00
James Turner
a7a2cb393a Use the new Simgear ResourceManager to resolve paths. 2010-09-06 09:13:10 +01:00
Torsten Dreyer
1e43675f61 Expose some OSG DisplaySettings to the property tree 2010-09-05 11:56:38 +02:00
Torsten Dreyer
54e6757211 Autopilot is more than just an autopilot: Introducing: "property rule"
The autopilot has grown beyond being just an autopilot. It's
components, filters and controllers could be used to set property
values based on complex rules and driven from other property values.
That's why I chose to give it the name "property-rule".
This patch allows to define an arbitrary number of property rules under
a/sim/property-rule[n]/path
using the same syntax as autopilot configurations.
2010-08-18 18:50:07 +02:00
James Turner
dbd9935c52 Expose aircraft-dirs under /sim (read-only, for security) 2010-08-16 11:00:54 +01:00
Torsten Dreyer
e43456ba43 Merge branch 'next' of gitorious.org:fg/flightgear into next 2010-08-15 20:35:14 +02:00
Torsten Dreyer
60f7d0f16c Downgrade the ridgelift to a subsystem of environment 2010-08-15 20:33:29 +02:00
James Turner
bca3494462 Support relative paths in 'loadxml' command
(relative to FG_ROOT or an aircraft dir)
2010-08-15 11:02:15 +01:00
Torsten Dreyer
bb2d1f55e9 Interpret environment variables and hostname on Windows
- Point the homedir variable to %APPDATA%/flightgear.org. This
enables .fgfsrc in this path for windows users.
- Evaluate the returncode of gethostname() to not strdup() bogus
characters on failure. Also mainly on windows.
2010-08-06 09:06:32 +02:00
James Turner
7f36caede6 Create TimeManager subsystem, and collect the time related code out of main.cxx and fg_init.cxx into it.
Remove the unfortunately named 'tmp.[cxx|hxx]', pushing the remaining code in FGLight.
(second try, with init bug fixed)
2010-08-04 09:16:37 +01:00
David Luff
53358a55bf Remove old AI system 2010-08-03 00:21:56 +01:00
James Turner
47fd8a8a2a Revert "Create TimeManager subsystem" - not quite ready for prime-time yet!
This reverts commit 50eb95dcad.
2010-08-02 00:23:36 +01:00
James Turner
50eb95dcad Create TimeManager subsystem, and collect the time related code out of main.cxx and fg_init.cxx into it.
Remove the unfortunately named 'tmp.[cxx|hxx]', pushing the remaining code in FGLight.
2010-08-01 20:33:11 +01:00
James Turner
388a0a5b6a Make saveInitialProperties smarter, and hence simplify the reset code path. 2010-08-01 19:04:20 +01:00
Durk Talsma
7c73c7d3e5 Added some stubs in the flightgear main code to eventually add a full, FGSubsystems based ATIS system that will serve as a replacement for the ATCDCL code. 2010-08-01 16:16:33 +02:00
James Turner
d9236f33b2 Remove use of simgear/screen/extensions.h. 2010-07-31 15:15:40 +01:00
James Turner
8e5f3ac8a3 Set the key SGModelLib callback to make aircraft-dir OSG loading work. 2010-07-29 01:07:32 +01:00
James Turner
ab495d1370 Add --fg-aircraft option, and aircraft dir path list. Partial support in places that load files, for respecting the setting.
Add helper to look for an aircraft branch path in multiple candidate locations.
Update the main subsystems to use the helper, and hence load from any aircraft dir.
2010-07-28 22:03:10 +01:00
James Turner
d1852430bf Make various implicit includes (via PLIB) explicit. 2010-07-28 10:25:42 +01:00
James Turner
9604908a8d Remove all (2) uses of simgear/math/vector.h from FlightGear. 2010-07-23 13:26:07 +01:00
James Turner
900fce6374 Fix issues exposed by PLIB-free SimGear. 2010-07-23 09:41:37 +01:00
James Turner
bf52c378a4 Clean up names in --show-aircraft; avoid -set.xml suffixes. 2010-07-22 01:36:32 +01:00
James Turner
c95a5db23d Rewrite --show-aircraft and --aircraft handling to share directory search code.
As a bonus, sort the --show-aircraft list case-insensitively.
2010-07-17 14:12:52 +01:00
James Turner
af3f072c21 Convert scenery path setup to use simgear::Dir 2010-07-17 14:12:52 +01:00
James Turner
2c90eb8370 Convert --show-aircraft to use simgear::Dir 2010-07-17 14:12:52 +01:00
James Turner
c32da90e5c Ensure sim/signals/fdm-initialized is only fired on a rising edge; add sim/fdm-initialized as the state value. 2010-07-13 13:47:24 +01:00
James Turner
c47d4f2f30 Fix bug 141, by ensuring certain subsystems are assigned to the 'post FDM' group (which is new) 2010-07-08 23:24:39 +01:00
James Turner
07d055b4de One more juggle to appease the linker gods. 2010-07-02 10:00:05 +01:00
James Turner
cfe9aaac4c Juggle fgfs link order to keep GNU ld happy. 2010-07-02 09:06:57 +01:00
James Turner
88e65f7662 aircraft.[cxx|hxx] is gone. 2010-07-01 22:56:22 +01:00
James Turner
18d42ec1af Rename reInit() method to 'resetSimulator', and document that it's hooked up to the 'reset' command. 2010-07-01 22:50:11 +01:00
James Turner
d279c394d7 Clean fg_init.hxx 2010-07-01 22:43:28 +01:00
James Turner
01e0156b5d Remove current_aircraft global, fgAIRCRAFT struct, and dead code for reading aircraft dirs. 2010-07-01 22:33:51 +01:00
James Turner
3f26d2b14b Trivial cleanup commit, to test continuous integration server. 2010-07-01 19:51:05 +01:00
James Turner
fec7cb977c Clarify warnings from fgUntie, and fix one source of such warnings, in FGInterface. 2010-07-01 02:04:16 +01:00
Durk Talsma
3c60bf6511 Make sure also not to try running AI_mgr when compiling fgfs with --disable-atcdcl. FlightGear can now actually run without segfaulting when compiled this way. 2010-06-27 10:08:26 +02:00
Torsten Dreyer
4466729987 fix assertion in sunsolver.cxx with --timeofday=xx 2010-06-26 21:58:45 +02:00
Torsten Dreyer
2e6d7e111a gcc warning fixes 2010-06-26 21:24:46 +02:00
Torsten Dreyer
e1b9d3d759 Don't crash if built with --disable-atcdcl 2010-06-26 20:24:34 +02:00
James Turner
180e524a0e Fix automake build after mainloop changes - especially, JSBSim includes. 2010-06-26 18:37:51 +01:00
James Turner
f9ec605ffb Fix ordering of aircraft-model updates against flight model. 2010-06-26 10:31:22 +01:00
James Turner
85be9be1e0 Initial work on FDM shell, and removal of cur_fdm_state 2010-06-26 10:31:22 +01:00
James Turner
4756cd4882 Wrap SGEphemeris in a subsytem/property interface, and remove from mainloop. 2010-06-26 10:31:21 +01:00
James Turner
3fbf3aa080 Make FGAircraftModel more subsystem-alike, move update to fgMainLoop. 2010-06-26 10:31:21 +01:00
Torsten Dreyer
d558b52cb6 New autopilot subsystem implementation.
Split the former single-file-implementation in xmlauto.?xx into multiple
files and use some OO techniques. Started with documentation to be used
with doxygen.
2010-06-24 17:09:33 +02:00
Tim Moore
0f8312150d Log OpenGL vendor and version string 2010-06-15 23:58:55 +02:00
Mathias Froehlich
f433f4d973 Default the screen and display number to a value >= 0 2010-06-14 22:05:15 +02:00
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