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

LP-29 minor renaming in DirtySupport + silencing a warning

Browse Source
This commit is contained in:
Philippe Renon 2016-04-08 09:22:12 +02:00
parent a0b6220d7a
commit 03152b88b5
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ground/gcs/src/libs/osgearth/osgQtQuick/DirtySupport.cpp
View File

@ -72,7 +72,7 @@ public:
{
// qDebug() << "DirtySupport::setDirty" << mask;
if (!dirtyFlags) {
osg::Node *node = self->hookNode();
osg::Node *node = self->nodeToUpdate();
if (node) {
if (!nodeUpdateCallback.valid()) {
// lazy creation
@ -80,7 +80,7 @@ public:
}
node->addUpdateCallback(nodeUpdateCallback.get());
} else {
qWarning() << "DirtySupport::setDirty - node is null";
// qWarning() << "DirtySupport::setDirty - node to update is null";
}
}
dirtyFlags |= mask;
@ -88,7 +88,7 @@ public:
void clearDirty()
{
osg::Node *node = self->hookNode();
osg::Node *node = self->nodeToUpdate();
if (node && nodeUpdateCallback.valid()) {
node->removeUpdateCallback(nodeUpdateCallback.get());

2
ground/gcs/src/libs/osgearth/osgQtQuick/DirtySupport.hpp
View File

@ -54,7 +54,7 @@ private:
struct NodeUpdateCallback;
Hidden *const h;
virtual osg::Node *hookNode() const = 0;
virtual osg::Node *nodeToUpdate() const = 0;
virtual void update() = 0;
};

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

@ -52,7 +52,7 @@ public:
Hidden(OSGNode *self) : QObject(self), self(self), complete(false) /*, dirty(0)*/
{}
osg::Node *hookNode() const
osg::Node *nodeToUpdate() const
{
return self->node();
}

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

@ -55,7 +55,7 @@ public:
~Hidden()
{}
osg::Node *hookNode() const
osg::Node *nodeToUpdate() const
{
return manipulator->getNode();
}