Erik Hofman
6c6e74e8d1
Change logging levels to developer mode and be more descriptive
2020-03-19 13:33:30 +01:00
gallaert
4bab064ad6
- When HLA is enabled in Simgear, HLA is also enabled in Flightgear
...
making the build between Simgear and Flightgear consistent.
- Fix an issue with lib/lib64 path between CentOS/RedHat distributions
and Debian derived distributions.
2020-03-15 22:29:43 +00:00
gallaert
3da2880aae
Merge branch 'next' of https://git.code.sf.net/p/flightgear/simgear into next
2020-03-15 21:32:42 +00:00
James Turner
c8d802bc1d
More SGPath / UTF-8 fixes
...
Use SGPath in more public APIs, so FlightGear doesn’t have to convert
and guess the conversion itself.
2020-03-15 14:26:42 +00:00
James Turner
c3a169319c
Fix UTF-8 shader path support
...
Work around osg::Shader::loadShaderFromSourceFile ’s lack of UTF-8
support by loading using our own istream, and then setting the text
directly.
2020-03-15 14:26:42 +00:00
Erik Hofman
72af950573
Fix an error
2020-03-15 14:57:24 +01:00
Erik Hofman
edae7a2b75
Make warnings and alerts a single message for DEV_WARN and DEV_ALERT since they will result in a popu-dialog message
2020-03-15 14:33:05 +01:00
Erik Hofman
1fa48e7edb
File readind is not of the SG_INPUT class s change it to SG_IO and make all warinigs and alerts developer-warings and developer-alerts
2020-03-15 14:24:02 +01:00
Erik Hofman
d76992efe6
Show the affected file when displaying an animation error or warning
2020-03-15 10:44:29 +01:00
James Turner
87da4680c7
Tweaks to Windows string conversion
...
Avoid use of code-cvt, and tolerate differences in compiler handling of
string literals (tested Clanged and MSVC, hopefully GCC is kind)
2020-03-14 20:10:20 +00:00
Richard Harrison
9cc7508b07
fixes #2123 Relocation splash distorted.
...
Allow splash screen as an origin and do not allow splash screens to be cached and thus the poweroftwo rules don't apply.
2020-03-13 20:07:31 +01:00
James Turner
b258bc598e
Load time-zones from UTF-8 paths correctly
...
Use _wfopen on Windows, after converting UTF-8 paths to wchar
2020-03-13 16:48:12 +00:00
James Turner
f25c0c60a8
Use UTF8 paths in nearly all places, for OSG
...
We already request OSG to use UTF8 paths, so ensure whenever we pass
an SGPath to OSG, we use the correct conversion function.
2020-03-13 09:50:43 +00:00
James Turner
f350bd31bd
CanvasImage: fillRect / setPixel tweaks
...
Fix image dirtying and allocation without an underlying fike
2020-03-11 17:12:42 +00:00
gallaert
06f1699223
Merge branch 'next' of https://git.code.sf.net/p/flightgear/simgear into next
2020-03-09 22:13:16 +00:00
James Turner
3e4d528859
Additional install / download failure test
...
Ensure we can install again on a previously failed URL.
2020-03-09 15:00:23 +00:00
Erik Hofman
b847f57382
Fix a threads header
2020-03-09 14:56:08 +01:00
gallaert
2d7ad25031
Merge branch 'next' of https://git.code.sf.net/p/flightgear/simgear into next
2020-03-01 16:14:13 +00:00
James Turner
d670cc13ac
testHTTP mods to investigate macOS failure.
...
Disabled one test for now, since it’s blocking macOS release process
2020-02-25 16:12:12 +00:00
James Turner
43699d039f
Track package install status persistently.
2020-02-25 14:27:48 +00:00
James Turner
9192b009e1
Catalog enable/disable feature
2020-02-24 11:35:04 +00:00
Stuart Buchanan
3fe85809b2
Add support for tarballs in Terrasync
2020-02-16 20:26:20 +00:00
Stuart Buchanan
a4b79d6882
Merge /u/tbmoore/simgear/ branch tmoore/canvas-mipmap into next
...
https://sourceforge.net/p/flightgear/simgear/merge-requests/52/
2020-02-12 21:02:43 +00:00
gallaert
fc21e6eafa
Merge branch 'next' of https://git.code.sf.net/p/flightgear/simgear into next
2020-01-31 22:51:14 +00:00
Erik Hofman
11e243a216
Clean up the threading code: remove the private classes.
2020-01-29 11:33:54 +01:00
Stuart Buchanan
9f862dcc0e
Fix directional lights for AMD
...
Some AMD drivers do not like triangles for point sprites, which
breaks directional lights. This works around this by allowing
users to set /rendering/triangle-directional-lights=false which
falls back to the non-directional implementation of a point.
2020-01-27 09:28:25 +00:00
Erik Hofman
faf43d2c4b
Comment out Windows debugging code, for now
2020-01-24 19:30:32 +01:00
Erik Hofman
b0580b2df5
Re-order the mutex locking of the condition-mutex and the caller-mutex, add noxecept. Also add some debugging code to detect multiple locks of the same mutex.
2020-01-24 15:46:36 +01:00
Erik Hofman
308903dc91
Revert to c3ae704610
until the condition_variable problem is solved
2020-01-24 13:52:37 +01:00
Erik Hofman
1c7fd67c39
Convert condition variables to C++11 too.
2020-01-24 10:48:53 +01:00
Erik Hofman
c3ae704610
Move SGThread::current to after the system dependent code which includes the proper header files
2020-01-23 13:47:04 +01:00
Erik Hofman
9f8e6c0634
Make backwards compatible stubs so only a recompile without any modification is required.
2020-01-23 10:38:52 +01:00
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