Changeset 10751 for OpenSceneGraph/trunk/include/osgAnimation/Skeleton

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

Files:

• OpenSceneGraph/trunk/include/osgAnimation/Skeleton (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();
     };