1
0
Fork 0
Commit graph

58 commits

Author SHA1 Message Date
James Turner
bd666f952e Raise minimum OSG version to 3.4.1 2020-06-18 17:39:48 +01:00
gallaert
4b60bc7a5b CMake fails to detect OpenRTI include files. 2020-04-01 20:59:39 +01:00
James Turner
c2f163ec97 Fix linkage of fgviewer
Now we don't export OpenGL publiclly from SimGear, declare that
FGViewer uses OpenGL symbols directly, explicitly.
2019-10-19 09:27:27 -07:00
Richard Harrison
8e35b7efc7 OSG 3.4.0 compilation fixes. 2019-02-20 19:12:02 +01:00
Scott Giese
edce380c7b Fix missing header for OSG macros.
Patch provided by Stewart Andreason.
2019-02-05 21:48:05 -06:00
Richard Harrison
f05c0297c0 OSG < 3.4.x fixes
This will use the inherently unsafe versions of the load methods which can result in deleting an object (from the cache) that has just been loaded in the database thread.

Symptom OSG WARN deleting still referenced object.

branches next, origin/next
2019-01-26 18:20:52 +01:00
Richard Harrison
832654fd2b Use readRef version of osgDB methods to give us thread safety 2019-01-20 23:30:21 +01:00
Richard Harrison
1e636ce4cf Support for DDS Texture Cache
- pass texture cache control properties to simgear
 - /sim/rendering/texture-cache/cache-enabled
 - /sim/rendering/texture-cache/compress-transparent
 - /sim/rendering/texture-cache/compress-solid
 - /sim/rendering/texture-cache/compress

- support --texture-cache-dir command line option
- set max reported supported texture size during splashscreen.
2018-11-24 20:21:46 +01:00
Peter Sadrozinski
ec4b9f8542 Alternative terrain engine based on pagedLOD
- remove TileMgr from sub systems - add to btg terrain engine
2017-02-26 10:17:15 -05:00
James Turner
78498c560d Rename preferences.xml -> defaults.xml
Requires FGData commit: 0565eaab10a5d466cd485766b17d1870936a0a57
(which actually renames the file).

Also disables the preferences-load command since I don’t believe it
would actually be safe to reload the defaults without doing a simulator
reset (aircraft -set.xml values would be overwritten, for example)
2017-01-12 09:45:19 +00:00
James Turner
e2f7585d9c Use a Cmake imported target for SimGear 2016-10-30 22:15:54 +00:00
Jeremy Bicha
25928bf614 Use CMAKE_INSTALL_BINDIR
Allow /bin install directory to be overriden. Debian for example uses this
to install FlightGear to /usr/games/ instead of /usr/bin/

https://cmake.org/cmake/help/latest/module/GNUInstallDirs.html
2016-07-09 18:52:58 -04:00
James Turner
6d0c2070fd Use future-proof SGPath APIs.
Remove uses of .str(), .c_str() and some other methods of SGPath.
Pass SGPath directly where possible, or explicitly convert to the
appropriate 8-bit encoding.
2016-06-28 10:08:38 +01:00
Rebecca N. Palmer
14405fe2e3 Fix compile with CMake 3.2.1, by Kevin Seroux
Explicitly link X11, as this no longer comes with OpenGL
2015-04-03 19:15:52 +01:00
Stuart Buchanan
b654477794 New materials.xml format 2014-08-09 20:43:34 +01:00
James Turner
b7a9aee796 FGViewer fixes
- ensure active material are cached
 - clear osgDB object cache on exit explicitly
