History

add a new meta event, HFCancelEvent

Stephen Birarda committed 12 years ago

Commit 7b5115c1 parent 8556b8b5 files · +70 −5Browse files

Showing the changes to interface/src/scripting/ControllerScriptingInterface.cpp (1 of 5 files). Show all

Unified · Split

interface/src/scripting/ControllerScriptingInterface.cpp+10−3
@@ -10,10 +10,13 @@ · 9 unmodified lines
1010 //
1111
1212 #include <HandData.h>
13+#include <HFCancelEvent.h>
14+
1315 #include "Application.h"
16+#include "devices/MotionTracker.h"
1417 #include "devices/SixenseManager.h"
1518 #include "ControllerScriptingInterface.h"
16−#include "devices/MotionTracker.h"
19+
1720
1821 ControllerScriptingInterface::ControllerScriptingInterface() :
1922 _mouseCaptured(false),
@@ -25,9 +28,13 @@ ControllerScriptingInterface::ControllerScriptingInterface() : · 5 unmodified lines
2528
2629 void ControllerScriptingInterface::handleMetaEvent(HFMetaEvent* event) {
2730 if (event->type() == HFActionEvent::startType()) {
28− emitActionStartEvent(static_cast<HFActionEvent*>(event));
31+ emit actionStartEvent(static_cast<HFActionEvent&>(*event));
2932 } else if (event->type() == HFActionEvent::endType()) {
30− emitActionEndEvent(static_cast<HFActionEvent*>(event));
33+ emit actionEndEvent(static_cast<HFActionEvent&>(*event));
34+ } else if (event->type() == HFCancelEvent::startType()) {
35+ emit cancelStartEvent();
36+ } else if (event->type() == HFCancelEvent::endType()) {
37+ emit cancelEndEvent();
3138 }
3239 }
3340