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

13195 commits

This branch
This branch
All branches
Author SHA1 Message Date
James Turner
3b18a3667b Fix offsetting in FGQCanvas, enable clipping 
Visual output is nearly correct now, just some crashes when changing
the display contents to track down.
 2017-11-16 09:24:07 +00:00
James Turner
8fc04fdfb3 Fix Windows build for launcher changes 2017-11-15 22:04:03 +00:00
James Turner
2d663f2509 Fix crash with adding catalogs in the launcher 
Change how we get notified about catalog changes, so we can remove
our hook and hence not leave a dangling pointer.

Fixes https://sourceforge.net/p/flightgear/codetickets/1994/
 2017-11-15 21:46:57 +00:00
James Turner
7305b20483 Hopefully pacify GCC 4.8.x 2017-11-15 21:18:24 +00:00
James Turner
72ca36535a Fix the PUI map ruler feature, use right-click 
The OSG Ctrl to right-click mapping was breaking this on Mac, but
changing that will break other things, so move the ruler feature from
‘ctrl left click’ to a simple ‘right click’ which ends up being the
same on Mac anyway.
 2017-11-15 17:02:25 +00:00
James Turner
723e631f87 Restore PUI scrolling event behaviour 
Fixes zooming in the map, for example.
 2017-11-15 16:35:07 +00:00
James Turner
15fbf1f9cd Merge /u/thbr/flightgear/ branch next into next 
https://sourceforge.net/p/flightgear/flightgear/merge-requests/106/
 2017-11-15 08:01:07 +00:00
ThorstenB
cae4523d97 Completely removed obsolete debug code 
as suggested by James.
 2017-11-14 20:39:27 +01:00
ThorstenB
5f994c94b9 TCAS: do not process invalid AI models 2017-11-14 20:39:13 +01:00
James Turner
78bacefb60 Advanced weather support in the launcher 2017-11-14 17:54:22 +00:00
James Turner
daedf1e546 PUI dialog correct positioning on HiDPI displays 
Apply the device-pixel-ratio when calculating the initial position of
PUI dialogs, so they appear correctly (eg, centered) when running with
device-pixel-ratio != 1.0
 2017-11-14 17:30:31 +00:00
James Turner
b870b3f022 Fix wrong launcher aircraft name on startup 
The mapping from aircraft URI to name was wrong for local (non-package)
aircraft, as spotted by Thorsten Renk. Note other data (thumbnail) is
still incorrect, but another change I have pending will replace this 
code anyway so only doing the simple fix for now.
 2017-11-14 17:30:31 +00:00
ThorstenB
6077ef8cdd Remove unused copy&pasted nmea code from other protocol's source. 2017-11-13 20:40:41 +01:00
ThorstenB
f6ce434241 Disabled forgotten debug output. 2017-11-13 20:40:36 +01:00
ThorstenB
dd7d54cfcc Do not crash when specifying an unsupported transport medium for an I/O protocol. 2017-11-13 20:40:23 +01:00
Florent Rougon
2bf5a96aec Add two missing includes for <algorithm> 2017-11-13 15:58:08 +01:00
James Turner
9eaa2f7efc Missed build fix for FGQCanvas 2017-11-09 16:01:21 +02:00
James Turner
329f8f77ab Fix broken private header detection 2017-11-09 15:34:44 +02:00
James Turner
89827fcd96 Restoring snapshots nearly working 2017-11-09 12:33:33 +02:00
James Turner
157b2148cb Add snapshots UI 2017-11-08 15:36:07 +02:00
James Turner
3c1cb67a27 Remove old FGQCanvas files 2017-11-07 17:23:55 +02:00
James Turner
a184f532ce Clipping support in all elements 2017-11-07 17:20:42 +02:00
James Turner
a22a17a995 Further work on snapshots feature 2017-11-05 19:42:57 +00:00
James Turner
6156cbbe1d Fixes after merging branch 2017-11-05 14:04:17 +00:00
James Turner
78b0d9c91e Working on snapshot save/loading 2017-11-05 13:57:51 +00:00
James Turner
2a95e09a09 Enhanced git-ignore 2017-11-05 13:49:45 +00:00
James Turner
19fd8e6e26 WIP on clipping working 2017-11-05 13:49:33 +00:00
James Turner
045e6fb29a Fix image rendering, somewhat. 2017-11-05 13:47:15 +00:00
James Turner
70a199a2f5 Render text in Quick directly. 
Uses private QQuickTextNode api.
 2017-11-05 13:46:52 +00:00
