BTH/squidout
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

WIP Level System + Pad

Browse Source
This commit is contained in:
PlatinumSkink
2015-09-10 20:28:48 +02:00
parent 193720e883
commit 6a81751e56
7 changed files with 108 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/Core/Engine.h
+3
View File
@@ -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>();
include/Game/LevelSystem.h
+3 -3
View File
@@ -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;
};
}
include/Game/PadSystem.h
+14 -1
View File
@@ -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>
include/Transform/TransformSystem.h
+1 -1
View File
@@ -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);
src/game/Game/LevelSystem.cpp
+4 -3
View File
@@ -34,10 +34,11 @@ void dd::Systems::LevelSystem::CreateBrick(int row, int line, int spacesBetweenB
{
auto brick = m_World->CreateEntity();
std::shared_ptr<Components::Transform> transform = m_World->AddComponent<Components::Transform>(brick);
//std::shared_ptr<Components::Sprite> sprite = m_World->AddComponent<Components::Sprite>(brick);
std::shared_ptr<Components::Sprite> sprite = m_World->AddComponent<Components::Sprite>(brick);
sprite->SpriteFile = "Textures/Core/ErrorTexture.png";
float x = spaceToEdge + line * spacesBetweenBricks;
float y = spaceToEdge + line * spacesBetweenBricks;
transform->Position = glm::vec3(x, y, 0.f);
float y = spaceToEdge + row * spacesBetweenBricks;
transform->Position = glm::vec3(x-5, y-5, -10.f);
//sprite->Color = glm::vec4(1.f, 1.f, 1.f, 1.f);
return;
}
src/game/Game/PadSystem.cpp
+77 -11
View File
@@ -5,6 +5,7 @@
#include "PrecompiledHeader.h"
#include "Game/PadSystem.h"
#include "Core/World.h"
#include <iostream>
void dd::Systems::PadSystem::Initialize()
@@ -16,47 +17,112 @@ void dd::Systems::PadSystem::Initialize()
Events::BindKey l;
l.KeyCode = GLFW_KEY_LEFT;
l.Command = "right";
l.Command = "left";
EventBroker->Publish(l);
ent = m_World->CreateEntity();
transform = m_World->AddComponent<Components::Transform>(ent);
transform->Position = glm::vec3(0.f, -5.f, -10.f);
sprite = m_World->AddComponent<Components::Sprite>(ent);
sprite->SpriteFile = "Textures/Core/ErrorTexture.png";
EVENT_SUBSCRIBE_MEMBER(m_EKeyDown, PadSystem::OnKeyDown);
EVENT_SUBSCRIBE_MEMBER(m_EKeyUp, PadSystem::OnKeyUp);
return;
}
void dd::Systems::PadSystem::Update(double dt)
{
if (transform->Velocity.x < -400.f)
{
transform->Velocity.x = -400.f;
}
else if (transform->Velocity.x > 400.f)
{
transform->Velocity.x = 400.f;
}
transform->Position += transform->Velocity * (float)dt;
transform->Velocity += acceleration * (float)dt;
transform->Velocity -= transform->Velocity * (0.9f * (float)dt);
if (left)
{
acceleration.x = -20.f;
}
else if (right)
{
acceleration.x = 20.f;
}
else
{
acceleration.x = 0.f;
}
return;
}
bool dd::Systems::PadSystem::OnKeyDown(const dd::Events::KeyDown &event)
{
int val = event.KeyCode;
if (val == 265)
{
//std::cout << "Up!" << std::endl;
}
else if (val == 264)
{
//std::cout << "Down!" << std::endl;
}
else if (val == 263)
{
//std::cout << "Left!" << std::endl;
//acceleration.x = -0.01f;
left = true;
}
else if (val = 262)
{
//std::cout << "Right!" << std::endl;
//acceleration.x = 0.01f;
right = true;
}
return true;
}
/*bool dd::Systems::PadSteeringInputController::OnCommand(const Events::InputCommand &event)
bool dd::Systems::PadSystem::OnKeyUp(const dd::Events::KeyUp &event)
{
std::string command = event.Command;
if (command == "right")
int val = event.KeyCode;
if (val == 265)
{
}
else if (command == "left")
else if (val == 264)
{
}
else if (val == 263)
{
left = false;
}
else if (val = 262)
{
right = false;
}
return true;
}*/
}
bool dd::Systems::PadSystem::PadSteeringInputController::OnCommand(const Events::InputCommand &event)
{
std::string command = event.Command;
std::cout << "Command!" << std::endl;
if (command == "right")
{
std::cout << "Right!" << std::endl;
}
else if (command == "left")
{
std::cout << "Left!" << std::endl;
}
return true;
src/game/Transform/TransformSystem.cpp
+6
View File
@@ -20,6 +20,12 @@
#include "Transform/TransformSystem.h"
#include "Core/World.h"
void dd::Systems::TransformSystem::Update(double dt)
{
return;
}
glm::vec3 dd::Systems::TransformSystem::AbsolutePosition(EntityID entity)
{
glm::vec3 absPosition;