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

few refactoring and fixes

Browse Source
This commit is contained in:
Julien Valentin
2017-08-29 02:55:40 +02:00
parent b3402d9344
commit 0c9a624026
3 changed files with 33 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
include/osgAnimation/RigTransformSoftware
View File

@@ -53,7 +53,6 @@ namespace osgAnimation
osg::observer_ptr< Bone > _boneptr;
};
typedef std::vector<BonePtrWeight> BonePtrWeightList;
typedef std::vector<unsigned int> IndexList;
/// map a set of boneinfluence to a list of vertex indices sharing this set
class VertexGroup
@@ -61,7 +60,7 @@ namespace osgAnimation
public:
inline BonePtrWeightList& getBoneWeights() { return _boneweights; }
inline IndexList& getVertexes() { return _vertexes; }
inline IndexList& getVertices() { return _vertexes; }
inline void resetMatrix()
{
@@ -122,9 +121,8 @@ namespace osgAnimation
osg::Matrix _result;
};
template <class V> void compute(const osg::Matrix& transform, const osg::Matrix& invTransform, const V* src, V* dst)
template <class V>
inline 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(VertexGroupList::iterator itvg=_uniqInfluenceSet2VertIDList.begin(); itvg!=_uniqInfluenceSet2VertIDList.end(); ++itvg)
@@ -133,7 +131,7 @@ namespace osgAnimation
uniq.computeMatrixForVertexSet();
osg::Matrix matrix = transform * uniq.getMatrix() * invTransform;
const IndexList& vertexes = uniq.getVertexes();
const IndexList& vertexes = uniq.getVertices();
for(IndexList::const_iterator vertIDit=vertexes.begin(); vertIDit!=vertexes.end(); ++vertIDit)
{
dst[*vertIDit] = src[*vertIDit] * matrix;
@@ -143,7 +141,8 @@ namespace osgAnimation
}
template <class V> void computeNormal(const osg::Matrix& transform, const osg::Matrix& invTransform, const V* src, V* dst)
template <class V>
inline void computeNormal(const osg::Matrix& transform, const osg::Matrix& invTransform, const V* src, V* dst)
{
for(VertexGroupList::iterator itvg=_uniqInfluenceSet2VertIDList.begin(); itvg!=_uniqInfluenceSet2VertIDList.end(); ++itvg)
{
@@ -151,7 +150,7 @@ namespace osgAnimation
uniq.computeMatrixForVertexSet();
osg::Matrix matrix = transform * uniq.getMatrix() * invTransform;
const IndexList& vertexes = uniq.getVertexes();
const IndexList& vertexes = uniq.getVertices();
for(IndexList::const_iterator vertIDit=vertexes.begin(); vertIDit!=vertexes.end(); ++vertIDit)
{
dst[*vertIDit] = osg::Matrix::transform3x3(src[*vertIDit],matrix);

24
include/osgAnimation/VertexInfluence
View File

@@ -46,14 +46,6 @@ namespace osgAnimation
typedef std::vector<BoneWeight> BoneWeightList;
typedef std::vector<unsigned int> IndexList;
/// map a set of boneinfluence to a list of vertex indices sharing this set
class VertexGroup: public std::pair<BoneWeightList, IndexList>
{
public:
inline const BoneWeightList& getBoneWeights()const { return first; }
inline void setBoneWeights(BoneWeightList&o) { first=o; }
inline IndexList& vertIDs() { return second; }
};
class OSGANIMATION_EXPORT BoneInfluenceList : public IndexWeightList
{
public:
@@ -82,9 +74,19 @@ namespace osgAnimation
void cullInfluenceCountPerVertex(unsigned int maxnumbonepervertex, float minweight=0, bool renormalize=true);
//compute PerVertexInfluenceList
void computePerVertexInfluenceList(std::vector<BoneWeightList>& vertex2Bones,unsigned int numvert)const;
//create the minimal VertexGroup set
void computeMinimalVertexGroupList(std::vector<VertexGroup>&uniqVertexGroupList,unsigned int numvert)const;
void computePerVertexInfluenceList(std::vector<BoneWeightList>& perVertexInfluenceList, unsigned int numvert)const;
/// map a set of boneinfluence to a list of vertex indices sharing this set
class VertexGroup: public std::pair<BoneWeightList, IndexList>
{
public:
inline const BoneWeightList& getBoneWeights()const { return first; }
inline void setBoneWeights( BoneWeightList& o ) { first=o; }
inline IndexList& vertIDs() { return second; }
};
/// compute the minimal VertexGroup Set in which vertices shares the same influence set
void computeMinimalVertexGroupList(std::vector<VertexGroup>&uniqVertexGroupList, unsigned int numvert)const;
};
}