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

Added missing checks for null pointers

Browse Source
This commit is contained in:
Robert Osfield 2008-01-22 10:28:48 +00:00
parent 708a4032a4
commit 4163f173a0
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/osgTerrain/GeometryTechnique.cpp
View File

@ -491,8 +491,8 @@ void GeometryTechnique::generateGeometry(Locator* masterLocator, const osg::Vec3
unsigned int new_i = _vertices->size(); // index of new index of added skirt point unsigned int new_i = _vertices->size(); // index of new index of added skirt point
osg::Vec3 new_v = (*_vertices)[orig_i] - ((*skirtVectors)[orig_i])*skirtHeight; osg::Vec3 new_v = (*_vertices)[orig_i] - ((*skirtVectors)[orig_i])*skirtHeight;
(*_vertices).push_back(new_v); (*_vertices).push_back(new_v);
(*_normals).push_back((*_normals)[orig_i]); if (_normals.valid()) (*_normals).push_back((*_normals)[orig_i]);
(*_texcoords).push_back((*_texcoords)[orig_i]); if (_texcoords.valid()) (*_texcoords).push_back((*_texcoords)[orig_i]);
skirtDrawElements->push_back(orig_i); skirtDrawElements->push_back(orig_i);
skirtDrawElements->push_back(new_i); skirtDrawElements->push_back(new_i);
@ -524,8 +524,8 @@ void GeometryTechnique::generateGeometry(Locator* masterLocator, const osg::Vec3
unsigned int new_i = _vertices->size(); // index of new index of added skirt point unsigned int new_i = _vertices->size(); // index of new index of added skirt point
osg::Vec3 new_v = (*_vertices)[orig_i] - ((*skirtVectors)[orig_i])*skirtHeight; osg::Vec3 new_v = (*_vertices)[orig_i] - ((*skirtVectors)[orig_i])*skirtHeight;
(*_vertices).push_back(new_v); (*_vertices).push_back(new_v);
(*_normals).push_back((*_normals)[orig_i]); if (_normals.valid()) (*_normals).push_back((*_normals)[orig_i]);
(*_texcoords).push_back((*_texcoords)[orig_i]); if (_texcoords.valid()) (*_texcoords).push_back((*_texcoords)[orig_i]);
skirtDrawElements->push_back(orig_i); skirtDrawElements->push_back(orig_i);
skirtDrawElements->push_back(new_i); skirtDrawElements->push_back(new_i);
@ -557,8 +557,8 @@ void GeometryTechnique::generateGeometry(Locator* masterLocator, const osg::Vec3
unsigned int new_i = _vertices->size(); // index of new index of added skirt point unsigned int new_i = _vertices->size(); // index of new index of added skirt point
osg::Vec3 new_v = (*_vertices)[orig_i] - ((*skirtVectors)[orig_i])*skirtHeight; osg::Vec3 new_v = (*_vertices)[orig_i] - ((*skirtVectors)[orig_i])*skirtHeight;
(*_vertices).push_back(new_v); (*_vertices).push_back(new_v);
(*_normals).push_back((*_normals)[orig_i]); if (_normals.valid()) (*_normals).push_back((*_normals)[orig_i]);
(*_texcoords).push_back((*_texcoords)[orig_i]); if (_texcoords.valid()) (*_texcoords).push_back((*_texcoords)[orig_i]);
skirtDrawElements->push_back(orig_i); skirtDrawElements->push_back(orig_i);
skirtDrawElements->push_back(new_i); skirtDrawElements->push_back(new_i);
@ -590,8 +590,8 @@ void GeometryTechnique::generateGeometry(Locator* masterLocator, const osg::Vec3
unsigned int new_i = _vertices->size(); // index of new index of added skirt point unsigned int new_i = _vertices->size(); // index of new index of added skirt point
osg::Vec3 new_v = (*_vertices)[orig_i] - ((*skirtVectors)[orig_i])*skirtHeight; osg::Vec3 new_v = (*_vertices)[orig_i] - ((*skirtVectors)[orig_i])*skirtHeight;
(*_vertices).push_back(new_v); (*_vertices).push_back(new_v);
(*_normals).push_back((*_normals)[orig_i]); if (_normals.valid()) (*_normals).push_back((*_normals)[orig_i]);
(*_texcoords).push_back((*_texcoords)[orig_i]); if (_texcoords.valid()) (*_texcoords).push_back((*_texcoords)[orig_i]);
skirtDrawElements->push_back(orig_i); skirtDrawElements->push_back(orig_i);
skirtDrawElements->push_back(new_i); skirtDrawElements->push_back(new_i);