Changeset 10751

Timestamp:

11/13/09 14:39:21 (4 years ago)

Author:

cedricpinson

Message:

From Cedric Pinson, Fix Skeleton to compute correctly bind matrix, fix compile issue on osganimationhardware after fixing Skeleton

Location:

OpenSceneGraph/trunk

Files:

• include/osgAnimation/Skeleton (modified) (3 diffs)
• src/osgAnimation/Skeleton.cpp (modified) (3 diffs)

OpenSceneGraph/trunk/include/osgAnimation/Skeleton

@@ -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  
@@ -13 +13 @@
 */
 
-#ifndef OSGANIMATION_SKELETON_H
-#define OSGANIMATION_SKELETON_H
+#ifndef OSGANIMATION_SKELETON
+#define OSGANIMATION_SKELETON 1
 
-#include <osg/MatrixTransform>
+#include <osgAnimation/Export>
 #include <osgAnimation/Bone>
-#include <osgAnimation/Export>
 
 namespace osgAnimation 
@@ -32 +31 @@
         public:
             META_Object(osgAnimation, UpdateSkeleton);
-            UpdateSkeleton() : _needValidate(true) {}
-            UpdateSkeleton(const UpdateSkeleton& us, const osg::CopyOp& copyop= osg::CopyOp::SHALLOW_COPY) : osg::Object(us, copyop), osg::NodeCallback(us, copyop) { _needValidate = true;}
+            UpdateSkeleton();
+            UpdateSkeleton(const UpdateSkeleton&, const osg::CopyOp&);
             virtual void operator()(osg::Node* node, osg::NodeVisitor* nv);
-
+            bool needToValidate() const;
         protected:
             bool _needValidate;
         };
 
-        Skeleton(const Skeleton& b, const osg::CopyOp& copyop= osg::CopyOp::SHALLOW_COPY) : Bone(b,copyop) {}
         Skeleton();
-        void setDefaultUpdateCallback(void);
-        void computeBindMatrix() { _invBindInSkeletonSpace = osg::Matrix::inverse(_bindInBoneSpace); _needToRecomputeBindMatrix = false; }
+        Skeleton(const Skeleton&, const osg::CopyOp&);
+
+        void setDefaultUpdateCallback();
+        void computeBindMatrix();
     };
 

OpenSceneGraph/trunk/src/osgAnimation/Skeleton.cpp

@@ -17 +17 @@
 
 using namespace osgAnimation;
+
+Skeleton::Skeleton() {}
+Skeleton::Skeleton(const Skeleton& b, const osg::CopyOp& copyop) : Bone(b,copyop) {}
+
+Skeleton::UpdateSkeleton::UpdateSkeleton() : _needValidate(true) {}
+Skeleton::UpdateSkeleton::UpdateSkeleton(const UpdateSkeleton& us, const osg::CopyOp& copyop= osg::CopyOp::SHALLOW_COPY) : osg::Object(us, copyop), osg::NodeCallback(us, copyop) 
+{
+    _needValidate = true;
+}
+bool Skeleton::UpdateSkeleton::needToValidate() const
+{
+    return _needValidate;
+}
+
 
 class ValidateSkeletonVisitor : public osg::NodeVisitor
@@ -57 +71 @@
 void Skeleton::UpdateSkeleton::operator()(osg::Node* node, osg::NodeVisitor* nv)
 { 
-    if (_needValidate && nv && nv->getVisitorType() == osg::NodeVisitor::UPDATE_VISITOR) 
+    if (nv->getVisitorType() == osg::NodeVisitor::UPDATE_VISITOR)
     {
-        Skeleton* b = dynamic_cast<Skeleton*>(node);
-        if (b) 
+        Skeleton* skeleton = dynamic_cast<Skeleton*>(node);
+        if (_needValidate && skeleton)
         {
             ValidateSkeletonVisitor visitor;
             node->accept(visitor);
+            _needValidate = false;
         }
-
-        _needValidate = false;
+        if (skeleton->needToComputeBindMatrix())
+            skeleton->computeBindMatrix();
     }
     traverse(node,nv);
-}
-
-Skeleton::Skeleton()
-{
 }
 
@@ -79 +90 @@
     setUpdateCallback(new Skeleton::UpdateSkeleton );
 }
+
+void Skeleton::computeBindMatrix() 
+{
+    _invBindInSkeletonSpace = osg::Matrix::inverse(_bindInBoneSpace); 
+    _needToRecomputeBindMatrix = false; 
+}