From 9cb714cd39770924dc5241a72956a2750435b4fe Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Wed, 25 May 2016 11:20:13 +0100 Subject: [PATCH] Fixed shadows warning and an associated by in osgAnimation::Statshandler::changeYposition(..) --- src/osgAnimation/RigTransformHardware.cpp | 6 +++--- src/osgAnimation/StatsHandler.cpp | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/osgAnimation/RigTransformHardware.cpp b/src/osgAnimation/RigTransformHardware.cpp index d4e64bd85..8fe7a351f 100644 --- a/src/osgAnimation/RigTransformHardware.cpp +++ b/src/osgAnimation/RigTransformHardware.cpp @@ -76,10 +76,10 @@ bool RigTransformHardware::createPalette(int nbVertexes, BoneMap boneMap, const vertexIndexWeight.resize(nbVertexes); int maxBonePerVertex = 0; - for (VertexInfluenceSet::VertexIndexToBoneWeightMap::const_iterator it = vertexIndexToBoneWeightMap.begin(); it != vertexIndexToBoneWeightMap.end(); ++it) + for (VertexInfluenceSet::VertexIndexToBoneWeightMap::const_iterator vis_itr = vertexIndexToBoneWeightMap.begin(); vis_itr != vertexIndexToBoneWeightMap.end(); ++vis_itr) { - int vertexIndex = it->first; - const VertexInfluenceSet::BoneWeightList& boneWeightList = it->second; + int vertexIndex = vis_itr->first; + const VertexInfluenceSet::BoneWeightList& boneWeightList = vis_itr->second; int bonesForThisVertex = 0; for (VertexInfluenceSet::BoneWeightList::const_iterator it = boneWeightList.begin(); it != boneWeightList.end(); ++it) { diff --git a/src/osgAnimation/StatsHandler.cpp b/src/osgAnimation/StatsHandler.cpp index 1fdb9b2bc..d2ce73c4a 100644 --- a/src/osgAnimation/StatsHandler.cpp +++ b/src/osgAnimation/StatsHandler.cpp @@ -90,7 +90,6 @@ struct StatsGraph : public osg::MatrixTransform void changeYposition(float y) { - osg::Vec3 _pos = getMatrix().getTrans(); _pos[1] = y - _height; setMatrix(osg::Matrix::translate(_pos)); }