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

Removed inappropriate code which was causing a memory leak. This code was clearly a copy and paste error. The mistake was spotted by Robin Bourianes, with code changes made by Robert Osfield.

Browse Source
This commit is contained in:
Robert Osfield
2010-05-12 14:34:18 +00:00
parent cfd4c514cb
commit 046b6a4bfd
1 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/osgTerrain/GeometryTechnique.cpp
View File

@@ -1069,7 +1069,7 @@ void GeometryTechnique::generateGeometry(BufferData& buffer, Locator* masterLoca
{
itr->second.first->push_back((*itr->second.first)[orig_i]);
}
skirtDrawElements->addElement(orig_i);
skirtDrawElements->addElement(new_i);
}
@@ -1078,18 +1078,18 @@ void GeometryTechnique::generateGeometry(BufferData& buffer, Locator* masterLoca
if (skirtDrawElements->getNumIndices()!=0)
{
geometry->addPrimitiveSet(skirtDrawElements.get());
skirtDrawElements = smallTile ?
skirtDrawElements = smallTile ?
static_cast<osg::DrawElements*>(new osg::DrawElementsUShort(GL_QUAD_STRIP)) :
static_cast<osg::DrawElements*>(new osg::DrawElementsUInt(GL_QUAD_STRIP));
}
}
}
if (skirtDrawElements->getNumIndices()!=0)
{
geometry->addPrimitiveSet(skirtDrawElements.get());
skirtDrawElements = smallTile ?
skirtDrawElements = smallTile ?
static_cast<osg::DrawElements*>(new osg::DrawElementsUShort(GL_QUAD_STRIP)) :
static_cast<osg::DrawElements*>(new osg::DrawElementsUInt(GL_QUAD_STRIP));
}
@@ -1111,7 +1111,7 @@ void GeometryTechnique::generateGeometry(BufferData& buffer, Locator* masterLoca
{
itr->second.first->push_back((*itr->second.first)[orig_i]);
}
skirtDrawElements->addElement(orig_i);
skirtDrawElements->addElement(new_i);
}
@@ -1120,11 +1120,11 @@ void GeometryTechnique::generateGeometry(BufferData& buffer, Locator* masterLoca
if (skirtDrawElements->getNumIndices()!=0)
{
geometry->addPrimitiveSet(skirtDrawElements.get());
skirtDrawElements = smallTile ?
skirtDrawElements = smallTile ?
static_cast<osg::DrawElements*>(new osg::DrawElementsUShort(GL_QUAD_STRIP)) :
static_cast<osg::DrawElements*>(new osg::DrawElementsUInt(GL_QUAD_STRIP));
}
}
}
@@ -1153,7 +1153,7 @@ void GeometryTechnique::generateGeometry(BufferData& buffer, Locator* masterLoca
{
itr->second.first->push_back((*itr->second.first)[orig_i]);
}
skirtDrawElements->addElement(orig_i);
skirtDrawElements->addElement(new_i);
}
@@ -1162,11 +1162,11 @@ void GeometryTechnique::generateGeometry(BufferData& buffer, Locator* masterLoca
if (skirtDrawElements->getNumIndices()!=0)
{
geometry->addPrimitiveSet(skirtDrawElements.get());
skirtDrawElements = smallTile ?
skirtDrawElements = smallTile ?
static_cast<osg::DrawElements*>(new osg::DrawElementsUShort(GL_QUAD_STRIP)) :
static_cast<osg::DrawElements*>(new osg::DrawElementsUInt(GL_QUAD_STRIP));
}
}
}
@@ -1195,7 +1195,7 @@ void GeometryTechnique::generateGeometry(BufferData& buffer, Locator* masterLoca
{
itr->second.first->push_back((*itr->second.first)[orig_i]);
}
skirtDrawElements->addElement(orig_i);
skirtDrawElements->addElement(new_i);
}
@@ -1206,16 +1206,12 @@ void GeometryTechnique::generateGeometry(BufferData& buffer, Locator* masterLoca
geometry->addPrimitiveSet(skirtDrawElements.get());
skirtDrawElements = new osg::DrawElementsUShort(GL_QUAD_STRIP);
}
}
}
if (skirtDrawElements->getNumIndices()!=0)
{
geometry->addPrimitiveSet(skirtDrawElements.get());
smallTile ?
static_cast<osg::DrawElements*>(new osg::DrawElementsUShort(GL_QUAD_STRIP)) :
static_cast<osg::DrawElements*>(new osg::DrawElementsUInt(GL_QUAD_STRIP));
}
}