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

uncomment normalization in rigtransformxxx

Browse Source
This commit is contained in:
Julien Valentin 2017-08-30 12:55:45 +02:00
parent 0ebf540d65
commit 985d766f05
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/osgAnimation/MorphTransformHardware
View File

@ -37,14 +37,9 @@ namespace osgAnimation
META_Object(osgAnimation,MorphTransformHardware); META_Object(osgAnimation,MorphTransformHardware);
virtual void operator()(MorphGeometry&); virtual void operator()(MorphGeometry&);
void setShader(osg::Shader*); void setShader(osg::Shader*);
protected: protected:
bool init(MorphGeometry&); bool init(MorphGeometry&);

4
src/osgAnimation/RigTransformSoftware.cpp
View File

@ -77,7 +77,7 @@ void RigTransformSoftware::buildMinimumUpdateSet(const BoneMap&boneMap,const Rig
// normalize _vertex2Bones weight per vertex // normalize _vertex2Bones weight per vertex
unsigned vertexID=0; unsigned vertexID=0;
/*for (std::vector<BonePtrWeightList>::iterator it = _vertex2Bones.begin(); it != _vertex2Bones.end(); ++it, ++vertexID) for (std::vector<BonePtrWeightList>::iterator it = _vertex2Bones.begin(); it != _vertex2Bones.end(); ++it, ++vertexID)
{ {
BonePtrWeightList& bones = *it; BonePtrWeightList& bones = *it;
float sum = 0; float sum = 0;
@ -93,7 +93,7 @@ void RigTransformSoftware::buildMinimumUpdateSet(const BoneMap&boneMap,const Rig
for(BonePtrWeightList::iterator bwit=bones.begin();bwit!=bones.end();++bwit) for(BonePtrWeightList::iterator bwit=bones.begin();bwit!=bones.end();++bwit)
bwit->setWeight(bwit->getWeight() * mult); bwit->setWeight(bwit->getWeight() * mult);
} }
}*/ }
///2 Create inverse mapping Vec<BoneWeight>2Vec<Index> from previous built Index2Vec<BoneWeight> ///2 Create inverse mapping Vec<BoneWeight>2Vec<Index> from previous built Index2Vec<BoneWeight>
///in order to minimize weighted matrices computation on update ///in order to minimize weighted matrices computation on update