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/LevelSystem.cpp
+24 -36
View File
@@ -13,8 +13,7 @@ void dd::Systems::LevelSystem::Initialize()
EVENT_SUBSCRIBE_MEMBER(m_ELifeLost, LevelSystem::LifeLost);
EVENT_SUBSCRIBE_MEMBER(m_EScoreEvent, LevelSystem::ScoreEvent);
for (int i = 0; i < lives; i++)
{
for (int i = 0; i < Lives(); i++) {
CreateLife(i);
}
@@ -29,7 +28,7 @@ void dd::Systems::LevelSystem::CreateLife(int number)
transform->Scale = glm::vec3(0.5f, 0.5f, 0.5f);
std::shared_ptr<Components::Life> lifeNr = m_World->AddComponent<Components::Life>(life);
lifeNr->number = number;
lifeNr->Number = number;
std::shared_ptr<Components::Sprite> sprite = m_World->AddComponent<Components::Sprite>(life);
sprite->SpriteFile = "Textures/Ball.png";
@@ -40,7 +39,7 @@ void dd::Systems::LevelSystem::CreateLife(int number)
void dd::Systems::LevelSystem::Update(double dt)
{
if (!m_Initialized) {
CreateBasicLevel(tRows, tLines, tSpaceBetweenBricks, tSpaceToEdge);
CreateBasicLevel(Rows(), Lines(), SpaceBetweenBricks(), SpaceToEdge());
m_Initialized = true;
}
}
@@ -49,13 +48,10 @@ void dd::Systems::LevelSystem::UpdateEntity(double dt, EntityID entity, EntityID
{
auto ball = m_World->GetComponent<Components::Ball>(entity);
if (ball != NULL)
{
if (ball != NULL) {
auto transformBall = m_World->GetComponent<Components::Transform>(entity);
if (transformBall->Position.y < -10)
{
if (lives == pastLives)
{
if (transformBall->Position.y < -10) {
if (Lives() == PastLives()) {
Events::LifeLost e;
e.Entity = entity;
EventBroker->Publish(e);
@@ -66,14 +62,12 @@ void dd::Systems::LevelSystem::UpdateEntity(double dt, EntityID entity, EntityID
}
}
if (lives != pastLives)
{
if (Lives() != PastLives()) {
auto life = m_World->GetComponent<Components::Life>(entity);
if (life != NULL)
{
if (life->number + 1 == pastLives) {
if (life != NULL) {
if (life->Number + 1 == PastLives()) {
m_World->RemoveEntity(entity);
pastLives = lives;
SetPastLives(Lives());
}
}
}
@@ -82,12 +76,10 @@ void dd::Systems::LevelSystem::UpdateEntity(double dt, EntityID entity, EntityID
void dd::Systems::LevelSystem::CreateBasicLevel(int rows, int lines, glm::vec2 spacesBetweenBricks, int spaceToEdge)
{
int num = 0;
numberOfBricks = rows * lines;
for (int i = 0; i < rows; i++)
{
SetNumberOfBricks(rows * lines);
for (int i = 0; i < rows; i++) {
num++;
for (int j = 0; j < lines; j++)
{
for (int j = 0; j < Lines(); j++) {
CreateBrick(i, j, spacesBetweenBricks, spaceToEdge, num);
}
if (num == 7)
@@ -127,11 +119,9 @@ void dd::Systems::LevelSystem::ProcessCollision()
void dd::Systems::LevelSystem::OnEntityRemoved(EntityID entity)
{
/*auto brick = m_World->GetComponent<Components::Brick>(entity);
if (brick != NULL)
{
if (brick != NULL) {
numberOfBricks--;
if (numberOfBricks < 1)
{
if (numberOfBricks < 1) {
EndLevel();
}
}*/
@@ -142,43 +132,41 @@ bool dd::Systems::LevelSystem::OnContact(const dd::Events::Contact &event)
{
EntityID entityBrick = event.Entity1;
auto brick = m_World->GetComponent<Components::Brick>(entityBrick);
if (brick == NULL)
{
if (brick == NULL) {
return false;
}
EntityID entityBall = event.Entity2;
m_World->RemoveEntity(entityBrick);
numberOfBricks--;
if (numberOfBricks == 0)
{
SetNumberOfBricks(NumberOfBricks() - 1);
if (NumberOfBricks() == 0) {
Events::ScoreEvent es;
es.score = 500;
es.Score = 500;
EventBroker->Publish(es);
Events::ResetBall e;
EventBroker->Publish(e);
CreateBasicLevel(tRows, tLines, tSpaceBetweenBricks, tSpaceToEdge);
CreateBasicLevel(Rows(), Lines(), SpaceBetweenBricks(), SpaceToEdge());
}
Events::ScoreEvent es;
es.score = brick->Score;
es.Score = brick->Score;
EventBroker->Publish(es);
std::cout << "Score: " << score << std::endl;
std::cout << "Score: " << Score() << std::endl;
return true;
}
bool dd::Systems::LevelSystem::LifeLost(const dd::Events::LifeLost &event)
{
lives--;
SetLives(Lives() - 1);
return true;
}
bool dd::Systems::LevelSystem::ScoreEvent(const dd::Events::ScoreEvent &event)
{
score += event.score;
SetScore(Score() += event.Score);
return true;
}