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

Code readability improvements

Browse Source
This commit is contained in:
OpenSceneGraph git repository 2017-11-11 12:54:28 +00:00 committed by GitHub
parent f59efe0bfe
commit 8e55ed5923
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/osgAnimation/RigTransformSoftware.cpp
View File

@ -91,9 +91,12 @@ void RigTransformSoftware::buildMinimumUpdateSet( const RigGeometry&rig )
vg.getVertices().push_back(vertexID);
}
}
_uniqVertexGroupList.reserve(unifyBuffer.size());
for (UnifyBoneGroup::const_iterator it = unifyBuffer.begin(); it != unifyBuffer.end(); ++it)
{
_uniqVertexGroupList.push_back(it->second);
}
OSG_INFO << "uniq groups " << _uniqVertexGroupList.size() << " for " << rig.getName() << std::endl;
}
@ -144,6 +147,7 @@ bool RigTransformSoftware::init(RigGeometry&rig)
if(!rig.getSkeleton())
return false;
///get bonemap from skeleton
BoneMapVisitor mapVisitor;
rig.getSkeleton()->accept(mapVisitor);
@ -175,6 +179,7 @@ bool RigTransformSoftware::init(RigGeometry&rig)
localid2bone.push_back(0);
continue;
}
Bone* bone = bmit->second.get();
localid2bone.push_back(bone);
}
@ -226,15 +231,14 @@ void RigTransformSoftware::VertexGroup::normalize()
void RigTransformSoftware::operator()(RigGeometry& geom)
{
if (_needInit)
if (!init(geom))
return;
if (_needInit && !init(geom)) return;
if (!geom.getSourceGeometry())
{
OSG_WARN << this << " RigTransformSoftware no source geometry found on RigGeometry" << std::endl;
return;
}
osg::Geometry& source = *geom.getSourceGeometry();
osg::Geometry& destination = geom;
@ -247,11 +251,9 @@ void RigTransformSoftware::operator()(RigGeometry& geom)
compute<osg::Vec3>(geom.getMatrixFromSkeletonToGeometry(),
geom.getInvMatrixFromSkeletonToGeometry(),
&positionSrc->front(),
&positionDst->front());
&positionDst->front());
positionDst->dirty();
if (normalSrc )
{
computeNormal<osg::Vec3>(geom.getMatrixFromSkeletonToGeometry(),