1
0
Fork 0
Commit graph

13582 commits

Author SHA1 Message Date
James Turner
268f9c9c33 Launcher: ensure extra args override launcher ones
Categorise arguments to ensure user-specified ones take precedence
over values set by the launcher.

When any positional arg is set, exclude all positional ones from being
set at all, to prevent strange interactions.
2018-06-25 23:06:20 +01:00
James Turner
9098e47664 Launcher: use new SGGeod <-> string functions
This relies on the latest Simgear to provide these functions.
2018-06-25 18:12:43 +01:00
James Turner
ca785f01e5 Launcher: Fix a crash in the new location code 2018-06-25 16:40:00 +01:00
James Turner
7d84a03dea WebSocket property-mirror: optimise JSON building
Work around some awful cJSON performance when building large arrays,
greatly speeding up remote-canvas updating
2018-06-24 23:22:30 +01:00
James Turner
b2e8097b22 Remote-canvas: hide the whole UI on click 2018-06-24 21:33:07 +01:00
James Turner
be3e927d4e Property-mirror protocol C++11 tweaks 2018-06-24 14:32:35 +01:00
James Turner
b0aa3b93b7 FGQCanvas: load config on start mode 2018-06-24 14:11:46 +01:00
James Turner
57fbd2fe01 Remote-canvas: QPainter rendering mode 2018-06-24 11:34:43 +01:00
James Turner
0987b82fa8 Launcher styling tweaks 2018-06-24 11:15:01 +01:00
James Turner
c38e820756 Launcher: fix Windows build 2018-06-23 17:55:39 +01:00
James Turner
1bf52662ae Launcher converted to QQ2
This simplifies the launcher's rendering since the widget-based
code is gone, various things get hooked up as a result. Styling
fixes everywhere as well.

Menubar on Linux/Windows needs to be re-added.
2018-06-23 17:14:21 +01:00
Scott Giese
78882621e9 Support Visual Studio 2017 2018-06-22 22:40:37 -05:00
Bertrand Coconnier
f81c01465e Fixed crashes while repositioning the aircraft. 2018-06-22 23:16:22 +02:00
James Turner
01f05b5383 Launcher: styling improvements everywhere
Use a standard text component to ensure the base font size can be
controlled centrally.
2018-06-21 22:54:37 +01:00
James Turner
225a128540 Consistent capitalisation of ACTIVE 2018-06-21 17:34:16 +01:00
James Turner
24d877fc18 Launcher: experiment with HiDPI airport icons 2018-06-21 16:16:35 +01:00
James Turner
240ac0f458 Launcher: optional alt/spd/hdg select
Bring this feature up to parity with the release branch.
2018-06-21 15:27:48 +01:00
James Turner
198f9ccb70 Tweaks to location search based on feedback 2018-06-21 14:34:05 +01:00
James Turner
8f205040dc Work on clipping in remote canvas
Different canvas clip reference frames are handled now, and updating
the clip nodes should not longer crash. Unfortunately, clips set
on groups don't work yet, further work is needed here.
2018-06-21 14:34:05 +01:00
James Turner
c82a725e47 Fills working again in FGQCanvas 2018-06-21 08:03:02 +01:00
Bertrand Coconnier
6d83e6978d Sync'ed JSBSim
* Removed the IAS dependency to the Pitot tube angle (real Pitot tube are less sensitive to AoA than was simulated)
* Removed the class FGUDPOutputSocket which was redundant with FGOutputSocket
* Added a new type of functions "template" which are intended to prevent duplication of functions. For now, they are available to compute output values and script notifications.
* Aerodynamics forces can now be specified in stability axes.
* Density altitude and pressure altitude are computed according to ISA standard atmosphere 1976.

New properties:
* Flight path angle (gamma) in degrees
  - fdm/jsbsim/flight-path/gamma-deg
* Aerodynamics forces in stability axes
  - fdm/jsbsim/forces/fsx-aero-lbs
  - fdm/jsbsim/forces/fsy-aero-lbs
  - fdm/jsbsim/forces/fsz-aero-lbs
* Aerodynamics moments in stability axes
  - moments/roll-stab-aero-lbsft
  - moments/pitch-stab-aero-lbsft
  - moments/yaw-stab-aero-lbsft
* Pause JSBSim
  - fdm/jsbsim/simulation/pause

* Fixed multiple bugs.
2018-06-19 23:08:07 +02:00
James Turner
ccabc052bc Restore alphabetical sort of aircraft 2018-06-16 22:52:59 +01:00
James Turner
670bc17def Launcher: improve transparent panel legibility 2018-06-16 22:17:45 +01:00
James Turner
e8ef24a54f MSVC warning fixes 2018-06-16 13:03:36 +01:00
James Turner
82f23e556e Improve MSVC project generation
- set startup project to fgfs
- guess a value for PATH based on the build config
2018-06-16 13:03:23 +01:00
James Turner
7c9b1b391f Guard against SGPath::document()s returning null
Underlying bug is fixed in SimGear, but let's also guard against a failure here,
by falling back to FG_HOME on Windows.

