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

From David Callu, warning fixes and removal of spaces at end of lines.

Browse Source
This commit is contained in:
Robert Osfield
2013-06-28 12:00:43 +00:00
parent d82768417d
commit 097aedf23c
100 changed files with 496 additions and 428 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/osgUtil/CullVisitor.cpp
View File

@@ -58,6 +58,7 @@ CullVisitor::CullVisitor():
}
CullVisitor::CullVisitor(const CullVisitor& rhs):
Referenced(true),
NodeVisitor(rhs),
CullStack(rhs),
_currentStateGraph(NULL),

2
src/osgUtil/DelaunayTriangulator.cpp
View File

@@ -222,7 +222,7 @@ public:
// GWM July 2005 add test for triangle intersected by p1-p2.
// return true for unused edge
const bool intersected(const unsigned int ip1,const unsigned int ip2,const osg::Vec2 p1 ,const osg::Vec2 p2,const int iedge, osg::Vec3Array *points) const
bool intersected(const unsigned int ip1,const unsigned int ip2,const osg::Vec2 p1 ,const osg::Vec2 p2,const int iedge, osg::Vec3Array *points) const
{
// return true if edge iedge of triangle is intersected by ip1,ip2
Vertex_index ie1,ie2;

6
src/osgUtil/PolytopeIntersector.cpp
View File

@@ -123,7 +123,7 @@ namespace PolytopeIntersectorUtils
}
// handle points
void operator()(const Vec3_type v1, bool treatVertexDataAsTemporary)
void operator()(const Vec3_type v1, bool /*treatVertexDataAsTemporary*/)
{
++_index;
if ((_dimensionMask & PolytopeIntersector::DimZero) == 0) return;
@@ -142,7 +142,7 @@ namespace PolytopeIntersectorUtils
}
// handle lines
void operator()(const Vec3_type v1, const Vec3_type v2, bool treatVertexDataAsTemporary)
void operator()(const Vec3_type v1, const Vec3_type v2, bool /*treatVertexDataAsTemporary*/)
{
++_index;
if ((_dimensionMask & PolytopeIntersector::DimOne) == 0) return;
@@ -207,7 +207,7 @@ namespace PolytopeIntersectorUtils
}
// handle triangles
void operator()(const Vec3_type v1, const Vec3_type v2, const Vec3_type v3, bool treatVertexDataAsTemporary)
void operator()(const Vec3_type v1, const Vec3_type v2, const Vec3_type v3, bool /*treatVertexDataAsTemporary*/)
{
++_index;
if ((_dimensionMask & PolytopeIntersector::DimTwo) == 0) return;

2
src/osgUtil/SceneGraphBuilder.cpp
View File

@@ -346,7 +346,7 @@ void SceneGraphBuilder::Cylinder(GLfloat aBase,
OSG_NOTICE<<"SceneGraphBuilder::Cylinder("<<aBase<<", "<<aTop<<", "<<aHeight<<", "<<aSlices<<", "<<aStacks<<") not implemented yet"<<std::endl;
}
void SceneGraphBuilder::Disk(GLfloat inner,
void SceneGraphBuilder::Disk(GLfloat /*inner*/,
GLfloat outer,
GLint slices,
GLint /*loops*/)

1
src/osgUtil/SmoothingVisitor.cpp
View File

@@ -236,6 +236,7 @@ struct FindSharpEdgesFunctor
_primitiveSetIndex(primitiveSetIndex), _p1(p1), _p2(p2), _p3(p3) {}
Triangle(const Triangle& tri):
osg::Referenced(true),
_primitiveSetIndex(tri._primitiveSetIndex), _p1(tri._p1), _p2(tri._p2), _p3(tri._p3) {}
Triangle& operator = (const Triangle& tri)

2
src/osgUtil/Tessellator.cpp
View File

@@ -607,7 +607,7 @@ void Tessellator::reduceArray(osg::Array * cold, const unsigned int nnu)
}
}
void Tessellator::collectTessellation(osg::Geometry &geom, unsigned int originalIndex)
void Tessellator::collectTessellation(osg::Geometry &geom, unsigned int /*originalIndex*/)
{
if (geom.containsDeprecatedData()) geom.fixDeprecatedData();