Subversion Repository Public Repository

Divide-Framework

This repository has no backups
This repository's network speed is throttled to 100KB/sec

Diff Revisions 309 vs 318 for /trunk/Source Code/Scenes/PingPongScene/Headers/PingPongScene.h

Diff revisions: vs.
  @@ -25,6 +25,8 @@
25 25
26 26 #include "Scenes/Headers/Scene.h"
27 27
28 + namespace Divide {
29 +
28 30 class Sphere3D;
29 31
30 32 class PingPongScene : public Scene {
  @@ -51,9 +53,9 @@
51 53 void processTasks(const U64 deltaTime);
52 54 void processGUI(const U64 deltaTime);
53 55
54 - bool onKeyUp(const OIS::KeyEvent& key);
55 - bool joystickAxisMoved(const OIS::JoyStickEvent& key,I8 axis);
56 - bool joystickButtonReleased(const OIS::JoyStickEvent& key, I8 button);
56 + bool onKeyUp(const Input::KeyEvent& key);
57 + bool joystickAxisMoved(const Input::JoystickEvent& key,I8 axis);
58 + bool joystickButtonReleased(const Input::JoystickEvent& key, I8 button);
57 59
58 60 private:
59 61 void test(cdiggins::any a, CallbackParam b);
  @@ -79,4 +81,6 @@
79 81 F32 _sideDrift;
80 82 };
81 83
84 + }; //namespace Divide
85 +
82 86 #endif