- Timestamp:
- Jan 10, 2016, 1:54:11 PM (8 years ago)
- Location:
- code/branches/cpp11_v3
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/cpp11_v3
- Property svn:mergeinfo changed
-
code/branches/cpp11_v3/src/libraries/core/input/JoyStick.h
r9667 r11054 70 70 //! Assigns a generated ID string and loads the calibration (if present) 71 71 JoyStick(unsigned int id, OIS::InputManager* oisInputManager); 72 ~JoyStick() { }72 ~JoyStick() = default; 73 73 void setConfigValues(); 74 74 … … 77 77 78 78 private: 79 v oid calibrationStarted();80 v oid calibrationStopped();79 virtual void calibrationStarted() override; 80 virtual void calibrationStopped() override; 81 81 void evaluateCalibration(); 82 82 … … 86 86 87 87 //! OIS event handler 88 bool buttonPressed (const OIS::JoyStickEvent &arg, int button)88 virtual bool buttonPressed (const OIS::JoyStickEvent &arg, int button) override 89 89 { 90 90 super::buttonPressed(static_cast<JoyStickButtonCode::ByEnum>(button)); … … 93 93 94 94 //! OIS event handler 95 bool buttonReleased(const OIS::JoyStickEvent &arg, int button)95 virtual bool buttonReleased(const OIS::JoyStickEvent &arg, int button) override 96 96 { 97 97 super::buttonReleased(static_cast<JoyStickButtonCode::ByEnum>(button)); … … 99 99 } 100 100 101 bool axisMoved (const OIS::JoyStickEvent &arg, int axis);102 bool sliderMoved (const OIS::JoyStickEvent &arg, int id);103 bool povMoved (const OIS::JoyStickEvent &arg, int id);101 virtual bool axisMoved (const OIS::JoyStickEvent &arg, int axis) override; 102 virtual bool sliderMoved (const OIS::JoyStickEvent &arg, int id) override; 103 virtual bool povMoved (const OIS::JoyStickEvent &arg, int id) override; 104 104 //! OIS event handler (don't remove that because of OIS version issues!) 105 bool vector3Moved (const OIS::JoyStickEvent &arg, int id){ return true; }105 virtual bool vector3Moved (const OIS::JoyStickEvent &arg, int id) override { return true; } 106 106 107 107 //! Returns the class name as string
Note: See TracChangeset
for help on using the changeset viewer.