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

Fixed member variable names to avoid conflicts with osg::Node

Browse Source
This commit is contained in:
Robert Osfield 2018-03-23 19:54:01 +00:00
parent 9797b0f56c
commit deef029823
2 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
include/osg/Drawable
View File

@ -113,10 +113,10 @@ class OSG_EXPORT Drawable : public Node
/** Set the initial bounding volume to use when computing the overall bounding volume.*/ /** Set the initial bounding volume to use when computing the overall bounding volume.*/
void setInitialBound(const osg::BoundingBox& bbox) { _initialBound = bbox; dirtyBound(); } void setInitialBound(const osg::BoundingBox& bbox) { _initialBoundingBox = bbox; dirtyBound(); }
/** Set the initial bounding volume to use when computing the overall bounding volume.*/ /** Set the initial bounding volume to use when computing the overall bounding volume.*/
const BoundingBox& getInitialBound() const { return _initialBound; } const BoundingBox& getInitialBound() const { return _initialBoundingBox; }
inline const BoundingSphere& getBound() const inline const BoundingSphere& getBound() const
{ {
@ -131,10 +131,10 @@ class OSG_EXPORT Drawable : public Node
{ {
if(!_boundingSphereComputed) if(!_boundingSphereComputed)
{ {
_boundingBox = _initialBound; _boundingBox = _initialBoundingBox;
if (_computeBoundCallback.valid()) if (_computeBoundingBoxCallback.valid())
_boundingBox.expandBy(_computeBoundCallback->computeBound(*this)); _boundingBox.expandBy(_computeBoundingBoxCallback->computeBound(*this));
else else
_boundingBox.expandBy(computeBoundingBox()); _boundingBox.expandBy(computeBoundingBox());
@ -171,13 +171,13 @@ class OSG_EXPORT Drawable : public Node
}; };
/** Set the compute bound callback to override the default computeBound.*/ /** Set the compute bound callback to override the default computeBound.*/
void setComputeBoundingBoxCallback(ComputeBoundingBoxCallback* callback) { _computeBoundCallback = callback; } void setComputeBoundingBoxCallback(ComputeBoundingBoxCallback* callback) { _computeBoundingBoxCallback = callback; }
/** Get the compute bound callback.*/ /** Get the compute bound callback.*/
ComputeBoundingBoxCallback* getComputeBoundingBoxCallback() { return _computeBoundCallback.get(); } ComputeBoundingBoxCallback* getComputeBoundingBoxCallback() { return _computeBoundingBoxCallback.get(); }
/** Get the const compute bound callback.*/ /** Get the const compute bound callback.*/
const ComputeBoundingBoxCallback* getComputeBoundingBoxCallback() const { return _computeBoundCallback.get(); } const ComputeBoundingBoxCallback* getComputeBoundingBoxCallback() const { return _computeBoundingBoxCallback.get(); }
/** Set the Shape of the \c Drawable. The shape can be used to /** Set the Shape of the \c Drawable. The shape can be used to
@ -524,8 +524,8 @@ class OSG_EXPORT Drawable : public Node
friend class Geode; friend class Geode;
friend class StateSet; friend class StateSet;
BoundingBox _initialBound; BoundingBox _initialBoundingBox;
ref_ptr<ComputeBoundingBoxCallback> _computeBoundCallback; ref_ptr<ComputeBoundingBoxCallback> _computeBoundingBoxCallback;
mutable BoundingBox _boundingBox; mutable BoundingBox _boundingBox;
ref_ptr<Shape> _shape; ref_ptr<Shape> _shape;

5
src/osg/Drawable.cpp
View File

@ -240,8 +240,8 @@ Drawable::Drawable()
Drawable::Drawable(const Drawable& drawable,const CopyOp& copyop): Drawable::Drawable(const Drawable& drawable,const CopyOp& copyop):
Node(drawable,copyop), Node(drawable,copyop),
_initialBound(drawable._initialBound), _initialBoundingBox(drawable._initialBoundingBox),
_computeBoundCallback(drawable._computeBoundCallback), _computeBoundingBoxCallback(drawable._computeBoundingBoxCallback),
_boundingBox(drawable._boundingBox), _boundingBox(drawable._boundingBox),
_shape(copyop(drawable._shape.get())), _shape(copyop(drawable._shape.get())),
_supportsDisplayList(drawable._supportsDisplayList), _supportsDisplayList(drawable._supportsDisplayList),
@ -252,7 +252,6 @@ Drawable::Drawable(const Drawable& drawable,const CopyOp& copyop):
_drawCallback(drawable._drawCallback), _drawCallback(drawable._drawCallback),
_createVertexArrayStateCallback(drawable._createVertexArrayStateCallback) _createVertexArrayStateCallback(drawable._createVertexArrayStateCallback)
{ {
setStateSet(copyop(drawable._stateset.get()));
} }
Drawable::~Drawable() Drawable::~Drawable()