Commit Graph

103 Commits

Author SHA1 Message Date
Mat Sutcliffe
359bd1ab15 Ref T633 Simplify whitespace in X-Plane flyable model strings. 2019-09-16 22:40:04 +01:00
Mat Sutcliffe
61439a48e0 Inline functions defined in header file, to avoid ODR violation. 2019-09-16 22:40:04 +01:00
Klaus Basan
ab281649f8 Minor improvements for XP model loader, file path concatenation 2019-09-16 20:29:59 +01:00
Klaus Basan
d59e1c3332 Style 2019-09-16 20:29:56 +01:00
Roland Rossgotterer
013bd08b5f Fix segfault when a parser error occurred before any parsed CSL plane 2019-05-16 10:12:51 +02:00
Mat Sutcliffe
9c07326462 Treat an OBJ8_AIRCRAFT command with too many arguments as merely a warning.
The aircraft can still be successfully loaded.
2019-05-13 11:21:06 +02:00
Roland Rossgotterer
267a9720da Don't skip CSL package parsing after an error occurred
Summary:
This patch fixes X-Plane CSL package parsing to no longer skip the rest
of the package when an error occurred. Instead CSL planes are marked
having errors and are removed after the full package has been parsed.

Reviewers: #gatekeepers, msutcliffe

Reviewed By: #gatekeepers, msutcliffe

Maniphest Tasks: T616

Differential Revision: https://dev.swift-project.org/D101
2019-05-13 11:20:46 +02:00
Mat Sutcliffe
c05a32dbd4 Ref T545 Using constructor inheritance in derived container classes. 2019-04-12 13:30:51 +01:00
Mat Sutcliffe
e9a4c49d68 Ref T547 Update license masthead in all source code files. 2019-02-22 20:36:43 +00:00
Klaus Basan
02f638501e Ref T529, model loader improvements
* XP loader improved progress messages
* added LoadingFailed
* use "Qt::QueuedConnection" for CMultiAircraftModelLoaderProvider

In some cases the loading progress signal was not send properly changing to Qt::QueuedConnection has solved the issue
2019-02-22 20:36:06 +00:00
Klaus Basan
001d90bd6b Ref T529, using sort order in model loader 2019-02-22 20:36:04 +00:00
Mat Sutcliffe
fe7a45afcf Ref T516 Update CStatusMessage call sites to use new syntax. 2019-02-22 20:35:51 +00:00
Roland Rossgotterer
6aa1402303 Improve XP model loader messages
Change the severity to Error for parser errors and raise a prominent popup with all collected issues.
Also be more explicit from which file and line the error came from.

Maniphest Tasks: T462
2019-02-22 20:35:51 +00:00
Roland Rossgotterer
6ea8d16460 Fix CAircraftModelLoaderXPlane::performParsing to accept multiple dirs
This implements an old todo from KB.
2019-02-22 20:35:50 +00:00
Roland Rossgotterer
5181855b59 Update loading progress while parsing X-Plane models
Maniphest Tasks: T517
2019-02-22 20:35:50 +00:00
Mat Sutcliffe
225ff81252 Ref T485 Adjust CLogMessage and CStatusMessage call sites to use the new API. 2019-02-22 20:34:55 +00:00
Mat Sutcliffe
ace7650ebe Ref T480 No need for QStringLiteral when concatenating with %, use UTF-16 string literals. 2019-02-22 20:23:46 +00:00
Mat Sutcliffe
268d858e2d Parse errors in CAircraftModelLoaderXPlane should be errors, not warnings. 2019-02-22 20:23:32 +00:00
Klaus Basan
363b7c9966 Ref T430, style 2018-12-07 02:37:15 +01:00
Roland Winklmeier
2843e20d54 Update xswiftbus.conf when updating connection details
ref T434
2018-11-29 20:54:25 +01:00
Klaus Basan
9293989a78 Doxygen comments 2018-11-04 17:42:45 +01:00
Roland Winklmeier
1fecf65a40 Fix parsing of X-Plane ACF file headers
So far the 'version' literal was compared case sensitive. So we did not
parse ACF files which had a capitalized literal. Instead the comparison
should be case insensitive. To do that we convert all strings to lower
case before comparing.

ref T378
2018-11-04 17:42:43 +01:00
Roland Winklmeier
dbbc459dbc Add X-Plane object version into the model description 2018-09-12 17:01:47 +02:00
Roland Winklmeier
01779183c4 Don't set distributor from CSL package name
That is almost always wrong.
2018-09-12 17:01:46 +02:00
Roland Winklmeier
d682df243a Fix loading of older OBJ8 CSL modelsets
- Fix support for older modelsets not using the texture for OBJ8 feature
- Small error when xsb_aircraft.txt was outside the object folder

