From 819ce6c0d181312298b0713852cd573bbfa448fd Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Tue, 14 Jun 2016 18:27:27 +0100 Subject: [PATCH] Removed redundent _boundingBoxComputed --- include/osg/Drawable | 1 - src/osg/Drawable.cpp | 6 ++---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/include/osg/Drawable b/include/osg/Drawable index 2ae458f54..2ebefcc33 100644 --- a/include/osg/Drawable +++ b/include/osg/Drawable @@ -457,7 +457,6 @@ class OSG_EXPORT Drawable : public Node BoundingBox _initialBound; ref_ptr _computeBoundCallback; mutable BoundingBox _boundingBox; - mutable bool _boundingBoxComputed; ref_ptr _shape; diff --git a/src/osg/Drawable.cpp b/src/osg/Drawable.cpp index fb4d88a33..f16231f44 100644 --- a/src/osg/Drawable.cpp +++ b/src/osg/Drawable.cpp @@ -213,8 +213,6 @@ void Drawable::deleteDisplayList(unsigned int contextID,GLuint globj, unsigned i Drawable::Drawable() { - _boundingBoxComputed = false; - // Note, if your are defining a subclass from drawable which is // dynamically updated then you should set both the following to // to false in your constructor. This will prevent any display @@ -238,7 +236,6 @@ Drawable::Drawable(const Drawable& drawable,const CopyOp& copyop): _initialBound(drawable._initialBound), _computeBoundCallback(drawable._computeBoundCallback), _boundingBox(drawable._boundingBox), - _boundingBoxComputed(drawable._boundingBoxComputed), _shape(copyop(drawable._shape.get())), _supportsDisplayList(drawable._supportsDisplayList), _useDisplayList(drawable._useDisplayList), @@ -584,5 +581,6 @@ BoundingBox Drawable::computeBoundingBox() const void Drawable::setBound(const BoundingBox& bb) const { _boundingBox = bb; - _boundingBoxComputed = true; + _boundingSphere = computeBound(); + _boundingSphereComputed = true; }