From 8d1ad184a658460497d76b6d916d8b83415c7a93 Mon Sep 17 00:00:00 2001 From: PlatinumSkink Date: Mon, 14 Sep 2015 15:39:39 +0200 Subject: [PATCH 1/8] Modified the pad-and-ball collision code a bit. Hopefully for the better. --- include/Core/Engine.h | 4 ++-- include/Game/PadSystem.h | 4 +++- src/game/Game/PadSystem.cpp | 39 +++++++++++++++++++++++++------------ 3 files changed, 32 insertions(+), 15 deletions(-) diff --git a/include/Core/Engine.h b/include/Core/Engine.h index 352a763..5c51b5f 100755 --- a/include/Core/Engine.h +++ b/include/Core/Engine.h @@ -139,8 +139,8 @@ public: { auto topWall = m_World->CreateEntity(); std::shared_ptr transform = m_World->AddComponent(topWall); - transform->Position = glm::vec3(0.f, 5.f, -10.f); - transform->Scale = glm::vec3(15.f, 0.5f, 1.f); + transform->Position = glm::vec3(0.f, 6.f, -10.f); + transform->Scale = glm::vec3(18.f, 0.5f, 1.f); std::shared_ptr sprite = m_World->AddComponent(topWall); sprite->SpriteFile = "Textures/Core/ErrorTexture.png"; diff --git a/include/Game/PadSystem.h b/include/Game/PadSystem.h index adce7a0..c9a753a 100644 --- a/include/Game/PadSystem.h +++ b/include/Game/PadSystem.h @@ -49,7 +49,9 @@ private: bool OnContact(const dd::Events::Contact &event); - + float slowdownModifier = 5.f; + float accelerationSpeed = 80.f; + float maxSpeed = 40.f; diff --git a/src/game/Game/PadSystem.cpp b/src/game/Game/PadSystem.cpp index a465b8b..1b5efbd 100644 --- a/src/game/Game/PadSystem.cpp +++ b/src/game/Game/PadSystem.cpp @@ -40,25 +40,25 @@ void dd::Systems::PadSystem::Update(double dt) } } - if (transform->Velocity.x < -400.f) + if (transform->Velocity.x < -maxSpeed) { - transform->Velocity.x = -400.f; + transform->Velocity.x = -maxSpeed; } - else if (transform->Velocity.x > 400.f) + else if (transform->Velocity.x > maxSpeed) { - transform->Velocity.x = 400.f; + transform->Velocity.x = maxSpeed; } transform->Position += transform->Velocity * (float)dt; transform->Velocity += acceleration * (float)dt; - transform->Velocity -= transform->Velocity * (0.9f * (float)dt); + transform->Velocity -= transform->Velocity * slowdownModifier * (float)dt; if (left) { - acceleration.x = -20.f; + acceleration.x = -accelerationSpeed; } else if (right) { - acceleration.x = 20.f; + acceleration.x = accelerationSpeed; } else { @@ -133,17 +133,32 @@ bool dd::Systems::PadSystem::OnContact(const dd::Events::Contact &event) auto transformBall = m_World->GetComponent(entityBall); auto transformPad = m_World->GetComponent(entityPad); - float movementMultiplier = 2.f; + float movementMultiplier = 4.f; - float movementX = (event.ContactPoint.x - transformPad->Position.x) * movementMultiplier; - float movementY = glm::cos((abs(movementX) / (3.2f * movementMultiplier)) * 3.14159265359f / 2) * 2.f; + float whatX = transformBall->Position.x - transformPad->Position.x; + float movementX; + if (whatX > 0) + { + movementX = movementMultiplier * whatX; + std::cout << "Right!" << std::endl; + } + else + { + movementX = movementMultiplier * whatX; + std::cout << "Left!" << std::endl; + } + + //float movementY = 1; + + //float movementX = (event.ContactPoint.x - transformPad->Position.x) * movementMultiplier; + float movementY = glm::cos((abs(movementX) / ((1.6f) * movementMultiplier)) * 3.14159265359f / 2); std::cout << movementX << " " << movementY << std::endl; //Temporary solution. Add a new ball and delete the old one. auto ent = m_World->CreateEntity(); std::shared_ptr transform = m_World->AddComponent(ent); - transform->Position = glm::vec3(transformBall->Position.x, transformBall->Position.y + 0.1f, -10.f); + transform->Position = glm::vec3(transformBall->Position.x, transformBall->Position.y + 0.01f, -10.f); transform->Scale = glm::vec3(1.f, 1.f, 1.f); std::shared_ptr sprite = m_World->AddComponent(ent); sprite->SpriteFile = "Textures/Ball.png"; @@ -158,7 +173,7 @@ bool dd::Systems::PadSystem::OnContact(const dd::Events::Contact &event) Events::SetImpulse e; e.Entity = ent; e.Impulse = glm::vec2(movementX, movementY); - e.Point = glm::vec2(event.ContactPoint); + e.Point = glm::vec2(transform->Position.x, transform->Position.y); EventBroker->Publish(e); } From 88bd96861d9df39cab79858596a9fc68b2270560 Mon Sep 17 00:00:00 2001 From: PlatinumSkink Date: Tue, 15 Sep 2015 12:40:23 +0200 Subject: [PATCH 2/8] Tried to implement lives. Failed. Everything crashes if I try to RemoveEntity in Update. --- include/Game/CBall.h | 2 +- include/Game/CLife.h | 26 +++++++++ include/Game/EBallFellOffStage.h | 27 +++++++++ include/Game/LevelSystem.h | 16 +++++- include/Game/PadSystem.h | 18 ++++-- include/Physics/PhysicsSystem.h | 1 + src/game/CMakeLists.txt | 3 +- src/game/Game/LevelSystem.cpp | 99 +++++++++++++++++++++++++++++++- src/game/Game/PadSystem.cpp | 51 ++++++++++++++-- 9 files changed, 226 insertions(+), 17 deletions(-) create mode 100644 include/Game/CLife.h create mode 100644 include/Game/EBallFellOffStage.h diff --git a/include/Game/CBall.h b/include/Game/CBall.h index d5c652f..e6b96c1 100644 --- a/include/Game/CBall.h +++ b/include/Game/CBall.h @@ -15,7 +15,7 @@ namespace Components struct Ball : Component { - + int number = 0; }; } diff --git a/include/Game/CLife.h b/include/Game/CLife.h new file mode 100644 index 0000000..b5b6a92 --- /dev/null +++ b/include/Game/CLife.h @@ -0,0 +1,26 @@ +// +// Created by Administrator on 2015-09-15. +// + +#ifndef DAYDREAM_CLIFE_H +#define DAYDREAM_CLIFE_H + +#include "Core/Component.h" + +namespace dd +{ + +namespace Components +{ + +struct Life : Component { + + int number = 0; + +}; + +} + +} + +#endif //DAYDREAM_CLIFE_H diff --git a/include/Game/EBallFellOffStage.h b/include/Game/EBallFellOffStage.h new file mode 100644 index 0000000..39ff421 --- /dev/null +++ b/include/Game/EBallFellOffStage.h @@ -0,0 +1,27 @@ +// +// Created by Adniklastrator on 2015-09-14. +// + +#ifndef DAYDREAM_EBALLFELLOFFSTAGE_H +#define DAYDREAM_EBALLFELLOFFSTAGE_H + +#include "Core/EventBroker.h" +#include "Core/Entity.h" + +namespace dd +{ + +namespace Events +{ + +struct BallFellOffStage : Event +{ + EntityID entity; + +}; + +} + +} + +#endif //DAYDREAM_EBALLFELLOFFSTAGE_H diff --git a/include/Game/LevelSystem.h b/include/Game/LevelSystem.h index 6269974..08aaa56 100644 --- a/include/Game/LevelSystem.h +++ b/include/Game/LevelSystem.h @@ -9,13 +9,17 @@ #include "Core/CTransform.h" #include "Rendering/CSprite.h" #include "Game/CBrick.h" -#include "Physics/EContact.h" #include "Core/EventBroker.h" #include "Core/World.h" #include "Game/CBall.h" +#include "Game/CLife.h" #include "Game/EStageCleared.h" +#include "Game/EBallFellOffStage.h" #include "Physics/CBoxShape.h" #include "Physics/CPhysics.h" +#include "Physics/CCircleShape.h" +#include "Physics/ESetImpulse.h" +#include "Physics/EContact.h" #include #include #include @@ -47,6 +51,7 @@ public: void Initialize() override; void CreateBasicLevel(int, int, glm::vec2, int); + void CreateLife(int); void SaveLevel(int, int, glm::vec2, int); // Shouldn't be here, but I'm experimenting. void LoadLevel(char[20]); void CreateBrick(int, int, glm::vec2, int, int); @@ -56,12 +61,17 @@ public: void EndLevel(); - void Update(double dt); + void Update(double dt) override; + void UpdateEntity(double dt, EntityID entity, EntityID parent) override; + int lives = 3; + int pastLives = 3; private: dd::EventRelay m_EContact; + dd::EventRelay m_EBall; bool OnContact(const dd::Events::Contact &event); + bool BallFellOffStage(const dd::Events::BallFellOffStage &event); bool m_Initialized = false; @@ -70,6 +80,8 @@ private: int tLines = 8; glm::vec2 tSpaceBetweenBricks = glm::vec2(2, 0.5); int tSpaceToEdge = 0; + + EntityID entityToRemove = NULL; }; } diff --git a/include/Game/PadSystem.h b/include/Game/PadSystem.h index c9a753a..3852d5e 100644 --- a/include/Game/PadSystem.h +++ b/include/Game/PadSystem.h @@ -7,19 +7,22 @@ #include "Core/InputController.h" #include "Core/System.h" +#include "Core/Component.h" +#include "Core/CTransform.h" #include "Core/EventBroker.h" #include "Core/EKeyDown.h" #include "Core/EKeyUp.h" #include "Input/EBindKey.h" #include "Physics/EContact.h" -#include "Core/CTransform.h" #include "Physics/CBoxShape.h" #include "Physics/CPhysics.h" +#include "Physics/CCircleShape.h" +#include "Physics/ESetImpulse.h" #include "Rendering/CSprite.h" #include "Game/CBall.h" -#include "Core/Component.h" -#include "Physics/ESetImpulse.h" -#include "Physics/CCircleShape.h" +#include "Game/EBallFellOffStage.h" + + namespace dd @@ -37,17 +40,22 @@ public: void Initialize() override; void Update(double dt) override; + void UpdateEntity(double dt, EntityID entity, EntityID parent) override; private: dd::EventRelay m_EKeyDown; dd::EventRelay m_EKeyUp; dd::EventRelay m_EContact; + dd::EventRelay m_EBall; bool OnKeyDown(const dd::Events::KeyDown &event); bool OnKeyUp(const dd::Events::KeyUp &event); bool OnContact(const dd::Events::Contact &event); + bool BallFellOffStage(const dd::Events::BallFellOffStage &event); + + EntityID removeThisObject = NULL; float slowdownModifier = 5.f; float accelerationSpeed = 80.f; @@ -61,7 +69,7 @@ private: EntityID ent = 0; Components::Transform* transform; glm::vec3 acceleration = glm::vec3(0.f, 0.f, 0.f); - bool left = false, right = false; + bool left = false, right = false, replaceBall = false; }; class PadSystem::PadSteeringInputController : InputController diff --git a/include/Physics/PhysicsSystem.h b/include/Physics/PhysicsSystem.h index 57bad34..4b19098 100644 --- a/include/Physics/PhysicsSystem.h +++ b/include/Physics/PhysicsSystem.h @@ -80,6 +80,7 @@ private: e.Entity1 = m_PhysicsSystem->m_BodiesToEntities[contact->GetFixtureA()->GetBody()]; e.Entity2 = m_PhysicsSystem->m_BodiesToEntities[contact->GetFixtureB()->GetBody()]; + m_PhysicsSystem->EventBroker->Publish(e); } void EndContact(b2Contact* contact) diff --git a/src/game/CMakeLists.txt b/src/game/CMakeLists.txt index 0577ab1..5b895af 100755 --- a/src/game/CMakeLists.txt +++ b/src/game/CMakeLists.txt @@ -75,8 +75,7 @@ set(SOURCE_FILES ${SOURCE_FILES_Rendering} ${SOURCE_FILES_Transform} ${SOURCE_FILES_Physics} - ${SOURCE_FILES_Game} -) + ${SOURCE_FILES_Game} ../../include/Game/CLife.h) if(CMAKE_COMPILER_IS_GNUCXX) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread") diff --git a/src/game/Game/LevelSystem.cpp b/src/game/Game/LevelSystem.cpp index 68dce72..8a2e122 100644 --- a/src/game/Game/LevelSystem.cpp +++ b/src/game/Game/LevelSystem.cpp @@ -10,15 +10,73 @@ void dd::Systems::LevelSystem::Initialize() { EVENT_SUBSCRIBE_MEMBER(m_EContact, LevelSystem::OnContact); + EVENT_SUBSCRIBE_MEMBER(m_EBall, LevelSystem::BallFellOffStage); + + for (int i = 0; i < lives; i++) + { + CreateLife(i); + } return; } -void dd::Systems::LevelSystem::Update(double dt) { +void dd::Systems::LevelSystem::CreateLife(int number) +{ + /*auto life = m_World->CreateEntity(); + std::shared_ptr transform = m_World->AddComponent(life); + transform->Position = glm::vec3(-11.f + number, -8.f, -10.f); + transform->Scale = glm::vec3(0.5f, 0.5f, 0.5f); + + std::shared_ptr lifeNr = m_World->AddComponent(life); + lifeNr->number = number; + + std::shared_ptr sprite = m_World->AddComponent(life); + sprite->SpriteFile = "Textures/Ball.png"; + + m_World->CommitEntity(life);*/ +} + +void dd::Systems::LevelSystem::Update(double dt) +{ if (!m_Initialized) { CreateBasicLevel(tRows, tLines, tSpaceBetweenBricks, tSpaceToEdge); m_Initialized = true; } + + if (entityToRemove != NULL) + { + //m_World->RemoveEntity(entityToRemove); + entityToRemove = NULL; + } +} + +void dd::Systems::LevelSystem::UpdateEntity(double dt, EntityID entity, EntityID parent) +{ + auto ball = m_World->GetComponent(entity); + + if (ball != NULL) + { + auto transformBall = m_World->GetComponent(entity); + if (transformBall->Position.y < -10) + { + Events::BallFellOffStage e; + e.entity = entity; + EventBroker->Publish(e); + return; + } + } + + if (lives != pastLives) + { + auto life = m_World->GetComponent(entity); + if (life != NULL) + { + if (life->number + 1 == pastLives) { + pastLives--; + //m_World->RemoveEntity(entity); + } + } + } } void dd::Systems::LevelSystem::CreateBasicLevel(int rows, int lines, glm::vec2 spacesBetweenBricks, int spaceToEdge) @@ -127,7 +185,6 @@ bool dd::Systems::LevelSystem::OnContact(const dd::Events::Contact &event) if (entityBrick != NULL && entityBall != NULL) {*/ - //std::cout << "We're destroying!" << std::endl; m_World->RemoveEntity(entityBrick); return true; @@ -136,6 +193,44 @@ bool dd::Systems::LevelSystem::OnContact(const dd::Events::Contact &event) return false; } +bool dd::Systems::LevelSystem::BallFellOffStage(const dd::Events::BallFellOffStage &event) +{ + /*std::cout << "Did you get here?" << std::endl; + EntityID entity = event.entity; + + //Temporary. Create new ball. + auto ent = m_World->CreateEntity(); + std::shared_ptr transform = m_World->AddComponent(ent); + transform->Position = glm::vec3(0.5f, 0.f, -10.f);; + transform->Scale = glm::vec3(1.f, 1.f, 1.f); + std::shared_ptr sprite = m_World->AddComponent(ent); + sprite->SpriteFile = "Textures/Ball.png"; + std::shared_ptr circleShape = m_World->AddComponent(ent); + std::shared_ptr cball = m_World->AddComponent(ent); + std::shared_ptr physics = m_World->AddComponent(ent); + physics->Static = false; + + std::cout << "How about here?" << std::endl; +*/ + //m_World->RemoveEntity(event.entity); + //entityToRemove = event.entity; +/* m_World->CommitEntity(ent); + + std::cout << "Or here?" << std::endl; + + Events::SetImpulse e; + e.Entity = ent; + e.Impulse = glm::vec2(0.f, -7.f); + e.Point = glm::vec2(transform->Position.x, transform->Position.y); + EventBroker->Publish(e); + + std::cout << "Maybe even here?" << std::endl; +*/ + lives--; + + return true; +} + void dd::Systems::LevelSystem::EndLevel() { Events::StageCleared e; diff --git a/src/game/Game/PadSystem.cpp b/src/game/Game/PadSystem.cpp index 1b5efbd..1a23985 100644 --- a/src/game/Game/PadSystem.cpp +++ b/src/game/Game/PadSystem.cpp @@ -24,10 +24,41 @@ void dd::Systems::PadSystem::Initialize() EVENT_SUBSCRIBE_MEMBER(m_EKeyDown, PadSystem::OnKeyDown); EVENT_SUBSCRIBE_MEMBER(m_EKeyUp, PadSystem::OnKeyUp); EVENT_SUBSCRIBE_MEMBER(m_EContact, PadSystem::OnContact); + EVENT_SUBSCRIBE_MEMBER(m_EBall, PadSystem::BallFellOffStage); return; } +void dd::Systems::PadSystem::UpdateEntity(double dt, EntityID entity, EntityID parent) +{ + auto ball = m_World->GetComponent(entity); + if (replaceBall == true) + { + replaceBall = false; + + //Temporary. Create new ball. + auto ent = m_World->CreateEntity(); + std::shared_ptr transform = m_World->AddComponent(ent); + transform->Position = glm::vec3(0.5f, 0.f, -10.f);; + transform->Scale = glm::vec3(1.f, 1.f, 1.f); + std::shared_ptr sprite = m_World->AddComponent(ent); + sprite->SpriteFile = "Textures/Ball.png"; + std::shared_ptr circleShape = m_World->AddComponent(ent); + std::shared_ptr cball = m_World->AddComponent(ent); + std::shared_ptr physics = m_World->AddComponent(ent); + physics->Static = false; + + m_World->RemoveEntity(entity); + m_World->CommitEntity(ent); + + Events::SetImpulse e; + e.Entity = ent; + e.Impulse = glm::vec2(0.f, -7.f); + e.Point = glm::vec2(transform->Position.x, transform->Position.y); + EventBroker->Publish(e); + } +} + void dd::Systems::PadSystem::Update(double dt) { if (ent == 0) { @@ -85,12 +116,16 @@ bool dd::Systems::PadSystem::OnKeyDown(const dd::Events::KeyDown &event) //acceleration.x = -0.01f; left = true; } - else if (val = 262) + else if (val == 262) { //std::cout << "Right!" << std::endl; //acceleration.x = 0.01f; right = true; } + else if (val == 82) + { + replaceBall = true; + } return true; } @@ -109,7 +144,7 @@ bool dd::Systems::PadSystem::OnKeyUp(const dd::Events::KeyUp &event) { left = false; } - else if (val = 262) + else if (val == 262) { right = false; } @@ -140,12 +175,12 @@ bool dd::Systems::PadSystem::OnContact(const dd::Events::Contact &event) if (whatX > 0) { movementX = movementMultiplier * whatX; - std::cout << "Right!" << std::endl; + //std::cout << "Right!" << std::endl; } else { movementX = movementMultiplier * whatX; - std::cout << "Left!" << std::endl; + //std::cout << "Left!" << std::endl; } //float movementY = 1; @@ -153,7 +188,7 @@ bool dd::Systems::PadSystem::OnContact(const dd::Events::Contact &event) //float movementX = (event.ContactPoint.x - transformPad->Position.x) * movementMultiplier; float movementY = glm::cos((abs(movementX) / ((1.6f) * movementMultiplier)) * 3.14159265359f / 2); - std::cout << movementX << " " << movementY << std::endl; + //std::cout << movementX << " " << movementY << std::endl; //Temporary solution. Add a new ball and delete the old one. auto ent = m_World->CreateEntity(); @@ -177,6 +212,12 @@ bool dd::Systems::PadSystem::OnContact(const dd::Events::Contact &event) EventBroker->Publish(e); } +bool dd::Systems::PadSystem::BallFellOffStage(const dd::Events::BallFellOffStage &event) +{ + replaceBall = true; + return true; +} + bool dd::Systems::PadSystem::PadSteeringInputController::OnCommand(const Events::InputCommand &event) { std::string command = event.Command; From 9db15aa898a82d0f00408e256951f49aee8c20ec Mon Sep 17 00:00:00 2001 From: PlatinumSkink Date: Tue, 15 Sep 2015 12:41:57 +0200 Subject: [PATCH 3/8] This is a safety commit on a working point because what I do next might crash everything. --- src/game/Game/LevelSystem.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/game/Game/LevelSystem.cpp b/src/game/Game/LevelSystem.cpp index 8a2e122..b8ce807 100644 --- a/src/game/Game/LevelSystem.cpp +++ b/src/game/Game/LevelSystem.cpp @@ -73,6 +73,7 @@ void dd::Systems::LevelSystem::UpdateEntity(double dt, EntityID entity, EntityID { if (life->number + 1 == pastLives) { pastLives--; + //m_World->RemoveEntity(entity); } } From ce878ac1db7c0d0104597ad7430264ebea5164b9 Mon Sep 17 00:00:00 2001 From: PlatinumSkink Date: Tue, 15 Sep 2015 13:35:04 +0200 Subject: [PATCH 4/8] Lives kind of work, and so does the demo! --- include/Core/Engine.h | 5 ++-- src/game/Game/LevelSystem.cpp | 24 +++++++++------- src/game/Game/PadSystem.cpp | 46 ++++++++++++++++-------------- src/game/Physics/PhysicsSystem.cpp | 14 ++++++--- 4 files changed, 51 insertions(+), 38 deletions(-) diff --git a/include/Core/Engine.h b/include/Core/Engine.h index 527d9bb..e500db2 100644 --- a/include/Core/Engine.h +++ b/include/Core/Engine.h @@ -81,6 +81,7 @@ public: m_World->ComponentFactory.Register(); m_World->ComponentFactory.Register(); m_World->ComponentFactory.Register(); + m_World->ComponentFactory.Register(); m_World->SystemFactory.Register( [this]() { return new Systems::PhysicsSystem(m_World.get(), m_EventBroker); }); m_World->AddSystem(); @@ -97,7 +98,7 @@ public: //TODO: Remove tobias light-test code. - { + /*{ auto t_BrickWall = m_World->CreateEntity(); auto transform = m_World->AddComponent(t_BrickWall); transform->Position = glm::vec3(0.f, 0.f, -10.f); @@ -106,7 +107,7 @@ public: sprite->SpriteFile = "Textures/Test/Brick_Diffuse.png"; sprite->NormalTexture = "Textures/Test/Brick_Normal.png"; sprite->SpecularTexture = "Textures/Test/Brick_Specular.png"; - } + }*/ { diff --git a/src/game/Game/LevelSystem.cpp b/src/game/Game/LevelSystem.cpp index b8ce807..8243629 100644 --- a/src/game/Game/LevelSystem.cpp +++ b/src/game/Game/LevelSystem.cpp @@ -22,7 +22,7 @@ void dd::Systems::LevelSystem::Initialize() void dd::Systems::LevelSystem::CreateLife(int number) { - /*auto life = m_World->CreateEntity(); + auto life = m_World->CreateEntity(); std::shared_ptr transform = m_World->AddComponent(life); transform->Position = glm::vec3(-11.f + number, -8.f, -10.f); transform->Scale = glm::vec3(0.5f, 0.5f, 0.5f); @@ -33,7 +33,7 @@ void dd::Systems::LevelSystem::CreateLife(int number) std::shared_ptr sprite = m_World->AddComponent(life); sprite->SpriteFile = "Textures/Ball.png"; - m_World->CommitEntity(life);*/ + m_World->CommitEntity(life); } void dd::Systems::LevelSystem::Update(double dt) @@ -59,10 +59,13 @@ void dd::Systems::LevelSystem::UpdateEntity(double dt, EntityID entity, EntityID auto transformBall = m_World->GetComponent(entity); if (transformBall->Position.y < -10) { - Events::BallFellOffStage e; - e.entity = entity; - EventBroker->Publish(e); - return; + if (lives == pastLives) + { + Events::BallFellOffStage e; + e.entity = entity; + EventBroker->Publish(e); + return; + } } } @@ -72,9 +75,8 @@ void dd::Systems::LevelSystem::UpdateEntity(double dt, EntityID entity, EntityID if (life != NULL) { if (life->number + 1 == pastLives) { - pastLives--; - - //m_World->RemoveEntity(entity); + m_World->RemoveEntity(entity); + pastLives = lives; } } } @@ -196,8 +198,8 @@ bool dd::Systems::LevelSystem::OnContact(const dd::Events::Contact &event) bool dd::Systems::LevelSystem::BallFellOffStage(const dd::Events::BallFellOffStage &event) { - /*std::cout << "Did you get here?" << std::endl; - EntityID entity = event.entity; + std::cout << "Did you get here?" << std::endl; + /*EntityID entity = event.entity; //Temporary. Create new ball. auto ent = m_World->CreateEntity(); diff --git a/src/game/Game/PadSystem.cpp b/src/game/Game/PadSystem.cpp index 1a23985..030c061 100644 --- a/src/game/Game/PadSystem.cpp +++ b/src/game/Game/PadSystem.cpp @@ -32,30 +32,34 @@ void dd::Systems::PadSystem::Initialize() void dd::Systems::PadSystem::UpdateEntity(double dt, EntityID entity, EntityID parent) { auto ball = m_World->GetComponent(entity); - if (replaceBall == true) - { - replaceBall = false; + if (ball != NULL) { + if (replaceBall == true) { + replaceBall = false; - //Temporary. Create new ball. - auto ent = m_World->CreateEntity(); - std::shared_ptr transform = m_World->AddComponent(ent); - transform->Position = glm::vec3(0.5f, 0.f, -10.f);; - transform->Scale = glm::vec3(1.f, 1.f, 1.f); - std::shared_ptr sprite = m_World->AddComponent(ent); - sprite->SpriteFile = "Textures/Ball.png"; - std::shared_ptr circleShape = m_World->AddComponent(ent); - std::shared_ptr cball = m_World->AddComponent(ent); - std::shared_ptr physics = m_World->AddComponent(ent); - physics->Static = false; + auto transformEntity = m_World->GetComponent(entity); + transformEntity->Position = glm::vec3(20, 20, -10); - m_World->RemoveEntity(entity); - m_World->CommitEntity(ent); + //Temporary. Create new ball. + auto ent = m_World->CreateEntity(); + std::shared_ptr transform = m_World->AddComponent(ent); + transform->Position = glm::vec3(0.5f, 0.f, -10.f);; + transform->Scale = glm::vec3(1.f, 1.f, 1.f); + std::shared_ptr sprite = m_World->AddComponent(ent); + sprite->SpriteFile = "Textures/Ball.png"; + std::shared_ptr circleShape = m_World->AddComponent(ent); + std::shared_ptr cball = m_World->AddComponent(ent); + std::shared_ptr physics = m_World->AddComponent(ent); + physics->Static = false; - Events::SetImpulse e; - e.Entity = ent; - e.Impulse = glm::vec2(0.f, -7.f); - e.Point = glm::vec2(transform->Position.x, transform->Position.y); - EventBroker->Publish(e); + m_World->RemoveEntity(entity); + m_World->CommitEntity(ent); + + Events::SetImpulse e; + e.Entity = ent; + e.Impulse = glm::vec2(0.f, -7.f); + e.Point = glm::vec2(transform->Position.x, transform->Position.y); + EventBroker->Publish(e); + } } } diff --git a/src/game/Physics/PhysicsSystem.cpp b/src/game/Physics/PhysicsSystem.cpp index 3d244a7..28ffc37 100644 --- a/src/game/Physics/PhysicsSystem.cpp +++ b/src/game/Physics/PhysicsSystem.cpp @@ -49,6 +49,8 @@ void dd::Systems::PhysicsSystem::Update(double dt) b2Body* body = i.second; auto transformComponent = m_World->GetComponent(entity); + if (! transformComponent) + continue; if (m_World->GetEntityParent(entity) == 0) { @@ -85,7 +87,8 @@ void dd::Systems::PhysicsSystem::Update(double dt) b2Body* body = i.second; auto transformComponent = m_World->GetComponent(entity); - + if (! transformComponent) + continue; if (m_World->GetEntityParent(entity) == 0) { b2Vec2 position = body->GetPosition(); @@ -119,10 +122,13 @@ void dd::Systems::PhysicsSystem::OnEntityRemoved(EntityID entity) { b2Body* body = m_EntitiesToBodies[entity]; - m_EntitiesToBodies.erase(entity); - m_BodiesToEntities.erase(body); + if (body != nullptr) { + m_EntitiesToBodies.erase(entity); + m_BodiesToEntities.erase(body); + + m_PhysicsWorld->DestroyBody(body); + } - m_PhysicsWorld->DestroyBody(body); } From d3d24876bbdc15a2651a2444ffe742ea8eb57fa6 Mon Sep 17 00:00:00 2001 From: PlatinumSkink Date: Tue, 15 Sep 2015 14:32:42 +0200 Subject: [PATCH 5/8] Something. --- src/game/Game/PadSystem.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/game/Game/PadSystem.cpp b/src/game/Game/PadSystem.cpp index 030c061..44f0aa2 100644 --- a/src/game/Game/PadSystem.cpp +++ b/src/game/Game/PadSystem.cpp @@ -190,7 +190,7 @@ bool dd::Systems::PadSystem::OnContact(const dd::Events::Contact &event) //float movementY = 1; //float movementX = (event.ContactPoint.x - transformPad->Position.x) * movementMultiplier; - float movementY = glm::cos((abs(movementX) / ((1.6f) * movementMultiplier)) * 3.14159265359f / 2); + float movementY = glm::cos((abs(movementX) / ((1.6f) * movementMultiplier)) * 3.14159265359f / 2) + 1; //std::cout << movementX << " " << movementY << std::endl; From d06cd54c2a836174bd0dc8abf562eea9d13b33b4 Mon Sep 17 00:00:00 2001 From: PlatinumSkink Date: Tue, 15 Sep 2015 15:00:12 +0200 Subject: [PATCH 6/8] Created ELifeLost event. It works. --- include/Game/EBallFellOffStage.h | 27 --------------------------- 1 file changed, 27 deletions(-) delete mode 100644 include/Game/EBallFellOffStage.h diff --git a/include/Game/EBallFellOffStage.h b/include/Game/EBallFellOffStage.h deleted file mode 100644 index 39ff421..0000000 --- a/include/Game/EBallFellOffStage.h +++ /dev/null @@ -1,27 +0,0 @@ -// -// Created by Adniklastrator on 2015-09-14. -// - -#ifndef DAYDREAM_EBALLFELLOFFSTAGE_H -#define DAYDREAM_EBALLFELLOFFSTAGE_H - -#include "Core/EventBroker.h" -#include "Core/Entity.h" - -namespace dd -{ - -namespace Events -{ - -struct BallFellOffStage : Event -{ - EntityID entity; - -}; - -} - -} - -#endif //DAYDREAM_EBALLFELLOFFSTAGE_H From b340cf97bb4ecd2f25cafcf09cef6afd1cb680bb Mon Sep 17 00:00:00 2001 From: PlatinumSkink Date: Tue, 15 Sep 2015 15:00:47 +0200 Subject: [PATCH 7/8] I forgot to stage in my last commit. --- include/Game/ELifeLost.h | 27 ++++++++++++ include/Game/LevelSystem.h | 6 +-- include/Game/PadSystem.h | 6 +-- src/game/CMakeLists.txt | 2 +- src/game/Game/LevelSystem.cpp | 82 +++-------------------------------- src/game/Game/PadSystem.cpp | 4 +- 6 files changed, 41 insertions(+), 86 deletions(-) create mode 100644 include/Game/ELifeLost.h diff --git a/include/Game/ELifeLost.h b/include/Game/ELifeLost.h new file mode 100644 index 0000000..b77eee1 --- /dev/null +++ b/include/Game/ELifeLost.h @@ -0,0 +1,27 @@ +// +// Created by Administrator on 2015-09-15. +// + +#ifndef DAYDREAM_ELIFELOST_H +#define DAYDREAM_ELIFELOST_H + +#include "Core/EventBroker.h" +#include "Core/Entity.h" + +namespace dd +{ + +namespace Events +{ + +struct LifeLost : Event +{ + EntityID entity; + +}; + +} + +} + +#endif //DAYDREAM_ELIFELOST_H diff --git a/include/Game/LevelSystem.h b/include/Game/LevelSystem.h index 08aaa56..ad04ffa 100644 --- a/include/Game/LevelSystem.h +++ b/include/Game/LevelSystem.h @@ -14,7 +14,7 @@ #include "Game/CBall.h" #include "Game/CLife.h" #include "Game/EStageCleared.h" -#include "Game/EBallFellOffStage.h" +#include "Game/ELifeLost.h" #include "Physics/CBoxShape.h" #include "Physics/CPhysics.h" #include "Physics/CCircleShape.h" @@ -68,10 +68,10 @@ public: private: dd::EventRelay m_EContact; - dd::EventRelay m_EBall; + dd::EventRelay m_ELifeLost; bool OnContact(const dd::Events::Contact &event); - bool BallFellOffStage(const dd::Events::BallFellOffStage &event); + bool LifeLost(const dd::Events::LifeLost &event); bool m_Initialized = false; diff --git a/include/Game/PadSystem.h b/include/Game/PadSystem.h index 3852d5e..91a23e7 100644 --- a/include/Game/PadSystem.h +++ b/include/Game/PadSystem.h @@ -20,7 +20,7 @@ #include "Physics/ESetImpulse.h" #include "Rendering/CSprite.h" #include "Game/CBall.h" -#include "Game/EBallFellOffStage.h" +#include "Game/ELifeLost.h" @@ -46,14 +46,14 @@ private: dd::EventRelay m_EKeyDown; dd::EventRelay m_EKeyUp; dd::EventRelay m_EContact; - dd::EventRelay m_EBall; + dd::EventRelay m_ELifeLost; bool OnKeyDown(const dd::Events::KeyDown &event); bool OnKeyUp(const dd::Events::KeyUp &event); bool OnContact(const dd::Events::Contact &event); - bool BallFellOffStage(const dd::Events::BallFellOffStage &event); + bool LifeLost(const dd::Events::LifeLost &event); EntityID removeThisObject = NULL; diff --git a/src/game/CMakeLists.txt b/src/game/CMakeLists.txt index 5b895af..3c79b79 100755 --- a/src/game/CMakeLists.txt +++ b/src/game/CMakeLists.txt @@ -75,7 +75,7 @@ set(SOURCE_FILES ${SOURCE_FILES_Rendering} ${SOURCE_FILES_Transform} ${SOURCE_FILES_Physics} - ${SOURCE_FILES_Game} ../../include/Game/CLife.h) + ${SOURCE_FILES_Game} ../../include/Game/CLife.h ../../include/Game/ELifeLost.h) if(CMAKE_COMPILER_IS_GNUCXX) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread") diff --git a/src/game/Game/LevelSystem.cpp b/src/game/Game/LevelSystem.cpp index 8243629..7499d34 100644 --- a/src/game/Game/LevelSystem.cpp +++ b/src/game/Game/LevelSystem.cpp @@ -10,7 +10,7 @@ void dd::Systems::LevelSystem::Initialize() { EVENT_SUBSCRIBE_MEMBER(m_EContact, LevelSystem::OnContact); - EVENT_SUBSCRIBE_MEMBER(m_EBall, LevelSystem::BallFellOffStage); + EVENT_SUBSCRIBE_MEMBER(m_ELifeLost, LevelSystem::LifeLost); for (int i = 0; i < lives; i++) { @@ -61,7 +61,7 @@ void dd::Systems::LevelSystem::UpdateEntity(double dt, EntityID entity, EntityID { if (lives == pastLives) { - Events::BallFellOffStage e; + Events::LifeLost e; e.entity = entity; EventBroker->Publish(e); return; @@ -116,7 +116,6 @@ void dd::Systems::LevelSystem::CreateBrick(int row, int line, glm::vec2 spacesBe float y = spaceToEdge + row * spacesBetweenBricks.y; transform->Scale = glm::vec3(1.6, 0.4, 0.); transform->Position = glm::vec3(x - 7, y + 1, -10.f); - //sprite->Color = glm::vec4(1.f, 1.f, 1.f, 1.f); m_World->CommitEntity(brick); return; } @@ -143,8 +142,6 @@ void dd::Systems::LevelSystem::OnEntityRemoved(EntityID entity) bool dd::Systems::LevelSystem::OnContact(const dd::Events::Contact &event) { - /*event.Entity1 - Vi vet inte vilken som. - event.Entity2 - */ EntityID entityBrick = event.Entity1; auto brick = m_World->GetComponent(entityBrick); if (brick == NULL) @@ -152,83 +149,14 @@ bool dd::Systems::LevelSystem::OnContact(const dd::Events::Contact &event) return false; } EntityID entityBall = event.Entity2; - //EntityID entity1 = event.Entity1; - //EntityID entity2 = event.Entity2; - //auto brick = m_World->GetComponent(entity1); - //auto ball = m_World->GetComponent(entity2); - //std::cout << brick << std::endl; - //std::cout << ball << std::endl; - /*if (brick != NULL) - { - std::cout << "Entity1 is a brick!" << std::endl; - entityBrick = entity1; - if (ball != NULL) - { - std::cout << "Entity2 is a ball!" << std::endl; - entityBall = entity2; - } - } - else - { - brick = m_World->GetComponent(entity2); - if (brick != NULL) - { - std::cout << "Entity2 is a brick!" << std::endl; - entityBrick = entity2; - } + m_World->RemoveEntity(entityBrick); - ball = m_World->GetComponent(entity1); - if (ball != NULL) - { - std::cout << "Entity1 is a ball!" << std::endl; - entityBall = entity1; - } - } - - if (entityBrick != NULL && entityBall != NULL) - {*/ - m_World->RemoveEntity(entityBrick); - - return true; - //} - - return false; + return true; } -bool dd::Systems::LevelSystem::BallFellOffStage(const dd::Events::BallFellOffStage &event) +bool dd::Systems::LevelSystem::LifeLost(const dd::Events::LifeLost &event) { - std::cout << "Did you get here?" << std::endl; - /*EntityID entity = event.entity; - - //Temporary. Create new ball. - auto ent = m_World->CreateEntity(); - std::shared_ptr transform = m_World->AddComponent(ent); - transform->Position = glm::vec3(0.5f, 0.f, -10.f);; - transform->Scale = glm::vec3(1.f, 1.f, 1.f); - std::shared_ptr sprite = m_World->AddComponent(ent); - sprite->SpriteFile = "Textures/Ball.png"; - std::shared_ptr circleShape = m_World->AddComponent(ent); - std::shared_ptr cball = m_World->AddComponent(ent); - std::shared_ptr physics = m_World->AddComponent(ent); - physics->Static = false; - - std::cout << "How about here?" << std::endl; -*/ - //m_World->RemoveEntity(event.entity); - //entityToRemove = event.entity; -/* m_World->CommitEntity(ent); - - std::cout << "Or here?" << std::endl; - - Events::SetImpulse e; - e.Entity = ent; - e.Impulse = glm::vec2(0.f, -7.f); - e.Point = glm::vec2(transform->Position.x, transform->Position.y); - EventBroker->Publish(e); - - std::cout << "Maybe even here?" << std::endl; -*/ lives--; return true; diff --git a/src/game/Game/PadSystem.cpp b/src/game/Game/PadSystem.cpp index 44f0aa2..0242537 100644 --- a/src/game/Game/PadSystem.cpp +++ b/src/game/Game/PadSystem.cpp @@ -24,7 +24,7 @@ void dd::Systems::PadSystem::Initialize() EVENT_SUBSCRIBE_MEMBER(m_EKeyDown, PadSystem::OnKeyDown); EVENT_SUBSCRIBE_MEMBER(m_EKeyUp, PadSystem::OnKeyUp); EVENT_SUBSCRIBE_MEMBER(m_EContact, PadSystem::OnContact); - EVENT_SUBSCRIBE_MEMBER(m_EBall, PadSystem::BallFellOffStage); + EVENT_SUBSCRIBE_MEMBER(m_ELifeLost, PadSystem::LifeLost); return; } @@ -216,7 +216,7 @@ bool dd::Systems::PadSystem::OnContact(const dd::Events::Contact &event) EventBroker->Publish(e); } -bool dd::Systems::PadSystem::BallFellOffStage(const dd::Events::BallFellOffStage &event) +bool dd::Systems::PadSystem::LifeLost(const dd::Events::LifeLost &event) { replaceBall = true; return true; From 884fee9f13f915e686b9d5dd08c052ef3fed0967 Mon Sep 17 00:00:00 2001 From: sippeangelo Date: Tue, 15 Sep 2015 17:11:18 +0200 Subject: [PATCH 8/8] Updated style guide --- tools/StyleGuide.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/tools/StyleGuide.h b/tools/StyleGuide.h index bdb250e..f43b57c 100755 --- a/tools/StyleGuide.h +++ b/tools/StyleGuide.h @@ -1,5 +1,5 @@ -#ifndef FILENAME_H__ -#define FILENAME_H__ +#ifndef NAMESPACE_FILENAME_H__ +#define NAMESPACE_FILENAME_H__ namespace dd { @@ -62,8 +62,7 @@ private: // Private member function bool privateMemberFunction() { - switch (m_PrivateMember1) - { + switch (m_PrivateMember1) { case 1: m_PrivateMember2 = new ClassName(2); break;