History

Add entity clicks capture capabilities

Atlante45 committed 9 years ago

Commit 512bb471 parent f4ff5cf6 files · +29 −3Browse files

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

Unified · Split

interface/src/scripting/ControllerScriptingInterface.h+5−0
@@ -84,6 +84,7 @@ public: · 83 unmodified lines
84 bool isKeyCaptured(QKeyEvent* event) const;84 bool isKeyCaptured(QKeyEvent* event) const;
85 bool isKeyCaptured(const KeyEvent& event) const;85 bool isKeyCaptured(const KeyEvent& event) const;
86 bool isJoystickCaptured(int joystickIndex) const;86 bool isJoystickCaptured(int joystickIndex) const;
87 bool areEntityClicksCaptured() const;
87 88
88 void updateInputControllers();89 void updateInputControllers();
89 90
@@ -95,6 +96,9 @@ public slots: · 5 unmodified lines
95 virtual void captureJoystick(int joystickIndex);96 virtual void captureJoystick(int joystickIndex);
96 virtual void releaseJoystick(int joystickIndex);97 virtual void releaseJoystick(int joystickIndex);
97 98
99 virtual void captureEntityClickEvents();
100 virtual void releaseEntityClickEvents();
101
98 virtual glm::vec2 getViewportDimensions() const;102 virtual glm::vec2 getViewportDimensions() const;
99 virtual QVariant getRecommendedOverlayRect() const;103 virtual QVariant getRecommendedOverlayRect() const;
100 104
@@ -128,6 +132,7 @@ private: · 27 unmodified lines
128 132
129 QMultiMap<int,KeyEvent> _capturedKeys;133 QMultiMap<int,KeyEvent> _capturedKeys;
130 QSet<int> _capturedJoysticks;134 QSet<int> _capturedJoysticks;
135 bool _captureEntityClicks;
131 136
132 using InputKey = controller::InputController::Key;137 using InputKey = controller::InputController::Key;
133 using InputControllerMap = std::map<InputKey, controller::InputController::Pointer>;138 using InputControllerMap = std::map<InputKey, controller::InputController::Pointer>;