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

Converted the instances of const built in types being returned from methods

Browse Source 
and passed as paramters into straight forward non const built in types,
i.e. const bool foogbar(const int) becomes bool foobar(int).
This commit is contained in:
Robert Osfield
2002-09-02 12:31:35 +00:00
parent 52518673d1
commit 12226e4371
123 changed files with 850 additions and 841 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/osg/Drawable.cpp
View File

@@ -32,7 +32,7 @@ Drawable::Drawable()
Drawable::Drawable(const Drawable& drawable,const CopyOp& copyop):
Object(drawable,copyop),
_parents(), // leave empty as parentList is managed by Geode
_dstate(copyop(drawable._dstate.get())),
_stateset(copyop(drawable._stateset.get())),
_supportsDisplayList(drawable._supportsDisplayList),
_useDisplayList(drawable._useDisplayList),
_globjList(drawable._globjList),
@@ -58,6 +58,12 @@ void Drawable::removeParent(osg::Node* node)
if (pitr!=_parents.end()) _parents.erase(pitr);
}
osg::StateSet* Drawable::getOrCreateStateSet()
{
if (!_stateset) _stateset = osgNew StateSet;
return _stateset.get();
}
void Drawable::dirtyBound()
{
if (_bbox_computed)
@@ -96,9 +102,9 @@ void Drawable::compile(State& state)
}
if (_dstate.valid())
if (_stateset.valid())
{
_dstate->compile(state);
_stateset->compile(state);
}
globj = glGenLists( 1 );
@@ -113,7 +119,7 @@ void Drawable::compile(State& state)
}
void Drawable::setSupportsDisplayList(const bool flag)
void Drawable::setSupportsDisplayList(bool flag)
{
// if value unchanged simply return.
if (_supportsDisplayList==flag) return;
@@ -134,7 +140,7 @@ void Drawable::setSupportsDisplayList(const bool flag)
_supportsDisplayList=flag;
}
void Drawable::setUseDisplayList(const bool flag)
void Drawable::setUseDisplayList(bool flag)
{
// if value unchanged simply return.
if (_useDisplayList==flag) return;
@@ -288,7 +294,7 @@ struct ComputeBound : public Drawable::PrimitiveFunctor
BoundingBox _bb;
};
const bool Drawable::computeBound() const
bool Drawable::computeBound() const
{
ComputeBound cb;