From 5debd6e25af486d8234b9ece7d4270b9c63ee099 Mon Sep 17 00:00:00 2001 From: Bo Svensson <90132211+bosvensson1@users.noreply.github.com> Date: Thu, 4 Nov 2021 21:31:22 +0000 Subject: [PATCH] removes two dummy serialisers (#3212) This PR removes dummy serialisers for `StateSetUpdater`, `NodeCallback` and the respective `META` macros that trigger serialisation requirement here. `StateSetUpdater` and `NodeCallback` are just base classes that can not be used on their own, so there is no need to incorporate them into serialisation. These changes might have minor effects on derived classes that forget to override `className()`, `libraryName()` through `META`, but it makes hardly a difference to now serialise such classes as a dysfunctional `osg::Callback` instead of a dysfunctional `SceneUtil::NodeCallback`. --- components/sceneutil/nodecallback.hpp | 1 - components/sceneutil/serialize.cpp | 2 -- components/sceneutil/statesetupdater.hpp | 2 -- 3 files changed, 5 deletions(-) diff --git a/components/sceneutil/nodecallback.hpp b/components/sceneutil/nodecallback.hpp index 942cb17ded..96e3ae229e 100644 --- a/components/sceneutil/nodecallback.hpp +++ b/components/sceneutil/nodecallback.hpp @@ -19,7 +19,6 @@ public: NodeCallback(){} NodeCallback(const NodeCallback& nc,const osg::CopyOp& copyop): osg::Callback(nc, copyop) {} - META_Object(SceneUtil, NodeCallback) bool run(osg::Object* object, osg::Object* data) override { diff --git a/components/sceneutil/serialize.cpp b/components/sceneutil/serialize.cpp index 134f7c29dd..9da0d6a40e 100644 --- a/components/sceneutil/serialize.cpp +++ b/components/sceneutil/serialize.cpp @@ -125,11 +125,9 @@ void registerSerializers() "SceneUtil::CompositeStateSetUpdater", "SceneUtil::LightListCallback", "SceneUtil::LightManagerUpdateCallback", - "SceneUtil::NodeCallback", "SceneUtil::UpdateRigBounds", "SceneUtil::UpdateRigGeometry", "SceneUtil::LightSource", - "SceneUtil::StateSetUpdater", "SceneUtil::DisableLight", "SceneUtil::MWShadowTechnique", "SceneUtil::TextKeyMapHolder", diff --git a/components/sceneutil/statesetupdater.hpp b/components/sceneutil/statesetupdater.hpp index 35be9cb434..cc2e248457 100644 --- a/components/sceneutil/statesetupdater.hpp +++ b/components/sceneutil/statesetupdater.hpp @@ -34,8 +34,6 @@ namespace SceneUtil StateSetUpdater(); StateSetUpdater(const StateSetUpdater& copy, const osg::CopyOp& copyop); - META_Object(SceneUtil, StateSetUpdater) - void operator()(osg::Node* node, osg::NodeVisitor* nv); /// Apply state - to override in derived classes