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

Refactored the ::getOrCreate*Object() methods to clean them up and fix a bug in the getOrCreateElementsBuffers method.

Browse Source
This commit is contained in:
Robert Osfield
2009-10-06 09:28:41 +00:00
parent 98c79e4918
commit e6a1429335
1 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/osg/Geometry.cpp
View File

@@ -1089,20 +1089,16 @@ osg::VertexBufferObject* Geometry::getOrCreateVertexBufferObject()
ArrayList arrayList;
getArrayList(arrayList);
osg::VertexBufferObject* vbo = 0;
ArrayList::iterator vitr;
for(vitr = arrayList.begin();
vitr != arrayList.end() && !vbo;
vitr != arrayList.end();
++vitr)
{
osg::Array* array = *vitr;
if (array->getVertexBufferObject()) vbo = array->getVertexBufferObject();
if (array->getVertexBufferObject()) return array->getVertexBufferObject();
}
if (!vbo) vbo = new osg::VertexBufferObject;
return vbo;
return new osg::VertexBufferObject;
}
osg::ElementBufferObject* Geometry::getOrCreateElementBufferObject()
@@ -1110,20 +1106,16 @@ osg::ElementBufferObject* Geometry::getOrCreateElementBufferObject()
DrawElementsList drawElementsList;
getDrawElementsList(drawElementsList);
osg::ElementBufferObject* ebo = 0;
DrawElementsList::iterator deitr;
for(deitr = drawElementsList.begin();
deitr != drawElementsList.end();
++deitr)
{
osg::DrawElements* elements = *deitr;
if (!elements->getElementBufferObject()) ebo = elements->getElementBufferObject();
if (elements->getElementBufferObject()) return elements->getElementBufferObject();
}
if (!ebo) ebo = new osg::ElementBufferObject;
return ebo;
return new osg::ElementBufferObject;
}
void Geometry::setUseVertexBufferObjects(bool flag)