Changeset 9737

Timestamp:

02/09/09 23:56:21 (4 years ago)

Author:

robert

Message:

From Fabien Lavignotte, "Here is some various small fixes i have done while playing with
osgAnimation.

• Animation : removed the _name attribute that is never used.
  
• BasicAnimationManager? : fix a crash on Windows with the example
  

osganimationviewer. The _lastUpdate attribute was not initialized when
using copy constructor.

• CMakeLists.txt : add RigGeometry? to the headers list"
  

Location:

OpenSceneGraph/trunk

Files:

• examples/osganimationskinning/osganimationskinning.cpp (modified) (1 diff)
• include/osgAnimation/RigGeometry (modified) (3 diffs)
• include/osgAnimation/Timeline (modified) (2 diffs)
• src/osgWrappers/osgAnimation/RigGeometry.cpp (modified) (6 diffs)
• src/osgWrappers/osgAnimation/Timeline.cpp (modified) (3 diffs)

OpenSceneGraph/trunk/examples/osganimationskinning/osganimationskinning.cpp

@@ -253 +253 @@
     initVertexMap(root.get(), right0.get(), right1.get(), geom, src.get());
 
-    geom->buildVertexSet();
-    geom->buildTransformer(skelroot.get());
-
     // let's run !
     viewer.setSceneData( scene );

OpenSceneGraph/trunk/include/osgAnimation/RigGeometry

@@ -28 +28 @@
     public:
 
+        RigGeometry();
+        RigGeometry(const osg::Geometry& b);
+        RigGeometry(const RigGeometry& b, const osg::CopyOp& copyop = osg::CopyOp::SHALLOW_COPY);
+
+        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();}
+ 
+        const Skeleton* getSkeleton() const;
+        Skeleton* getSkeleton();
+        
+        void setNeedToComputeMatrix(bool state) { _needToComputeMatrix = state;}
+        bool getNeedToComputeMatrix() const { return _needToComputeMatrix;}
+        
+        void buildVertexSet();
+        void buildTransformer(Skeleton* root);
+        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;}
+
+    protected:
+
+        std::vector<osg::Vec3> _positionSource;
+        std::vector<osg::Vec3> _normalSource;
+
+        osgAnimation::VertexInfluenceSet _vertexInfluenceSet;
+        osg::ref_ptr<osgAnimation::VertexInfluenceMap> _vertexInfluenceMap;
+        osgAnimation::TransformVertexFunctor _transformVertexes;
+
+        osg::Matrix _matrixFromSkeletonToGeometry;
+        osg::Matrix _invMatrixFromSkeletonToGeometry;
+        osg::observer_ptr<Skeleton> _root;
+        bool _needToComputeMatrix;
+
+ 
         struct FindNearestParentSkeleton : public osg::NodeVisitor
         {
@@ -74 +115 @@
          *  throw a subgraph. 
          */
-        struct BuildVertexTransformerVisitor : public osg::NodeVisitor 
+        struct BuildVertexTransformerVisitor : public osg::NodeVisitor
         {
             osg::ref_ptr<Skeleton> _root;
@@ -95 +136 @@
         };
 
-
-        RigGeometry();
-        RigGeometry(const osg::Geometry& b);
-        RigGeometry(const RigGeometry& b, const osg::CopyOp& copyop = osg::CopyOp::SHALLOW_COPY);
-
-        virtual osg::Object* cloneType() const { return new RigGeometry(); }
-        virtual osg::Object* clone(const osg::CopyOp& copyop) const { return new RigGeometry(*this,copyop); }        
-        virtual bool isSameKindAs(const osg::Object* obj) const { return dynamic_cast<const RigGeometry*>(obj)!=NULL; }
-        virtual const char* libraryName() const { return "osgAnimation"; }
-        virtual const char* className() const { return "RigGeometry"; }
-
-
-        void setInfluenceMap(osgAnimation::VertexInfluenceMap* vertexInfluenceMap) { _vertexInfluenceMap = vertexInfluenceMap; }
-        const osgAnimation::VertexInfluenceMap* getInfluenceMap() const { return _vertexInfluenceMap.get();}
-        osgAnimation::VertexInfluenceMap* getInfluenceMap() { return _vertexInfluenceMap.get();}
-        void buildVertexSet();
-        void buildTransformer(Skeleton* root);
-        void computeMatrixFromRootSkeleton();
-
-        void setNeedToComputeMatrix(bool state) { _needToComputeMatrix = state;}
-        bool getNeedToComputeMatrix() const { return _needToComputeMatrix;}
-
-        const Skeleton* getSkeleton() const;
-        Skeleton* getSkeleton();
-        virtual void transformSoftwareMethod();
-        const osgAnimation::VertexInfluenceSet& getVertexInfluenceSet() const { return _vertexInfluenceSet;}
-
-        std::vector<osg::Vec3> _positionSource;
-        std::vector<osg::Vec3> _normalSource;
-
-        osgAnimation::VertexInfluenceSet _vertexInfluenceSet;
-        osg::ref_ptr<osgAnimation::VertexInfluenceMap> _vertexInfluenceMap;
-        osgAnimation::TransformVertexFunctor _transformVertexes;
-
-        osg::Matrix _matrixFromSkeletonToGeometry;
-        osg::Matrix _invMatrixFromSkeletonToGeometry;
-        osg::observer_ptr<Skeleton> _root;
-        bool _needToComputeMatrix;
-
-    };
+   };
 
 }

