FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactored how the callbacks for updating geometry are managed in MorphGeometry and RigGeometry to address bugs in serialization.

Browse Source 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14784 16af8721-9629-0410-8352-f15c8da7e697
This commit is contained in:
Robert Osfield
2015-03-12 17:11:11 +00:00
parent dd2de7f132
commit e2f208af54
14 changed files with 107 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
include/osgAnimation/MorphGeometry
View File

@@ -48,18 +48,6 @@ namespace osgAnimation
typedef std::vector<MorphTarget> MorphTargetList;
struct UpdateVertex : public osg::Drawable::UpdateCallback
{
virtual void update(osg::NodeVisitor*, osg::Drawable* drw)
{
MorphGeometry* geom = dynamic_cast<MorphGeometry*>(drw);
if (!geom)
return;
geom->transformSoftwareMethod();
}
};
MorphGeometry();
MorphGeometry(const osg::Geometry& b);
MorphGeometry(const MorphGeometry& b, const osg::CopyOp& copyop = osg::CopyOp::SHALLOW_COPY);
@@ -149,6 +137,25 @@ namespace osgAnimation
bool link(osgAnimation::Channel* channel);
};
struct UpdateMorphGeometry : public osg::Drawable::UpdateCallback
{
UpdateMorphGeometry() {}
UpdateMorphGeometry(const UpdateMorphGeometry&, const osg::CopyOp&) {}
META_Object(osgAnimation, UpdateMorphGeometry);
virtual void update(osg::NodeVisitor*, osg::Drawable* drw)
{
MorphGeometry* geom = dynamic_cast<MorphGeometry*>(drw);
if (!geom)
return;
geom->transformSoftwareMethod();
}
};
}
#endif

92
include/osgAnimation/RigGeometry
View File

@@ -46,6 +46,7 @@ namespace osgAnimation
mutable osg::BoundingBox _boundingBox;
};
class OSGANIMATION_EXPORT RigGeometry : public osg::Geometry
{
public:
@@ -92,41 +93,16 @@ namespace osgAnimation
void copyFrom(osg::Geometry& from);
struct UpdateVertex : public osg::Drawable::UpdateCallback
struct FindNearestParentSkeleton : public osg::NodeVisitor
{
UpdateVertex() {}
UpdateVertex(const UpdateCallback&, const osg::CopyOp&) {}
META_Object(osgAnimation, UpdateVertex);
virtual void update(osg::NodeVisitor*, osg::Drawable* drw) {
RigGeometry* geom = dynamic_cast<RigGeometry*>(drw);
if(!geom)
osg::ref_ptr<Skeleton> _root;
FindNearestParentSkeleton() : osg::NodeVisitor(osg::NodeVisitor::TRAVERSE_PARENTS) {}
void apply(osg::Transform& node)
{
if (_root.valid())
return;
if(!geom->getSkeleton() && !geom->getParents().empty())
{
FindNearestParentSkeleton finder;
if(geom->getParents().size() > 1)
osg::notify(osg::WARN) << "A RigGeometry should not have multi parent ( " << geom->getName() << " )" << std::endl;
geom->getParents()[0]->accept(finder);
if(!finder._root.valid())
{
osg::notify(osg::WARN) << "A RigGeometry did not find a parent skeleton for RigGeomtry ( " << geom->getName() << " )" << std::endl;
return;
}
geom->buildVertexInfluenceSet();
geom->setSkeleton(finder._root.get());
}
if(!geom->getSkeleton())
return;
if(geom->getNeedToComputeMatrix())
geom->computeMatrixFromRootSkeleton();
geom->update();
_root = dynamic_cast<osgAnimation::Skeleton*>(&node);
traverse(node);
}
};
@@ -143,21 +119,47 @@ namespace osgAnimation
osg::observer_ptr<Skeleton> _root;
bool _needToComputeMatrix;
struct FindNearestParentSkeleton : public osg::NodeVisitor
{
osg::ref_ptr<Skeleton> _root;
FindNearestParentSkeleton() : osg::NodeVisitor(osg::NodeVisitor::TRAVERSE_PARENTS) {}
void apply(osg::Transform& node)
{
if (_root.valid())
return;
_root = dynamic_cast<osgAnimation::Skeleton*>(&node);
traverse(node);
}
};
};
struct UpdateRigGeometry : public osg::Drawable::UpdateCallback
{
UpdateRigGeometry() {}
UpdateRigGeometry(const UpdateRigGeometry&, const osg::CopyOp&) {}
META_Object(osgAnimation, UpdateRigGeometry);
virtual void update(osg::NodeVisitor*, osg::Drawable* drw) {
RigGeometry* geom = dynamic_cast<RigGeometry*>(drw);
if(!geom)
return;
if(!geom->getSkeleton() && !geom->getParents().empty())
{
RigGeometry::FindNearestParentSkeleton finder;
if(geom->getParents().size() > 1)
osg::notify(osg::WARN) << "A RigGeometry should not have multi parent ( " << geom->getName() << " )" << std::endl;
geom->getParents()[0]->accept(finder);
if(!finder._root.valid())
{
osg::notify(osg::WARN) << "A RigGeometry did not find a parent skeleton for RigGeomtry ( " << geom->getName() << " )" << std::endl;
return;
}
geom->buildVertexInfluenceSet();
geom->setSkeleton(finder._root.get());
}
if(!geom->getSkeleton())
return;
if(geom->getNeedToComputeMatrix())
geom->computeMatrixFromRootSkeleton();
geom->update();
}
};
}
#endif