Changeset 1637 for code/branches/input/src/core/input/InputInterfaces.h
- Timestamp:
- Jul 20, 2008, 6:49:24 PM (16 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/input/src/core/input/InputInterfaces.h
r1630 r1637 38 38 #include "core/CorePrereqs.h" 39 39 40 #include " src/ois/OISKeyboard.h"41 #include " src/ois/OISMouse.h"42 #include " src/ois/OISJoyStick.h"40 #include "ois/OISKeyboard.h" 41 #include "ois/OISMouse.h" 42 #include "ois/OISJoyStick.h" 43 43 #include "util/Math.h" 44 44 … … 222 222 }; 223 223 } 224 225 namespace InputDevice 226 { 227 enum Enum 228 { 229 Keyboard, 230 Mouse, 231 JoyStick0, 232 JoyStick1, 233 JoyStick2, 234 JoyStick3, 235 // note: No problem if there are more joy sticks. This enum is just for convenience. 236 }; 237 } 224 238 225 239 struct _CoreExport Key … … 265 279 multiple handlers) are active. 266 280 */ 267 struct HandlerState268 {269 HandlerState() : key(false), mouse(false), joyStick(false) { }270 bool key;271 bool mouse;272 bool joyStick;273 };281 //struct HandlerState 282 //{ 283 // HandlerState() : keyboard(false), mouse(false) { } 284 // bool keyboard; 285 // bool mouse; 286 // std::vector<bool> joySticks; 287 //}; 274 288 275 289 class _CoreExport InputTickable … … 277 291 public: 278 292 virtual ~InputTickable() { } 279 virtual void tickInput(float dt, const HandlerState& state) = 0; 293 virtual void tickInput(float dt) = 0; 294 //virtual void tickInput(float dt, unsigned int device) = 0; 280 295 }; 281 296 … … 291 306 virtual void keyReleased(const KeyEvent& evt) = 0; 292 307 virtual void keyHeld (const KeyEvent& evt) = 0; 293 //virtual void tickKey (float dt) { }308 virtual void tickKey (float dt) { } 294 309 }; 295 310 … … 307 322 virtual void mouseMoved (IntVector2 abs, IntVector2 rel, IntVector2 clippingSize) = 0; 308 323 virtual void mouseScrolled (int abs, int rel) = 0; 309 //virtual void tickMouse (float dt) { }324 virtual void tickMouse (float dt) { } 310 325 }; 311 326 … … 319 334 public: 320 335 virtual ~JoyStickHandler() { } 321 virtual void joyStickButtonPressed (int joyStickID, int button) = 0; 322 virtual void joyStickButtonReleased(int joyStickID, int button) = 0; 323 virtual void joyStickButtonHeld (int joyStickID, int button) = 0; 324 virtual void joyStickAxisMoved (int joyStickID, int axis, float value) = 0; 325 //virtual bool joyStickVector3Moved (int joyStickID, int index /*, fill list*/) {return true;} 326 //virtual void tickJoyStick (float dt) { } 336 virtual void joyStickButtonPressed (unsigned int joyStickID, unsigned int button) = 0; 337 virtual void joyStickButtonReleased(unsigned int joyStickID, unsigned int button) = 0; 338 virtual void joyStickButtonHeld (unsigned int joyStickID, unsigned int button) = 0; 339 virtual void joyStickAxisMoved (unsigned int joyStickID, unsigned int axis, float value) = 0; 340 //virtual bool joyStickVector3Moved (unsigned int joyStickID, unsigned int index /*, fill list*/) {return true;} 341 virtual void tickJoyStick (float dt, unsigned int device) { } 342 }; 343 344 class _CoreExport EmptyHandler : public KeyHandler, public MouseHandler, public JoyStickHandler 345 { 346 private: 347 void tickInput(float dt) { } 348 void tickInput(float dt, unsigned int device) { } 349 350 void keyPressed (const KeyEvent& evt) { } 351 void keyReleased(const KeyEvent& evt) { } 352 void keyHeld (const KeyEvent& evt) { } 353 354 void mouseButtonPressed (MouseButton::Enum id) { } 355 void mouseButtonReleased(MouseButton::Enum id) { } 356 void mouseButtonHeld (MouseButton::Enum id) { } 357 void mouseMoved (IntVector2 abs, IntVector2 rel, IntVector2 clippingSize) { } 358 void mouseScrolled (int abs, int rel) { } 359 360 void joyStickButtonPressed (unsigned int joyStickID, unsigned int button) { } 361 void joyStickButtonReleased(unsigned int joyStickID, unsigned int button) { } 362 void joyStickButtonHeld (unsigned int joyStickID, unsigned int button) { } 363 void joyStickAxisMoved (unsigned int joyStickID, unsigned int axis, float value) { } 327 364 }; 328 365
Note: See TracChangeset
for help on using the changeset viewer.