Changeset 10769 for code/branches/cpp11_v2/src/libraries/core/input
- Timestamp:
- Nov 7, 2015, 10:23:42 AM (9 years ago)
- Location:
- code/branches/cpp11_v2/src/libraries/core/input
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/cpp11_v2/src/libraries/core/input/InputManager.h
r10765 r10769 225 225 std::vector<InputState*> activeStatesTicked_; //!< Like activeStates_, but only contains the ones that currently receive events 226 226 227 std::vector<boost::function<void ()> 227 std::vector<boost::function<void ()>> callBuffer_; //!< Caches all calls from InputStates to be executed afterwards (see preUpdate) 228 228 229 229 static InputManager* singletonPtr_s; //!< Pointer reference to the singleton -
code/branches/cpp11_v2/src/libraries/core/input/KeyBinder.h
r10765 r10769 127 127 }; 128 128 //! Actual key bindings for joy stick buttons 129 std::vector<shared_ptr<JoyStickButtonVector> 129 std::vector<shared_ptr<JoyStickButtonVector>> joyStickButtons_; 130 130 //! Helper class to use something like std:vector<HalfAxis[48]> 131 131 struct JoyStickAxisVector … … 135 135 }; 136 136 //! Actual key bindings for joy stick axes (and sliders) 137 std::vector<shared_ptr<JoyStickAxisVector> 137 std::vector<shared_ptr<JoyStickAxisVector>> joyStickAxes_; 138 138 139 139 //! Pointer map with all Buttons, including half axes … … 142 142 std::vector<HalfAxis*> allHalfAxes_; 143 143 //! Maps input commands to all Button names, including half axes 144 std::map< std::string, std::vector<std::string> 144 std::map< std::string, std::vector<std::string>> allCommands_; 145 145 146 146 /**
Note: See TracChangeset
for help on using the changeset viewer.