FGFS-4.1/simgear
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'timoore/clipgroup' into next

Browse Source
This commit is contained in:
Tim Moore 2010-03-16 15:44:56 +01:00
commit 7b1d1fd288
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
simgear/scene/model/SGClipGroup.cxx
View File

@ -70,8 +70,18 @@ public:
osg::ref_ptr<osg::RefMatrix> mModelView; osg::ref_ptr<osg::RefMatrix> mModelView;
}; };
osgUtil::RegisterRenderBinProxy struct SGClipGroup::ClipBinRegistrar
SGClipGroup::clipBinProxy("ClipRenderBin", new SGClipGroup::ClipRenderBin); {
ClipBinRegistrar()
{
osgUtil::RenderBin
::addRenderBinPrototype("ClipRenderBin",
new SGClipGroup::ClipRenderBin);
}
static ClipBinRegistrar registrar;
};
SGClipGroup::ClipBinRegistrar SGClipGroup::ClipBinRegistrar::registrar;
class SGClipGroup::CullCallback : public osg::NodeCallback { class SGClipGroup::CullCallback : public osg::NodeCallback {
public: public:

4
simgear/scene/model/SGClipGroup.hxx
View File

@ -49,10 +49,8 @@ public:
protected: protected:
class CullCallback; class CullCallback;
class ClipRenderBin; class ClipRenderBin;
struct ClipBinRegistrar;
std::vector<osg::ref_ptr<osg::ClipPlane> > mClipPlanes; std::vector<osg::ref_ptr<osg::ClipPlane> > mClipPlanes;
static osgUtil::RegisterRenderBinProxy clipBinProxy;
}; };
#endif #endif