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

Improved naming of createVertexArrayState(..) method

Browse Source
This commit is contained in:
Robert Osfield 2016-08-04 17:51:45 +01:00
parent 98344157c0
commit 97df15b205
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/osg/Drawable
View File

@ -276,7 +276,7 @@ class OSG_EXPORT Drawable : public Node
*/
virtual void compileGLObjects(RenderInfo& renderInfo) const;
virtual VertexArrayState* setUpVertexArrayState(RenderInfo& renderInfo, bool usingVBOs) const;
virtual VertexArrayState* createVertexArrayState(RenderInfo& renderInfo, bool usingVBOs) const;
/** Set whether to use a mutex to ensure ref() and unref() are thread safe.*/

2
include/osg/Geometry
View File

@ -230,7 +230,7 @@ class OSG_EXPORT Geometry : public Drawable
bool _containsDeprecatedData;
virtual VertexArrayState* setUpVertexArrayState(RenderInfo& renderInfo, bool usingVBOs) const;
virtual VertexArrayState* createVertexArrayState(RenderInfo& renderInfo, bool usingVBOs) const;
public:

4
src/osg/Drawable.cpp
View File

@ -641,7 +641,7 @@ void Drawable::draw(RenderInfo& renderInfo) const
VertexArrayState* vas = _vertexArrayStateList[contextID].get();
if (!vas)
{
_vertexArrayStateList[contextID] = vas = setUpVertexArrayState(renderInfo, true);
_vertexArrayStateList[contextID] = vas = createVertexArrayState(renderInfo, true);
}
else
{
@ -699,7 +699,7 @@ void Drawable::draw(RenderInfo& renderInfo) const
}
}
VertexArrayState* Drawable::setUpVertexArrayState(RenderInfo& renderInfo, bool usingVBOs) const
VertexArrayState* Drawable::createVertexArrayState(RenderInfo& renderInfo, bool usingVBOs) const
{
osg::State* state = renderInfo.getState();
return new osg::VertexArrayState(state->get<GLExtensions>());

4
src/osg/Geometry.cpp
View File

@ -663,7 +663,7 @@ void Geometry::releaseGLObjects(State* state) const
}
VertexArrayState* Geometry::setUpVertexArrayState(RenderInfo& renderInfo, bool usingVBOs) const
VertexArrayState* Geometry::createVertexArrayState(RenderInfo& renderInfo, bool usingVBOs) const
{
OSG_NOTICE<<"Creating new osg::VertexArrayState"<<std::endl;
State& state = *renderInfo.getState();
@ -764,7 +764,7 @@ void Geometry::compileGLObjects(RenderInfo& renderInfo) const
{
VertexArrayState* vas = 0;
_vertexArrayStateList[contextID] = vas = setUpVertexArrayState(renderInfo, true);
_vertexArrayStateList[contextID] = vas = createVertexArrayState(renderInfo, true);
State::SetCurrentVertexArrayStateProxy setVASProxy(state, vas);