1
0
Fork 0
Commit graph

603 commits

Author SHA1 Message Date
James Turner
da65411ef4 FGQCanvas clipping / default text color fixes
Also fix some compiler warnings, but the main thing is text now
defaults to white correctly if no color was set explicitly, and
local/parent clip-reference-frames are supported.
2019-01-17 10:46:58 +00:00
James Turner
591750b911 Frameless mode for FGQCanvas 2019-01-02 17:35:45 +00:00
Richard Harrison
1e636ce4cf Support for DDS Texture Cache
- pass texture cache control properties to simgear
 - /sim/rendering/texture-cache/cache-enabled
 - /sim/rendering/texture-cache/compress-transparent
 - /sim/rendering/texture-cache/compress-solid
 - /sim/rendering/texture-cache/compress

- support --texture-cache-dir command line option
- set max reported supported texture size during splashscreen.
2018-11-24 20:21:46 +01:00
James Turner
56495485e2 FGQCanvas: in-app help page 2018-11-08 09:40:53 +01:00
James Turner
d052dc2576 Remote canvas: UI fixes 2018-11-07 09:39:54 +01:00
James Turner
41e9baaba1 FGQCanvas iOS tweaks 2018-11-07 09:39:54 +01:00
James Turner
d0017f3bec Remove canvas: handle node removes
Especially on the path, handles removes of path coord/cmd data
2018-09-29 15:32:16 +01:00
James Turner
c15d65692a Remote-canvas logging cleanups 2018-09-27 22:39:39 +01:00
James Turner
639c8fd4b4 FGCanvas: warning fixes 2018-09-18 23:31:07 +01:00
James Turner
7e3c1a1b1d Fixes for the sim-pit
* ensure the UI disappears with no user interaction
* comoile fix for GCC
2018-07-27 18:45:25 +01:00
James Turner
2403e95559 FGCanvas tweaks
Enable daemon mode for hands-off operation. Add auto-reconnect
feature for daemon mode, will keep trying to connect to the configured
FGFS instance.
2018-06-26 23:24:02 +01:00
James Turner
f24d0a0fab Update Qmake build of FGQCanvas 2018-06-25 23:39:22 +01:00
James Turner
b2e8097b22 Remote-canvas: hide the whole UI on click 2018-06-24 21:33:07 +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
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
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
cf5e2b39f1 Handle CMake policy 0071 correctly 2018-05-01 12:35:55 +01:00
James Turner
8e6500ae47 Orderly destruction of canvas elements
Driven from the object destroyed signal, ensure children and 
corresponding QQ items are also destroyed when the property is removed.
2017-11-28 22:54:12 +00:00
James Turner
e4b5a699d8 Remote canvas: fix crashes on remove 2017-11-28 22:32:30 +00:00
James Turner
731097bca3 Remote canvas: fix snapshot loading
Visibility prop was being saved incorrectly.
2017-11-28 16:20:23 +00:00
James Turner
089abcfe40 Fix FGQCanvas compilation with Qt 5.7
Use raw OpenGL type constants instead of the QSG aliases which were
only added in 5.8
2017-11-19 21:57:14 +01:00
James Turner
fc084f4f1b Raise minimum version for FGQCanvas to Qt 5.7
Unfortunately QQuickTextNode isn’t exported from the libraries until
Qt 5.7, so rendering text directly would be very awkward.
2017-11-16 10:02:26 +00:00
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
9eaa2f7efc Missed build fix for FGQCanvas 2017-11-09 16:01:21 +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
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
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
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
Erik Hofman
b1f9107f22 Add the vendor tag 2017-03-30 15:56:15 +02:00
Erik Hofman
c6976b8871 rename the soure-file to source-file.bak and construct a new 'source-file' with an added <tags> section 2017-03-30 11:23:54 +02:00
Erik Hofman
054b8e4127 Anot batch of small bug-fixes 2017-03-25 14:21:05 +01:00
Erik Hofman
ed924b6da4 another small bug-fix 2017-03-24 14:11:44 +01:00
Erik Hofman
95887ea7fd Add support for afterburner, supercharger, helicopters and variable-pitch prop.Rename a few tags and small bug fixes 2017-03-24 13:37:23 +01:00
Erik Hofman
2096d704be Some small fixes 2017-03-23 16:10:44 +01:00
Erik Hofman
01e44bf7b8 Add YASim tag reporting 2017-03-23 15:08:39 +01:00
Erik Hofman
0e22d383b4 Add a tag about gear retractability and steering, improve the detection of the number of engines 2017-03-23 13:32:36 +01:00
Erik Hofman
1b18e31a24 Initial commit of an Aircraft automatic metadata generation utility 2017-03-23 12:51:58 +01:00
Ganael Laplanche
43dab178c0 Use ${FREETYPE_INCLUDE_DIRS} instead of hardcoded path 2017-03-03 21:26:44 +00:00
Peter Sadrozinski
ec4b9f8542 Alternative terrain engine based on pagedLOD
- remove TileMgr from sub systems - add to btg terrain engine
2017-02-26 10:17:15 -05:00
Florent Rougon
8f24de831d Adapt includes according to relocation of SimGear's iostreams-related files
This change is the logical counterpart of SimGear's change from commit
79f869a7f32910197be72b21f6489fbbba02c836 that moved the following files
from simgear/misc to simgear/io/iostreams:

  gzcontainerfile.cxx
  gzcontainerfile.hxx
  gzfstream.cxx (formerly zfstream.cxx)
  gzfstream.hxx (formerly zfstream.hxx)
  sgstream.cxx
  sgstream.hxx
  sgstream_test.cxx
