1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-24 13:54:16 +01:00

80 Commits

Author SHA1 Message Date
Philippe Renon
ed225b1935 LP-29 osgearth: minor code cleanups 2016-02-09 00:13:38 +01:00
Philippe Renon
05d806f6f1 LP-29 upgrade to osg 3.5.1 to match version used on windows 2016-02-09 00:13:38 +01:00
James Duley
16d52016e1 hotfix: use msys2 osg, disable osgearth by default 2016-01-31 12:02:58 +00:00
Philippe Renon
d222361663 cleanup all copydata.pro files 2016-01-23 01:55:34 +01:00
Philippe Renon
9c25180483 LP-29 minor comment fix on how to enable OSG debug logging 2016-01-20 08:18:21 +01:00
Philippe Renon
80dafbe446 LP-29 remove glc_lib sources 2016-01-19 22:43:26 +01:00
James Duley
f89031dc6c Fix osg 3.2 compat 2016-01-16 00:07:58 +00:00
James Duley
72560638c8 Rework osg config options 2016-01-15 23:41:09 +00:00
Philippe Renon
f5a1498b36 LP-29 make dependency on osgQt and osgearthQt optional 2016-01-15 08:55:46 +01:00
Philippe Renon
2d59530f6e LP-29 further adaptations to msys2
fix list of mingw provided dependencies
fix path handling
other related cleanups
2016-01-14 03:02:17 +01:00
Philippe Renon
b4f4cd48f0 LP-29 fixed typos 2016-01-12 02:37:13 +01:00
Philippe Renon
c0613fe6d0 Adapted osgearth branch to msys2
Merge remote-tracking branch 'upstream/next' into filnet/LP-29_osgearth_integration

