James Turner
06c6e994a5
Merge /u/accek/flightgear/ branch build-with-gdal into next
...
https://sourceforge.net/p/flightgear/flightgear/merge-requests/83/
2017-03-15 18:57:11 +00:00
James Turner
c7f29699d3
Allow XML control over splash logo position.
...
As suggested by Chris, these are normalised and account for the logo
size after scaling, so 0.5 will centre, 1.0 is the right/bottom edge.
E.g. (in /sim/startup)
<splash-logo-x-norm>0.5</splash-logo-x-norm>
<splash-logo-y-norm>0.9</splash-logo-y-norm>
Many values will overlap with other text, so use with care!
2017-03-15 12:01:29 +00:00
Florent Rougon
f4788cddb4
Qt launcher: accept scenery paths containing either of: Buildings, Roads, Pylons
...
When adding a scenery path in the built-in launcher, accept folders
containing any of the new directories populated by osm2city. Also try to
improve the message that is displayed when the sanity check conditions
for the added scenery path aren't met (cf. discussion around
<https://sourceforge.net/p/flightgear/mailman/message/35716946/ >).
2017-03-15 00:42:36 +01:00
Bertrand Coconnier
40be2687f7
Restored the legacy behavior: the XML extension is mandatory and when it is not explicitely specified it is automatically added.
2017-03-14 21:59:14 +01:00
Henning Stahlke
dbf21b1ca8
YASim calculate max CG range (on x-axis) from gear positions, to implement checks later (a better guesstimate will follow).
2017-03-11 22:44:45 +01:00
Florent Rougon
6e44fb1015
Fix unsigned int vs. int problem in SplashScreen::manuallyResizeFBO()
...
Justified because:
osg::Camera::getNumChildren() returns an unsigned int, and
osg::Camera::getChild() takes an unsigned int
2017-03-11 21:53:24 +01:00
Henning Stahlke
e78a763eef
YASim Airplane: move one-liners to header and remove unused code.
2017-03-11 21:29:05 +01:00
Henning Stahlke
60f5c97272
YASim Gear: move one-liners to header
2017-03-11 21:06:16 +01:00
Bertrand Coconnier
0d342f526e
Exports the parameters of JSBSim ground reactions friction resolver to the property tree for debugging.
2017-03-11 14:00:20 +01:00
Szymon Acedański
93e68c001a
Fixed building FG with GDAL
2017-03-11 13:34:19 +01:00
Bertrand Coconnier
579f215005
Sync w/ JSBSim:
...
* Propeller required power now accounts for the engine tilt
* Fixed a division by zero in FGLGear::GetSteerNorm for non steerable gears
* Fixed a bug reported by Ron H. and Rebecca N. Palmer on the FG mailing list: the 'length' parameter passed to gethostbyaddr in FGFdmSocket was erroneous.
2017-03-11 13:24:51 +01:00
Florent Rougon
dab68505bb
Rename fgfs' option --log-file to --log-dir
...
This makes sense, since this option expects a directory parameter, or
the special value 'desktop', and computes the file's base name on its
own.
cf. <https://sourceforge.net/p/flightgear/mailman/message/35715817/ >
and <https://sourceforge.net/p/flightgear/mailman/message/35715836/ >
2017-03-11 09:51:16 +01:00
Florent Rougon
8372f086c1
Add the lists of fix.dat and nav.dat files to the output of --json-report
...
- Declare 'datTypeStr' and 'defaultDatFile' as public member variables
of NavDataCache ('defaultDatFile' is not *required* for this commit,
it just seems to make sense to treat both members the same way/keep
them together in the source code).
- New keys under "navigation data" in the JSON report: "fix.dat files"
and "nav.dat files".
2017-03-10 23:04:39 +01:00
Florent Rougon
99ebfcd368
Simplify reading of the frequency field from nav.dat files
...
The frequency field is always an integer, so reading it as a float to
convert it to int doesn't make sense. I've probably been confused by
field indices when I introduced this in commit a2bf424118
.
This clarifies things, but shouldn't change the code behavior in any
way (unless with bogus nav.dat files, of course).
2017-03-10 16:53:39 +01:00
Szymon Acedański
14611e905e
GUI: do not complain if only NavData is present in scenery folder
2017-03-09 00:10:26 +01:00
Szymon Acedański
bd0fa1fa5a
Do not apply .ils.xml adjustments while building the cache
2017-03-09 00:10:26 +01:00
Szymon Acedański
e37fd6ea1f
Minor comment fixes
2017-03-09 00:10:26 +01:00
Szymon Acedański
4403f22a8b
Support multiple nav.dat and fix.dat files
2017-03-09 00:10:26 +01:00
Szymon Acedański
b9dbe9c9e7
nav.dat: support XP NAV1100 format
...
This allows using NavXP1100-formatted nav.dat from gateway.x-plane.com.
The skipped field types are:
14 Final approach path alignment point of an SBAS or GBAS approach path
15 GBAS differential ground station of a GLS
16 Landing threshold point or fictitious threshold point of an SBAS/GBAS
approach
We don't have SBAS/GBAS in Flightgear.
This change also includes duplicate detection for multiple nav.dat files
support.
2017-03-09 00:10:26 +01:00
Szymon Acedański
2b2780bfca
fix.dat: support XP FIX1101 format
...
Also: duplicates detection, in preparation for multiple fix.dat files
support.
2017-03-09 00:10:26 +01:00
Henning Stahlke
06ba4fe351
YASim wrap bugfix with version check to maintain compatibility with old aircraft config.
2017-03-07 20:47:43 +01:00
Henning Stahlke
1e92c33a9e
YASim export config version used by aircraft to property tree.
...
Gives /fdm/yasim/config-version as integer (see enum in Version.hpp to decode).
2017-03-07 20:45:46 +01:00
Henning Stahlke
80462d23c5
YASim Wing: remove unnecessary local variable "root" (use _base);
...
calculate _tip in directly in one command
clarify signature of Wing::interp()
2017-03-07 18:03:25 +01:00
Henning Stahlke
583ea27dd6
YASim Version: add tag for version 2017.2
2017-03-07 17:50:05 +01:00
Henning Stahlke
a56f85ac95
YASim removed unused include from Rotor.cpp
2017-03-07 17:50:05 +01:00
Henning Stahlke
6efa1ab821
YASim moved one liners
2017-03-07 17:50:05 +01:00
Henning Stahlke
ce4df326d7
YASim Airplane.cpp additional comments
2017-03-07 17:50:05 +01:00
Henning Stahlke
05f9fcfd10
comments
2017-03-07 17:50:04 +01:00
Henning Stahlke
dc66959b83
YASim comments
2017-03-07 17:50:04 +01:00
Henning Stahlke
1198f5a3ec
YASim CLI tool: add print out of max lift and min drag
...
add drag(speed) print function
2017-03-07 17:50:04 +01:00
Henning Stahlke
cb7d2a1bc5
YASim Wing: add _aspectRatio and _meanChord.
...
(an some indent)
2017-03-07 17:50:04 +01:00
Henning Stahlke
a87442c6f3
YASim fix performance problem due to export to prop.tree.
2017-03-07 17:50:04 +01:00
Henning Stahlke
76a0ea96cc
YASim clarification. Add const to method parameters in Math.hpp
2017-03-07 17:50:04 +01:00
Henning Stahlke
4cbe540bec
YASim: convert local variables alpha and stallAlpha to members of Surface.
2017-03-07 17:50:03 +01:00
Henning Stahlke
5f78545961
only white spaces
2017-03-07 17:50:03 +01:00
Henning Stahlke
d4688d206a
YASim: export surface data to property tree.
2017-03-07 17:50:03 +01:00
Henning Stahlke
d322ded552
YASim bugfix: ground effect did not calculate wingspan correctly;
...
Variable name clarification;
Add Wing::getWingArea, separate Wing::getWingSpan and Wing::getBase.
2017-03-07 17:50:03 +01:00
Henning Stahlke
559dcf4e32
YASim optimization: pre-calculate data for masses that do not change in flight to save CPU (RigidBody::recalc() runs at FDM rate).
...
export mass data to property tree.
2017-03-07 17:50:03 +01:00
Henning Stahlke
4e1be43f15
YASim: export wing data to property tree.
2017-03-07 17:50:03 +01:00
Henning Stahlke
021a9db9be
YASim add surface id and export surface positions to prop tree after model compile.
2017-03-07 17:50:02 +01:00
Henning Stahlke
dd420c6ff4
YASim bugfix, correct an obvious copy-and-paste error
2017-03-07 17:50:02 +01:00
Henning Stahlke
41b18155a8
YASim: export FDM state (v, a, rot) to property tree.
2017-03-07 17:50:02 +01:00
Henning Stahlke
70dd3de3bb
YASim: FGFDM convert local variable _yasimN into a class member
2017-03-07 17:50:02 +01:00
Henning Stahlke
2cac4e4671
YASim: Move variables and methods for input properties from FGFDM to ControlMap.
2017-03-07 17:50:01 +01:00
Henning Stahlke
f14cc3be33
Extend yasim-test.cpp; add print mass distribution, add plot with different configs
2017-03-07 17:47:51 +01:00
Henning Stahlke
6f1f850c11
YASim method name clarification Airplane::setWeight
2017-03-07 17:47:50 +01:00
Henning Stahlke
97a0511ce0
YASim method name clarification in class Surface
2017-03-07 17:47:50 +01:00
Henning Stahlke
91fd075796
YASim method name clarification Wind::setSlat
2017-03-07 17:47:50 +01:00
Henning Stahlke
91806861c6
YASim method name clarification Wind::setFlap1
2017-03-07 17:47:50 +01:00
Henning Stahlke
e69f6ba9ab
YASim method name clarification Wind::setFlap0
2017-03-07 17:47:50 +01:00