Random Commit to get Viktor's stuff
This commit is contained in:
@@ -11,10 +11,13 @@
|
|||||||
#include "Core/EKeyDown.h"
|
#include "Core/EKeyDown.h"
|
||||||
#include "Core/EKeyUp.h"
|
#include "Core/EKeyUp.h"
|
||||||
#include "Input/EBindKey.h"
|
#include "Input/EBindKey.h"
|
||||||
|
//#include "Core/EContact.h"
|
||||||
#include "Core/CTransform.h"
|
#include "Core/CTransform.h"
|
||||||
#include "Rendering/CSprite.h"
|
#include "Rendering/CSprite.h"
|
||||||
|
#include "Game/CBall.h"
|
||||||
#include "Core/Component.h"
|
#include "Core/Component.h"
|
||||||
|
|
||||||
|
|
||||||
namespace dd
|
namespace dd
|
||||||
{
|
{
|
||||||
|
|
||||||
@@ -33,13 +36,21 @@ public:
|
|||||||
private:
|
private:
|
||||||
dd::EventRelay<PadSystem, dd::Events::KeyDown> m_EKeyDown;
|
dd::EventRelay<PadSystem, dd::Events::KeyDown> m_EKeyDown;
|
||||||
dd::EventRelay<PadSystem, dd::Events::KeyUp> m_EKeyUp;
|
dd::EventRelay<PadSystem, dd::Events::KeyUp> m_EKeyUp;
|
||||||
|
//dd::EventRelay<LevelSystem, dd::Events::Contact> m_EContact;
|
||||||
class PadSteeringInputController;
|
|
||||||
std::array<std::shared_ptr<PadSteeringInputController>, 4> m_PadInputControllers;
|
|
||||||
|
|
||||||
bool OnKeyDown(const dd::Events::KeyDown &event);
|
bool OnKeyDown(const dd::Events::KeyDown &event);
|
||||||
bool OnKeyUp(const dd::Events::KeyUp &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;
|
EntityID ent;
|
||||||
std::shared_ptr<Components::Transform> transform;
|
std::shared_ptr<Components::Transform> transform;
|
||||||
std::shared_ptr<Components::Sprite> sprite;
|
std::shared_ptr<Components::Sprite> sprite;
|
||||||
|
|||||||
@@ -111,6 +111,11 @@ bool dd::Systems::PadSystem::OnKeyUp(const dd::Events::KeyUp &event)
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool dd::Systems::PadSystem::OnContact(/*const dd::Events::Contact &event,*/)
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
bool dd::Systems::PadSystem::PadSteeringInputController::OnCommand(const Events::InputCommand &event)
|
bool dd::Systems::PadSystem::PadSteeringInputController::OnCommand(const Events::InputCommand &event)
|
||||||
{
|
{
|
||||||
std::string command = event.Command;
|
std::string command = event.Command;
|
||||||
|
|||||||
Reference in New Issue
Block a user