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

12800 commits

This branch
This branch
All branches
Author SHA1 Message Date
Richard Harrison
11778f595f Fixed exception caused when next is equal to end() 
This happened whilst running under debug whilst spawning at a new location so it may be an edge case, but still worth checking for
 2017-02-16 18:29:44 +01:00
Richard Harrison
bde3dd0644 Canvas texture replacement visitor compiler fix. 
Change to use pointers rather than osg::ref_ptr<osg::Group> - based on http://andesengineering.com/OSG_ProducerArticles/RefPointers/RefPointers I think that it is not possible that the scenegraph can be modified between the visitor and the modify, provided that the methods are called after each other like this:

  ReplaceStaticTextureVisitor visitor(name, new_texture);
  branch->accept(visitor);
  visitor.modify_groups();
  return visitor.getPlacements();
 2017-02-16 09:16:27 +01:00
Richard Harrison
e48a3d8b32 Replacement Texture visitor modified iterator whilst iterating 
The visitor would modify the scenegraph during the traversal by inserting groups; this is not valid when using vectors, and MSVC2015 debug RTL throws an exception when this happens.

The fix is to simply make a list of the textures that need to be modified and modify once the scenegraph traversal has finished.
 2017-02-14 18:56:38 +01:00
Richard Harrison
fa142c9464 Change log level for "prepare_ground_cache(): scenery_available returns false" message as the message occurs at a high rate and seems to be more suited at bulk rather than warn level 2017-02-14 16:08:05 +01:00
Richard Harrison
275d73d01f Multiplay: Improve log message handling for win32. 2017-02-14 16:08:04 +01: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
a83947edbf Basic validation of added scenery paths. 
Try to catch uses adding parent directories and hence missing
scenery.
 2017-02-10 23:04:00 +00:00
Bertrand Coconnier
227087b3a8 Automatic detection of the ENABLE_SIMD setting for SG: 
* Scrapped the previous code
* Instead use the symbol value imported from SG via the "CONFIG" mode of CMake find_package()
 2017-02-07 00:04:56 +01:00
Bertrand Coconnier
93a8ab99ff Fix to manage the case where SimGear include files are obtained via CMAKE_PREFIX_PATH 2017-02-05 10:27:30 +01:00
Bertrand Coconnier
044715ba05 CMake commands TRY_COMPILE and TRY_RUN are ignoring the instructions from INCLUDE_DIRECTORIES so the include directory has to specified ad hoc. 2017-02-04 22:53:22 +01:00
Bertrand Coconnier
80b8a298e1 Fix for when SimGear headers are not installed system wide (as is the case for Jenkins) 2017-02-04 21:53:18 +01:00
Bertrand Coconnier
4ab0b71fa8 The flag ENABLE_SIMD is now automatically carried over from SimGear. Mixed configurations between FG & SG could crash FG so this should not be allowed. 2017-02-04 20:21:19 +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
d05b934702 Revert "Fixes for HUD, model-manager listeners." 
This reverts commit 831053bd04.

See if this fixes the problem deleting models which Denk reported.
 2017-02-02 17:02:39 +01:00
Erik Hofman
05b2b6536b Make use of the Vector new interpolation function 2017-02-02 11:35:55 +01:00
James Turner
0f3659818b QtInfoMsg requires Qt 5.5 2017-02-01 17:36:48 +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
8f7c0d6801 Scenery extraction: set progress text 
Fixes bug:https://sourceforge.net/p/flightgear/codetickets/1938/
 2017-01-31 17:11:44 +01:00
Richard Harrison
0bf80f9b2a Add protection to the multiplayer (AI) interpolation to protect against segfaults when the previous and next packets contain different properties. 2017-01-30 23:25:00 +01:00
Erik Hofman
e39eac8a6d Nicer, human readanle, stack trace output 2017-01-30 15:58:09 +01:00
Erik Hofman
57dc778565 Fix a last minute typo 2017-01-30 12:31:05 +01:00
Erik Hofman
182f758eb7 Add a segmentation-fault report for Linux and Apple 2017-01-30 12:29:51 +01:00
James Turner
5d27d2509f Add “—-log-file” option, to log to other locations. 
Each argument creates another log file, in the directory named. Symbolic
value ‘desktop’ creates logs on the user’s desktop.

