Erik Hofman
aab88b411e
Switch to C++11 threads, mutexes and lock_guards. Switching to C++11 condition_variables requires some more thought.
2020-01-22 13:44:47 +01:00
James Turner
867cf6b60a
test_Http: Better completion checking
2020-01-19 06:30:10 -08:00
gallaert
ed87114c5e
Merge branch 'next' of https://git.code.sf.net/p/flightgear/simgear into next
2020-01-11 18:52:36 +00:00
Julian Smith
213adb5f0d
simgear/debug/logstream.cxx: ensure fgfs.log always includes file:line.
...
This is a bit of a hack - we set line = -line if m_fileLine is false, so that
the +ve value can be recovered by FileLogCallback::operator().
2019-12-31 16:50:46 +00:00
Scott Giese
c5c10a003a
Rollback error until stability issues are resolved.
2019-12-31 10:29:25 -06:00
Julian Smith
e78205f071
simgear/debug/logstream.cxx: Fixed FileLogCallback to not output <filename>:-1.
...
logstream::LogStreamPrivate::log() sets line=-1 to turn off both filename and
line numbers in log output, if m_fileLine is false.
StderrLogCallback::operator() already omits both file and line if line == -1;
this commit does the same thing for FileLogCallback::operator().
E.g. this fixes output e.g. to ~/.fgfs/fgfs.log.
2019-12-29 19:04:47 +00:00
Richard Harrison
ba7134c2a2
Use isfinite to determine if an FP number is valid.
...
ref: https://forum.flightgear.org/viewtopic.php?f=30&t=36600&sid=4bdfcb69abb4a6440cd8965aa03815d5#p357164
2019-12-29 13:50:21 +01:00
Richard Harrison
1eadaa4cda
Protect against null reference when effect not found
2019-12-29 13:48:40 +01:00
Richard Harrison
d93ce29b20
Exclusive thread possible fix for Linux
...
The deadlock is possibly caused by the thread not being joined, or because of an implementation difference with phtreads.
So this fix adds a call to release the background thread when terminating it and then also joins the thread to await for the completion of the background thread.
As before this works fine under Win32 (x64)
2019-12-29 13:48:09 +01:00
Richard Harrison
0cddb9e843
Revert "Disable NasalMainLoopRecipient"
...
This reverts commit 67e2860cc3
2019-12-29 13:45:42 +01:00
Scott Giese
67e2860cc3
Disable NasalMainLoopRecipient
...
This is preventing FGFS shutdown on Linux OS.
Does not appear that this thread is properly joined and terminated.
2019-12-27 20:48:02 -06:00
James Turner
0cf9dd165e
Add NetBeans .gitignore
2019-12-24 20:58:48 +00:00
James Turner
3aa567b672
Merge /u/fgarlin/simgear/ branch next into next
...
https://sourceforge.net/p/flightgear/simgear/merge-requests/70/
2019-12-24 19:47:25 +00:00
Fernando García Liñán
fa1e3cb183
Support in Effects for reading 3D textures from disk as an array of 2D textures
2019-12-24 03:37:14 +01:00
Fernando García Liñán
14845bf3f2
Compositor: Provide previous frame transformation matrices and the sunlight direction as uniforms
2019-12-24 03:34:37 +01:00
Fernando García Liñán
120328eb2b
Removed 'using namespace' from header
2019-12-24 03:31:28 +01:00
gallaert
e222c0888c
Merge branch 'next' of https://git.code.sf.net/p/flightgear/simgear into next
2019-12-19 11:48:09 +00:00
James Turner
ec19dfc2f2
Fix Windows build
...
__PRETTY_FUNCTION__ is not portable, alas.
2019-12-18 23:43:40 +00:00
James Turner
da45c26e7d
Adding pixel manipulators to canvas::Image
2019-12-17 22:32:25 +00:00
James Turner
c39a5fd8c0
Fix some Clang warnings
2019-12-17 22:32:25 +00:00
Scott Giese
fb57fe9da7
Catching an exception by value
2019-12-15 03:12:54 -06:00
Scott Giese
02496da4d2
Logic error
2019-12-15 03:08:06 -06:00
Scott Giese
eb1afec22b
Remove unused object creation
2019-12-15 02:39:43 -06:00
Scott Giese
1619df97f8
Potential unterminated string
2019-12-15 02:19:13 -06:00
Scott Giese
c653a82619
Eliminate unitialized warning
2019-12-15 02:00:16 -06:00
Scott Giese
2289618cea
Fix conditional compile logic
2019-12-15 00:18:39 -06:00
Scott Giese
dc886118ba
[CanvasText] Fix conditional compiles
2019-12-15 00:13:46 -06:00
Scott Giese
879b01004b
[CanvasText] Fix conditional compiles
2019-12-14 23:31:13 -06:00
Stuart Buchanan
86f3169e4b
Shader Buildings - fix roof orientation
...
Correct transformation to make roof ridges match orientation
in documentation.
2019-12-08 17:36:23 +00:00
Stuart Buchanan
d5957b8c5f
Random Buildings - improved texture mapping
...
Previously the front and side faces of random/OSM buildings
had identical texture coordinates. This resulted in the sides
of buildings texture mapping being squeezed or stretched.
This change generates a separate texture mapping for the sides
of the buildings.
2019-11-23 17:05:20 +00:00
James.Hester
595eb3efea
Change order of test for is_plantation as per feedback.
2019-11-21 20:36:56 +11:00
James.Hester
81e93448e3
Merge branch 'plantation' into next
2019-11-17 09:05:47 +11:00
James.Hester
0f9fe8adef
Add generation of plantation vegetation to TileDetailsCallback.
...
Plantations are regularly spaced vegetation. This effect is switched
on by the is_plantation material property. Vegetation is laid out
at integer spacings in x and y, with the spacing determined by the
usual coverage properties.
2019-11-16 11:16:09 +11:00
James.Hester
56933067c0
Add "is_plantation" property to materials definitions.
2019-11-16 11:02:35 +11:00
James.Hester
0919f5bf9c
Improve comments on previous commit.
2019-11-12 08:00:04 +11:00
James.Hester
b91d4411b5
Added point_in_triangle function.
2019-11-12 07:55:09 +11:00
Erik Hofman
15c6131f0e
Use a better way to set the listener position and orientation
2019-11-08 10:51:56 +01:00
James Turner
c2f2f25046
Merge /u/fgarlin/simgear/ branch next into next
...
https://sourceforge.net/p/flightgear/simgear/merge-requests/68/
2019-11-07 17:38:31 +00:00
Fernando García Liñán
94ced66f87
Compositor: Enable more culling for shadow passes
2019-11-07 15:46:05 +01:00
Erik Hofman
ece2f913a1
Get AeonWave up to par again by removing a number of errors, and fixing a unit type for the audio cone inner and outer angle.
2019-11-07 15:15:02 +01:00
Fernando García Liñán
2b2ada2037
Compositor: Added support for spotlights in clustered shading
2019-11-07 15:09:26 +01:00
Julian Smith
1a4568175c
simgear/environment/metar.*: getDescription() can now also use single spaces.
...
If <tabstop> param is -1, all sequences of tabs are replaced by a single space.
2019-11-06 19:56:03 +00:00
Julian Smith
0c8949e723
simgear/environment/metar.cxx:SGMetar::getDescription(): minor improvements to returned text.
...
remove special characters from output. We used to include 0xb0 characters -
small 'o' degree symbol, but this isn't reliable and looks bad in flightgear's
weather window.
Consistently use space between number and its unit.
remove 'METAR Report' header.
2019-11-06 19:56:03 +00:00
James Turner
012966f6a2
Merge /u/fgarlin/simgear/ branch next into next
...
https://sourceforge.net/p/flightgear/simgear/merge-requests/67/
2019-11-05 09:32:28 +00:00
Erik Hofman
82b1cca247
Also add pressure to the mix
2019-11-04 15:18:59 +01:00
Erik Hofman
2976dc29d5
Merge branch 'next' of ssh://git.code.sf.net/p/flightgear/simgear into next
2019-11-04 14:54:30 +01:00
Erik Hofman
99d5b0dc8a
Switch to in-place declarations and to the ISO9613 distance attenuation model for AeonWave which also calcualtes the proper sound velocity based on atmospheric properties
2019-11-04 14:54:06 +01:00
Fernando García Liñán
d1eb768de6
Disabled CASTSHADOW_BIT on most of the scene graph geometry to optimize performance
2019-11-03 20:53:55 +01:00
Julian Smith
5db8e42c69
simgear/environment/metar.*: added getDescription().
...
Returns human-readable descrition of metar. Uses code from
flightgear:src/Main/metar_main.cxx.
2019-11-01 22:55:20 +00:00
Fernando García Liñán
c7efa81efe
Only use effect schemes when the Compositor is enabled
2019-10-30 17:14:38 +01:00
Erik Hofman