2017-02-12 21:30:51 +01:00
James Turner
80e45f6d9b Different solution for FGQCanvas install
Move the install line back inside the subdir, but pull in the extra
config file so the install-bindir is defined.
2017-02-04 08:25:41 +01:00
James Turner
311d59011c Fix an error when FGQCanvas is not defined.
There’s various cases where FGQCanvas might be enabled but still
fail to define the target.
2017-02-02 18:17:45 +01:00
James Turner
40fbebb777 Move FGQCanvas install command
This keeps standalone FGQCanvas build working.
2017-01-31 17:16:03 +01:00
James Turner
8472f8c6d0 Fix positional ordering of remote-canvas elements.
The mirror protocol now sends the position for internal as well as
leaf nodes, and the group uses this data to sort when no explicit
Z-indices exist. This gets the extra-500 much closer to working!
2017-01-26 23:14:48 +00:00
Gijs de Rooy
5aef1a8700 Let CMake install fgqcanvas 2017-01-26 15:16:21 +01:00
James Turner
15dbe1069d Bump the minimum Qt version for Remote-canvas.
QByteArrayList needs 5.4, not 5.3

Also flip the default to off of building the remote-canvas, to avoid
people getting caught out.
2017-01-24 10:34:56 +00:00
Stuart Buchanan
07a9ee5b42 Fix fgelev by defining the correct scenery-path-suffix. 2017-01-23 19:17:50 +00:00
James Turner
78498c560d Rename preferences.xml -> defaults.xml
Requires FGData commit: 0565eaab10a5d466cd485766b17d1870936a0a57
(which actually renames the file).

Also disables the preferences-load command since I don’t believe it
would actually be safe to reload the defaults without doing a simulator
reset (aircraft -set.xml values would be overwritten, for example)
2017-01-12 09:45:19 +00:00
Erik Hofman
f61293a935 Geoff McLane:
1. The variables  SIMGEAR_CORE_LIBRARIES and
SIMGEAR_CORE_LIBRARY_DEPENDENCIES are
no longer set... hence the need to hard-code 'SimGearCore'
in the target_link_libraries()

2. And -lfreetype means the linker must know the specific
link path to it, while the variable FREETYPE_LIBRARIES
contains the fully qualified path to the library.

3. Improved the 'found glut' message to show exactly what
was found, and being used... This is due to the user possibly
also have the near binary compatible glut32.lib found, which
will fail in the link due to some freeglut extensions have been
used.

4. Adding the define -DFREEGLUT_LIB_PRAGMAS=0  is
necessary to stop the freeglut headers from using a MSVC pragma
to declare the library, which will /not/ not be found...

