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

make preparedata skeleton independant (as it was with the Rig::buildInfluenceSet)

Browse Source 
no more divergence with master i think
This commit is contained in:
Julien Valentin
2017-09-03 17:37:06 +02:00
parent 381c2150d4
commit 041a2a6e72
5 changed files with 290 additions and 236 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/osgAnimation/RigGeometry
View File

@@ -145,9 +145,8 @@ namespace osgAnimation
osg::notify(osg::WARN) << "A RigGeometry did not find a parent skeleton for RigGeometry ( " << geom->getName() << " )" << std::endl;
return;
}
geom->setSkeleton(finder._root.get());
geom->getRigTransformImplementation()->prepareData(*geom);
geom->setSkeleton(finder._root.get());
}
if(!geom->getSkeleton())

1
include/osgAnimation/RigTransformHardware
View File

@@ -89,6 +89,7 @@ namespace osgAnimation
//on first update
virtual bool init(RigGeometry& );
std::vector<IndexWeightList> _perVertexInfluences;
};
}

27
include/osgAnimation/RigTransformSoftware
View File

@@ -40,22 +40,28 @@ namespace osgAnimation
//to call when a skeleton is reacheable from the rig to prepare technic data
virtual bool prepareData(RigGeometry&);
class BonePtrWeight: std::pair< osg::observer_ptr< Bone >, float>
typedef std::pair<unsigned int, float> LocalBoneIDWeight;
class BonePtrWeight: LocalBoneIDWeight
{
public:
BonePtrWeight(Bone*bone, float weight) :std::pair< osg::observer_ptr< Bone >, float>(bone,weight) {}
BonePtrWeight(const BonePtrWeight &bw2) : std::pair< osg::observer_ptr< Bone >, float>(bw2.first.get(),bw2.getWeight()) {}
inline const Bone * getBonePtr() const {return first.get();}
inline void setBonePtr(Bone*b){first=b;}
BonePtrWeight(unsigned int id,float weight, Bone*bone=0 ): LocalBoneIDWeight(id,weight), _boneptr(bone){}
BonePtrWeight(const BonePtrWeight &bw2): LocalBoneIDWeight(bw2.getBoneID(),bw2.getWeight()), _boneptr(bw2._boneptr.get()){}
inline const float & getWeight() const {return second;}
inline void setWeight(float b) {second=b;}
inline const unsigned int & getBoneID() const {return first;}
inline void setBoneID(unsigned int b) {first=b;}
inline bool operator<(const BonePtrWeight &b1) const{
if (second > b1.second)return true;
if (second < b1.second)return false;
return (first.get() > b1.first.get());
return (first > b1.first);
}
///set Bone pointer
inline const Bone * getBonePtr() const {return _boneptr.get();}
inline void setBonePtr(Bone*b){_boneptr=b;}
protected:
osg::observer_ptr< Bone > _boneptr;
};
typedef std::vector<BonePtrWeight> BonePtrWeightList;
/// map a set of boneinfluence to a list of vertex indices sharing this set
@@ -144,7 +150,6 @@ namespace osgAnimation
}
}
template <class V>
inline void computeNormal(const osg::Matrix& transform, const osg::Matrix& invTransform, const V* src, V* dst)
{
@@ -166,12 +171,14 @@ namespace osgAnimation
bool _needInit;
virtual bool init(RigGeometry&);
std::map<std::string,bool> _invalidInfluence;
typedef std::vector<VertexGroup> VertexGroupList;
VertexGroupList _uniqVertexGroupList;
void buildMinimumUpdateSet(const BoneMap&boneMap,const RigGeometry&rig );
void buildMinimumUpdateSet(const RigGeometry&rig );
};
}