From fa727038a46924777345cf0017df9a92733cc4b9 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Mon, 2 Feb 2009 14:51:51 +0000 Subject: [PATCH] From Cedric Pinson, "Here an update of the osgAnimation ReaderWriter, it add other NodeCallback that could be attached to a node with Bone." --- src/osgPlugins/osgAnimation/ReaderWriter.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/osgPlugins/osgAnimation/ReaderWriter.cpp b/src/osgPlugins/osgAnimation/ReaderWriter.cpp index c9a89ee9d..192a8002b 100644 --- a/src/osgPlugins/osgAnimation/ReaderWriter.cpp +++ b/src/osgPlugins/osgAnimation/ReaderWriter.cpp @@ -75,8 +75,6 @@ bool Bone_readLocalData(Object& obj, Input& fr) } bone.setBindMatrixInBoneSpace( osg::Matrix(att) * osg::Matrix::translate(pos)); -// if (bone.getUpdateCallback() && bone.getUpdateCallback()->getName().empty() && bone.getUpdateCallback()->getNestedCallback()) -// bone.setUpdateCallback(bone.getUpdateCallback()->getNestedCallback()); // skip the default callback build in constructor of Bone return iteratorAdvanced; } @@ -496,7 +494,7 @@ RegisterDotOsgWrapperProxy g_atkUpdateBoneProxy ( new osgAnimation::Bone::UpdateBone, "osgAnimation::UpdateBone", - "Object osgAnimation::UpdateBone", + "Object NodeCallback osgAnimation::UpdateBone", &UpdateBone_readLocalData, &UpdateBone_writeLocalData, DotOsgWrapper::READ_AND_WRITE @@ -519,7 +517,7 @@ RegisterDotOsgWrapperProxy g_atkUpdateSkeletonProxy ( new osgAnimation::Skeleton::UpdateSkeleton, "osgAnimation::UpdateSkeleton", - "Object osgAnimation::UpdateSkeleton", + "Object NodeCallback osgAnimation::UpdateSkeleton", &UpdateSkeleton_readLocalData, &UpdateSkeleton_writeLocalData, DotOsgWrapper::READ_AND_WRITE @@ -542,7 +540,7 @@ RegisterDotOsgWrapperProxy g_atkUpdateTransformProxy ( new osgAnimation::UpdateTransform, "osgAnimation::UpdateTransform", - "Object osgAnimation::UpdateTransform", + "Object NodeCallback osgAnimation::UpdateTransform", &UpdateTransform_readLocalData, &UpdateTransform_writeLocalData, DotOsgWrapper::READ_AND_WRITE