OpenSceneGraph/trunk/include/osgAnimation/Timeline

@@ -28 +28 @@
 {
 
-    class Action : public virtual osg::Object
-    {
-    public:
-
-        class Callback : public virtual osg::Object
+    class Action : public osg::Object
+    {
+    public:
+
+        class Callback : public osg::Object
         {
         public:
@@ -163 +163 @@
 
 
-    class Timeline : public virtual osg::Object
+    class Timeline : public osg::Object
     {
     protected:

OpenSceneGraph/trunk/src/osgWrappers/osgAnimation/RigGeometry.cpp

@@ -12 +12 @@
 
 #include <osg/CopyOp>
-#include <osg/Drawable>
-#include <osg/Geode>
 #include <osg/Geometry>
-#include <osg/NodeVisitor>
 #include <osg/Object>
-#include <osg/Transform>
+#include <osg/Vec3>
 #include <osgAnimation/RigGeometry>
 #include <osgAnimation/Skeleton>
@@ -85 +82 @@
                   "",
                   "");
+        I_Method0(const osgAnimation::Skeleton *, getSkeleton,
+                  Properties::NON_VIRTUAL,
+                  __C5_Skeleton_P1__getSkeleton,
+                  "",
+                  "");
+        I_Method0(osgAnimation::Skeleton *, getSkeleton,
+                  Properties::NON_VIRTUAL,
+                  __Skeleton_P1__getSkeleton,
+                  "",
+                  "");
+        I_Method1(void, setNeedToComputeMatrix, IN, bool, state,
+                  Properties::NON_VIRTUAL,
+                  __void__setNeedToComputeMatrix__bool,
+                  "",
+                  "");
+        I_Method0(bool, getNeedToComputeMatrix,
+                  Properties::NON_VIRTUAL,
+                  __bool__getNeedToComputeMatrix,
+                  "",
+                  "");
         I_Method0(void, buildVertexSet,
                   Properties::NON_VIRTUAL,
@@ -100 +117 @@
                   "",
                   "");
-        I_Method1(void, setNeedToComputeMatrix, IN, bool, state,
-                  Properties::NON_VIRTUAL,
-                  __void__setNeedToComputeMatrix__bool,
-                  "",
-                  "");
-        I_Method0(bool, getNeedToComputeMatrix,
-                  Properties::NON_VIRTUAL,
-                  __bool__getNeedToComputeMatrix,
-                  "",
-                  "");
-        I_Method0(const osgAnimation::Skeleton *, getSkeleton,
-                  Properties::NON_VIRTUAL,
-                  __C5_Skeleton_P1__getSkeleton,
-                  "",
-                  "");
-        I_Method0(osgAnimation::Skeleton *, getSkeleton,
-                  Properties::NON_VIRTUAL,
-                  __Skeleton_P1__getSkeleton,
-                  "",
-                  "");
         I_Method0(void, transformSoftwareMethod,
                   Properties::VIRTUAL,
@@ -130 +127 @@
                   "",
                   "");
+        I_Method0(const std::vector< osg::Vec3 > &, getPositionSource,
+                  Properties::NON_VIRTUAL,
+                  __C5_std_vectorT1_osg_Vec3__R1__getPositionSource,
+                  "",
+                  "");
+        I_Method0(const std::vector< osg::Vec3 > &, getNormalSource,
+                  Properties::NON_VIRTUAL,
+                  __C5_std_vectorT1_osg_Vec3__R1__getNormalSource,
+                  "",
+                  "");
         I_SimpleProperty(osgAnimation::VertexInfluenceMap *, InfluenceMap, 
                          __osgAnimation_VertexInfluenceMap_P1__getInfluenceMap, 
@@ -136 +143 @@
                          __bool__getNeedToComputeMatrix, 
                          __void__setNeedToComputeMatrix__bool);
+        I_SimpleProperty(const std::vector< osg::Vec3 > &, NormalSource, 
+                         __C5_std_vectorT1_osg_Vec3__R1__getNormalSource, 
+                         0);
+        I_SimpleProperty(const std::vector< osg::Vec3 > &, PositionSource, 
+                         __C5_std_vectorT1_osg_Vec3__R1__getPositionSource, 
+                         0);
         I_SimpleProperty(osgAnimation::Skeleton *, Skeleton, 
                          __Skeleton_P1__getSkeleton, 
@@ -142 +155 @@
                          __C5_osgAnimation_VertexInfluenceSet_R1__getVertexInfluenceSet, 
                          0);
-        I_PublicMemberProperty(std::vector< osg::Vec3 >, _positionSource);
-        I_PublicMemberProperty(std::vector< osg::Vec3 >, _normalSource);
-        I_PublicMemberProperty(osgAnimation::VertexInfluenceSet, _vertexInfluenceSet);
-        I_PublicMemberProperty(osg::ref_ptr< osgAnimation::VertexInfluenceMap >, _vertexInfluenceMap);
-        I_PublicMemberProperty(osgAnimation::TransformVertexFunctor, _transformVertexes);
-        I_PublicMemberProperty(osg::Matrix, _matrixFromSkeletonToGeometry);
-        I_PublicMemberProperty(osg::Matrix, _invMatrixFromSkeletonToGeometry);
-        I_PublicMemberProperty(osg::observer_ptr< osgAnimation::Skeleton >, _root);
-        I_PublicMemberProperty(bool, _needToComputeMatrix);
 END_REFLECTOR
 
-BEGIN_OBJECT_REFLECTOR(osgAnimation::RigGeometry::BuildVertexTransformerVisitor)
-        I_DeclaringFile("osgAnimation/RigGeometry");
-        I_BaseType(osg::NodeVisitor);
-        I_Constructor1(IN, osgAnimation::Skeleton *, root,
-                       Properties::NON_EXPLICIT,
-                       ____BuildVertexTransformerVisitor__Skeleton_P1,
-                       "",
-                       "");
-        I_Method0(const char *, libraryName,
-                  Properties::VIRTUAL,
-                  __C5_char_P1__libraryName,
-                  "return the library name/namespapce of the visitor's. ",
-                  "Should be defined by derived classes. ");
-        I_Method0(const char *, className,
-                  Properties::VIRTUAL,
-                  __C5_char_P1__className,
-                  "return the name of the visitor's class type. ",
-                  "Should be defined by derived classes. ");
-        I_Method1(void, apply, IN, osg::Geode &, node,
-                  Properties::VIRTUAL,
-                  __void__apply__osg_Geode_R1,
-                  "",
-                  "");
-        I_PublicMemberProperty(osg::ref_ptr< osgAnimation::Skeleton >, _root);
-END_REFLECTOR
-
-BEGIN_OBJECT_REFLECTOR(osgAnimation::RigGeometry::FindNearestParentSkeleton)
-        I_DeclaringFile("osgAnimation/RigGeometry");
-        I_BaseType(osg::NodeVisitor);
-        I_Constructor0(____FindNearestParentSkeleton,
-                       "",
-                       "");
-        I_Method1(void, apply, IN, osg::Transform &, node,
-                  Properties::VIRTUAL,
-                  __void__apply__osg_Transform_R1,
-                  "",
-                  "");
-        I_PublicMemberProperty(osg::ref_ptr< osgAnimation::Skeleton >, _root);
-END_REFLECTOR
-
-BEGIN_OBJECT_REFLECTOR(osgAnimation::RigGeometry::UpdateVertex)
-        I_DeclaringFile("osgAnimation/RigGeometry");
-        I_BaseType(osg::Drawable::UpdateCallback);
-        I_Constructor0(____UpdateVertex,
-                       "",
-                       "");
-        I_Method2(void, update, IN, osg::NodeVisitor *, x, IN, osg::Drawable *, drw,
-                  Properties::VIRTUAL,
-                  __void__update__osg_NodeVisitor_P1__osg_Drawable_P1,
-                  "do customized update code. ",
-                  "");
-END_REFLECTOR
-

OpenSceneGraph/trunk/src/osgWrappers/osgAnimation/Timeline.cpp

@@ -29 +29 @@
 BEGIN_OBJECT_REFLECTOR(osgAnimation::Action)
         I_DeclaringFile("osgAnimation/Timeline");
-        I_VirtualBaseType(osg::Object);
+        I_BaseType(osg::Object);
         I_Method0(osg::Object *, cloneType,
                   Properties::VIRTUAL,
@@ -139 +139 @@
 BEGIN_OBJECT_REFLECTOR(osgAnimation::Action::Callback)
         I_DeclaringFile("osgAnimation/Timeline");
-        I_VirtualBaseType(osg::Object);
+        I_BaseType(osg::Object);
         I_Constructor0(____Callback,
                        "",
@@ -323 +323 @@
 BEGIN_OBJECT_REFLECTOR(osgAnimation::Timeline)
         I_DeclaringFile("osgAnimation/Timeline");
-        I_VirtualBaseType(osg::Object);
+        I_BaseType(osg::Object);
         I_Method0(osg::Object *, cloneType,
                   Properties::VIRTUAL,