1
0
Fork 0
Commit graph

1634 commits

Author SHA1 Message Date
James Turner
f5f2a8fd33 Route-manager: sync with C++ approach trans API
When an explicit approach transition is used, route to it, otherwise
keep using the automatic selection based on IAF.
2020-05-28 09:08:30 +01:00
Stuart Buchanan
f0a999cb2c Nasal library load order
Control the order in which fgdata/Nasal/*.nas files are loaded
on startup.

Previously all the files were loaded in order based on filename.
This was problematic for aaa.nas which might want to call
props.getNode(), and generally resolved by using
_setlistener("/sim/signals/nasal-dir-initialized")

This change allows us to configure a list of Nasal files that are
loaded first on startup - loadpriority.xml.
2020-05-25 19:47:50 +01:00
James Turner
d0d55ccb04 Route-manager: use Flightplan transition data
Explicitly use the flight-plan transition data when building the
routes for the SID and STAR. Previously we didn’t actually pick
this up reliably.
2020-05-21 22:34:28 +01:00
Henning Stahlke
11e36dd8a9 debug.nas subdir per probe class 2020-05-17 20:04:05 +01:00
Henning Stahlke
ec3cef2183 aircraft.nas data use maketimer instead of settimer loop; replace typeof by isType 2020-05-17 20:03:53 +01:00
Henning Stahlke
5a5d958dd9 replace typeof() == foo with isFoo 2020-05-17 20:03:43 +01:00
Henning Stahlke
627530cf5b props.nas prevent endless recursion in copy if destination is a subnode of source 2020-05-17 20:03:30 +01:00
Henning Stahlke
eeb1b5e3d5 debug.nas add helpers for adding probes at runtime; add subnode to _debug for hit counters
add dumpProbeStats() and Breakpoint.dumpTrace()
dumpTrace to XML file separate tracer class
2020-05-17 20:01:43 +01:00
fly
b44a1c1a7c Added autopush
Signed-off-by: fly <merspieler@airmail.cc>
2020-05-15 11:29:07 +01:00
James Turner
acd37379ea Add sample test file to Nasal/ 2020-05-06 15:41:18 +01:00
Henning Stahlke
d1d3b6559e compass.nas: add font to style hash; efis-canvas.nas: improve font mapping 2020-05-05 13:52:06 +01:00
Henning Stahlke
67c83d020f make font_mapper more configurable 2020-05-05 13:52:00 +01:00
Henning Stahlke
49c8dcd442 modules/canvas_efis/efis.nas replace typeof(), use log constants, add {} 2020-05-05 13:51:56 +01:00
Henning Stahlke
17e3ba6698 debug.nas add dumpProbeStats() and Breakpoint.dumpTrace() 2020-05-05 13:51:52 +01:00
Henning Stahlke
bef5de6e81 debug.nas add helpers for adding probes at runtime; add subnode to _debug for hit counters 2020-05-05 13:51:45 +01:00
Henning Stahlke
a65cb738e5 re-enable reload prop on modules.nas 2020-04-30 11:47:25 +01:00
Henning Stahlke
551f4dab62 canvas/api/element.nas add getType 2020-04-30 08:59:25 +01:00
Henning Stahlke
e16bf79e91 move "hidden" constructor from api.nas to api/canvas.nas; add destructor support 2020-04-30 08:59:25 +01:00
Henning Stahlke
3892d2eddd move fontmapper function from svg.nas to api/text.nas so it is generally avail 2020-04-30 08:59:25 +01:00
Henning Stahlke
e996f4c8c6 add getTranslation and setGeoPosition to transform.nas, adapt element.nas accordingly;
improve readability and comments
2020-04-30 08:59:25 +01:00
Henning Stahlke
2eb4c78794 improve code readability 2020-04-30 08:59:25 +01:00
Henning Stahlke
1094e5214e split classes into separate files 2020-04-30 08:59:25 +01:00
James Turner
f074504326 setlistener: tolerate being call()-ed
Fix bug https://sourceforge.net/p/flightgear/codetickets/2219/
Changes to logging mean than setlistener breaks when invoked via
call(), which occurs in the Warthog Nasal scripting. The problem is
that call() forces caller() to return nil, which the setlistener()
debug code did not check for.
2020-04-27 22:50:34 +01:00
Henning Stahlke
95d0aa032e bugfixes for debug.nas and props.nas 2020-04-24 16:00:09 +02:00
Henning Stahlke
4c867a79f0 adjust setlistener default in modules/addons to match globals.nas 2020-04-24 16:00:09 +02:00
Henning Stahlke
fba17e4d34 Replace printlog by logprint 2020-04-21 09:07:20 +02:00
Henning Stahlke
6078cff6b1 extend debug.Probe and debug.Breakpoint classes with trace option 2020-04-21 09:06:09 +02:00
Henning Stahlke
ed3568554d Add toggleBool() to props.nas 2020-04-21 09:02:16 +02:00
James Turner
d1998f27ff Default GPS handling of DISCON waypoints
When a DISCON is sequencing, revert to OSB mode at the current heading.
Also fix heading capture when reverting to OBS mode in various other
places.
2020-04-19 17:05:29 +01:00
James Turner
fc50680694 Use logprint() in various places
This reduces Nasal console spamming to match to the set log-level
2020-04-19 16:46:57 +01:00
Henning Stahlke
251a376f68 modules.nas: change reload trigger from property to fgcommand, fix a logprint call, add module name to debug output 2020-04-19 12:39:33 +01:00
Henning Stahlke
1035ed4269 add skip parameter to debug.nas breakpoint class 2020-04-19 12:29:01 +01:00
Henning Stahlke
93c48818fd debug.nas: prevent stack overflow in dump; print function names in backtrace; 2020-04-16 16:25:20 +01:00
Henning Stahlke
8f6fd3cb79 props.nas add adjustValue() 2020-04-16 16:25:20 +01:00
Henning Stahlke
b4eaa3e438 props.nas add increment and decrement for int props 2020-04-16 16:25:17 +01:00
Henning Stahlke
f210a38011 addons.nas add fgcommand addon-reload 2020-04-16 16:23:51 +01:00
Henning Stahlke
2a48a3012b add approx_eq to math.nas and is_regular_file io.nas 2020-04-16 16:19:29 +01:00
Henning Stahlke
d2d1fead76 modified output of debug.backtrace 2020-04-16 16:18:15 +01:00
James Turner
838ba8230b Local-weather: Remove a debug print()
This caused random ‘0’ to appear on the console. Checked with
Thorsten R, okay to disable this.
2020-04-10 11:24:32 +01:00
Richard Harrison
f9eacd8be0 Nasal Debug.dump tweaks to make it readable as JSON 2020-04-09 23:56:43 +02:00
Richard Harrison
5f1784937e Added Joystick Sensitivity Reduction to dialog.
This allows the setting of the <power> tag - which in turn will decreases the sensitivity around the zero position
2020-04-09 23:56:37 +02:00
James Turner
7a3a36eab2 Nasal modules: expose reload as a command 2020-04-07 14:28:30 +01:00
Richard Harrison
2dbe28d43b Emesary MP bridge: fix lost messages on MP bridge.
When more than one message type being transmitted on the bridge only one of the types would be reliably received. Bug caused because the message index is per notification type (on MP bridge outgoing) but was being treated as per incoming bridge (rather than notification).
2020-03-24 17:13:37 +01:00
Eatdirt
f0a23d6ab1 Implement Earthview tiles loading based on visibility in spherical geometry 2020-03-23 23:47:31 +01:00
Stuart Buchanan
3caa899068 FG1000 - NRST PFD Function
Implement the Nearest Airports PFD softkey, displaying a scrollable
list of the closest 25 airports within 200nm.

Also fix a couple of minor bugs and add self-checking to the
GroupElement
2020-03-12 21:39:23 +00:00
Stuart Buchanan
76cfa2c077 FG1000 and MFD handle non-MFD Emesary notifications
Previously the FG1000 and MFD assumed that all notifications received
via Emesary had a Device_Id field.  This is true for
notifications.PFDEventNotification.DefaultType but not for other
messages - e.g. those generated by the AN SPN 46  system on the
carrier.

The effect of this was that when Nimitz was loaded, the FG1000 stopped
working with various errors.

This fix checks the notification type before the Device_Id.
2020-03-12 17:25:34 +00:00
James Turner
556c19e1ee Merge /u/dirteat/flightgear/ branch next into next
https://sourceforge.net/p/flightgear/fgdata/merge-requests/172/
2020-03-11 09:44:21 +00:00
Henning Stahlke
f547786fe4 add canvas/draw.nas library 2020-03-08 21:02:44 +01:00
Henning Stahlke
8b0fa9a08d update canvas_efis/main.nas to get namespace via module API 2020-03-08 20:57:04 +01:00
Henning Stahlke
a1664a4759 add 'available' node for reloadable Nasal modules 2020-03-08 20:56:05 +01:00
Henning Stahlke
ce848ff916 remove dead code from addons.nas (forgotten when moving code out to modules.nas) 2020-03-08 20:48:28 +01:00
Henning Stahlke
4108652c94 remove unnecessary userarchive flags from defaults.xml 2020-03-08 20:46:56 +01:00
Henning Stahlke
11b05ebab2 modules.nas fix type in path; update comments 2020-02-23 19:39:42 +01:00
Henning Stahlke
6c92220d18 Merge branch 'next' of git://git.code.sf.net/p/flightgear/fgdata into next 2020-02-23 19:37:17 +01:00
Richard Harrison
1d0129bdd9 Fixed timers in wildfire 2020-02-22 19:51:41 +01:00
Eatdirt
5310734d4c Add two new methods for geo objects
The method horizon() returns the distance to the horizon, along earth
surface, starting from current location. The method
greatcircle_distance_to(A,B) returns the shortest distance to a great
circle passing by A and B, along earth surface and from current location.
2020-02-20 21:36:54 +01:00
Henning Stahlke
b69f460ee5 Canvas EFIS framework 2020-02-20 00:02:33 +01:00
Henning Stahlke
c6e5244b13 update defaults.xml
add repair_config.nas to fix old userarchive flags
2020-02-15 14:39:36 +01:00
Stuart Buchanan
4b0d08975c Merge /u/jsb1685/fgdata/ branch next into next
https://sourceforge.net/p/flightgear/fgdata/merge-requests/164/
2020-02-12 19:38:43 +00:00
Henning Stahlke
1b2014ed04 minor improvements to modules.nas 2020-02-03 09:59:38 +01:00
James Turner
53e3bac6ee Merge /u/deltaecho/flightgear_fgdata/ branch next into next
https://sourceforge.net/p/flightgear/fgdata/merge-requests/163/
2020-01-30 10:40:01 +00:00
Henning Stahlke
e39ebd79e3 add Nasal loadable module support (modules.nas) 2020-01-26 18:13:08 +01:00
jano
c982d3e333 added a page with the unit toggle, to display lag statistics, to help diagnose and address lag issues 2020-01-14 11:58:26 +01:00
Richard Harrison
e9b12b302f Fix Tanker when no offset specificed 2020-01-10 20:00:55 +01:00
Richard Harrison
94c9f3b428 Fix failure manager warning
ironically the warning message was causing a more serious failure.
2019-12-11 17:53:35 +01:00
Henning Stahlke
5676ce6c68 add is_directory(path) and subdirectories(path) to Nasal/io.nas 2019-11-09 23:26:49 +01:00
Henning Stahlke
43efd64dd2 add aspect ratio lock feature to canvas window; user window.lockAspectRatio() to activate 2019-11-06 22:59:08 +01:00
Julian Smith
3302620745 Nasal/multiplayer.nas: Make sure we update view if /sim/current-view/model-view is changed. 2019-10-25 21:03:36 +01:00
Thorsten Renk
8efa938ace Add volcanic activity for Surtsey 2019-10-19 10:27:33 +03:00
Thorsten Renk
79af6d0fd0 Fix spurious altitude variation in improved analytical orbit of orbital target 2019-10-06 11:30:07 +03:00
Stuart Buchanan
01dc9d0b38 Add props.nas getDoubleValue(), getIntValue()
Also fixed an issue with whitespace around view parameters.
2019-09-22 21:14:07 +01:00
James Turner
f83caf7e45 The default GPS delegate now handles sequencing
In conjunction with some FlightGear changes, the delegate can now do
all sequencing decisions, i.e the GPS C++ code does not make any policy
decisions about sequencing.

Update the default Nasal delegate to mimic the old behaviour, and set
the config option, both to allow future developments and to demonstrate
the new API.
2019-09-20 13:08:10 +01:00
James Turner
0172ef9d08 Nasal fixes for unit testing
Tolerate missing properties in various places, since defaults and 
other subsystems might not have created them.
2019-09-18 15:00:00 +01:00
Julian Smith
e41c0f099b Nasal/canvas/tooltip.nas: handle multiple properties.
Allows sprintf string to contain multiple %'s, which are mapped to multiple
<property>...</property> tags.
2019-08-31 14:14:18 +01:00
Julian Smith
c280ff3fc4 Nasal/prop_key_handler.nas: fixed couple of issues in search ('?') code.
Don't include initial '/' in search string.

Don't fail if a property value is -Nan.
2019-08-31 14:14:18 +01:00
Julian Smith
96fd272a51 Nasal/prop_key_handler.nas: added new '#' command to listen to properties.
Sets up listeners to show all changes to specified property or any of its child
properties.
2019-08-31 14:13:31 +01:00
Delta Echo
16086cac2d [Nasal]Add possibility to recognise drag robots for glider towing 2019-08-31 10:20:15 +02:00
Julian Smith
8301a4f16e Nasal/view.nas: allow Tower View Look From to work with multiplayer aircraft. 2019-08-29 00:11:52 +01:00
Julian Smith
2c5f6a96c2 Nasal/view.nas: Implemented multiplayer fly-by view. 2019-08-29 00:11:52 +01:00
Julian Smith
7550ff70d9 Nasal/view.nas: set new property /sim/current-view/multiplayer to 0 or 1.
Useful to have this information available as a simple property.
2019-08-29 00:11:51 +01:00
Julian Smith
48911a8131 Nasal/gui.nas: nextStyle(): popup new GUI style's name.
Also added delta param to control direction of change.
2019-08-29 00:11:51 +01:00
Julian Smith
2d8ec16afc Nasal/multiplayer.nas: improved font handling in Pilot List dialog.
It looks like widgets don't inherit font or colour from parent widgets. Also,
setting font=nil gives sublety different results compared to leaving font
unspecified.

So we now set font and colour explicitly for every widget using new function
set_default().

Also set font and colour of 'Pilots:' widgets and heading widget to me.fg[1] to
match other text.
2019-08-29 00:11:51 +01:00
Julian Smith
0f741b16fe Nasal/multiplayer.nas: disable 'no model installed' messages. 2019-08-29 00:11:51 +01:00
Julian Smith
c4d71f06e0 Nasal/multiplayer.nas: remove hard-coded default font params.
These are unnecessary because we use gui/styles/*. This also allows an empty
style to be specified, where we inherit from system-wide defaults.
2019-08-29 00:11:51 +01:00
legoboyvdlp R
fc7319a5da Local weather: correct the fade in rate per private discussion with Thorsten, this will in the short term reduce jumps until I figure out changing this per distance; this was originally meant to be over 10 seconds apparently 2019-08-27 20:56:32 +01:00
Julian Smith
81fc15d8e7 Nasal/view.nas: fix for regression in handling of /sim/current-view/?-offset-m.
resetViewPos(): set /sim/current-view/?-offset-m to
/sim/view[]/config/?-offset-m, not zeros.

This requires corresponding change to flightgear to compensate for the extra
offset, and fixes things when aircraft implement custom views by writing to
/sim/current-view/?-offset-m.
2019-08-12 18:02:02 +01:00
Julian Smith
ff503c1093 Nasal/multiplayer.nas: in Pilot List, append +/- to altitude if ascending or descending. 2019-08-12 18:02:02 +01:00
Julian Smith
4e94cdc906 Nasal/multiplayer.nas: in Pilot List, added column showing id of nearest airport.
Requires changes to flightgear to populate
/ai/models/multiplayer[]/sim/tower/airport-id.
2019-08-11 13:22:59 +01:00
Julian Smith
f591120032 Disabled old 'Model View' selector by default.
It is now called 'Legacy multiplayer view selector', and enabled/disabled via
new checkbox in the 'View - View Options' dialogue.
2019-08-05 07:31:47 +01:00
Julian Smith
2e5e314a77 Nasal/view.nas:stepView(): also create /sim/current-view/view-number-raw.
This allows new view code to find the view configuration with non-sequential
view numbers (e.g. on 777).
2019-08-05 07:31:47 +01:00
Julian Smith
a10274665d Nasal/view.nas: pilot_view_limiter: protect against nil. 2019-08-05 07:31:47 +01:00
Richard Harrison
294e76a47f Revert "Nasal/screen.nas: move log window to top-left and left-align the text."
It's always been at the top; and although it is clear that the intent of this change was to improve things it highlights the need to make more substantial improvements to the way on screen messages are handled.

What we probably should have is an area that has a transparent dark background, a fixed size, supports scrolling, can be left open (or re-opened) and moved persitently around the screen.

This reverts commit 82f3eb45b9.
2019-07-29 13:00:23 +02:00
James Turner
0a68cbd93a Merge /u/jsb1685/fgdata/ branch next into next
https://sourceforge.net/p/flightgear/fgdata/merge-requests/151/
2019-07-22 15:54:56 +00:00
Henning Stahlke
aaa7888f6b add setViewByIndex to view.nas 2019-07-21 12:56:01 +02:00
Julian Smith
c80059ba53 Removed Model View so that Tower View AGL doesn't alter view numbers.
Due to Nasal/view.nas making a sequential copy of views, inserting new view
number 8 for Tower View AGL broke custom views, e.g. for aircraft 777).

We no longer require Model View (it's identical to Helicopter view now), so
this way we can have Tower View AGL without altering sequential view numbers.
2019-07-20 22:01:05 +01:00
Julian Smith
3738d84d7b Nasal/view.nas: set /sim/viewp[]/config/root to point to multiplayer data.root.
This is required by view code.
2019-07-09 16:25:11 +01:00
Julian Smith
f61b097eb3 Nasal/multiplayer.nas: In Pilots list, use only one colour (white) for pilots for whom we have a model.
I think the previous alternating colours were confusing because of the use of
a third and fourth colour for when we have no model or are using a fallback
model.
2019-07-09 16:25:11 +01:00
Julian Smith
82f3eb45b9 Nasal/screen.nas: move log window to top-left and left-align the text.
Reduces chat messages etc obscuring HUD.
2019-07-09 16:25:11 +01:00
Julian Smith
e2df25343a Nasal/multiplayer.nas: reordered columns in Pilot List window.
Moved 'code', 'ver' and 'set' away to the right, as i think they are less
important. Also demoted 'brg' a little and promoted 'dist-'.
2019-07-09 16:25:11 +01:00
Julian Smith
47415e20ce Pilot List dialogue now allows control of which aircraft to view.
I think this is more convenient than the normal model-view buttons / popup
list. [Though this is still there.]

Nasal/multiplayer.nas:
    Added new column 'view' with checkbox. Also added 'view self' button to
    titlebar to view the user's aircraft.

    Fix some bad indentation.

Nasal/view.nas:
    Changed /sim/current-view/model-view to contain just the callsign, not
    '<callsign> <model>', so that Nasal/multiplayer.nas can get the callsign
    reliably.
2019-07-09 16:25:11 +01:00