From 1ca1f6ad22b9f30035274f4758471466f18943c4 Mon Sep 17 00:00:00 2001 From: Tim Moore Date: Tue, 16 Mar 2010 15:42:54 +0100 Subject: [PATCH] Remove reference to osgUtil::RegisterRenderBinProxy This has gone away in recent OSG sources. --- simgear/scene/model/SGClipGroup.cxx | 14 ++++++++++++-- simgear/scene/model/SGClipGroup.hxx | 4 +--- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/simgear/scene/model/SGClipGroup.cxx b/simgear/scene/model/SGClipGroup.cxx index 758a5b6a..6d2ab7f1 100644 --- a/simgear/scene/model/SGClipGroup.cxx +++ b/simgear/scene/model/SGClipGroup.cxx @@ -70,8 +70,18 @@ public: osg::ref_ptr mModelView; }; -osgUtil::RegisterRenderBinProxy -SGClipGroup::clipBinProxy("ClipRenderBin", new SGClipGroup::ClipRenderBin); +struct SGClipGroup::ClipBinRegistrar +{ + ClipBinRegistrar() + { + osgUtil::RenderBin + ::addRenderBinPrototype("ClipRenderBin", + new SGClipGroup::ClipRenderBin); + } + static ClipBinRegistrar registrar; +}; + +SGClipGroup::ClipBinRegistrar SGClipGroup::ClipBinRegistrar::registrar; class SGClipGroup::CullCallback : public osg::NodeCallback { public: diff --git a/simgear/scene/model/SGClipGroup.hxx b/simgear/scene/model/SGClipGroup.hxx index eb0e0ddb..9820ec1d 100644 --- a/simgear/scene/model/SGClipGroup.hxx +++ b/simgear/scene/model/SGClipGroup.hxx @@ -49,10 +49,8 @@ public: protected: class CullCallback; class ClipRenderBin; - + struct ClipBinRegistrar; std::vector > mClipPlanes; - - static osgUtil::RegisterRenderBinProxy clipBinProxy; }; #endif -- 2.39.5