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

Merge branch 'osganimation' of https://github.com/mp3butcher/OpenSceneGraph into osganimation

Browse Source
This commit is contained in:
Robert Osfield
2017-08-28 10:28:18 +01:00
parent 26d0d3f424 6dc6bd5b92
commit 5d55ffe6ee
28 changed files with 1057 additions and 452 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/osganimationhardware/osganimationhardware.cpp
View File

@@ -145,7 +145,7 @@ struct SetupRigGeometry : public osg::NodeVisitor
if (_hardware) {
osgAnimation::RigGeometry* rig = dynamic_cast<osgAnimation::RigGeometry*>(&geom);
if (rig)
rig->setRigTransformImplementation(new MyRigTransformHardware);
rig->setRigTransformImplementation(new osgAnimation::RigTransformHardware);
}
#if 0

6
examples/osganimationskinning/osganimationskinning.cpp
View File

@@ -146,11 +146,11 @@ void initVertexMap(osgAnimation::Bone* b0,
float val = (*array)[i][0];
std::cout << val << std::endl;
if (val >= -1.0f && val <= 0.0f)
(*vim)[b0->getName()].push_back(osgAnimation::VertexIndexWeight(i,1.0f));
(*vim)[b0->getName()].push_back(osgAnimation::IndexWeight(i,1.0f));
else if ( val > 0.0f && val <= 1.0f)
(*vim)[b1->getName()].push_back(osgAnimation::VertexIndexWeight(i,1.0f));
(*vim)[b1->getName()].push_back(osgAnimation::IndexWeight(i,1.0f));
else if ( val > 1.0f)
(*vim)[b2->getName()].push_back(osgAnimation::VertexIndexWeight(i,1.0f));
(*vim)[b2->getName()].push_back(osgAnimation::IndexWeight(i,1.0f));
}
geom->setInfluenceMap(vim);