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

CreateBall clones the original ball rather than create new balls.

Browse Source
This commit is contained in:
PlatinumSkink
2015-09-28 18:09:55 +02:00
parent fc41727a5d
commit 7b7277509e
4 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/Game/BallSystem.cpp
+10 -1
View File
@@ -34,6 +34,10 @@ void dd::Systems::BallSystem::UpdateEntity(double dt, EntityID entity, EntityID
{
auto ballComponent = m_World->GetComponent<Components::Ball>(entity);
if (ballComponent != nullptr) {
if (Ball() == NULL) {
SetBall(entity);
}
if (ReplaceBall() == true) {
SetReplaceBall(false);
@@ -175,7 +179,9 @@ bool dd::Systems::BallSystem::Contact(const Events::Contact &event)
EntityID dd::Systems::BallSystem::CreateBall()
{
auto ent = m_World->CreateEntity();
auto ent = m_World->CloneEntity(Ball());
/* auto ent = m_World->CreateEntity();
std::shared_ptr<Components::Transform> transform = m_World->AddComponent<Components::Transform>(ent);
transform->Position = glm::vec3(0.5f, 0.26f, -10.f);
transform->Scale = glm::vec3(0.5f, 0.5f, 0.5f);
@@ -191,6 +197,9 @@ EntityID dd::Systems::BallSystem::CreateBall()
physics->Calculate = true;
cball->Speed = 5.f;
auto plight = m_World->AddComponent<Components::PointLight>(ent);
plight->Radius = 2.f;*/
m_World->CommitEntity(ent);
return ent;
src/game/Game/LevelSystem.cpp
+3 -3
View File
@@ -70,14 +70,12 @@ void dd::Systems::LevelSystem::UpdateEntity(double dt, EntityID entity, EntityID
}
} else {
if (ball != nullptr && MultiBalls() > 0) {
Events::MultiBallLost e;
EventBroker->Publish(e);
SetMultiBalls(MultiBalls()-1);
m_World->RemoveComponent<Components::Ball>(entity);
m_World->RemoveComponent<Components::Transform>(entity);
m_World->RemoveComponent<Components::CircleShape>(entity);
m_World->RemoveComponent<Components::Physics>(entity);
m_World->RemoveEntity(entity);
auto transformBall = m_World->GetComponent<Components::Transform>(entity);
} else {
auto powerUp = m_World->GetComponent<Components::PowerUp>(entity);
if (powerUp != nullptr) {
@@ -259,12 +257,14 @@ bool dd::Systems::LevelSystem::OnScoreEvent(const dd::Events::ScoreEvent &event)
bool dd::Systems::LevelSystem::OnMultiBall(const dd::Events::MultiBall &event)
{
SetMultiBalls(MultiBalls()+2);
std::cout << MultiBalls() << std::endl;
return true;
}
bool dd::Systems::LevelSystem::OnMultiBallLost(const dd::Events::MultiBallLost &event)
{
SetMultiBalls(MultiBalls()-1);
std::cout << MultiBalls() << std::endl;
return true;
}