2014-01-29 10:10:53 +00:00
James Turner
ce3a7b20fe Crash-fix: mat-lib is now reference-counted.
Adapt to corresponding SG change to make SGMaterialLib be ref-counted,
and have the 'reload-materials' command notify the tile-manager of this,
so it can update the options struct it passes to new tiles.
2014-01-19 16:49:44 +00:00
James Turner
e81df0df1f Fix FGViewer compilation when HLA is disabled.
Changed definition in config_cmake.in means #ifdef is no longer
a valid test; use #if instead.
2013-10-20 15:56:33 +01:00
Mathias Froehlich
b0249bad98 fgviewer: Move rti libs past libsimgear. 2013-03-17 15:27:38 +01:00
Christian Schmitt
2013f7149d Some headers missing... ;) 2013-02-07 19:00:54 +01:00
Frederic Bouvier
32e959e88a popen/pclose changed to _popen/_pclose for Windows 2012-12-16 20:35:50 +01:00
Frederic Bouvier
48b794c073 near and far are reserved keyword under Windows 2012-12-16 20:30:10 +01:00
Thomas Geymayer
fee379423d Add fgviewer missing includes. 2012-12-16 19:20:22 +01:00
Mathias Froehlich
243929274b fgviewer: Import hla based viewer application. 2012-12-16 16:52:28 +01:00
Mathias Froehlich
6e5ef711fa fgviewer: Update fgviewer. 2012-07-21 15:23:34 +02:00
Mathias Froehlich
d2411199e8 fgviewer: Update to current initialization structure.
Improove argument parsing. Reorder initialization.
2012-03-15 21:11:44 +01:00
Mathias Froehlich
1ddb658a70 scenery: Move flightgears paging back into the application.
This way of scenery paging is really application code.
Now that the simgear stg loader is seperated from the paging
code, this appication specific paging can reside here.
May be at some time also use the spt stuff here.
2012-03-15 20:56:37 +01:00
Mathias Froehlich
44c716bb03 scenery: The tile entries load callback is not needed anymore.
The stg loader can do this itself.
2012-03-15 19:39:07 +01:00
Mathias Froehlich
ba8fd4c7d1 fgviewer: adapt to simgear upstream changes. 2012-03-08 07:32:18 +01:00
Mathias Froehlich
daf3fbcd67 fgviewer: Make use of the world texture when no file argument is given. 2012-03-04 20:31:14 +01:00
Mathias Froehlich
c71c9aee0a Adapt to simgear SGMath change.
Simgears SGMath has lost its dependency on osg.
Update includes and code using these methods.
2012-03-03 13:37:43 +01:00
Mathias Froehlich
60e49130b2 fgviewer: Does not need plib. 2012-03-03 07:07:22 +01:00
Mathias Froehlich
7d1372cae0 fgviewer: Improove reader/writer option command line handling. 2011-12-17 08:28:33 +01:00
Mathias Froehlich
33630ffe33 fgviewer: add DatabasePager. 2011-12-16 21:45:33 +01:00
Mathias Froehlich
7f528bbd31 fgviewer: add StateSetManipulator. 2011-12-16 21:45:09 +01:00
Mathias Froehlich
b2eb047a03 fgviewer: add license header, adapt to cmake. 2011-11-13 18:34:53 +01:00
Mathias Froehlich
42fb9b8e9f Consolidate the different ReaderWriterOptions classes. 2011-11-13 18:34:53 +01:00
James Turner
70b4f38ebc Goodbye automake. 2011-11-01 11:15:53 +00:00
Mathias Froehlich
549c5eccb9 cmake: Factor out common simgear dependency libs.
Factor out and use this core simgear depenency
library cmake variable.
2011-09-11 11:22:10 +02:00
Csaba Halasz
938d4f3752 autotools build updated with sgthreads library 2011-09-07 22:14:36 +02:00
Mathias Froehlich
6b6238293f Revert to simgears thread support. Flightgear side.
For all source directories outside of simgear/scene,
which really depends very hard on osg, avoid using osg
classes. This should reenable the use of some basic and
scenegraph independent parts of simgear without the
the need for osg.
2011-09-06 07:31:12 +02:00
Mathias Froehlich
e389b45599 Provide command line arguments for fgviewer.
Provide --fg-root and --fg-scenery command line
processing for fgviewer.
2011-07-15 17:57:32 +02:00
Mathias Froehlich
827ea96d7e Make fgviewer at least somehow work again. 2011-06-22 22:15:04 +02:00
Frederic Bouvier
d0a2fbba99 Revert joystick patch. One would have to provide a better one 2011-01-14 22:37:39 +01:00
Frederic Bouvier
4d0a6f5668 Olaf Flebbe: incorporate plib js code to fix problems with MS joysticks under Vista and 7 2011-01-14 21:32:59 +01:00
James Turner
a91ec5f9f9 Initial work on CMake build files, with considerable help from Olaf Flebbe. 2010-12-19 15:06:04 +00:00
Christian Schmitt
0a5e86f4e6 remove old .cvsignore files 2010-11-11 01:16:29 +01:00
Torsten Dreyer
c89b18ddbd Ignore generated files
add generated files to gitignore that has also been in cvsignore
remove generated config.h-msvc* from source control
2010-06-02 11:27:16 +02:00
Tim Moore
473cea7f17 remove references to osgGA::MatrixManipulator
This class has been removed in current OSG sources.
2010-05-31 07:06:55 +02:00
fredb
00e9ad3055 MINGW patch from Benot Laniel 2010-01-25 17:12:04 +01:00