For discussion see:
https://sourceforge.net/p/flightgear/codetickets/2019/
2018-06-15 11:11:05 +01:00
James Turner
dde2ef5972 Fix compilation on Qt 5.4 2018-06-15 10:33:11 +01:00
Stuart Buchanan
8d51050820 stgmerge improvements
- Handle directories recursively
- Support Terrasync directory for Models
- sanity check that objects are in the correct tile.
2018-06-14 22:28:14 +01:00
James Turner
9c4e4d411c Defualt STGMerge to OFF for now
(Unbreak Windows)
2018-06-14 16:46:55 +01:00
James Turner
6f8a788d80 Launcher bugfix: custom download dirs
Partial fixes for:
https://sourceforge.net/p/flightgear/codetickets/2019/

But further work needed on Windows I expect, will do that now.
2018-06-14 16:28:03 +01:00
James Turner
2e438e357e Launcher: fix scenery path re-ordering 2018-06-13 11:03:06 +01:00
James Turner
c3414a63c2 Fix the launcher summary license link 2018-06-13 10:55:04 +01:00
James Turner
29ec23e582 Ensure launcher terraysync setting is used
Terrasync state is auto-saved, so we need to force the value each start,
to avoid a previous value getting used.
2018-06-13 10:52:35 +01:00
James Turner
b2f90fbfa4 Launcher: location page in QtQuick
This moves the last page into QQ2 implementation, in preparation
for making the top-level UI be a QQuickWindow.
2018-06-13 10:01:04 +01:00
James Turner
7e8b1b67e7 JS comparison type safety warning fixes 2018-06-13 10:01:04 +01:00
James Turner
e3fd7f7d61 Launcher warns when setting conflicting args
Display a warning when the user tries to set arguments in additional
settings which the launcher will also set / conflict with. Blacklist
is still evolving, and we don’t actually prevent the user from running,
since maybe they are doing something special
2018-06-13 10:01:04 +01:00
Stuart Buchanan
42c3a366a3 Add ENABLE_STGMERGE option to build stgmerge tool 2018-06-12 20:16:35 +01:00
Ganael Laplanche
b9b393a355 Use all linker flags from pkgconf, including library path 2018-06-12 12:10:31 +02:00
Ganael Laplanche
bc01619fe1 jsSetError() takes only two arguments (unlike ulSetError()) 2018-06-12 12:10:00 +02:00
Ganael Laplanche
327d8021d0 Add missing defines and includes from removed ul.h 2018-06-12 12:09:41 +02:00
Edward d'Auvergne
112d64f828 TestSuite: Helper functions for setting up a dummy renderer and FGScenery. 2018-06-07 11:17:04 +02:00
Edward d'Auvergne
3c9d3590d4 TestSuite: Migration of the Navaids tests into the CppUnit infrastructure. 2018-06-06 20:39:25 +02:00
Stuart Buchanan
236b7c0f83 Multiple LoD levels of MP Aircraft
At a basic level, the implementation supports two levels of LoD:

FAR from /sim/rendering/static-lod/ai-range-bare to /sim/rendering/static-lod/ai-range-detailed.
NEAR from /sim/rendering/static-lod/ai-range-detailed to 0.

(First of many digressions:  If /sim/rendering/static-lod/ai-range-mode-pixel=true then instead of measuring LOD distance in meters, the size of the object in pixels is used, so the ranges are different)

The models that are loaded for FAR and NEAR depend on a combination of the availability of a model in /AI/AIrcraft/ and FG_AIRCRAFT directories.

If /sim/rendering/static-lod/ai-range-detailed=false then an AI aircraft will be used in preference for both NEAR and FAR.

If /sim/rendering/static-lod/ai-range-detailed=true then an AI aircraft will be used for FAR, and an FG_AIRCRAFT for NEAR.

Obviously if only an AI or a FG_AIRCRAFT model are available, that will be used for the entire NEAR+FAR range.
2018-06-05 21:58:03 +01:00
Edward d'Auvergne
a22c53a807 TestSuite: Temporary fix for CTests yet to be ported into the CppUnit framework. 2018-06-05 14:33:01 +02:00
Erik Hofman
d043a20d3f Better AeonWave detection 2018-06-05 09:40:29 +02:00
Erik Hofman
2edf1443d3 Detect AeonWave and if it is installed use it, otherwise fall back to OpenAL. Also let get_available_devices() use C++ strings instead of const char* 2018-06-02 14:06:36 +02:00
James Turner
100155e37e Launcher: improve state handling
Fix some dumb bugs and improve selection of states inside the launcher
2018-06-01 15:11:30 +01:00
James Turner
b52cdf8723 Vector helipad symbol
Nicer rendering when zooming in, and easier to indicate the selected
helipad, in the same was as runways
2018-06-01 15:11:30 +01:00
Richard Harrison
ff302a307d Canvas Screen image provider:
Change delay to 15 seconds; and alert that there is a delay.

The 15 second delay should be sufficient to allow the compressor to finish processing; and in anycase this is running in a thread and therefore shouldn't freeze the whole sim for the delay period.
2018-06-01 00:45:40 +02:00
Richard Harrison
f17685ca79 Merge /u/geoffmc/flightgear/ branch msvc-build2 into next
https://sourceforge.net/p/flightgear/flightgear/merge-requests/133/
2018-05-31 22:39:11 +00:00