Further migration to using RenderInfo

This commit is contained in:
Robert Osfield
2006-11-14 12:51:31 +00:00
parent b5bb541cca
commit d0cc014f1b
11 changed files with 45 additions and 34 deletions

View File

@@ -276,7 +276,7 @@ class OSG_EXPORT Drawable : public Object
/** Immediately compile this \c Drawable into an OpenGL Display List.
* @note Operation is ignored if \c _useDisplayList is \c false.
*/
virtual void compileGLObjects(State& state) const;
virtual void compileGLObjects(RenderInfo& renderInfo) const;
/** If State is non-zero, this function releases OpenGL objects for
* the specified graphics context. Otherwise, releases OpenGL objexts

View File

@@ -126,7 +126,7 @@ class OSG_EXPORT Geode : public Node
const DrawableList& getDrawableList() const { return _drawables; }
/** Compile OpenGL Display List for each drawable.*/
void compileDrawables(State& state);
void compileDrawables(RenderInfo& renderInfo);
/** Return the Geode's bounding box, which is the union of all the
* bounding boxes of the geode's drawables.*/

View File

@@ -77,7 +77,7 @@ class OSG_EXPORT Material : public StateAttribute
Material& operator = (const Material& rhs);
virtual bool getModeUsage(ModeUsage& usage) const
virtual bool getModeUsage(ModeUsage& /*usage*/) const
{
// note, since Material does it's own glEnable/glDisable of GL_COLOR_MATERIAL
// we shouldn't declare usage of that mode, so commenting out the below usage.