Torsten Dreyer
f33d26d51c
Warning fix: unused variables
2010-11-26 16:14:43 +01:00
Christian Schmitt
0a5e86f4e6
remove old .cvsignore files
2010-11-11 01:16:29 +01:00
James Turner
0320010d95
Make use of view[0] in HUD-runway lazy.
2010-10-28 13:54:01 +01:00
James Turner
3464eef711
Make the v2 HUD support reinit(), so HUDs can be reloaded at runtime.
2010-10-22 19:11:24 +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
Tim Moore
f901dac2ac
replace GLU functions with OSG functionality
2010-10-08 23:48:01 +02: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
01e0156b5d
Remove current_aircraft global, fgAIRCRAFT struct, and dead code for reading aircraft dirs.
2010-07-01 22:33:51 +01:00
James Turner
a0588272dc
Merge branch 'topics/mainloop' into next
2010-06-26 15:30:00 +01:00
James Turner
85be9be1e0
Initial work on FDM shell, and removal of cur_fdm_state
2010-06-26 10:31:22 +01:00
Erik Hofman
de3afcce99
gcc issues 'format not a string literal and no format arguments' when running -Werror, trick gcc into thinking everything is alright.
2010-06-26 09:36:48 +02:00
torsten
cb81aa9f65
one more gcc warning fix: xxx will be initialized after yyy
2010-03-09 10:39:02 +01:00
V Meazza
f112fc4638
Revised bugfix for tachymetric gunsight
2010-02-26 08:46:15 +01:00
Tim Moore
4027a92f88
Only draw tachymetric sight if appropriate inputs exist
...
This avoids triggering asserts for missing inputs.
2010-02-11 00:13:04 +01:00
Meazza@.(none)
aa8bccf93e
Add Tachymetric Gunsight
...
Signed-off-by: <V Meazza>
2010-02-10 16:19:06 +01:00
jmt
0c8c8380b1
Break viewmgr.hxx dependency on on viewer.hxx.
2009-09-20 00:20:17 +02:00
torsten
8d98e4cd49
warning fixes
2009-08-23 21:43:10 +02:00
Tim Moore
b588a92b7f
adapt to changes in sg_exception interface
...
sg_location now uses C strings. Also, change uses of sg_throwable to more
specific exceptions like sg_io_exception.
2009-06-16 11:46:47 +02:00
frohlich
a99ea1c7b5
Port over remaining Point3D usage to the more type and unit safe SG* classes.
...
Remove leftover headers from plib/sg.
Modified Files:
src/AIModel/AIBase.cxx
src/AIModel/AIFlightPlanCreateCruise.cxx
src/ATCDCL/AIEntity.cxx src/ATCDCL/AIEntity.hxx
src/ATCDCL/AIGAVFRTraffic.cxx src/ATCDCL/AIGAVFRTraffic.hxx
src/ATCDCL/AILocalTraffic.cxx src/ATCDCL/AILocalTraffic.hxx
src/ATCDCL/AIMgr.cxx src/ATCDCL/ATC.hxx
src/ATCDCL/ATCDialog.cxx src/ATCDCL/ATCProjection.cxx
src/ATCDCL/ATCProjection.hxx src/ATCDCL/ATCutils.cxx
src/ATCDCL/ATCutils.hxx src/ATCDCL/approach.cxx
src/ATCDCL/commlist.cxx src/ATCDCL/ground.cxx
src/ATCDCL/ground.hxx src/ATCDCL/tower.cxx
src/ATCDCL/tower.hxx src/Airports/calc_loc.cxx
src/Airports/dynamics.cxx src/Airports/groundnetwork.cxx
src/Airports/parking.cxx src/Airports/runwayprefs.cxx
src/Airports/simple.cxx src/Cockpit/cockpit.cxx
src/Cockpit/hud.hxx src/Cockpit/hud_card.cxx
src/Cockpit/hud_rwy.cxx src/Environment/environment.cxx
src/FDM/UFO.cxx src/FDM/SP/MagicCarpet.cxx src/GUI/dialog.hxx
src/Instrumentation/HUD/HUD.hxx
src/Instrumentation/HUD/HUD_runway.cxx
src/Instrumentation/KLN89/kln89.cxx src/Main/fg_init.cxx
src/Main/viewer.cxx src/Main/viewmgr.cxx
src/Model/panelnode.cxx src/MultiPlayer/mpmessages.hxx
src/Scenery/tilemgr.cxx src/Traffic/SchedFlight.cxx
src/Traffic/TrafficMgr.cxx
2009-03-18 08:00:08 +01:00
mfranz
0e72224559
add <label-offset> param for adjusting number labels in scales
2009-03-18 08:00:07 +01:00
mfranz
d3b2b9f1e3
allow to change/reload HUD by setting path in /sim/path/path[1]
2009-03-18 08:00:07 +01:00
Tim Moore
1e71177e7c
Merge branch 'topic/tape' into next
2009-02-06 15:44:51 +01:00
Tim Moore
3e37d81f1d
HUD::Tape: avoid floating point exception
2009-02-06 15:44:07 +01:00
Tim Moore
b8724644c6
Merge branch 'maint' into next
2009-01-14 11:42:26 +01:00
Tim Moore
c3d611f7f9
HUD::Ladder::draw was capturing the value of a freed temporary
...
Fix from Csaba Halász
2009-01-14 11:22:18 +01:00
jmt
0f4f044a94
Kill off many Point3D includes, and a couple of uses in the HUD code.
...
Requires a SimGear update to get some new SGGeodesy helpers.
2008-12-26 12:28:05 +00:00
ehofman
aa78341698
James Turner:
...
Convert FGRunway to be heap-based, and inherit FGPositioned. This is a large, ugly change, since FGRunway was essentially a plain struct, with no accessors or abstraction. This change adds various helpers and accessors to FGRunway, but doesn't change many places to use them - that will be a follow up series of patches. It's still a large patch, but outside of FGAirport and FGRunway, mostly mechanical search-and-replace.
An interesting part of this change is that reciprocal runways now exist as independent objects, rather than being created on the fly by the search methods. This simplifies some pieces of code that search for and iterate runways. For users who only want one 'end' of a runway, the new 'isReciprocal' predicate allows them to ignore the 'other' end. Current the only user of this is the 'ground-radar' ATC feature. If we had data on which runways are truly 'single-ended', it would now be trivial to use this in the airport loader to *not* create the reciprocal.
2008-09-11 08:38:09 +00:00
durk
301054204e
James Turner: Improved runway management code:
...
- Runways are now part of an airport, instead of a separate list
- Runways are no longer represented as a boring struct, but as a class
of their own.
-Improved runway access to unify various runway access methods.
2008-08-14 18:13:39 +00:00
mfranz
fa2387c05b
- fix function argument order (top & bottom were swapped)
...
- drop wrong and superfluous rounding (sprintf() rounds already)
- remove redundant default values to property getters (default is 0 already)
2008-08-05 05:22:05 +00:00
mfranz
61812ef4b8
better use unset() for unsetting ...
2008-07-30 15:01:59 +00:00
mfranz
a0c2e5b97f
disable clip planes after use (Doesn't seem to make a difference,
...
and is only a temporary measure, as it was planned to OSGify the
HUD and put it in the scenegraph etc.)
2008-07-30 14:52:01 +00:00
mfranz
7a3fe04275
s/clip/clipping/
2008-07-29 15:48:11 +00:00
mfranz
7ba3d5cb53
- extract clipping code to HUD.cxx, allowing generic clipping
...
and separate ladder clipping
- fix acceleration node names
- draw 90/-90 bars if there's no zenith/nadir
2008-07-29 15:41:25 +00:00
ehofman
429f2530de
James Turner:
...
* experimental clean-up / reduction on two of the FG headers:
(I'm going to await feedback on the developers list before doing more of
these, to avoiding going over files multiple times, but in principle it
seems pretty straightforward.)
* final fixes for SG_USING_STD removal
2008-07-29 08:27:48 +00:00
mfranz
5cceb32c0a
- read x/y/width/height as floats
...
- don't write bars past nadir/zenith (better MILSTD compliance)
- introduce tick-length/zero-bar-overlength/enable-dive-bar-angle
configuration parameters
- simplification
2008-07-28 17:04:24 +00:00
ehofman
667e64e1eb
- remove the SG_GLxxxx_H #defines, since OSG provides its own versions
...
- this exposed a bizarre issue on Mac where dragging in <AGL/agl.h> in
extensions.hxx was pulling in all of Carbon to the global namespace
- very scary. As a result, I now need to explicitly include CoreFoundation
in fg_init.cxx.
- change SG_USING_STD(x) to using std::x
2008-07-27 16:25:13 +00:00
fredb
967bf101ef
Restore inclusion of GLU.h
2008-07-27 16:08:45 +00:00
fredb
3db0cf1659
Remove unneeded inclusions of windows.h, GL.h and GLU.H
2008-07-27 15:18:34 +00:00
ehofman
d9bfd5a425
This should apply, and everything should build cleanly, in isolation from the
...
SimGear change. It changes all the SG_xxxx to be the 'real' includes, and gets
rid of many #ifdef SG_HAVE_STD_INCLUDES. As an added bonus, rather than
replacing 'SG_USING_NAMESPACE(std)' with 'using namespace std', I just fixed
the small number of places to use std:: explicitly. So we're no longer polluting
the global namespace with the entire contents of std, in many cases.
There is one more 'mechanical' change to come - getting rid of SG_USING_STD(X),
but I want to keep that separate from everything else. (There's another
mechnical change, replacing <math.h> with <cmath> and so on *everywhere*, but
one step at a time)
2008-07-25 18:38:29 +00:00
durk
4e24fba0d5
Merging David Luff's AI/ATC code with AIModels. Part 1:
...
- Move Dave's original code to a new directory (ATCDCL) so we can recycle
the original ATC directory for generic ATC functions.
2008-05-12 10:38:04 +00:00
timoore
00f8463ab4
Another round of memory leak fixes from Till Busch
2008-01-24 23:05:58 +00:00
frohlich
4fe615fff5
Modified Files:
...
src/AIModel/AIBase.cxx src/AIModel/AICarrier.cxx
src/ATC/AIEntity.cxx src/Cockpit/hud_rwy.cxx
src/FDM/Makefile.am src/FDM/flight.hxx src/FDM/groundcache.cxx
src/Instrumentation/HUD/HUD_runway.cxx src/Main/Makefile.am
src/Main/fg_init.cxx src/Main/main.cxx src/Main/renderer.cxx
src/Main/viewer.cxx src/Main/viewer.hxx src/Model/acmodel.cxx
src/Model/modelmgr.cxx src/Scenery/scenery.cxx
src/Scenery/scenery.hxx src/Scenery/tileentry.cxx
src/Time/tmp.cxx: Remove the scenery center handling.
Osg has double valued transforms at any relevant place.
2007-05-05 08:08:24 +00:00
frohlich
52645efa60
Modified Files:
...
src/Cockpit/hud.cxx src/Cockpit/hud.hxx
src/Cockpit/hud_labl.cxx src/Instrumentation/HUD/HUD_label.cxx:
Olaf Flebbe: avoid potential buffer overflows.
2007-01-22 05:46:51 +00:00
frohlich
b0f9d24f9d
Modified Files:
...
configure.ac src/AIModel/AIAircraft.cxx src/AIModel/AIBase.cxx
src/AIModel/AIBase.hxx src/AIModel/AICarrier.cxx
src/AIModel/AICarrier.hxx src/AIModel/AIManager.cxx
src/AIModel/AIManager.hxx src/ATC/AIEntity.cxx
src/ATC/AIEntity.hxx src/ATC/AIMgr.cxx src/ATC/AIMgr.hxx
src/ATC/ATCdisplay.cxx src/ATC/ATCdisplay.hxx
src/Cockpit/cockpit.cxx src/Cockpit/cockpit.hxx
src/Cockpit/hud.cxx src/Cockpit/hud.hxx
src/Cockpit/hud_rwy.cxx src/Cockpit/panel.cxx
src/Cockpit/panel.hxx src/Cockpit/built_in/FGMagRibbon.cxx
src/Cockpit/built_in/FGMagRibbon.hxx src/FDM/flight.cxx
src/FDM/groundcache.cxx src/FDM/groundcache.hxx
src/GUI/gui_funcs.cxx src/Input/input.cxx
src/Instrumentation/od_gauge.cxx
src/Instrumentation/od_gauge.hxx
src/Instrumentation/render_area_2d.cxx
src/Instrumentation/render_area_2d.hxx
src/Instrumentation/wxradar.cxx
src/Instrumentation/wxradar.hxx
src/Instrumentation/HUD/HUD.cxx
src/Instrumentation/HUD/HUD.hxx
src/Instrumentation/HUD/HUD_runway.cxx src/Main/Makefile.am
src/Main/main.cxx src/Main/renderer.cxx src/Main/renderer.hxx
src/Main/viewmgr.cxx src/Model/acmodel.cxx
src/Model/acmodel.hxx src/Model/model_panel.cxx
src/Model/model_panel.hxx src/Model/modelmgr.cxx
src/Model/modelmgr.hxx src/Model/panelnode.cxx
src/Model/panelnode.hxx src/Navaids/awynet.cxx
src/Scenery/Makefile.am src/Scenery/hitlist.cxx
src/Scenery/hitlist.hxx src/Scenery/newcache.cxx
src/Scenery/scenery.cxx src/Scenery/scenery.hxx
src/Scenery/tileentry.cxx src/Scenery/tileentry.hxx
src/Scenery/tilemgr.cxx src/Scripting/NasalSys.cxx
src/Scripting/NasalSys.hxx src/Time/light.cxx
Big BLOB on the way to OSG.
2006-10-29 19:30:21 +00:00
mfranz
010e03fab4
throw out "zoomed" tapes. These drew 60% of the scale with bullets rather
...
than tick marks, and looser (zoomed) than the other 40%. Rationale:
- this was only used in *one* tape of *one* HUD ("custom")
- it's not in the MIL-STD!
- doesn't seem very useful
- relies on integer scale values, while we now have float values in the new HUD
This feature would have had to be rewritten anyway. If someone needs it and
can come forward with a (MIL-)STD description, then it can be added to the
existing tape generator again (using a value->screen-position mapper function).
Otherwise it's simply declared dead.
(Yay, one TODO and a few FIXMEs less. ;-)
2006-08-02 15:34:33 +00:00
mfranz
46efbb0801
- "almost zero" is zero
...
- improve/add <format> warning
2006-08-01 21:43:13 +00:00
fredb
d0f8f8351b
Avoid redefinition in the same prototype
2006-08-01 21:16:56 +00:00
mfranz
2f8a476c3a
add optional <format> property for <tape>s
2006-08-01 21:11:38 +00:00
mfranz
b1a4fa24d4
cosmetics
2006-08-01 18:46:59 +00:00
mfranz
3f1af3334f
fix no-hole ladder (not that I think this mode will enjoy a long life)
2006-08-01 18:07:26 +00:00