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

StyleGuide Fix

Browse Source
This commit is contained in:
PlatinumSkink
2015-09-15 18:48:26 +02:00
parent 990f31d120
commit 5ee5400a28
8 changed files with 128 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/Game/PadSystem.cpp
+45 -66
View File
@@ -33,8 +33,8 @@ void dd::Systems::PadSystem::UpdateEntity(double dt, EntityID entity, EntityID p
{
auto ball = m_World->GetComponent<Components::Ball>(entity);
if (ball != NULL) {
if (replaceBall == true) {
replaceBall = false;
if (ReplaceBall() == true) {
SetReplaceBall(false);
auto transformEntity = m_World->GetComponent<Components::Transform>(entity);
transformEntity->Position = glm::vec3(20, 20, -10);
@@ -65,71 +65,65 @@ void dd::Systems::PadSystem::UpdateEntity(double dt, EntityID entity, EntityID p
void dd::Systems::PadSystem::Update(double dt)
{
if (ent == 0) {
if (Entity() == 0) {
for (auto it = m_World->GetEntities()->begin(); it != m_World->GetEntities()->end(); it++) {
if (m_World->GetProperty<std::string>(it->first, "Name") == "Pad") {
ent = it->first;
transform = m_World->GetComponent<Components::Transform>(ent);
pad = m_World->GetComponent<Components::Pad>(ent);
SetEntity(it->first);
SetTransform(m_World->GetComponent<Components::Transform>(Entity()));
SetPad(m_World->GetComponent<Components::Pad>(Entity()));
break;
}
}
}
if (transform->Velocity.x < -pad->maxSpeed)
{
transform->Velocity.x = -pad->maxSpeed;
auto transform = Transform();
auto pad = Pad();
auto acceleration = Acceleration();
if (transform->Velocity.x < -pad->MaxSpeed) {
transform->Velocity.x = -pad->MaxSpeed;
}
else if (transform->Velocity.x > pad->maxSpeed)
{
transform->Velocity.x = pad->maxSpeed;
else if (transform->Velocity.x > pad->MaxSpeed) {
transform->Velocity.x = pad->MaxSpeed;
}
transform->Position += transform->Velocity * (float)dt;
transform->Velocity += acceleration * (float)dt;
transform->Velocity -= transform->Velocity * pad->slowdownModifier * (float)dt;
transform->Velocity -= transform->Velocity * pad->SlowdownModifier * (float)dt;
if (left)
{
acceleration.x = -pad->accelerationSpeed;
if (Left()) {
acceleration.x = -pad->AccelerationSpeed;
}
else if (right)
{
acceleration.x = pad->accelerationSpeed;
else if (Right()) {
acceleration.x = pad->AccelerationSpeed;
}
else
{
else {
acceleration.x = 0.f;
}
SetTransform(transform);
SetPad(pad);
SetAcceleration(acceleration);
return;
}
bool dd::Systems::PadSystem::OnKeyDown(const dd::Events::KeyDown &event)
{
int val = event.KeyCode;
if (val == GLFW_KEY_UP)
{
if (val == GLFW_KEY_UP) {
//std::cout << "Up!" << std::endl;
}
else if (val == GLFW_KEY_DOWN)
{
} else if (val == GLFW_KEY_DOWN) {
//std::cout << "Down!" << std::endl;
}
else if (val == GLFW_KEY_LEFT)
{
} else if (val == GLFW_KEY_LEFT) {
//std::cout << "Left!" << std::endl;
//acceleration.x = -0.01f;
left = true;
}
else if (val == GLFW_KEY_RIGHT)
{
SetLeft(true);
} else if (val == GLFW_KEY_RIGHT) {
//std::cout << "Right!" << std::endl;
//acceleration.x = 0.01f;
right = true;
}
else if (val == GLFW_KEY_R)
{
replaceBall = true;
SetRight(true);
} else if (val == GLFW_KEY_R) {
SetReplaceBall(true);
}
return true;
}
@@ -137,21 +131,14 @@ bool dd::Systems::PadSystem::OnKeyDown(const dd::Events::KeyDown &event)
bool dd::Systems::PadSystem::OnKeyUp(const dd::Events::KeyUp &event)
{
int val = event.KeyCode;
if (val == GLFW_KEY_UP)
{
if (val == GLFW_KEY_UP) {
}
else if (val == GLFW_KEY_DOWN)
{
} else if (val == GLFW_KEY_DOWN) {
}
else if (val == GLFW_KEY_LEFT)
{
left = false;
}
else if (val == GLFW_KEY_RIGHT)
{
right = false;
} else if (val == GLFW_KEY_LEFT) {
SetLeft(false);
} else if (val == GLFW_KEY_RIGHT) {
SetRight(false);
}
return true;
}
@@ -160,14 +147,12 @@ bool dd::Systems::PadSystem::OnContact(const dd::Events::Contact &event)
{
EntityID entityBall = event.Entity2;
auto ball = m_World->GetComponent<Components::Ball>(entityBall);
if (ball == NULL)
{
if (ball == NULL) {
return false;
}
EntityID entityPad = event.Entity1;
auto pad = m_World->GetComponent<Components::Pad>(entityPad);
if (pad == NULL)
{
if (pad == NULL) {
return false;
}
auto transformBall = m_World->GetComponent<Components::Transform>(entityBall);
@@ -177,13 +162,10 @@ bool dd::Systems::PadSystem::OnContact(const dd::Events::Contact &event)
float whatX = transformBall->Position.x - transformPad->Position.x;
float movementX;
if (whatX > 0)
{
if (whatX > 0) {
movementX = movementMultiplier * whatX;
//std::cout << "Right!" << std::endl;
}
else
{
} else {
movementX = movementMultiplier * whatX;
//std::cout << "Left!" << std::endl;
}
@@ -219,7 +201,7 @@ bool dd::Systems::PadSystem::OnContact(const dd::Events::Contact &event)
bool dd::Systems::PadSystem::ResetBall(const dd::Events::ResetBall &event)
{
replaceBall = true;
SetReplaceBall(true);
return true;
}
@@ -229,12 +211,9 @@ bool dd::Systems::PadSystem::PadSteeringInputController::OnCommand(const Events:
std::cout << "Command!" << std::endl;
if (command == "right")
{
if (command == "right") {
std::cout << "Right!" << std::endl;
}
else if (command == "left")
{
} else if (command == "left") {
std::cout << "Left!" << std::endl;
}