Hi Julien,
I have done a merge based on the zip file you posted. I've assigned
Cedric as the author as I believe he's the author of the bulk of the
change, but added a not in the explanation that you are the one that
submitted and made fixes. Not ideal but hopefully conveys a bit of
the history of the changes.
During build I'm now see a few warnings, these are ones I probably
fixed in the previous code. There aren't many so I'll see if I can
fix them now and get the fixes checked in. Once we've got things
working cleanly we'll want to push these changes back to Cedric's
repository so we don't diverge too far again.
Robert.
[ 93%] Building CXX object
src/osgAnimation/CMakeFiles/osgAnimation.dir/RigTransformHardware.o
/home/robert/OpenSceneGraph/src/osgAnimation/RigTransformHardware.cpp:
In member function ‘bool
osgAnimation::RigTransformHardware::createPalette(int,
osgAnimation::BoneMap, const VertexIndexToBoneWeightMap&)’:
/home/robert/OpenSceneGraph/src/osgAnimation/RigTransformHardware.cpp:82:65:
warning: declaration of ‘it’ shadows a previous local [-Wshadow]
for (VertexInfluenceSet::BoneWeightList::const_iterator it =
boneWeightList.begin(); it != boneWeightList.end(); ++it)
^
/home/robert/OpenSceneGraph/src/osgAnimation/RigTransformHardware.cpp:77:73:
note: shadowed declaration is here
for (VertexInfluenceSet::VertexIndexToBoneWeightMap::const_iterator
it = vertexIndexToBoneWeightMap.begin(); it !=
vertexIndexToBoneWeightMap.end(); ++it)
^
[ 93%] Building CXX object
src/osgAnimation/CMakeFiles/osgAnimation.dir/RigTransformSoftware.o
[ 93%] Building CXX object
src/osgAnimation/CMakeFiles/osgAnimation.dir/Skeleton.o
[ 93%] Building CXX object
src/osgAnimation/CMakeFiles/osgAnimation.dir/StackedMatrixElement.o
[ 93%] Building CXX object
src/osgAnimation/CMakeFiles/osgAnimation.dir/StackedQuaternionElement.o
[ 93%] Building CXX object
src/osgAnimation/CMakeFiles/osgAnimation.dir/StackedRotateAxisElement.o
[ 93%] Building CXX object
src/osgAnimation/CMakeFiles/osgAnimation.dir/StackedScaleElement.o
[ 93%] Building CXX object
src/osgAnimation/CMakeFiles/osgAnimation.dir/StackedTransform.o
/home/robert/OpenSceneGraph/src/osgAnimation/StackedTransform.cpp: In
copy constructor
‘osgAnimation::StackedTransform::StackedTransform(const
osgAnimation::StackedTransform&, const osg::CopyOp&)’:
/home/robert/OpenSceneGraph/src/osgAnimation/StackedTransform.cpp:21:1:
warning: base class ‘class
osg::MixinVector<osg::ref_ptr<osgAnimation::StackedTransformElement>
>’ should be explicitly initialized in the copy constructor [-Wextra]
StackedTransform::StackedTransform(const StackedTransform& rhs, const
osg::CopyOp& co)
^
[ 93%] Building CXX object
src/osgAnimation/CMakeFiles/osgAnimation.dir/StackedTranslateElement.o
[ 93%] Building CXX object
src/osgAnimation/CMakeFiles/osgAnimation.dir/StatsVisitor.o
[ 93%] Building CXX object
src/osgAnimation/CMakeFiles/osgAnimation.dir/StatsHandler.o
/home/robert/OpenSceneGraph/src/osgAnimation/StatsHandler.cpp: In
member function ‘void
osgAnimation::StatsGraph::changeYposition(float)’:
/home/robert/OpenSceneGraph/src/osgAnimation/StatsHandler.cpp:93:19:
warning: declaration of ‘_pos’ shadows a member of
‘osgAnimation::StatsGraph’ [-Wshadow]
osg::Vec3 _pos = getMatrix().getTrans();
^
/home/robert/OpenSceneGraph/src/osgAnimation/StatsHandler.cpp:103:25:
note: shadowed declaration is here
osg::Vec3 _pos;
^
[ 93%] Building CXX object src/osgAnimation/CMakeFiles/osgAnimation.dir/Target.o
[ 93%] Building CXX object
src/osgAnimation/CMakeFiles/osgAnimation.dir/TimelineAnimationManager.o
[ 93%] Building CXX object
src/osgAnimation/CMakeFiles/osgAnimation.dir/Timeline.o
[100%] Building CXX object
src/osgAnimation/CMakeFiles/osgAnimation.dir/UpdateBone.o
[100%] Building CXX object
src/osgAnimation/CMakeFiles/osgAnimation.dir/UpdateMaterial.o
[100%] Building CXX object
src/osgAnimation/CMakeFiles/osgAnimation.dir/UpdateMatrixTransform.o
[100%] Building CXX object
src/osgAnimation/CMakeFiles/osgAnimation.dir/VertexInfluence.o
[100%] Linking CXX shared library ../../lib/libosgAnimation.so
[100%] Built target osgAnimation
_______________________________________________
osg-submissions mailing list
[email protected]
http://lists.openscenegraph.org/listinfo.cgi/osg-submissions-openscenegraph.org
