Changeset 10693 for OpenSceneGraph/trunk/include/osgAnimation/RigGeometry

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/include/osgAnimation/RigGeometry (modified) (6 diffs)

OpenSceneGraph/trunk/include/osgAnimation/RigGeometry

@@ -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  
@@ -17 +17 @@
 
 #include <osgAnimation/Export>
-#include <osgAnimation/Skinning>
 #include <osgAnimation/Skeleton>
+#include <osgAnimation/RigTransform>
 #include <osg/Geometry>
 
@@ -34 +34 @@
         META_Object(osgAnimation, RigGeometry);
 
-        void setInfluenceMap(osgAnimation::VertexInfluenceMap* vertexInfluenceMap) { _vertexInfluenceMap = vertexInfluenceMap; }
-        const osgAnimation::VertexInfluenceMap* getInfluenceMap() const { return _vertexInfluenceMap.get();}
-        osgAnimation::VertexInfluenceMap* getInfluenceMap() { return _vertexInfluenceMap.get();}
+        void setInfluenceMap(VertexInfluenceMap* vertexInfluenceMap) { _vertexInfluenceMap = vertexInfluenceMap; }
+        const VertexInfluenceMap* getInfluenceMap() const { return _vertexInfluenceMap.get();}
+        VertexInfluenceMap* getInfluenceMap() { return _vertexInfluenceMap.get();}
  
         const Skeleton* getSkeleton() const;
         Skeleton* getSkeleton();
+        // will be used by the update callback to init correctly the rig mesh
+        void setSkeleton(Skeleton*);
         
         void setNeedToComputeMatrix(bool state) { _needToComputeMatrix = state;}
         bool getNeedToComputeMatrix() const { return _needToComputeMatrix;}
         
-        void buildVertexSet();
-        void buildTransformer(Skeleton* root);
+
+        // this build the internal database about vertex influence and bones
+        void buildVertexInfluenceSet();
+        const VertexInfluenceSet& getVertexInfluenceSet() const;
+
         void computeMatrixFromRootSkeleton();
 
-        virtual void transformSoftwareMethod();
-        const osgAnimation::VertexInfluenceSet& getVertexInfluenceSet() const { return _vertexInfluenceSet;}
 
-        const std::vector<osg::Vec3>& getPositionSource() const { return _positionSource;}
-        const std::vector<osg::Vec3>& getNormalSource() const { return _normalSource;}
+        // set implementation of rig method
+        void setRigTransformImplementation(RigTransform*);
+        RigTransform* getRigTransformImplementation();
+
+        virtual void drawImplementation(osg::RenderInfo& renderInfo) const;
+        void update();
+
+        const osg::Matrix& getMatrixFromSkeletonToGeometry() const;
+        const osg::Matrix& getInvMatrixFromSkeletonToGeometry() const;
 
     protected:
 
-        std::vector<osg::Vec3> _positionSource;
-        std::vector<osg::Vec3> _normalSource;
+        osg::ref_ptr<RigTransform> _rigTransformImplementation;
 
-        osgAnimation::VertexInfluenceSet _vertexInfluenceSet;
-        osg::ref_ptr<osgAnimation::VertexInfluenceMap> _vertexInfluenceMap;
-        osgAnimation::TransformVertexFunctor _transformVertexes;
+        VertexInfluenceSet _vertexInfluenceSet;
+        osg::ref_ptr<VertexInfluenceMap> _vertexInfluenceMap;
 
         osg::Matrix _matrixFromSkeletonToGeometry;
@@ -67 +75 @@
         osg::observer_ptr<Skeleton> _root;
         bool _needToComputeMatrix;
-
  
         struct FindNearestParentSkeleton : public osg::NodeVisitor
         {
-            osg::ref_ptr<osgAnimation::Skeleton> _root;
+            osg::ref_ptr<Skeleton> _root;
             FindNearestParentSkeleton() : osg::NodeVisitor(osg::NodeVisitor::TRAVERSE_PARENTS) {}
             void apply(osg::Transform& node) 
@@ -99 +106 @@
                     if (!finder._root.valid())
                         return;
-                    geom->buildVertexSet();
-                    geom->buildTransformer(finder._root.get());
+                    geom->buildVertexInfluenceSet();
+                    geom->setSkeleton(finder._root.get());
                 }
 
@@ -108 +115 @@
                 if (geom->getNeedToComputeMatrix())
                     geom->computeMatrixFromRootSkeleton();
-                geom->transformSoftwareMethod();
+
+                geom->update();
             }
         };
-
-        /** BuildVertexTransformerVisitor is used to setup RigGeometry drawable
-         *  throw a subgraph. 
-         */
-        struct BuildVertexTransformerVisitor : public osg::NodeVisitor
-        {
-            osg::ref_ptr<Skeleton> _root;
-            BuildVertexTransformerVisitor(Skeleton* root): osg::NodeVisitor(osg::NodeVisitor::TRAVERSE_ALL_CHILDREN) { _root = root;}
-
-            META_NodeVisitor("osgAnimation","BuildVertexTransformerVisitor")
-
-            void apply(osg::Geode& node) 
-            { 
-                int num = node.getNumDrawables();
-                for (int i = 0; i < num; i++) {
-                    RigGeometry* geom = dynamic_cast<RigGeometry*>(node.getDrawable(i));
-                    if (geom) 
-                    {
-                        geom->buildVertexSet();
-                        geom->buildTransformer(_root.get());
-                    }
-                }
-            }
-        };
-
    };