Do not copy osg::ref_ptr when possible

apps/opencs/view/render/brushdraw.cpp

@@ -24,7 +24,7 @@
 #include "mask.hpp"
 
 CSVRender::BrushDraw::BrushDraw(osg::ref_ptr<osg::Group> parentNode, bool textureMode)
-    : mParentNode(parentNode)
+    : mParentNode(std::move(parentNode))
     , mTextureMode(textureMode)
 {
     mBrushDrawNode = new osg::Group();

apps/opencs/view/render/instancemode.cpp

@@ -197,7 +197,7 @@ CSVRender::InstanceMode::InstanceMode(
     , mDragAxis(-1)
     , mLocked(false)
     , mUnitScaleDist(1)
-    , mParentNode(parentNode)
+    , mParentNode(std::move(parentNode))
 {
     connect(this, &InstanceMode::requestFocus, worldspaceWidget, &WorldspaceWidget::requestFocus);
 

apps/opencs/view/render/scenewidget.cpp

@@ -284,7 +284,7 @@ namespace CSVRender
 
         osg::ref_ptr<osg::Geometry> gradientQuad = createGradientRectangle(bgColour, gradientColour);
 
-        camera->addChild(gradientQuad);
+        camera->addChild(std::move(gradientQuad));
         return camera;
     }
 

apps/openmw/mwinput/actionmanager.cpp

@@ -31,8 +31,8 @@ namespace MWInput
         osgViewer::ScreenCaptureHandler::CaptureOperation* screenCaptureOperation,
         osg::ref_ptr<osgViewer::Viewer> viewer, osg::ref_ptr<osgViewer::ScreenCaptureHandler> screenCaptureHandler)
         : mBindingsManager(bindingsManager)
-        , mViewer(viewer)
+        , mViewer(std::move(viewer))
-        , mScreenCaptureHandler(screenCaptureHandler)
+        , mScreenCaptureHandler(std::move(screenCaptureHandler))
         , mScreenCaptureOperation(screenCaptureOperation)
         , mTimeIdle(0.f)
     {

apps/openmw/mwphysics/physicssystem.cpp

@@ -102,7 +102,7 @@ namespace MWPhysics
         , mProjectileId(0)
         , mWaterHeight(0)
         , mWaterEnabled(false)
-        , mParentNode(parentNode)
+        , mParentNode(std::move(parentNode))
         , mPhysicsDt(1.f / 60.f)
     {
         mResourceSystem->addResourceManager(mShapeManager.get());

apps/openmw/mwrender/actoranimation.cpp

@@ -42,7 +42,7 @@ namespace MWRender
 
     ActorAnimation::ActorAnimation(
         const MWWorld::Ptr& ptr, osg::ref_ptr<osg::Group> parentNode, Resource::ResourceSystem* resourceSystem)
-        : Animation(ptr, parentNode, resourceSystem)
+        : Animation(ptr, std::move(parentNode), resourceSystem)
     {
         MWWorld::ContainerStore& store = mPtr.getClass().getContainerStore(mPtr);
 
@@ -474,7 +474,7 @@ namespace MWRender
             osg::ref_ptr<osg::Group> arrowNode = ammoNode->getChild(i)->asGroup();
             osg::ref_ptr<osg::Node> arrow = mResourceSystem->getSceneManager()->getInstance(model, arrowNode);
             if (!ammo->getClass().getEnchantment(*ammo).empty())
-                mGlowUpdater = SceneUtil::addEnchantedGlow(arrow, mResourceSystem, glowColor);
+                mGlowUpdater = SceneUtil::addEnchantedGlow(std::move(arrow), mResourceSystem, glowColor);
         }
     }
 

apps/openmw/mwrender/animation.cpp

@@ -515,7 +515,7 @@ namespace MWRender
 
     Animation::Animation(
         const MWWorld::Ptr& ptr, osg::ref_ptr<osg::Group> parentNode, Resource::ResourceSystem* resourceSystem)
-        : mInsert(parentNode)
+        : mInsert(std::move(parentNode))
         , mSkeleton(nullptr)
         , mNodeMapCreated(false)
         , mPtr(ptr)
@@ -1912,7 +1912,7 @@ namespace MWRender
     // ------------------------------
 
     PartHolder::PartHolder(osg::ref_ptr<osg::Node> node)
-        : mNode(node)
+        : mNode(std::move(node))
     {
     }
 

apps/openmw/mwrender/bulletdebugdraw.cpp

@@ -26,7 +26,7 @@ namespace MWRender
 {
 
     DebugDrawer::DebugDrawer(osg::ref_ptr<osg::Group> parentNode, btCollisionWorld* world, int debugMode)
-        : mParentNode(parentNode)
+        : mParentNode(std::move(parentNode))
         , mWorld(world)
     {
         DebugDrawer::setDebugMode(debugMode);

apps/openmw/mwrender/characterpreview.cpp

@@ -554,7 +554,7 @@ namespace MWRender
     public:
         UpdateCameraCallback(
             osg::ref_ptr<const osg::Node> nodeToFollow, const osg::Vec3& posOffset, const osg::Vec3& lookAtOffset)
-            : mNodeToFollow(nodeToFollow)
+            : mNodeToFollow(std::move(nodeToFollow))
             , mPosOffset(posOffset)
             , mLookAtOffset(lookAtOffset)
         {

apps/openmw/mwrender/effectmanager.cpp

@@ -17,7 +17,7 @@ namespace MWRender
 {
 
     EffectManager::EffectManager(osg::ref_ptr<osg::Group> parent, Resource::ResourceSystem* resourceSystem)
-        : mParentNode(parent)
+        : mParentNode(std::move(parent))
         , mResourceSystem(resourceSystem)
     {
     }

apps/openmw/mwrender/npcanimation.cpp

@@ -255,7 +255,7 @@ namespace MWRender
 
     NpcAnimation::NpcAnimation(const MWWorld::Ptr& ptr, osg::ref_ptr<osg::Group> parentNode,
         Resource::ResourceSystem* resourceSystem, bool disableSounds, ViewMode viewMode, float firstPersonFieldOfView)
-        : ActorAnimation(ptr, parentNode, resourceSystem)
+        : ActorAnimation(ptr, std::move(parentNode), resourceSystem)
         , mViewMode(viewMode)
         , mShowWeapons(false)
         , mShowCarriedLeft(true)

apps/openmw/mwrender/pathgrid.cpp

@@ -26,7 +26,7 @@ namespace MWRender
 
     Pathgrid::Pathgrid(osg::ref_ptr<osg::Group> root)
         : mPathgridEnabled(false)
-        , mRootNode(root)
+        , mRootNode(std::move(root))
         , mPathGridRoot(nullptr)
         , mInteriorPathgridNode(nullptr)
     {

apps/openmw/mwrender/precipitationocclusion.cpp

@@ -20,7 +20,7 @@ namespace
     {
     public:
         PrecipitationOcclusionUpdater(osg::ref_ptr<osg::Texture2D> depthTexture)
-            : mDepthTexture(depthTexture)
+            : mDepthTexture(std::move(depthTexture))
         {
         }
 

apps/openmw/mwrender/screenshotmanager.cpp

@@ -133,8 +133,8 @@ namespace MWRender
     ScreenshotManager::ScreenshotManager(osgViewer::Viewer* viewer, osg::ref_ptr<osg::Group> rootNode,
         osg::ref_ptr<osg::Group> sceneRoot, Resource::ResourceSystem* resourceSystem, Water* water)
         : mViewer(viewer)
-        , mRootNode(rootNode)
+        , mRootNode(std::move(rootNode))
-        , mSceneRoot(sceneRoot)
+        , mSceneRoot(std::move(sceneRoot))
         , mDrawCompleteCallback(new NotifyDrawCompletedCallback)
         , mResourceSystem(resourceSystem)
         , mWater(water)

apps/openmw/mwrender/skyutil.cpp

@@ -128,8 +128,8 @@ namespace MWRender
 
     OcclusionCallback::OcclusionCallback(
         osg::ref_ptr<osg::OcclusionQueryNode> oqnVisible, osg::ref_ptr<osg::OcclusionQueryNode> oqnTotal)
-        : mOcclusionQueryVisiblePixels(oqnVisible)
+        : mOcclusionQueryVisiblePixels(std::move(oqnVisible))
-        , mOcclusionQueryTotalPixels(oqnTotal)
+        , mOcclusionQueryTotalPixels(std::move(oqnTotal))
     {
     }
 
@@ -166,7 +166,7 @@ namespace MWRender
     public:
         SunFlashCallback(
             osg::ref_ptr<osg::OcclusionQueryNode> oqnVisible, osg::ref_ptr<osg::OcclusionQueryNode> oqnTotal)
-            : OcclusionCallback(oqnVisible, oqnTotal)
+            : OcclusionCallback(std::move(oqnVisible), std::move(oqnTotal))
             , mGlareView(1.f)
         {
         }
@@ -238,8 +238,8 @@ namespace MWRender
     public:
         SunGlareCallback(osg::ref_ptr<osg::OcclusionQueryNode> oqnVisible,
             osg::ref_ptr<osg::OcclusionQueryNode> oqnTotal, osg::ref_ptr<osg::PositionAttitudeTransform> sunTransform)
-            : OcclusionCallback(oqnVisible, oqnTotal)
+            : OcclusionCallback(std::move(oqnVisible), std::move(oqnTotal))
-            , mSunTransform(sunTransform)
+            , mSunTransform(std::move(sunTransform))
             , mTimeOfDayFade(1.f)
             , mGlareView(1.f)
         {

apps/openmw/mwrender/util.cpp

@@ -28,7 +28,7 @@ namespace MWRender
             if (node.getUserValue("overrideFx", index))
             {
                 if (index == 1)
-                    overrideTexture(mTexture, mResourcesystem, nodePtr);
+                    overrideTexture(mTexture, mResourcesystem, std::move(nodePtr));
             }
             traverse(node);
         }

apps/openmw/mwrender/water.cpp

@@ -625,8 +625,8 @@ namespace MWRender
             , mReflection(reflection)
             , mRefraction(refraction)
             , mRipples(ripples)
-            , mProgram(program)
+            , mProgram(std::move(program))
-            , mNormalMap(normalMap)
+            , mNormalMap(std::move(normalMap))
         {
         }
 
@@ -714,7 +714,7 @@ namespace MWRender
         node->setUpdateCallback(mRainIntensityUpdater);
 
         mShaderWaterStateSetUpdater
-            = new ShaderWaterStateSetUpdater(this, mReflection, mRefraction, mRipples, program, normalMap);
+            = new ShaderWaterStateSetUpdater(this, mReflection, mRefraction, mRipples, std::move(program), normalMap);
         node->addCullCallback(mShaderWaterStateSetUpdater);
     }
 

apps/openmw/mwworld/cellpreloader.hpp

@@ -95,7 +95,7 @@ namespace MWWorld
         {
             PreloadEntry(double timestamp, osg::ref_ptr<SceneUtil::WorkItem> workItem)
                 : mTimeStamp(timestamp)
-                , mWorkItem(workItem)
+                , mWorkItem(std::move(workItem))
             {
             }
             PreloadEntry()

apps/openmw/mwworld/projectilemanager.cpp

@@ -254,7 +254,7 @@ namespace MWWorld
         SceneUtil::AssignControllerSourcesVisitor assignVisitor(state.mEffectAnimationTime);
         state.mNode->accept(assignVisitor);
 
-        MWRender::overrideFirstRootTexture(texture, mResourceSystem, projectile);
+        MWRender::overrideFirstRootTexture(texture, mResourceSystem, std::move(projectile));
     }
 
     void ProjectileManager::update(State& state, float duration)

components/debug/debugdraw.cpp

@@ -336,7 +336,7 @@ namespace Debug
 }
 
 Debug::DebugDrawer::DebugDrawer(Shader::ShaderManager& shaderManager, osg::ref_ptr<osg::Group> parentNode)
-    : mParentNode(parentNode)
+    : mParentNode(std::move(parentNode))
 {
     mCurrentFrame = 0;
 

components/resource/keyframemanager.cpp

@@ -30,7 +30,7 @@ namespace Resource
         const VFS::Manager* vfs)
         : osg::NodeVisitor(TRAVERSE_ALL_CHILDREN)
         , mTarget(target)
-        , mAnimationManager(animationManager)
+        , mAnimationManager(std::move(animationManager))
         , mNormalized(normalized)
         , mVFS(vfs)
     {

components/sceneutil/attach.cpp

@@ -22,7 +22,7 @@ namespace SceneUtil
     public:
         CopyRigVisitor(osg::ref_ptr<osg::Group> parent, std::string_view filter)
             : osg::NodeVisitor(TRAVERSE_ALL_CHILDREN)
-            , mParent(parent)
+            , mParent(std::move(parent))
             , mFilter(filter)
         {
         }

components/sceneutil/riggeometryosgaextension.cpp

@@ -69,7 +69,7 @@ namespace SceneUtil
         }
 
         osg::ref_ptr<OsgaRigGeometry> rigGeometry = new OsgaRigGeometry(*copy.getSourceRigGeometry(), copyop);
-        setSourceRigGeometry(rigGeometry);
+        setSourceRigGeometry(std::move(rigGeometry));
     }
 
     RigGeometryHolder::RigGeometryHolder(const osgAnimation::RigGeometry& copy, const osg::CopyOp& copyop)
@@ -80,7 +80,7 @@ namespace SceneUtil
         setUseVertexBufferObjects(true);
 
         osg::ref_ptr<OsgaRigGeometry> rigGeometry = new OsgaRigGeometry(copy, copyop);
-        setSourceRigGeometry(rigGeometry);
+        setSourceRigGeometry(std::move(rigGeometry));
     }
 
     void RigGeometryHolder::setSourceRigGeometry(osg::ref_ptr<OsgaRigGeometry> sourceRigGeometry)

components/sdlutil/sdlinputwrapper.cpp

@@ -10,7 +10,7 @@ namespace SDLUtil
 
     InputWrapper::InputWrapper(SDL_Window* window, osg::ref_ptr<osgViewer::Viewer> viewer, bool grab)
         : mSDLWindow(window)
-        , mViewer(viewer)
+        , mViewer(std::move(viewer))
         , mMouseListener(nullptr)
         , mSensorListener(nullptr)
         , mKeyboardListener(nullptr)

components/sdlutil/sdlvideowrapper.cpp

@@ -13,7 +13,7 @@ namespace SDLUtil
 
     VideoWrapper::VideoWrapper(SDL_Window* window, osg::ref_ptr<osgViewer::Viewer> viewer)
         : mWindow(window)
-        , mViewer(viewer)
+        , mViewer(std::move(viewer))
         , mGamma(1.f)
         , mContrast(1.f)
         , mHasSetGammaContrast(false)

extern/osgQt/osgQOpenGLWidget.cpp

@@ -83,7 +83,7 @@ CompositeOsgRenderer* osgQOpenGLWidget::getCompositeViewer()
 
 void osgQOpenGLWidget::setGraphicsWindowEmbedded(osg::ref_ptr<osgViewer::GraphicsWindowEmbedded> osgWinEmb)
 {
-    if (m_renderer) m_renderer->setGraphicsWindowEmbedded(osgWinEmb);
+    if (m_renderer) m_renderer->setGraphicsWindowEmbedded(std::move(osgWinEmb));
 }
 
 void osgQOpenGLWidget::createRenderer()