mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-30 16:15:33 +00:00
Code Issues Releases Wiki Activity

removes two dummy serialisers (#3212)

Browse source 
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`.
This commit is contained in:
Bo Svensson 2021-11-04 21:31:22 +00:00 committed by GitHub
parent 0371072631
commit 5debd6e25a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 0 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
components/sceneutil/nodecallback.hpp
View file

@ -19,7 +19,6 @@ public:
NodeCallback(){} NodeCallback(){}
NodeCallback(const NodeCallback& nc,const osg::CopyOp& copyop): NodeCallback(const NodeCallback& nc,const osg::CopyOp& copyop):
osg::Callback(nc, copyop) {} osg::Callback(nc, copyop) {}
META_Object(SceneUtil, NodeCallback)
bool run(osg::Object* object, osg::Object* data) override bool run(osg::Object* object, osg::Object* data) override
{ {

2
components/sceneutil/serialize.cpp
View file

@ -125,11 +125,9 @@ void registerSerializers()
"SceneUtil::CompositeStateSetUpdater", "SceneUtil::CompositeStateSetUpdater",
"SceneUtil::LightListCallback", "SceneUtil::LightListCallback",
"SceneUtil::LightManagerUpdateCallback", "SceneUtil::LightManagerUpdateCallback",
"SceneUtil::NodeCallback",
"SceneUtil::UpdateRigBounds", "SceneUtil::UpdateRigBounds",
"SceneUtil::UpdateRigGeometry", "SceneUtil::UpdateRigGeometry",
"SceneUtil::LightSource", "SceneUtil::LightSource",
"SceneUtil::StateSetUpdater",
"SceneUtil::DisableLight", "SceneUtil::DisableLight",
"SceneUtil::MWShadowTechnique", "SceneUtil::MWShadowTechnique",
"SceneUtil::TextKeyMapHolder", "SceneUtil::TextKeyMapHolder",

2
components/sceneutil/statesetupdater.hpp
View file

@ -34,8 +34,6 @@ namespace SceneUtil
StateSetUpdater(); StateSetUpdater();
StateSetUpdater(const StateSetUpdater& copy, const osg::CopyOp& copyop); StateSetUpdater(const StateSetUpdater& copy, const osg::CopyOp& copyop);
META_Object(SceneUtil, StateSetUpdater)
void operator()(osg::Node* node, osg::NodeVisitor* nv); void operator()(osg::Node* node, osg::NodeVisitor* nv);
/// Apply state - to override in derived classes /// Apply state - to override in derived classes