Changeset 10693 for OpenSceneGraph/trunk/src/osgAnimation/VertexInfluence.cpp

Timestamp:

10/27/09 16:37:13 (4 years ago)

Author:

cedricpinson

Message:

From Cedric Pinson, The following commit include:
* Refactore of RigGeometry? to support hardware skinning
* Refactore of Timeline to split Action in differents files
* Add example how to use hardware skinning

Files:

• OpenSceneGraph/trunk/src/osgAnimation/VertexInfluence.cpp (modified) (8 diffs)

OpenSceneGraph/trunk/src/osgAnimation/VertexInfluence.cpp

@@ -1 +1 @@
 /*  -*-c++-*- 
- *  Copyright (C) 2008 Cedric Pinson <mornifle@plopbyte.net>
+ *  Copyright (C) 2008 Cedric Pinson <cedric.pinson@plopbyte.net>
  *
  * This library is open source and may be redistributed and/or modified under  
@@ -11 +11 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
  * OpenSceneGraph Public License for more details.
-*/
+ */
 
 #include <osgAnimation/VertexInfluence>
@@ -20 +20 @@
 using namespace osgAnimation;
 
-const osgAnimation::VertexInfluenceSet::VertexIndexToBoneWeightMap& osgAnimation::VertexInfluenceSet::getVertexToBoneList() const { return _vertex2Bones;}
+void VertexInfluenceSet::addVertexInfluence(const VertexInfluence& v) { _bone2Vertexes.push_back(v); }
+const VertexInfluenceSet::VertexIndexToBoneWeightMap& VertexInfluenceSet::getVertexToBoneList() const { return _vertex2Bones;}
 // this class manage VertexInfluence database by mesh
 // reference bones per vertex ...
-void osgAnimation::VertexInfluenceSet::buildVertex2BoneList()
+void VertexInfluenceSet::buildVertex2BoneList()
 {
     _vertex2Bones.clear();
@@ -36 +37 @@
             float weight = viw.second;
             if (vi.getName().empty())
-                osg::notify(osg::WARN) << "osgAnimation::VertexInfluenceSet::buildVertex2BoneList warning vertex " << index << " is not assigned to a bone" << std::endl;
+                osg::notify(osg::WARN) << "VertexInfluenceSet::buildVertex2BoneList warning vertex " << index << " is not assigned to a bone" << std::endl;
             _vertex2Bones[index].push_back(BoneWeight(vi.getName(), weight));
         }
@@ -65 +66 @@
 
 // sort by name and weight
-struct SortByNameAndWeight : public std::less<osgAnimation::VertexInfluenceSet::BoneWeight>
+struct SortByNameAndWeight : public std::less<VertexInfluenceSet::BoneWeight>
 {
-    bool operator()(const osgAnimation::VertexInfluenceSet::BoneWeight& b0, 
-                    const osgAnimation::VertexInfluenceSet::BoneWeight& b1) const 
+    bool operator()(const VertexInfluenceSet::BoneWeight& b0, 
+                    const VertexInfluenceSet::BoneWeight& b1) const 
     {
         if (b0.getBoneName() < b1.getBoneName())
@@ -80 +81 @@
 };
 
-struct SortByBoneWeightList : public std::less<osgAnimation::VertexInfluenceSet::BoneWeightList>
+struct SortByBoneWeightList : public std::less<VertexInfluenceSet::BoneWeightList>
 {
-    bool operator()(const osgAnimation::VertexInfluenceSet::BoneWeightList& b0, 
-                    const osgAnimation::VertexInfluenceSet::BoneWeightList& b1) const 
+    bool operator()(const VertexInfluenceSet::BoneWeightList& b0, 
+                    const VertexInfluenceSet::BoneWeightList& b1) const 
     {
         if (b0.size() < b1.size())
@@ -103 +104 @@
 };
 
-void osgAnimation::VertexInfluenceSet::buildUniqVertexSetToBoneSetList()
+void VertexInfluenceSet::clear()
+{
+    _bone2Vertexes.clear(); 
+    _uniqVertexSetToBoneSet.clear();
+}
+
+void VertexInfluenceSet::buildUniqVertexSetToBoneSetList()
 {
     _uniqVertexSetToBoneSet.clear();
@@ -131 +138 @@
     }
 }
+