James Turner
66543f1588 Fix support for Uint32 indices. 2017-11-05 13:41:46 +00:00
James Turner
905d8ae734 Text alignment support mostly working 
Baseline is still being strange, possibly need to use an
AnchorChange instead of multiple Binding elements
 2017-11-05 13:37:38 +00:00
James Turner
928fd31f2c Better image support in Quick-remote-canvas 2017-11-05 13:37:20 +00:00
James Turner
9af6e6cea0 Starting work on snapshots. 2017-11-05 13:21:28 +00:00
James Turner
c03d7b3c1f Remote-Canvas: nicer UI fades 2017-11-04 10:47:14 +00:00
James Turner
81a753cfa1 Delete and modify Remote-canvas configs 2017-11-04 10:09:08 +00:00
James Turner
623305965b Fix canvas sizing + scaling 2017-11-04 10:09:08 +00:00
James Turner
4bae38f994 Remote-canvas Image and font caches working again 
Reconnecting and disconnecting also starting to work more smoothly
 2017-11-04 10:09:08 +00:00
James Turner
67ab1c7162 Fix missing include for std::unique_ptr on non-Mac 2017-11-03 09:51:44 +00:00
James Turner
20311c1956 Sorting parking candidates by size. 
Ensures we only assign the smallest candidate parking, so tiny jets
don’t steal stands from A380s.
 2017-11-02 17:21:27 +00:00
James Turner
117404979b Migrate to a pure Quick-renderer solution, and QQ UI 
This means everything is displayed via OpenGL, and there’s a basic
menu system usable.
 2017-11-02 17:21:27 +00:00
Erik Hofman
f13edf01fa Merge branch 'next' of ssh://git.code.sf.net/p/flightgear/flightgear into next 2017-10-31 10:54:21 +01:00
Erik Hofman
5f828894df Update to AeonWave version 3.0+ 2017-10-31 10:53:34 +01:00
James Turner
61bf6b0f58 QtQuick-based rendering for remote canvas 
Currently displayed alongside the QPainter version, while establishing
the accuracy of each mode, but this is temporary.
 2017-10-29 16:44:32 +00:00
James Turner
682c229313 Preserve loaded flight plan departure/arrival 
When loading or cloning, don’t flag the departure and arrival as
changing, since this forces it to be discarded and rebuilt.
 2017-10-29 14:00:59 +00:00
James Turner
ea31cb30e3 Change Nasal navaid searching API to handle units 
Add explicit findNDBByFrequencyKHz, and rename the generic one to
explicitly use MHz, but exclude searching for NDBs.
 2017-10-29 12:24:05 +00:00
Florent Rougon
86aaaf6de9 Process the --addon option in the standard way 
Doing the option processing in Options::parseOption() has drawbacks:
  - doesn't work well upon reset;
  - doesn't work in the built-in launcher Additional Settings box.

Options::processOptions() is invoked both upon reset after the property
tree has been reset, and by the built-in launcher to process options
given in the Additional Settings box. This is not the case of
Options::parseOption() which is better for... parsing. :-)

Also use SGPath::fromLocal8Bit() to decode the path argument of --addon.
 2017-10-23 09:18:51 +02:00
James Turner
e090427591 Better fix for CanvasWidget transparency 
Use osg GLExtensions to retrieve glBlendFuncSeperate on Win32
 2017-10-22 19:25:46 +01:00
Alessandro Menti
89ca665bfb
PUICamera Linux compilation fixes 
* Correct the filename case in the #include directive in PUICamera.cxx,
  so that compilation succeeds on case-sensitive filesystems.
* Add the PU_SCROLL_UP_BUTTON and PU_SCROLL_DOWN_BUTTON #defines, as
  they are missing from some systems which ship old versions of the PUI
  library.
 2017-10-21 11:20:07 +02:00
James Turner
c1df6e9d15 Hack to fix Windows build. 
glBlendFuncSeperate will need some ugly trick to use in CanvasWidget, I better find another way.
 2017-10-20 17:25:06 +01:00
James Turner
804dc4e74a Steps to make PUI optional, HiDPI tolerant. 
Move all PUI event and rendering into a custom camera, which can be
rendered via an FBO to account for display-resolution scaling (HiDPI).

Start wrapping PUI calls in #ifdefs so PUI can be disabled at compile
time; a run-time switch is trivial now but not implemented yet.
 2017-10-20 12:10:51 +01:00