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

Scroll to next stage works!

Browse Source
This commit is contained in:
PlatinumSkink
2015-10-07 19:19:55 +02:00
parent 9bb50067fc
commit 07e59bd0e2
6 changed files with 76 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/Game/LevelSystem.cpp
+10 -10
View File
@@ -49,7 +49,7 @@ void dd::Systems::LevelSystem::Update(double dt)
{
if (!m_Initialized) {
GetNextLevel();
CreateLevel();
CreateLevel(0);
m_Initialized = true;
}
}
@@ -67,8 +67,8 @@ void dd::Systems::LevelSystem::UpdateEntity(double dt, EntityID entity, EntityID
if (model != nullptr) {
if (model->ModelFile == "Models/Test/halfpipe/Halfpipe.obj") {
auto transform = m_World->GetComponent<Components::Transform>(entity);
if (transform->Position.y <= -12) {
transform->Position.y = 12;
if (transform->Position.y <= -34.6) {
transform->Position.y = 34.6;
}
}
}
@@ -93,7 +93,7 @@ void dd::Systems::LevelSystem::UpdateEntity(double dt, EntityID entity, EntityID
if (NumberOfBricks() <= 0 && m_LooseBricks <= 0 && !Restarting()) {
if (MultiBalls() <= 0 && PowerUps() <= 0) {
Events::StageCleared ec;
ec.StageCleared = m_CurrentLevel;
ec.ClearedStage = m_CurrentLevel;
ec.StageCluster = m_CurrentCluster;
EventBroker->Publish(ec);
} else {
@@ -139,7 +139,7 @@ void dd::Systems::LevelSystem::CreateBasicLevel(int rows, int lines, glm::vec2 s
for (int i = 0; i < rows; i++) {
num--;
for (int j = 0; j < Lines(); j++) {
CreateBrick(i, j, spacesBetweenBricks, spaceToEdge, num, 1);
CreateBrick(i, j, spacesBetweenBricks, spaceToEdge, 0, num, 1);
}
if (num == 1)
num = Lines();
@@ -150,7 +150,7 @@ void dd::Systems::LevelSystem::CreateBasicLevel(int rows, int lines, glm::vec2 s
return;
}
void dd::Systems::LevelSystem::CreateLevel()
void dd::Systems::LevelSystem::CreateLevel(int aboveBasicLevel)
{
std::cout << "Loading level: " << m_CurrentLevel << std::endl;
SetNumberOfBricks(Rows() * Lines());
@@ -160,7 +160,7 @@ void dd::Systems::LevelSystem::CreateLevel()
for (int i = 0; i < Rows(); i++) {
num--;
for (int j = 0; j < Lines(); j++) {
CreateBrick(i, j, SpaceBetweenBricks(), SpaceToEdge(), num, m_Bricks[getter]);
CreateBrick(i, j, SpaceBetweenBricks(), SpaceToEdge(), aboveBasicLevel, num, m_Bricks[getter]);
getter++;
}
if (num == 1) {
@@ -171,7 +171,7 @@ void dd::Systems::LevelSystem::CreateLevel()
SetRestarting(false);
}
void dd::Systems::LevelSystem::CreateBrick(int row, int line, glm::vec2 spacesBetweenBricks, float spaceToEdge, int num, int typeInt)
void dd::Systems::LevelSystem::CreateBrick(int row, int line, glm::vec2 spacesBetweenBricks, float spaceToEdge, int aboveLevel, int num, int typeInt)
{
if (typeInt == EmptyBrickSpace) {
SetNumberOfBricks(NumberOfBricks() - 1);
@@ -191,7 +191,7 @@ void dd::Systems::LevelSystem::CreateBrick(int row, int line, glm::vec2 spacesBe
}
float x = line * spacesBetweenBricks.x;
float y = row * spacesBetweenBricks.y;
transform->Position = glm::vec3(x - 3, 5 - spaceToEdge - y , -10.f);
transform->Position = glm::vec3(x - 3, 5 - spaceToEdge - y + aboveLevel, -10.f);
cBrick->Score = 10 * num;
return;
}
@@ -352,7 +352,7 @@ bool dd::Systems::LevelSystem::OnStageCleared(const dd::Events::StageCleared &ev
m_CurrentLevel++;
if (m_CurrentLevel < 6) {
GetNextLevel();
CreateLevel();
CreateLevel(12);
}
}
return true;