Random Commit to get Viktor's stuff

2015-09-10 22:32:09 +02:00
parent 1d94338214
commit 4890b74f37
2 changed files with 19 additions and 3 deletions
@@ -11,10 +11,13 @@
 #include "Core/EKeyDown.h"
 #include "Core/EKeyUp.h"
 #include "Input/EBindKey.h"
+//#include "Core/EContact.h"
 #include "Core/CTransform.h"
 #include "Rendering/CSprite.h"
+#include "Game/CBall.h"
 #include "Core/Component.h"

+
 namespace dd
 {

@@ -33,13 +36,21 @@ public:
 private:
    dd::EventRelay<PadSystem, dd::Events::KeyDown> m_EKeyDown;
    dd::EventRelay<PadSystem, dd::Events::KeyUp> m_EKeyUp;
-
-    class PadSteeringInputController;
-    std::array<std::shared_ptr<PadSteeringInputController>, 4> m_PadInputControllers;
+    //dd::EventRelay<LevelSystem, dd::Events::Contact> m_EContact;

    bool OnKeyDown(const dd::Events::KeyDown &event);
    bool OnKeyUp(const dd::Events::KeyUp &event);

+
+    bool OnContact(/*const dd::Events::Contact &event*/);
+
+
+
+
+
+    class PadSteeringInputController;
+    std::array<std::shared_ptr<PadSteeringInputController>, 4> m_PadInputControllers;
+
    EntityID ent;
    std::shared_ptr<Components::Transform> transform;
    std::shared_ptr<Components::Sprite> sprite;