From fd249b46c0c6ebb46330ce3334b50c6dd6997b34 Mon Sep 17 00:00:00 2001 From: elsid Date: Wed, 10 May 2023 22:46:21 +0200 Subject: [PATCH] Remove redundant member function mActive is public. --- apps/openmw/mwrender/localmap.cpp | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/apps/openmw/mwrender/localmap.cpp b/apps/openmw/mwrender/localmap.cpp index 9e9580fcaa..a71ab61f3c 100644 --- a/apps/openmw/mwrender/localmap.cpp +++ b/apps/openmw/mwrender/localmap.cpp @@ -61,9 +61,6 @@ namespace MWRender void setDefaults(osg::Camera* camera) override; - bool isActive() { return mActive; } - void setIsActive(bool active) { mActive = active; } - osg::Node* mSceneRoot; osg::Matrix mProjectionMatrix; osg::Matrix mViewMatrix; @@ -243,7 +240,7 @@ namespace MWRender auto it = mLocalMapRTTs.begin(); while (it != mLocalMapRTTs.end()) { - if (!(*it)->isActive()) + if (!(*it)->mActive) { mRoot->removeChild(*it); it = mLocalMapRTTs.erase(it); @@ -758,13 +755,10 @@ namespace MWRender void CameraLocalUpdateCallback::operator()(LocalMapRenderToTexture* node, osg::NodeVisitor* nv) { - if (!node->isActive()) + if (!node->mActive) node->setNodeMask(0); - if (node->isActive()) - { - node->setIsActive(false); - } + node->mActive = false; // Rtt-nodes do not forward update traversal to their cameras so we can traverse safely. // Traverse in case there are nested callbacks.