Needs corresponding SimGear commit to build
 2017-01-30 08:01:20 +01:00
James Turner
658074f78e Map Qt log to the Simgear log. 2017-01-30 08:01:20 +01:00
Erik Hofman
7133bc5c0f Make MSVC happy 2017-01-30 00:41:27 +01:00
Erik Hofman
ebfadb908c Make sure the AISim code compiles with the latest SIMD code changes in simgear 2017-01-29 15:27:41 +01:00
Rebecca N. Palmer
2b1336cd39 clear GroundLightManager also on non-standard exits to avoid crash 
(e.g. --show-aircraft,
https://sourceforge.net/p/flightgear/codetickets/1935/ )
 2017-01-28 23:07:23 +00:00
James Turner
d343496084 Check nav-cache write-ability explicitly. 
Check the file permissions before opening using the new SGPath APIs,
and validate the result using Sqlite APIs after opening.
 2017-01-28 16:05:18 +00:00
James Turner
45c6ec216f Update .desktop files to show the launcher 
Suggested by Emilian, I assumed packagers tend to replace these files
or make their own decision anyway but for a non-terminal startup,
requesting the launcher seems a clear benefit to me.
 2017-01-27 16:09:19 +00: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
James Turner
c9f922ce1b Expose node position over property-mirror protocol. 2017-01-26 20:36:07 +00:00
Viktor Radnai
a26a5d741b Make wheels spin down slowly once off the ground 2017-01-26 20:36:07 +00:00
Erik Hofman
1a0537e493 Silence a few compiler warnings 2017-01-26 15:37:43 +01:00
Gijs de Rooy
5aef1a8700 Let CMake install fgqcanvas 2017-01-26 15:16:21 +01:00
Erik Hofman
e31d6b083e Pick a default build type if none is specified 2017-01-26 14:48:35 +01:00
James Turner
70e79a849e Tweak launcher to be a MainWindow 
For unknown reasons this seems to alleviate the word-wrap / min-height
bug on Windows. Committing so we can test and verify this is really
the case before the next release.
 2017-01-26 00:38:19 +00:00
James Turner
fb1a29200a Merge /u/setvisible/flightgear/ branch next into next 
https://sourceforge.net/p/flightgear/flightgear/merge-requests/72/
 2017-01-25 23:36:52 +00:00
James Turner
0fe14f7c36 Use enable-hot flag in model manager. 
Allow control of the terrain flag on models added via the model
manager at runtime.

Designed and requested by Henning Stahlke
 2017-01-25 22:19:15 +00:00
James Turner
a0f2726a39 Set default airport/aircraft in the launcher. 
Parse the defaults file to set the desired default aircraft and
airport when no previous state exists.

Fixes:
https://sourceforge.net/p/flightgear/codetickets/1936/
 2017-01-25 20:41:40 +00:00
setvisible
7d02ffecab Changed aircraft list's scrolling policy to *ScroolPerPixels*, because items have non-regular height. 2017-01-25 18:40:40 +01:00
setvisible
928567650f Added the missing FG icons to the Qt dialogs 2017-01-25 18:18:11 +01:00
Torsten Dreyer
1f9ece8303 Location preset for ENBR (2017.1) 2017-01-25 14:00:06 +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
6311e1ad24 Merge /u/setvisible/flightgear/ branch next into next 
https://sourceforge.net/p/flightgear/flightgear/merge-requests/70/
 2017-01-23 09:16:21 +00:00
Stuart Buchanan
dab9a9fc73 Remove /sim/rendering/building-mesh. 
Made redundant by /sim/rendering/scenery-path-suffix
 2017-01-21 22:22:43 +00:00
martymac
ffc7ad6cdf Fix build with Clang 4.0.0. 
Those patches fix errors related to ordered comparisons between pointers and
integers, such as the ones related here on FreeBSD :

https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=216203
 2017-01-21 21:32:50 +00:00
setvisible
5ce85c2248 fixed the missing FG icon (QtLauncher's mainwindow) 2017-01-21 19:23:21 +01:00
Erik Hofman
40b6ca14e8 Move SIMD flags to CMAKE_CXX_FLAGS_RELEASE and fix a typo in the process 2017-01-20 14:56:50 +01:00