ref T326
2018-09-12 17:01:45 +02:00
Roland Winklmeier
4cf3bc580f Use case sensitive name of Windows header files 2018-08-25 22:12:06 +02:00
Roland Winklmeier
a60ee4a7dd Use override for destructors 2018-08-25 22:12:06 +02:00
Roland Winklmeier
a19ccabf35 Refactor shared X-Plane model parser in common header only functions
ref T290
2018-08-24 21:27:00 +02:00
Klaus Basan
2838e90e75 Ref T292, Ref T285 XPlane loader to set file timestamp correctly 2018-07-26 04:32:39 +02:00
Klaus Basan
a6ee6d4b72 Ref T292, Ref T285 minor style improvements, renamings 2018-07-26 04:32:38 +02:00
Klaus Basan
74fa7d7289 Ref T292, Ref T285 signal when "real" loading was started (loading from disk) 2018-07-25 02:37:13 +02:00
Klaus Basan
f36ebbfa83 Doxygen and style 2018-07-25 02:37:12 +02:00
Klaus Basan
40c0c6ae35 Ref T292, adjusted the specific model loaders
* no longer using "std::unique_ptr"
* QObject parent
* Style
2018-07-25 02:36:55 +02:00
Klaus Basan
76334b75d1 Ref T246, model loader improvements / renamings 2018-07-17 19:04:55 +02:00
Klaus Basan
80cee12fdb Ref T246, utility for 1st model set directory
* remove empty enries in directories
* allow to add directory
* detect same directories and avoid duplicates
2018-07-14 19:45:21 +02:00
Klaus Basan
8bd969105a XSwiftBus install dialog (for local environment)
* can also be called from menu
* improved file check
* renamed some functions
2018-05-18 00:25:02 +02:00
Klaus Basan
42ef7c5633 Avoid long "hanging" if Windows UNC path is not reachable
Use own "isDirExisting" function checking UNC paths
2018-04-05 02:54:40 +02:00
Klaus Basan
c207d589a9 Ref T131, XPlane utility functions
* find XPL files
* newer build files
* conflicting files?
* some renamings
2018-04-05 02:53:30 +02:00
Roland Winklmeier
2ab6a96d57 Adapt to libxplanemp improvements
* XPMPMultiplayerInit API change
* New CSL command 'VERT_OFFSET'
* OBJ8 objects can have multiple textures now. Therefore use the same model
name convention as with OBJ7.
2018-04-05 02:52:24 +02:00
Klaus Basan
640ec3a573 Ref T252, send all loading status messages as list 2018-02-22 01:26:23 +01:00
Klaus Basan
b01119cc1b Ref T252, utility functions for simulator directories 2018-02-16 12:13:53 +01:00
Klaus Basan
1970ae9f9b Ref T252, formatting 2018-02-16 12:13:50 +01:00
Klaus Basan
e9e0ae1ff4 Ref T241, Ref T243 formatting and minor tweaks
* unified how we write thread_local const
* ASSERTs
* formatting
2018-02-04 08:53:48 +01:00
Klaus Basan
2f0253b3eb Ref T118, support multiple model directories
* this was recently discussed https://swift-project.slack.com/archives/C04J6J76N/p1508430536000065
* for config parser already implemented
* for XP the loading from multiple dirs still needs to be implemented (see todo)
2017-10-31 15:39:15 +01:00
Klaus Basan
e920dc77b8 Ref T118, formatting 2017-10-31 15:39:12 +01:00
Klaus Basan
65bc1c00fb Formatting, "this->m_" to "m_", comments 2017-09-24 20:29:09 +01:00
Klaus Basan
329b0512eb Ref T125, utility functions 2017-09-24 19:53:20 +01:00
Klaus Basan
65bd2d20ad Ref T125, X-Plan utility functions and moved XSwiftBus settings in own file 2017-09-24 19:53:03 +01:00
Mathew Sutcliffe
05c0d046aa Removed outdated todos. 2017-09-24 19:52:37 +01:00
Mathew Sutcliffe
bc80fd3bd5 [feature][XPlane] Set own aircraft model string when own aircraft changes.
Summary:
Refactored parts of CAircraftModelLoaderXPlane::parseFlyableAirplanes into static method extractAcfProperties that can be called by xswiftbus.

Used extractAcfProperties in xswiftbus to provide the model string to the driver. Implemented CSimulatorXPlane::ps_emitOwnAircraftModelChanged.

Implements T74.

Reviewers: rwinklmeier

Reviewed By: rwinklmeier

Subscribers: jenkins

Tags: #swift_pilot_client

Differential Revision: https://dev.swift-project.org/D23
2017-05-14 17:21:39 +01:00