From 1df3cb91443dc506dd2bac3fb91d1389d1af0cfa Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Tue, 28 Jun 2016 19:49:48 +0100 Subject: [PATCH] Fixed warnings --- src/osgPlugins/fbx/WriterCompareTriangle.cpp | 7 +++---- src/osgPlugins/fbx/WriterNodeVisitor.h | 4 ++-- src/osgPlugins/fbx/fbxRMesh.cpp | 4 ++-- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/osgPlugins/fbx/WriterCompareTriangle.cpp b/src/osgPlugins/fbx/WriterCompareTriangle.cpp index 5638d1e22..c3ef8edab 100644 --- a/src/osgPlugins/fbx/WriterCompareTriangle.cpp +++ b/src/osgPlugins/fbx/WriterCompareTriangle.cpp @@ -1,10 +1,9 @@ #include "WriterCompareTriangle.h" -WriterCompareTriangle::WriterCompareTriangle(const osg::Geode& geode, - unsigned int nbVertices) - : geode(geode) +WriterCompareTriangle::WriterCompareTriangle(const osg::Geode& in_geode, unsigned int in_nbVertices): + geode(geode) { - cutscene(nbVertices, geode.getDrawable(0)->asGeometry()->getBoundingBox()); + cutscene(in_nbVertices, geode.getDrawable(0)->asGeometry()->getBoundingBox()); } bool diff --git a/src/osgPlugins/fbx/WriterNodeVisitor.h b/src/osgPlugins/fbx/WriterNodeVisitor.h index 3ff398f37..a05c55c49 100644 --- a/src/osgPlugins/fbx/WriterNodeVisitor.h +++ b/src/osgPlugins/fbx/WriterNodeVisitor.h @@ -45,8 +45,8 @@ struct Triangle struct VertexIndex { - VertexIndex(unsigned int vertexIndex, unsigned int drawableIndex, unsigned int normalIndex) - : vertexIndex(vertexIndex), drawableIndex(drawableIndex), normalIndex(normalIndex) + VertexIndex(unsigned int in_vertexIndex, unsigned int in_drawableIndex, unsigned int in_normalIndex) + : vertexIndex(in_vertexIndex), drawableIndex(in_drawableIndex), normalIndex(in_normalIndex) {} VertexIndex(const VertexIndex & v) : vertexIndex(v.vertexIndex), drawableIndex(v.drawableIndex), normalIndex(v.normalIndex) {} diff --git a/src/osgPlugins/fbx/fbxRMesh.cpp b/src/osgPlugins/fbx/fbxRMesh.cpp index a60f6b3d1..3d1736257 100644 --- a/src/osgPlugins/fbx/fbxRMesh.cpp +++ b/src/osgPlugins/fbx/fbxRMesh.cpp @@ -678,8 +678,8 @@ bool quadSplit02(const FbxMesh * fbxMesh, int i /*polygonIndex*/, struct PolygonRef { - PolygonRef(osg::Geometry* pGeometry, int numPoly, int nVertex) - : pGeometry(pGeometry), numPoly(numPoly), nVertex(nVertex) + PolygonRef(osg::Geometry* in_pGeometry, int in_numPoly, int in_nVertex) + : pGeometry(in_pGeometry), numPoly(in_numPoly), nVertex(in_nVertex) {} osg::Geometry* pGeometry; int numPoly;