From 73a36679dfe6d9e32ae25066818f3e5c778b9945 Mon Sep 17 00:00:00 2001 From: Hartwig Date: Thu, 15 Feb 2018 21:10:59 +0100 Subject: [PATCH] Addition of radius parameter for ClusterCullingCallback's constructor The radius parameter is already present in ClusterCullingCallback's set method but has been forgotten in the constructor. --- include/osg/ClusterCullingCallback | 2 +- src/osg/ClusterCullingCallback.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/osg/ClusterCullingCallback b/include/osg/ClusterCullingCallback index 6d7bea1c9..a31f2bdeb 100644 --- a/include/osg/ClusterCullingCallback +++ b/include/osg/ClusterCullingCallback @@ -28,7 +28,7 @@ class OSG_EXPORT ClusterCullingCallback : public DrawableCullCallback, public No ClusterCullingCallback(); ClusterCullingCallback(const ClusterCullingCallback& ccc,const CopyOp& copyop); - ClusterCullingCallback(const osg::Vec3& controlPoint, const osg::Vec3& normal, float deviation); + ClusterCullingCallback(const osg::Vec3& controlPoint, const osg::Vec3& normal, float deviation, float radius=-1.0f); ClusterCullingCallback(const osg::Drawable* drawable); META_Object(osg,ClusterCullingCallback); diff --git a/src/osg/ClusterCullingCallback.cpp b/src/osg/ClusterCullingCallback.cpp index 1a5494766..7219ae6f1 100644 --- a/src/osg/ClusterCullingCallback.cpp +++ b/src/osg/ClusterCullingCallback.cpp @@ -40,10 +40,10 @@ ClusterCullingCallback::ClusterCullingCallback(const ClusterCullingCallback& ccc { } -ClusterCullingCallback::ClusterCullingCallback(const osg::Vec3& controlPoint, const osg::Vec3& normal, float deviation): +ClusterCullingCallback::ClusterCullingCallback(const osg::Vec3& controlPoint, const osg::Vec3& normal, float deviation, float radius): _controlPoint(controlPoint), _normal(normal), - _radius(-1.0f), + _radius(radius), _deviation(deviation) { }