Permalink
Browse files

Improved support for passing events between scripts and Present3D app…

…lication
  • Loading branch information...
1 parent cb3812b commit 8c260355a0049c84d571dd88f515ad18d9066857 @osg-training-guest osg-training-guest committed Mar 12, 2014
View
@@ -16,6 +16,7 @@
#include <osg/ScriptEngine>
#include <osg/Geometry>
#include <osg/MatrixTransform>
+#include <osg/ValueObject>
#include <osg/io_utils>
#include <osgGA/Widget>
@@ -228,9 +229,10 @@ void Widget::traverseImplementation(osg::NodeVisitor& nv)
itr != events.end();
++itr)
{
- handle(ev, itr->get());
-
- (*itr)->setHandled(true);
+ if (handle(ev, itr->get()))
+ {
+ (*itr)->setHandled(true);
+ }
}
}
}
@@ -255,7 +257,19 @@ bool Widget::handle(osgGA::EventVisitor* ev, osgGA::Event* event)
osg::Parameters inputParameters, outputParameters;
inputParameters.push_back(ev);
inputParameters.push_back(event);
- return co->run(this, inputParameters, outputParameters) && outputParameters.size()>=1;
+ if (co->run(this, inputParameters, outputParameters))
+ {
+ if (outputParameters.size()>=1)
+ {
+ osg::BoolValueObject* bvo = dynamic_cast<osg::BoolValueObject*>(outputParameters[0].get());
+ if (bvo)
+ {
+ return bvo->getValue();
+ }
+ return false;
+ }
+ }
+ return false;
}
else
{
@@ -1592,7 +1592,6 @@ void SlideEventHandler::dispatchEvent(osgGA::Event* event)
}
eq->addEvent(event);
-
}
void SlideEventHandler::dispatchEvent(const KeyPosition& keyPosition)
@@ -14,6 +14,26 @@ struct PresentationInterfaceGetSlideEventHandler : public osgDB::MethodObject
}
};
+struct PresentationInterfaceGetViewer : public osgDB::MethodObject
+{
+ virtual bool run(void* objectPtr, osg::Parameters& inputParameters, osg::Parameters& outputParameters) const
+ {
+ osgPresentation::PresentationInterface* pi = reinterpret_cast<osgPresentation::PresentationInterface*>(objectPtr);
+ outputParameters.push_back(pi->getViewer());
+ return true;
+ }
+};
+
+struct PresentationInterfaceGetPresentation : public osgDB::MethodObject
+{
+ virtual bool run(void* objectPtr, osg::Parameters& inputParameters, osg::Parameters& outputParameters) const
+ {
+ osgPresentation::PresentationInterface* pi = reinterpret_cast<osgPresentation::PresentationInterface*>(objectPtr);
+ outputParameters.push_back(pi->getPresentation());
+ return true;
+ }
+};
+
struct PresentationInterfaceSendEventToViewer : public osgDB::MethodObject
{
virtual bool run(void* objectPtr, osg::Parameters& inputParameters, osg::Parameters& outputParameters) const
@@ -27,7 +47,6 @@ struct PresentationInterfaceSendEventToViewer : public osgDB::MethodObject
{
osgGA::Event* event = dynamic_cast<osgGA::Event*>(itr->get());
osgPresentation::KeyPosition* kp = dynamic_cast<osgPresentation::KeyPosition*>(itr->get());
- OSG_NOTICE<<"Dispatch event "<<pi<<", "<<kp<<", "<<event<<std::endl;
if (kp) pi->sendEventToViewer(kp);
else if (event) pi->sendEventToViewer(event);
}
@@ -48,7 +67,6 @@ struct PresentationInterfaceSendEventToDevices : public osgDB::MethodObject
++itr)
{
osgGA::Event* event = dynamic_cast<osgGA::Event*>(itr->get());
- OSG_NOTICE<<"forward event "<<pi<<", "<<event<<std::endl;
if (event) pi->sendEventToDevices(event);
}
@@ -62,6 +80,8 @@ REGISTER_OBJECT_WRAPPER( osgPresentation_PresentationInterface,
"osg::Object osgPresentation::PresentationInterface" )
{
ADD_METHOD_OBJECT( "getSlideEventHandler", PresentationInterfaceGetSlideEventHandler );
+ ADD_METHOD_OBJECT( "getViewer", PresentationInterfaceGetViewer );
+ ADD_METHOD_OBJECT( "getPresentation", PresentationInterfaceGetPresentation );
ADD_METHOD_OBJECT( "sendEventToViewer", PresentationInterfaceSendEventToViewer );
ADD_METHOD_OBJECT( "sendEventToDevices", PresentationInterfaceSendEventToDevices );
}

0 comments on commit 8c26035

Please sign in to comment.