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

Made the drawable::compile(State&) method const and the DisplayListVisitor to

Browse Source 
compile even when dislay list is off.  This has been done to allow subclasses
of Drawable handle their own compile implementation, such as used by text.
This commit is contained in:
Robert Osfield
2003-01-20 20:40:06 +00:00
parent dc83e399a9
commit 0f69a4c3ae
3 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/osg/Drawable
View File

@@ -164,12 +164,12 @@ class SG_EXPORT Drawable : public Object
* Note, draw method should *not* be overridden in subclasses as it
* manages the optional display list.
*/
inline void draw(State& state);
inline void draw(State& state) const;
/** Immediately compile this drawable into an OpenGL Display List.
Note I, operation is ignored if _useDisplayList to false.
Note II, compile is not intended to be overridden in subclasses.*/
void compile(State& state);
virtual void compile(State& state) const;
struct UpdateCallback : public virtual osg::Referenced
@@ -403,7 +403,7 @@ class SG_EXPORT Drawable : public Object
};
inline void Drawable::draw(State& state)
inline void Drawable::draw(State& state) const
{
if (_useDisplayList)
{

2
src/osg/Drawable.cpp
View File

@@ -85,7 +85,7 @@ void Drawable::dirtyBound()
}
}
void Drawable::compile(State& state)
void Drawable::compile(State& state) const
{
if (!_useDisplayList) return;

12
src/osgUtil/DisplayListVisitor.cpp
View File

@@ -36,12 +36,9 @@ void DisplayListVisitor::apply(osg::Geode& node)
for(unsigned int i=0;i<node.getNumDrawables();++i)
{
Drawable* drawable = node.getDrawable(i);
if (drawable->getUseDisplayList())
if (drawable->getStateSet())
{
if (drawable->getStateSet())
{
drawable->getStateSet()->compile(*_state);
}
drawable->getStateSet()->compile(*_state);
}
}
}
@@ -65,10 +62,7 @@ void DisplayListVisitor::apply(osg::Geode& node)
{
for(unsigned int i=0;i<node.getNumDrawables();++i)
{
if (node.getDrawable(i)->getUseDisplayList())
{
node.getDrawable(i)->compile(*_state);
}
node.getDrawable(i)->compile(*_state);
}
}
}