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

remove default order for BoneWeight and restore old sort func (behaviors differs)

Browse Source
This commit is contained in:
Julien Valentin
2017-08-28 18:02:52 +02:00
parent ad550acc60
commit 28bb88a038
3 changed files with 57 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
include/osgAnimation/RigTransformSoftware
View File

@@ -127,9 +127,9 @@ namespace osgAnimation
template <class V> void compute(const osg::Matrix& transform, const osg::Matrix& invTransform, const V* src, V* dst)
{
// the result of matrix mult should be cached to be used for vertexes transform and normal transform and maybe other computation
for(VertexGroupSet::iterator itvg=_uniqInfluenceSet2VertIDList.begin(); itvg!=_uniqInfluenceSet2VertIDList.end(); ++itvg)
for(VertexGroupList::iterator itvg=_uniqInfluenceSet2VertIDList.begin(); itvg!=_uniqInfluenceSet2VertIDList.end(); ++itvg)
{
VertexGroup& uniq = itvg->second;
VertexGroup& uniq = *itvg;
uniq.computeMatrixForVertexSet();
osg::Matrix matrix = transform * uniq.getMatrix() * invTransform;
@@ -145,9 +145,9 @@ namespace osgAnimation
template <class V> void computeNormal(const osg::Matrix& transform, const osg::Matrix& invTransform, const V* src, V* dst)
{
for(VertexGroupSet::iterator itvg=_uniqInfluenceSet2VertIDList.begin(); itvg!=_uniqInfluenceSet2VertIDList.end(); ++itvg)
for(VertexGroupList::iterator itvg=_uniqInfluenceSet2VertIDList.begin(); itvg!=_uniqInfluenceSet2VertIDList.end(); ++itvg)
{
VertexGroup& uniq = itvg->second;
VertexGroup& uniq = *itvg;
uniq.computeMatrixForVertexSet();
osg::Matrix matrix = transform * uniq.getMatrix() * invTransform;
@@ -165,10 +165,9 @@ namespace osgAnimation
std::map<std::string,bool> _invalidInfluence;
typedef std::vector<BonePtrWeight> BoneWeightList;
typedef std::map<BoneWeightList, VertexGroup> VertexGroupSet;
typedef std::vector<VertexGroup> VertexGroupList;
VertexGroupSet _uniqInfluenceSet2VertIDList;
VertexGroupList _uniqInfluenceSet2VertIDList;
void buildMinimumUpdateSet(const BoneMap&boneMap,const RigGeometry&rig );
};

5
include/osgAnimation/VertexInfluence
View File

@@ -32,11 +32,6 @@ namespace osgAnimation
inline void setBoneName(const std::string&s){first=s;}
inline const float &getWeight()const{return second;}
inline void setWeight(float i){second=i;}
///default invweight ordered
bool operator <(const BoneWeight&o)const{
if(getWeight()>o.getWeight()) return true;
if(getWeight()<o.getWeight()) return false;
return getBoneName()<o.getBoneName();}
};
// first is vertex index, and second the weight
struct IndexWeight: public std::pair<unsigned int, float>