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

coding style/readability fixes

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

10
examples/osganimationhardware/osganimationhardware.cpp
View File

@ -79,7 +79,8 @@ struct MyRigTransformHardware : public osgAnimation::RigTransformHardware
osg::ref_ptr<osg::Shader> vertexshader; osg::ref_ptr<osg::Shader> vertexshader;
osg::ref_ptr<osg::StateSet> stateset = rig.getOrCreateStateSet(); osg::ref_ptr<osg::StateSet> stateset = rig.getOrCreateStateSet();
if(!CommonProgram.valid()){ if(!CommonProgram.valid())
{
CommonProgram = new osg::Program; CommonProgram = new osg::Program;
CommonProgram->setName("HardwareSkinning"); CommonProgram->setName("HardwareSkinning");
@ -115,6 +116,7 @@ struct MyRigTransformHardware : public osgAnimation::RigTransformHardware
} }
CommonProgram->addShader(vertexshader.get()); CommonProgram->addShader(vertexshader.get());
} }
unsigned int nbAttribs = getNumVertexAttrib(); unsigned int nbAttribs = getNumVertexAttrib();
for (unsigned int i = 0; i < nbAttribs; i++) for (unsigned int i = 0; i < nbAttribs; i++)
{ {
@ -144,6 +146,7 @@ struct MyRigTransformHardware : public osgAnimation::RigTransformHardware
struct SetupRigGeometry : public osg::NodeVisitor struct SetupRigGeometry : public osg::NodeVisitor
{ {
bool _hardware; bool _hardware;
SetupRigGeometry( bool hardware = true) : osg::NodeVisitor(osg::NodeVisitor::TRAVERSE_ALL_CHILDREN), _hardware(hardware) {} SetupRigGeometry( bool hardware = true) : osg::NodeVisitor(osg::NodeVisitor::TRAVERSE_ALL_CHILDREN), _hardware(hardware) {}
void apply(osg::Geode& geode) void apply(osg::Geode& geode)
@ -156,7 +159,8 @@ struct SetupRigGeometry : public osg::NodeVisitor
if (_hardware) if (_hardware)
{ {
osgAnimation::RigGeometry* rig = dynamic_cast<osgAnimation::RigGeometry*>(&geom); osgAnimation::RigGeometry* rig = dynamic_cast<osgAnimation::RigGeometry*>(&geom);
if (rig){ if (rig)
{
rig->setRigTransformImplementation(new MyRigTransformHardware); rig->setRigTransformImplementation(new MyRigTransformHardware);
osgAnimation::MorphGeometry *morph=dynamic_cast<osgAnimation::MorphGeometry*>(rig->getSourceGeometry()); osgAnimation::MorphGeometry *morph=dynamic_cast<osgAnimation::MorphGeometry*>(rig->getSourceGeometry());
if(morph)morph->setMorphTransformImplementation(new osgAnimation::MorphTransformHardware); if(morph)morph->setMorphTransformImplementation(new osgAnimation::MorphTransformHardware);
@ -266,7 +270,6 @@ int main (int argc, char* argv[])
{ {
for (double j = 0.0; j < yChar; j++) for (double j = 0.0; j < yChar; j++)
{ {
osg::ref_ptr<osg::Group> c = createCharacterInstance(root.get(), hardware); osg::ref_ptr<osg::Group> c = createCharacterInstance(root.get(), hardware);
osg::MatrixTransform* tr = new osg::MatrixTransform; osg::MatrixTransform* tr = new osg::MatrixTransform;
tr->setMatrix(osg::Matrix::translate( 2.0 * (i - xChar * .5), tr->setMatrix(osg::Matrix::translate( 2.0 * (i - xChar * .5),
@ -278,7 +281,6 @@ int main (int argc, char* argv[])
} }
std::cout << "created " << xChar * yChar << " instance" << std::endl; std::cout << "created " << xChar * yChar << " instance" << std::endl;
return viewer.run(); return viewer.run();
} }