5. In Windows the glew library is not -lGLEW, and even if it
was, it would not be found, without adding a link_directories(
path/to/library ),
while the GLEW_LIBRARIES variable has the fully qualified path.
2017-01-08 10:23:46 +01:00
Erik Hofman
52f5d19ac5 Windows also needs dirent.h 2017-01-07 14:16:58 +01:00
Erik Hofman
167a6ec031 MSVC fix 2017-01-07 11:19:43 +01:00
James Turner
90d6911d68 Work on Remote-Canvas 2016-12-28 22:01:29 +01:00
James Turner
a42900bef5 Remote-canvas element highlighting.
Debugging aid to correlate property tree items to their visual
location.
2016-12-28 22:01:29 +01:00
James Turner
980be9f479 Remote-canvas: fix clip parsing + handling. 2016-12-28 22:01:29 +01:00
James Turner
0e57001cab Add element inspector to remote-canvas 2016-12-28 22:01:29 +01:00
James Turner
967f1c1426 Fix source / dest rect in FGQCanvas image. 2016-12-28 22:01:29 +01:00
Florent Rougon
9b38c0046f Add missing include
In utils/fgqcanvas/fgcanvaspath.cpp: <QByteArrayList>
2016-12-25 21:33:41 +01:00
James Turner
12ad68f258 Abandon FGQCanvas build if QtWebSockets is missing.
Should avoid build pain for people with older Qt5 installs or who
don’t have the web-sockets development package available.
2016-12-21 11:14:50 +00:00
James Turner
6c0e9b747d Remote-canvas image support, partially working. 2016-12-21 10:26:31 +00:00
James Turner
066d81568d Remote-canvas loads fonts from the host. 2016-12-21 10:26:31 +00:00
James Turner
34ca0c15cc Fix default text alignment in remote-canvas 2016-12-21 10:26:31 +00:00
James Turner
4c4fb1a6ac Make FGPanel dependency handling better 2016-12-21 10:24:40 +00:00
James Turner
106b62caa5 Make FGQCanvas a bit more optional. 2016-12-19 17:54:37 +00:00
James Turner
351dfdb498 GCC compilation fix. 2016-12-19 09:04:25 +00:00
James Turner
569925b61b Remote-canvas work, based on Extra-500 testing. 2016-12-18 23:52:16 +00:00
James Turner
490592d96e Remote-canvas handles rects / round-rects directly.
When a rect shape is specified, paint it directly instead of converting
to a path, since this might be much cheaper.
2016-12-18 21:55:32 +00:00
James Turner
b999ab335b SVG handling for Remote-canvas 2016-12-18 21:24:39 +00:00
James Turner
bd5a266e9f Qt-based remote canvas application.
Work-in-progress, currently performance is sub-optimal (software
rendering via QPainter API).
2016-12-17 14:24:28 +00:00
Erik Hofman
005d5fa766 Search for Glew and freetype 2016-12-17 12:46:54 +01:00
Erik Hofman
a10d3d8381 Add SimGearCore 2016-12-17 11:40:35 +01:00
gallaert
effca9da5e Update FGPanel:
- use OpenGL 2.0 instead of OpenGL 1.0;
- port to Raspberry Pi;
- remove PLib dependencies.
2016-12-16 19:35:44 +00:00
Saikrishna Arcot
c505fbad5c
Fix compiling stgmerge.cxx in C++11 mode. 2016-12-03 08:13:39 -08:00
Durk Talsma
f7424271a7 Some prepratory work for FGTraffic 2020: Added utils/traffic, a sample C++ source/header file, and the necessary changes in the CMakefile system to allow automatic compilation. 2016-11-20 12:52:21 +01:00
Torsten Dreyer
af8625e4ac fgelev: add option to print solidness of terrain
Add option --print-solidness
without this option, behaviour of fgelev is unchanged
with this option the word "solid" gets printed behind the elevation if the
material at the given location is solid. A hyphen (-) gets printed otherwise
2016-11-08 10:42:48 +01:00
James Turner
e2f7585d9c Use a Cmake imported target for SimGear 2016-10-30 22:15:54 +00:00
Alessandro Menti
2d86fc11ad Replace the NOAA METAR URL with the new, updated one 2016-08-04 20:34:34 +02:00
Jeremy Bicha
25928bf614 Use CMAKE_INSTALL_BINDIR
Allow /bin install directory to be overriden. Debian for example uses this
to install FlightGear to /usr/games/ instead of /usr/bin/

https://cmake.org/cmake/help/latest/module/GNUInstallDirs.html
2016-07-09 18:52:58 -04:00
James Turner
9cffcf63ae Further SGPath encoding fixes. 2016-07-01 04:54:29 -05:00
James Turner
6d0c2070fd Use future-proof SGPath APIs.
Remove uses of .str(), .c_str() and some other methods of SGPath.
Pass SGPath directly where possible, or explicitly convert to the
appropriate 8-bit encoding.
2016-06-28 10:08:38 +01:00
Erik Hofman
d9129cfe80 Remove a debug message 2016-06-27 13:21:26 +02:00
James Turner
16814800ce Use Paths instead of strings. 2016-06-22 17:36:05 +01:00