rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-02 10:24:11 +01:00
Code Issues Releases Activity

update OSG and OSGEarth

Browse Source
This commit is contained in:
U-BAMS\philippe.renon 2022-08-18 21:11:26 +02:00
parent bc18da54de
commit 35e84b704d
5 changed files with 12 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ground/gcs/src/libs/osgearth/copydata.pro
View File

@ -160,11 +160,7 @@ win32:osg {
win32:osgearth { win32:osgearth {
# osgearth libraries # osgearth libraries
OSGEARTH_LIBS = \ OSGEARTH_LIBS = \
libosgEarth$${DS}.dll \ libosgEarth$${DS}.dll
libosgEarthAnnotation$${DS}.dll \
libosgEarthFeatures$${DS}.dll \
libosgEarthSymbology$${DS}.dll \
libosgEarthUtil$${DS}.dll
# loaded dynamically (probably by an osg plugin, need to find by which) # loaded dynamically (probably by an osg plugin, need to find by which)
OSGEARTH_LIBS += \ OSGEARTH_LIBS += \
@ -181,11 +177,8 @@ win32:osgearth {
# osgearth plugins # osgearth plugins
OSGEARTH_PLUGINS += \ OSGEARTH_PLUGINS += \
mingw_osgdb_earth$${DS}.dll \ mingw_osgdb_earth$${DS}.dll \
mingw_osgdb_osgearth_arcgis$${DS}.dll \ mingw_osgdb_osgearth_engine_rex$${DS}.dll \
mingw_osgdb_osgearth_engine_mp$${DS}.dll \
mingw_osgdb_osgearth_sky_simple$${DS}.dll \ mingw_osgdb_osgearth_sky_simple$${DS}.dll \
mingw_osgdb_osgearth_tms$${DS}.dll \
mingw_osgdb_osgearth_xyz$${DS}.dll \
mingw_osgdb_osgearth_cache_filesystem$${DS}.dll mingw_osgdb_osgearth_cache_filesystem$${DS}.dll
# more osgearth plugins # more osgearth plugins

2
ground/gcs/src/libs/osgearth/osgQtQuick/OSGCamera.cpp
View File

@ -31,7 +31,7 @@
#include <osg/Node> #include <osg/Node>
#ifdef USE_OSGEARTH #ifdef USE_OSGEARTH
#include <osgEarthUtil/LogarithmicDepthBuffer> #include <osgEarth/LogarithmicDepthBuffer>
#endif #endif
#include <QDebug> #include <QDebug>

12
ground/gcs/src/libs/osgearth/osgQtQuick/OSGSkyNode.cpp
View File

@ -34,7 +34,7 @@
#include <osgEarth/Config> #include <osgEarth/Config>
#include <osgEarth/DateTime> #include <osgEarth/DateTime>
#include <osgEarth/MapNode> #include <osgEarth/MapNode>
#include <osgEarthUtil/Sky> #include <osgEarth/Sky>
// #include <osgEarthDrivers/sky_silverlining/SilverLiningOptions> // #include <osgEarthDrivers/sky_silverlining/SilverLiningOptions>
@ -49,7 +49,7 @@ struct OSGSkyNode::Hidden : public QObject {
private: private:
OSGSkyNode * const self; OSGSkyNode * const self;
osg::ref_ptr<osgEarth::Util::SkyNode> skyNode; osg::ref_ptr<osgEarth::SkyNode> skyNode;
public: public:
OSGNode *sceneNode; OSGNode *sceneNode;
@ -102,7 +102,7 @@ public:
self->setNode(NULL); self->setNode(NULL);
return; return;
} }
if (!mapNode->getMap()->isGeocentric()) { if (!mapNode->isGeocentric()) {
qWarning() << "OSGSkyNode::updateScene - map node is not geocentric"; qWarning() << "OSGSkyNode::updateScene - map node is not geocentric";
self->setNode(NULL); self->setNode(NULL);
return; return;
@ -128,9 +128,9 @@ public:
} }
} }
osgEarth::Util::SkyNode *createSimpleSky(osgEarth::MapNode *mapNode) osgEarth::SkyNode *createSimpleSky(osgEarth::MapNode *mapNode)
{ {
return osgEarth::Util::SkyNode::create(mapNode); return osgEarth::SkyNode::create(/*mapNode*/);
} }
/* /*
@ -196,7 +196,7 @@ public:
} }
double d = minimumAmbientLight; double d = minimumAmbientLight;
// skyNode->getSunLight()->setAmbient(osg::Vec4(d, d, d, 1.0f)); // skyNode->getSunLight()->setAmbient(osg::Vec4(d, d, d, 1.0f));
skyNode->setMinimumAmbient(osg::Vec4(d, d, d, 1.0f)); //skyNode->setMinimumAmbient(osg::Vec4(d, d, d, 1.0f));
} }
void attachSkyNode(osgViewer::View *view) void attachSkyNode(osgViewer::View *view)

2
ground/gcs/src/libs/osgearth/osgQtQuick/ga/OSGEarthManipulator.cpp
View File

@ -29,7 +29,7 @@
#include "../OSGNode.hpp" #include "../OSGNode.hpp"
#include <osgEarthUtil/EarthManipulator> #include <osgEarth/EarthManipulator>
#include <QDebug> #include <QDebug>

4
ground/gcs/src/libs/osgearth/osgearth_dependencies.pri
View File

@ -43,12 +43,12 @@ osgearth {
linux|macx { linux|macx {
INCLUDEPATH += $$OSGEARTH_SDK_DIR/include INCLUDEPATH += $$OSGEARTH_SDK_DIR/include
LIBS += -L$$OSGEARTH_SDK_DIR/$$LIB_DIR_NAME LIBS += -L$$OSGEARTH_SDK_DIR/$$LIB_DIR_NAME
LIBS += -losgEarth -losgEarthUtil -losgEarthFeatures -losgEarthSymbology -losgEarthAnnotation LIBS += -losgEarth
osgearthQt:LIBS += -losgEarthQt osgearthQt:LIBS += -losgEarthQt
} }
win32 { win32 {
LIBS += -losgEarth$${DS} -losgEarthUtil$${DS} -losgEarthFeatures$${DS} -losgEarthSymbology$${DS} -losgEarthAnnotation$${DS} LIBS += -losgEarth$${DS}
osgearthQt:LIBS += -losgEarthQt$${DS} osgearthQt:LIBS += -losgEarthQt$${DS}
} }
} }