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

Warning fixes.

Browse Source
This commit is contained in:
Robert Osfield
2002-11-22 09:46:25 +00:00
parent bcf9d08c2b
commit 22c313cf3e
5 changed files with 21 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/osg/Geometry.cpp
View File

@@ -944,7 +944,7 @@ class AttrbuteFunctorArrayVisitor : public ArrayVisitor
virtual void apply(Vec4Array& array) { if (!array.empty()) _af.apply(_type,array.size(),&(array.front())); }
inline void apply(Drawable::AttributeType type,Array* array)
inline void applyArray(Drawable::AttributeType type,Array* array)
{
if (array)
{
@@ -961,13 +961,13 @@ void Geometry::accept(AttributeFunctor& af)
{
AttrbuteFunctorArrayVisitor afav(af);
afav.apply(VERTICES,_vertexArray.get());
afav.apply(NORMALS,_normalArray.get());
afav.apply(COLORS,_colorArray.get());
afav.applyArray(VERTICES,_vertexArray.get());
afav.applyArray(NORMALS,_normalArray.get());
afav.applyArray(COLORS,_colorArray.get());
for(unsigned unit=0;unit<_texCoordList.size();++unit)
{
afav.apply((AttributeType)(TEXTURE_COORDS_0+unit),_texCoordList[unit].first.get());
afav.applyArray((AttributeType)(TEXTURE_COORDS_0+unit),_texCoordList[unit].first.get());
}
}
@@ -993,7 +993,7 @@ class ConstAttrbuteFunctorArrayVisitor : public ConstArrayVisitor
virtual void apply(const Vec4Array& array) { if (!array.empty()) _af.apply(_type,array.size(),&(array.front())); }
inline void apply(Drawable::AttributeType type,const Array* array)
inline void applyArray(Drawable::AttributeType type,const Array* array)
{
if (array)
{
@@ -1010,13 +1010,13 @@ void Geometry::accept(ConstAttributeFunctor& af) const
{
ConstAttrbuteFunctorArrayVisitor afav(af);
afav.apply(VERTICES,_vertexArray.get());
afav.apply(NORMALS,_normalArray.get());
afav.apply(COLORS,_colorArray.get());
afav.applyArray(VERTICES,_vertexArray.get());
afav.applyArray(NORMALS,_normalArray.get());
afav.applyArray(COLORS,_colorArray.get());
for(unsigned unit=0;unit<_texCoordList.size();++unit)
{
afav.apply((AttributeType)(TEXTURE_COORDS_0+unit),_texCoordList[unit].first.get());
afav.applyArray((AttributeType)(TEXTURE_COORDS_0+unit),_texCoordList[unit].first.get());
}
}

4
src/osg/ShapeDrawable.cpp
View File

@@ -845,8 +845,6 @@ void PrimitiveShapeVisitor::apply(const Sphere& sphere)
float rBase=0.0f;
float zBase=-sphere.getRadius();
float vBase=0.0f;
float nzBase=-1.0f;
float nRatioBase=0.0f;
for(unsigned int rowi=0;
rowi<numRows;
@@ -888,8 +886,6 @@ void PrimitiveShapeVisitor::apply(const Sphere& sphere)
rBase=rTop;
zBase=zTop;
vBase=vTop;
nzBase=nzTop;
nRatioBase=nRatioTop;
}
}