diff --git a/src/osgPlugins/p3d/SlideEventHandler.cpp b/src/osgPlugins/p3d/SlideEventHandler.cpp index 20b13369f..949cae77c 100644 --- a/src/osgPlugins/p3d/SlideEventHandler.cpp +++ b/src/osgPlugins/p3d/SlideEventHandler.cpp @@ -136,44 +136,44 @@ struct CallbackOperator : public ObjectOperator virtual void setPause(bool pause) { - osg::AnimationPathCallback* apc = dynamic_cast(_callback.get()); - osgUtil::TransformCallback* tc = dynamic_cast(_callback.get()); - ss3d::AnimationMaterialCallback* amc = dynamic_cast(_callback.get()); - if (apc) - { + osg::AnimationPathCallback* apc = dynamic_cast(_callback.get()); + osgUtil::TransformCallback* tc = dynamic_cast(_callback.get()); + ss3d::AnimationMaterialCallback* amc = dynamic_cast(_callback.get()); + if (apc) + { osg::notify(osg::INFO)<<"apc->setPause("<setPause(pause); - } - if (tc) - { + } + if (tc) + { osg::notify(osg::INFO)<<"tc->setPause("<setPause(pause); - } - if (amc) - { + } + if (amc) + { osg::notify(osg::INFO)<<"amc->setPause("<setPause(pause); - } + } } virtual void reset() { - osg::AnimationPathCallback* apc = dynamic_cast(_callback.get()); - osgUtil::TransformCallback* tc = dynamic_cast(_callback.get()); - ss3d::AnimationMaterialCallback* amc = dynamic_cast(_callback.get()); - if (apc) - { + osg::AnimationPathCallback* apc = dynamic_cast(_callback.get()); + osgUtil::TransformCallback* tc = dynamic_cast(_callback.get()); + ss3d::AnimationMaterialCallback* amc = dynamic_cast(_callback.get()); + if (apc) + { apc->reset(); apc->update(*_node); - } - if (tc) - { - } - if (amc) - { + } + if (tc) + { + } + if (amc) + { amc->reset(); amc->update(*_node); - } + } } @@ -220,7 +220,7 @@ struct LayerAttributesOperator : public ObjectOperator int result = system(itr->c_str()); - osg::notify(osg::INFO)<<"system("<<*itr<<") result "<delta_s(startTick, osg::Timer::instance()->tick()); @@ -266,29 +266,28 @@ public: FindOperatorsVisitor(ActiveOperators::OperatorList& operatorList, osg::NodeVisitor::TraversalMode tm): osg::NodeVisitor(tm), _operatorList(operatorList) {} - - void apply(osg::Node& node) - { - if (node.getStateSet()) process(node.getStateSet()); - if (node.getUpdateCallback()) - { + void apply(osg::Node& node) + { + if (node.getStateSet()) process(node.getStateSet()); + + if (node.getUpdateCallback()) + { _operatorList.insert(new CallbackOperator(&node, node.getUpdateCallback())); - } + } LayerAttributes* la = dynamic_cast(node.getUserData()); if (la) { _operatorList.insert(new LayerAttributesOperator(&node, la)); } - + traverse(node); } void apply(osg::Geode& node) { apply((osg::Node&)node); - for(unsigned int i=0;i