diff --git a/include/Core/Engine.h b/include/Core/Engine.h index d2729e9..f55f5f4 100755 --- a/include/Core/Engine.h +++ b/include/Core/Engine.h @@ -137,7 +137,6 @@ public: //OctoBall - /* { auto ent = m_World->CreateEntity(); std::shared_ptr transform = m_World->AddComponent(ent); @@ -159,7 +158,7 @@ public: plight->Radius = 2.f; m_World->CommitEntity(ent); - }*/ + } //PointLightTest { @@ -212,8 +211,8 @@ public: { auto t_waterBody = m_World->CreateEntity(); auto transform = m_World->AddComponent(t_waterBody); - transform->Position = glm::vec3(0.f, -5.5f, -10.f); - transform->Scale = glm::vec3(0.2f, 0.2f, 1.f); + transform->Position = glm::vec3(0.f, -3.5f, -10.f); + transform->Scale = glm::vec3(7.0f, 1.5f, 1.f); auto water = m_World->AddComponent(t_waterBody); auto body = m_World->AddComponent(t_waterBody); m_World->CommitEntity(t_waterBody); @@ -221,18 +220,37 @@ public: //ParticleTest { + Events::CreateParticleSequence e; + e.Position = glm::vec3(0.f, 0.f, -10.f); + e.SpriteFile = "Textures/Background.png"; + e.GravityScale = 0.0f; + e.SpawnRate = 1.f; + e.NumberOfTicks = 2; + e.Speed = 1.f; + e.ParticlesPerTick = 5; + e.Spread = glm::pi() * 2; + e.EmittingAngle = glm::pi(); + e.EmitterLifeTime = 50; + e.ParticleLifeTime = 3.f; + m_EventBroker->Publish(e); + } + + /*{ auto Pe = m_World->CreateEntity(); auto transform = m_World->AddComponent(Pe); auto particleEmitter= m_World->AddComponent(Pe); + auto emitteSprite = m_World->AddComponent(Pe); transform->Position = glm::vec3(0.f, 0.f, -10.f); + emitteSprite->SpriteFile = "Textures/Test/Brick_Normal.png"; particleEmitter->GravityScale = 0.0f; - particleEmitter->SpawnRate = 1.1f; - particleEmitter->NumberOfTicks = 1000; - particleEmitter->Speed = 2.f; + particleEmitter->SpawnRate = 1.f; + particleEmitter->NumberOfTicks = 2; + particleEmitter->Speed = 1.f; particleEmitter->ParticlesPerTick = 5; - particleEmitter->Spread = glm::pi()/2; + particleEmitter->Spread = glm::pi()*2; particleEmitter->EmittingAngle = glm::pi(); + particleEmitter->LifeTime = 50; { auto Pt = m_World->CreateEntity(Pe); @@ -244,11 +262,11 @@ public: //PtTransform->Velocity = glm::vec3(1.0f, 0.f, 0.f); PtTransform->Position = transform->Position; PtSprite->SpriteFile = "Textures/Background.png"; - PtParticle->LifeTime = 1.f; + PtParticle->LifeTime = 3.f; PtParticle->Flags = ParticleFlags::Type::powderParticle | ParticleFlags::Type::particleContactFilterParticle | ParticleFlags::Type::fixtureContactFilterParticle; } m_World->CommitEntity(Pe); - } + }*/ //TODO: Why does the ball not collide with these bricks? //BottomBox @@ -361,7 +379,7 @@ public: auto ent = m_World->CreateEntity(); m_World->SetProperty(ent, "Name", "Pad"); auto ctransform = m_World->AddComponent(ent); - ctransform->Position = glm::vec3(0.f, -13.5f, -10.f); + ctransform->Position = glm::vec3(0.f, -3.5f, -10.f); ctransform->Scale = glm::vec3(1.0f, 1.0f, 1.f); auto rectangle = m_World->AddComponent(ent); auto physics = m_World->AddComponent(ent); diff --git a/include/Physics/CParticleEmitter.h b/include/Physics/CParticleEmitter.h index 1ef112e..56dd83c 100755 --- a/include/Physics/CParticleEmitter.h +++ b/include/Physics/CParticleEmitter.h @@ -18,6 +18,7 @@ struct ParticleEmitter : public Component float EmittingAngle = 0.f; float Spread = 0.f; float Speed = 2.f; + double LifeTime = 100; //ParticleSystem variables float GravityScale = 1.0f; diff --git a/include/Physics/ECreateParticleSequence.h b/include/Physics/ECreateParticleSequence.h new file mode 100644 index 0000000..1df3db6 --- /dev/null +++ b/include/Physics/ECreateParticleSequence.h @@ -0,0 +1,37 @@ +#ifndef EVENTS_ECREATEPARTICLESEQUENCE_H__ +#define EVENTS_ECREATEPARTICLESEQUENCE_H__ + +#include "Core/EventBroker.h" +#include "Physics/CParticle.h" + +namespace dd +{ +namespace Events +{ + +struct CreateParticleSequence : public Event +{ + //Emitter + double EmitterLifeTime = 100; + glm::vec3 Position = glm::vec3(0); + float GravityScale = 0.f; + float SpawnRate = 1.f; + int NumberOfTicks = 100; + float Speed = 1.f; + int ParticlesPerTick = 1.f; + float Spread = glm::pi(); + float EmittingAngle = glm::two_pi(); + float MaxCount = 0; + + //Particle + std::string SpriteFile = "Texures/Core/ErrorTexture.png"; + double ParticleLifeTime = 3.f; + ParticleFlags::Type Flags = ParticleFlags::Type::powderParticle | ParticleFlags::Type::particleContactFilterParticle | ParticleFlags::Type::fixtureContactFilterParticle; + float Radius = 1.f; +}; + +} +} + +#endif + diff --git a/include/Physics/PhysicsSystem.h b/include/Physics/PhysicsSystem.h index b11f84b..aace1fb 100755 --- a/include/Physics/PhysicsSystem.h +++ b/include/Physics/PhysicsSystem.h @@ -15,6 +15,7 @@ #include "Transform/TransformSystem.h" #include "Physics/EContact.h" #include "Physics/ESetImpulse.h" +#include "Physics/ECreateParticleSequence.h" #include "Physics/CCircleShape.h" #include "Core/EventBroker.h" #include "Game/CPad.h" @@ -47,6 +48,9 @@ public: EventRelay m_SetImpulse; bool SetImpulse(const Events::SetImpulse &event); + EventRelay m_ECreateParticleSequence; + bool CreateParticleSequence(const Events::CreateParticleSequence &event); + void RegisterComponents(ComponentFactory* cf) override; void Initialize() override; diff --git a/include/Sound/SoundSystem.h b/include/Sound/SoundSystem.h index 32dd05e..1cb981a 100644 --- a/include/Sound/SoundSystem.h +++ b/include/Sound/SoundSystem.h @@ -18,6 +18,8 @@ #include "Sound/CCollisionSound.h" #include "Core/ResourceManager.h" +#include "Physics/ECreateParticleSequence.h" + namespace dd { diff --git a/src/game/Physics/PhysicsSystem.cpp b/src/game/Physics/PhysicsSystem.cpp index 97b2629..3eaa8f7 100755 --- a/src/game/Physics/PhysicsSystem.cpp +++ b/src/game/Physics/PhysicsSystem.cpp @@ -33,6 +33,8 @@ void dd::Systems::PhysicsSystem::Initialize() EVENT_SUBSCRIBE_MEMBER(m_SetImpulse, PhysicsSystem::SetImpulse); + EVENT_SUBSCRIBE_MEMBER(m_ECreateParticleSequence, &PhysicsSystem::CreateParticleSequence); + } void dd::Systems::PhysicsSystem::InitializeWater() @@ -186,6 +188,9 @@ void dd::Systems::PhysicsSystem::Update(double dt) { //Normal particles for ( int e = 0; e < m_EntitiesToParticleHandle.size(); e++) { b2Vec2 *positionBuffer = m_ParticleEmitters.ParticleSystem[e]->GetPositionBuffer(); + if(!positionBuffer) { + break; + } for (auto i : m_EntitiesToParticleHandle[e]){ EntityID entity = i.first; b2ParticleHandle *particleH = i.second; @@ -394,6 +399,7 @@ void dd::Systems::PhysicsSystem::CreateParticleGroup(EntityID e) void dd::Systems::PhysicsSystem::UpdateParticleEmitters(double dt) { + std::vector emittersToDelete; int pSizeTest = 0; for (int i = 0; i < m_ParticleEmitters.ParticleSystem.size(); i++) { auto e = m_ParticleEmitters.ParticleEmitter[i]; @@ -416,6 +422,12 @@ void dd::Systems::PhysicsSystem::UpdateParticleEmitters(double dt) TempTransform->Orientation = glm::rotate(glm::quat(), 3.f, glm::vec3(0.f, 0.f, -1.f)); emitter->TimeSinceLastSpawn += dt; + emitter->LifeTime -= dt; + + if (emitter->LifeTime <= 0 || emitter->NumberOfTicks <= 0) { + emittersToDelete.push_back(e); + continue; + } if(emitter->TimeSinceLastSpawn < emitter->SpawnRate || emitter->NumberOfTicks < 1) { continue; } @@ -424,7 +436,6 @@ void dd::Systems::PhysicsSystem::UpdateParticleEmitters(double dt) auto templateTransform = m_World->GetComponent(pt); b2ParticleDef particleDef; for ( int j = 0; j < emitter->ParticlesPerTick; j++) { - LOG_INFO("Creating particle #%i", j); particleDef.flags = particleTemplate->Flags; //particleDef.color TODO: Implement this if we want color mixing and shit. particleDef.lifetime = particleTemplate->LifeTime; @@ -456,13 +467,68 @@ void dd::Systems::PhysicsSystem::UpdateParticleEmitters(double dt) m_ParticleHandleToEntities[i].insert(std::make_pair(b2ParticleHandle, particle)); } } + + for (int i = 0; i < emittersToDelete.size(); i++) + { + EntityID ent = emittersToDelete[i]; + int key; + for(key = 0; key < m_ParticleEmitters.ParticleEmitter.size(); key++) { + if (m_ParticleEmitters.ParticleEmitter[key] == ent) { + break; + } + } + + if (m_ParticleEmitters.ParticleSystem[key]->GetParticleCount() == 0 && key <= m_ParticleEmitters.ParticleSystem.size()) { + m_World->RemoveEntity(ent); + m_PhysicsWorld->DestroyParticleSystem(m_ParticleEmitters.ParticleSystem[key]); + m_ParticleEmitters.ParticleSystem.erase(m_ParticleEmitters.ParticleSystem.begin() + key); + m_ParticleEmitters.ParticleEmitter.erase(m_ParticleEmitters.ParticleEmitter.begin() + key); + m_ParticleEmitters.ParticleTemplate.erase(m_ParticleEmitters.ParticleTemplate.begin() + key); + m_EntitiesToParticleHandle.erase(m_EntitiesToParticleHandle.begin() + key); + m_ParticleHandleToEntities.erase(m_ParticleHandleToEntities.begin() + key); + } + } + int stp = 0; for (auto ts : m_EntitiesToParticleHandle) { stp += ts.size(); } - LOG_INFO("Particles in list: %i", stp); - LOG_INFO("Particles: %i", pSizeTest); +} + +bool dd::Systems::PhysicsSystem::CreateParticleSequence(const Events::CreateParticleSequence &event) +{ + //Creating Emitter + auto emitter = m_World->CreateEntity(); + auto emitterTransform = m_World->AddComponent(emitter); + auto particleEmitter= m_World->AddComponent(emitter); + + emitterTransform->Position = event.Position; + particleEmitter->GravityScale = event.GravityScale; + particleEmitter->SpawnRate = event.SpawnRate; + particleEmitter->NumberOfTicks = event.NumberOfTicks; + particleEmitter->Speed = event.Speed; + particleEmitter->ParticlesPerTick = event.ParticlesPerTick; + particleEmitter->Spread = event.Spread; + particleEmitter->EmittingAngle = event.EmittingAngle; + particleEmitter->LifeTime = event.EmitterLifeTime; + + { + //Creating Particle Template + auto particle = m_World->CreateEntity(emitter); + auto particleTransform = m_World->AddComponent(particle); + auto sprite = m_World->AddComponent(particle); + auto particleComponent = m_World->AddComponent(particle); + m_World->AddComponent(particle); + + particleTransform->Position = emitterTransform->Position; + sprite->SpriteFile = event.SpriteFile; + particleComponent->LifeTime = event.ParticleLifeTime; + particleComponent->Flags = event.Flags; + particleComponent->Radius = event.Radius; + } + m_World->CommitEntity(emitter); + return true; } void dd::Systems::PhysicsSystem::CreateParticleEmitter(EntityID entity) diff --git a/src/game/Sound/SoundSystem.cpp b/src/game/Sound/SoundSystem.cpp index 90939a1..1ecbd00 100644 --- a/src/game/Sound/SoundSystem.cpp +++ b/src/game/Sound/SoundSystem.cpp @@ -164,10 +164,29 @@ bool dd::Systems::SoundSystem::OnContact(const dd::Events::Contact &event) } //Send play-sound event - dd::Events::PlaySound e; - e.path = collisionSound->filePath; - e.isAmbient = false; - EventBroker->Publish(e); + + { + dd::Events::PlaySound e; + e.path = collisionSound->filePath; + e.isAmbient = false; + EventBroker->Publish(e); + } + + { + Events::CreateParticleSequence e; + e.Position = glm::vec3(0.f, 0.f, -10.f); + e.SpriteFile = "Textures/Background.png"; + e.GravityScale = 0.0f; + e.SpawnRate = 1.f; + e.NumberOfTicks = 2; + e.Speed = 1.f; + e.ParticlesPerTick = 5; + e.Spread = glm::pi() * 2; + e.EmittingAngle = glm::pi(); + e.EmitterLifeTime = 50; + e.ParticleLifeTime = 3.f; + EventBroker->Publish(e); + } //return true; }