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

revert s/VertexIndexWeight/IndexWeight/

Browse Source
This commit is contained in:
Julien Valentin
2017-08-31 13:30:24 +02:00
parent 0926bb783d
commit 068a032dac
8 changed files with 22 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/osgAnimation/RigTransformHardware
View File

@@ -81,7 +81,7 @@ namespace osgAnimation
unsigned int _minAttribIndex;
bool buildPalette(const BoneMap& boneMap ,const RigGeometry& rig);
bool init(RigGeometry& );
virtual bool init(RigGeometry& );
};
}

6
include/osgAnimation/VertexInfluence
View File

@@ -34,15 +34,15 @@ namespace osgAnimation
inline void setWeight(float i){second=i;}
};
// first is vertex index, and second the weight
struct IndexWeight: public std::pair<unsigned int, float>
struct VertexIndexWeight: public std::pair<unsigned int, float>
{
IndexWeight( unsigned int f = 0xffffffff,float s = 0.0f): std::pair<unsigned int,float>(f,s){}
VertexIndexWeight( unsigned int f = 0xffffffff,float s = 0.0f): std::pair<unsigned int,float>(f,s){}
inline const unsigned int& getIndex()const{return first;}
inline void setIndex(unsigned int i){first=i;}
inline const float &getWeight()const{return second;}
inline void setWeight(float i){second=i;}
};
typedef std::vector<IndexWeight> IndexWeightList;
typedef std::vector<VertexIndexWeight> IndexWeightList;
typedef std::vector<BoneWeight> BoneWeightList;
typedef std::vector<unsigned int> IndexList;