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

minor fixes

Browse Source 
removed unused
This commit is contained in:
Julien Valentin 2017-08-28 16:02:00 +02:00
parent 2aab28149f
commit 6d55d8d341
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/osgAnimation/RigTransform
View File

@ -35,7 +35,7 @@ namespace osgAnimation
/// to call manually when a skeleton is reacheable from the rig
/// in order to prepare technic data before rendering
virtual bool prepareData(RigGeometry&){}
virtual bool prepareData(RigGeometry&){return true;}
protected:
virtual ~RigTransform() {}

10
src/osgAnimation/RigTransformHardware.cpp
View File

@ -390,11 +390,11 @@ bool RigTransformHardware::buildPalette(BoneMap&boneMap ,RigGeometry&rig) {
VertexIndexWeightList vertexIndexWeight;
vertexIndexWeight.resize(_nbVertexes);
for (osgAnimation::VertexInfluenceMap::iterator it = vertexInfluenceMap->begin();
it != vertexInfluenceMap->end();
++it)
for (osgAnimation::VertexInfluenceMap::iterator mapit = vertexInfluenceMap->begin();
mapit != vertexInfluenceMap->end();
++mapit)
{
const BoneInfluenceList& boneinflist = it->second;
const BoneInfluenceList& boneinflist = mapit->second;
for(BoneInfluenceList::const_iterator infit = boneinflist.begin(); infit!=boneinflist.end(); ++infit)
{
const IndexWeight& iw = *infit;
@ -402,8 +402,6 @@ bool RigTransformHardware::buildPalette(BoneMap&boneMap ,RigGeometry&rig) {
const float &weight = iw.getWeight();
FloatInt &sum=sums[index];
unsigned int arrayid=sum.second/2;
unsigned short inx=2*(sum.second&1);
if (boneinflist.getBoneName().empty()) {
OSG_WARN << "VertexInfluenceSet::buildVertex2BoneList warning vertex " << index << " is not assigned to a bone" << std::endl;