# Conflicts:
#	Makefile
#	ground/gcs/src/libs/osgearth/copydata.pro
#	make/tools.mk
2016-01-12 02:32:16 +01:00
Philippe Renon
3d7558c28b LP-29 split osg and osgearth SDKs and make osgearth optional 2016-01-10 22:33:57 +01:00
James Duley
294f22d422 Merged in james-duley/librepilot/LP-187_use_Msys2 (pull request #132)
LP-187 Use MSYS2
2016-01-10 17:17:33 +00:00
James Duley
02e03259d3 LP-187 MSYS2: dont't explicitly specifiy qt spec 2016-01-10 17:11:46 +00:00
James Duley
df04a87831 LP-187 MSYS2: correct copy data dlls for msys2 2016-01-10 17:11:46 +00:00
Philippe Renon
72c7623a1b Merge remote-tracking branch 'upstream/next' into filnet/LP-29_osgearth_integration
# Conflicts:
#	ground/gcs/src/libs/osgearth/osgearth.pro
2016-01-06 22:16:32 +01:00
Philippe Renon
f7271df0e5 LP-30 fixed windows debug build 2016-01-04 21:36:38 +01:00
Philippe Renon
e843cac384 LP-2 osgearth copydata.pro: use scope to copy proper libs on linux 32/64 2015-12-14 22:14:22 +01:00
Philippe Renon
95ea26c396 Merge branch 'next' of bitbucket.org:librepilot/librepilot into filnet/LP-29_osgearth_integration
# Conflicts:
#	ground/gcs/src/libs/osgearth/osgearth.pro
2015-12-10 00:17:10 +01:00
Philippe Renon
67b143a73d Merged in filnet/librepilot/shared/LP-2_qt5_5_upgrade (pull request #112)
shared/LP-2_qt5_5_upgrade
2015-12-09 22:04:19 +01:00
Philippe Renon
fabdea9eee LP-29 redirect osg logging to Qt (commented out for now) 2015-12-09 08:35:48 +01:00
Philippe Renon
3e10e89cec LP-29 use QOpenGLWidget in place of depecrated QGLWidget 2015-12-09 08:32:04 +01:00
Philippe Renon
596286604e LP-29 add TODOs 2015-12-09 08:28:11 +01:00
Philippe Renon
26a3df4715 LP-29 remove OSGViewport hack
apparently not necessary anymore
2015-12-09 08:20:44 +01:00
Philippe Renon
7461159c69 LP-29 improve OSGViewport rendering loop
update scene in the Renderer synchronize method
2015-12-09 08:19:55 +01:00
Philippe Renon
f9694acfd1 Merge remote-tracking branch 'upstream/next' into filnet/LP-29_osgearth_integration
# Conflicts:
#	ground/gcs/src/plugins/pfdqml/pfdqmlgadgetwidget.cpp
#	ground/gcs/src/share/qml/pfd/Compass.qml
#	ground/gcs/src/share/qml/pfd/Info.qml
#	ground/gcs/src/share/qml/pfd/Panels.qml
#	ground/gcs/src/share/qml/pfd/VsiScale.qml
#	ground/gcs/src/share/qml/pfd/Warnings.qml
2015-12-08 01:22:12 +01:00
Philippe Renon
783cf7d981 LP-183 removed unused settingsutil (not related to LP-183...) 2015-12-06 12:56:00 +01:00
Philippe Renon
9c4c906765 LP-183 move toLowerCamelCase method to new string utility 2015-12-06 12:22:38 +01:00
Philippe Renon
2f18791a43 LP-29 don't take device pixel ratio into account 2015-12-02 23:09:38 +01:00
Philippe Renon
a4f8380c13 LP-29 silence OSGViewport::createFramebufferObject method 2015-12-02 23:08:49 +01:00
Philippe Renon
0dc76168a3 LP-2 remove unused windows specific utility method winGetDLLVersion (additionally had compile warnings) 2015-12-02 21:41:19 +01:00
Philippe Renon
8c47101562 LP-2 minor osg/Qt cleanup 2015-12-02 09:05:14 +01:00
Philippe Renon
f3b06daf4c LP-2 temporarilly disable glc_lib (and moldeview) as it does not link with Qt 5.5.x 2015-12-02 09:05:14 +01:00
Philippe Renon
7d06944a81 LP-29 remove duplicate osg lib on mac 2015-11-30 22:24:32 +01:00
Philippe Renon
9b100bea4a Merge remote-tracking branch 'origin/LP-183_more_qml_friendly_gcs_uav_object_generator' into filnet/LP-29_osgearth_integration 2015-11-29 19:38:57 +01:00
Philippe Renon
b629a7f69f LP-2 remove unused <QtDesigner/QDesignerExportWidget> import that was causing a deprecated warning 2015-11-25 09:09:55 +00:00
Philippe Renon
6d934fc177 LP-2 removed unused classes that fail to link with Qt 5.5 2015-11-25 09:09:55 +00:00
Philippe Renon
bc5e02e3af LP-30 uncrustify 2015-11-21 15:40:30 +01:00
Philippe Renon
5315af05a3 LP-30 fix minor OSGSky date issue 2015-11-21 15:39:34 +01:00
Philippe Renon
b873d37a8f LP-30 global enum cleanup 2015-11-21 15:37:39 +01:00
Philippe Renon
a79fd612ac LP-29 enable FragDepth when using LogarithmicDepthBuffer (fixes heavy z-fighting on the craft model) 2015-11-11 00:24:07 +01:00
Philippe Renon
0a374d2904 LP-29 remove AutoClipPlaneHandler (it is not recommended to use it
See http://forum.osgearth.org/Performance-issue-when-looking-at-horizon-td7588307.html
2015-11-11 00:22:57 +01:00
Philippe Renon
3ee0564421 LP-29 fixed some debug logs 2015-11-07 12:46:16 +01:00
Philippe Renon
3dbdd76225 LP-174 add missing EXPORT to TextBubbleSlider 2015-11-06 22:02:32 +01:00
Philippe Renon
58c880d706 Merge remote-tracking branch 'upstream/next' into filnet/LP-29_osgearth_integration 2015-11-06 09:22:48 +01:00
Laurent Lalanne
0f4eaf5b24 LP-174 Set Defgroup like others files in directory 2015-11-04 19:06:58 +01:00
Philippe Renon
b0fcfe8ffd LP-29 disable lighting when a map is used 2015-11-03 22:53:24 +01:00
Philippe Renon
c33c3c9b99 LP-29 remove commented out code and other minor cleanups 2015-11-02 21:33:09 +01:00
Philippe Renon
d9a0a3e84a LP-29 simplify resize logic (also fixes some resizing issues) 2015-11-02 21:32:50 +01:00