WIP Level System + Pad
This commit is contained in:
@@ -35,6 +35,7 @@
|
||||
#include "CTemplate.h"
|
||||
#include "Transform/TransformSystem.h"
|
||||
#include "Game/LevelSystem.h"
|
||||
#include "Game/PadSystem.h"
|
||||
|
||||
namespace dd
|
||||
{
|
||||
@@ -61,6 +62,8 @@ public:
|
||||
m_World->AddSystem<Systems::TransformSystem>();
|
||||
m_World->SystemFactory.Register<Systems::LevelSystem>([this]() { return new Systems::LevelSystem(m_World.get(), m_EventBroker); });
|
||||
m_World->AddSystem<Systems::LevelSystem>();
|
||||
m_World->SystemFactory.Register<Systems::PadSystem>([this]() { return new Systems::PadSystem(m_World.get(), m_EventBroker); });
|
||||
m_World->AddSystem<Systems::PadSystem>();
|
||||
m_World->ComponentFactory.Register<Components::Model>();
|
||||
m_World->ComponentFactory.Register<Components::Sprite>();
|
||||
m_World->ComponentFactory.Register<Components::Template>();
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
|
||||
#include "Core/System.h"
|
||||
#include "Core/CTransform.h"
|
||||
//#include "Rendering/CSprite.h"
|
||||
#include "Rendering/CSprite.h"
|
||||
#include "Core/EventBroker.h"
|
||||
#include "Game/CBrick.h"
|
||||
#include "Core/World.h"
|
||||
@@ -56,8 +56,8 @@ private:
|
||||
int numberOfBricks;
|
||||
int tRows = 8;
|
||||
int tLines = 8;
|
||||
int tSpaceBetweenBricks = 30;
|
||||
int tSpaceToEdge = 30;
|
||||
int tSpaceBetweenBricks = 2;
|
||||
int tSpaceToEdge = 0;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
@@ -9,7 +9,11 @@
|
||||
#include "Core/System.h"
|
||||
#include "Core/EventBroker.h"
|
||||
#include "Core/EKeyDown.h"
|
||||
#include "Core/EKeyUp.h"
|
||||
#include "Input/EBindKey.h"
|
||||
#include "Core/CTransform.h"
|
||||
#include "Rendering/CSprite.h"
|
||||
#include "Core/Component.h"
|
||||
|
||||
namespace dd
|
||||
{
|
||||
@@ -24,14 +28,23 @@ public:
|
||||
: System(world, eventBroker)
|
||||
{ }
|
||||
|
||||
void Initialize() override ;
|
||||
void Initialize() override;
|
||||
void Update(double dt) override;
|
||||
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;
|
||||
|
||||
bool OnKeyDown(const dd::Events::KeyDown &event);
|
||||
bool OnKeyUp(const dd::Events::KeyUp &event);
|
||||
|
||||
EntityID ent;
|
||||
std::shared_ptr<Components::Transform> transform;
|
||||
std::shared_ptr<Components::Sprite> sprite;
|
||||
glm::vec3 acceleration = glm::vec3(0.f, 0.f, 0.f);
|
||||
bool left = false, right = false;
|
||||
};
|
||||
|
||||
class PadSystem::PadSteeringInputController : InputController<PadSystem>
|
||||
|
||||
@@ -39,7 +39,7 @@ public:
|
||||
TransformSystem(World* world, std::shared_ptr<dd::EventBroker> eventBroker)
|
||||
: System(world, eventBroker)
|
||||
{ }
|
||||
//void Update(double dt) override;
|
||||
void Update(double dt) override;
|
||||
|
||||
Components::Transform AbsoluteTransform(EntityID entity);
|
||||
glm::vec3 AbsolutePosition(EntityID entity);
|
||||
|
||||
Reference in New Issue
Block a user