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

Added two new particle sprites.

Browse Source
This commit is contained in:
Stiffly
2015-10-08 18:19:15 +02:00
parent 51cc45fbf0
commit 143bff2d9e
9 changed files with 86 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/Physics/PhysicsSystem.cpp
+70 -7
View File
@@ -15,14 +15,16 @@ void dd::Systems::PhysicsSystem::Initialize()
m_DestructionListener = new DestructionListener(this);
m_ContactListener = new ContactListener(this);
m_PhysicsWorld = new b2World(m_Gravity);
m_ParticleContactDisabler = new ParticleContactDisabler();
m_PhysicsWorld->SetContactListener(m_ContactListener);
m_PhysicsWorld->SetContactFilter(&m_ParticleContactDisabler);
m_PhysicsWorld->SetDestructionListener(m_DestructionListener);
m_PhysicsWorld->SetContactFilter(m_ParticleContactDisabler);
m_PhysicsWorld->SetDestructionListener(m_DestructionListener);
InitializeWater();
EVENT_SUBSCRIBE_MEMBER(m_SetImpulse, &PhysicsSystem::SetImpulse);
EVENT_SUBSCRIBE_MEMBER(m_EPause, &PhysicsSystem::OnPause);
EVENT_SUBSCRIBE_MEMBER(m_ECreateParticleSequence, &PhysicsSystem::CreateParticleSequence);
EVENT_SUBSCRIBE_MEMBER(m_EContact, &PhysicsSystem::OnContact);
}
@@ -250,8 +252,14 @@ void dd::Systems::PhysicsSystem::UpdateEntity(double dt, EntityID entity, Entity
}
}
auto particle = m_World->GetComponent<Components::Particle>(entity);
auto pTemplate = m_World->GetComponent<Components::Template>(entity);
auto pTemplate = m_World->GetComponent<Components::Template>(entity);
if (particle && pTemplate)
LOG_ERROR("Particel + template finns");
if (particle && !pTemplate) {
//LOG_ERROR("Particel - template finns");
particle->LifeTime -= dt;
if (particle->LifeTime <= 0) {
for (int i = 0; i < m_EntitiesToParticleHandle.size(); i++) {
@@ -266,6 +274,7 @@ void dd::Systems::PhysicsSystem::UpdateEntity(double dt, EntityID entity, Entity
if (iter2 != m_ParticleHandleToEntities[i].end()) {
m_ParticleHandleToEntities[i].erase(iter2);
}
LOG_INFO("Deleteing particle!!.");
m_World->RemoveEntity(entity);
}
}
@@ -448,14 +457,14 @@ void dd::Systems::PhysicsSystem::CreateParticleGroup(EntityID e)
void dd::Systems::PhysicsSystem::UpdateParticleEmitters(double dt)
{
std::vector<EntityID> emittersToDelete;
int pSizeTest = 0;
int pSizeTest = 0; //For debugging, delete this
int psListSize = 0;
for (int i = 0; i < m_ParticleEmitters.ParticleSystem.size(); i++) {
auto e = m_ParticleEmitters.ParticleEmitter[i];
auto pt = m_ParticleEmitters.ParticleTemplate[i];
auto ps = m_ParticleEmitters.ParticleSystem[i];
pSizeTest += ps->GetParticleCount();
psListSize++;
auto emitter = m_World->GetComponent<Components::ParticleEmitter>(e);
auto particleTemplate = m_World->GetComponent<Components::Particle>(pt);
if(!emitter) {
@@ -493,7 +502,7 @@ void dd::Systems::PhysicsSystem::UpdateParticleEmitters(double dt)
std::uniform_real_distribution<float> dis(eAngle - halfSpread, eAngle + halfSpread);
float pAngle = dis(gen);
glm::vec2 unitVec = glm::normalize(glm::vec2(glm::cos(pAngle), glm::sin(pAngle)));
glm::vec2 vel = unitVec * emitter->Speed;
glm::vec2 vel = unitVec * emitter->Speed * (float)dt;
particleDef.velocity = b2Vec2(vel.x, vel.y);
particleDef.position = b2Vec2(templateTransform->Position.x, templateTransform->Position.y);
@@ -513,8 +522,25 @@ void dd::Systems::PhysicsSystem::UpdateParticleEmitters(double dt)
auto b2ParticleHandle = ps->GetParticleHandleFromIndex(b2Particle);
m_EntitiesToParticleHandle[i].insert(std::make_pair(particle, b2ParticleHandle));
m_ParticleHandleToEntities[i].insert(std::make_pair(b2ParticleHandle, particle));
}
}
// system("cls");
// std::cout << "Particles living: " << pSizeTest << std::endl;
// std::cout << "particle systems: " << psListSize << std::endl;
// int entHandles = 0;
// for (int i = 0; i < m_EntitiesToParticleHandle.size(); i++)
// entHandles += m_EntitiesToParticleHandle[i].size();
// std::cout << "Entities and handles: " << entHandles << std::endl;
// LOG_INFO("Particles living: %i", pSizeTest);
// LOG_INFO("Particle systems: %i", psListSize);
// int entHandles = 0;
// for (int i = 0; i < m_EntitiesToParticleHandle.size(); i++)
// entHandles += m_EntitiesToParticleHandle[i].size();
// LOG_INFO("Entities and handles: %i", entHandles);
for (int i = 0; i < emittersToDelete.size(); i++)
{
@@ -537,6 +563,8 @@ void dd::Systems::PhysicsSystem::UpdateParticleEmitters(double dt)
}
}
int stp = 0;
for (auto ts : m_EntitiesToParticleHandle)
{
@@ -571,6 +599,7 @@ bool dd::Systems::PhysicsSystem::CreateParticleSequence(const Events::CreatePart
particleTransform->Position = emitterTransform->Position;
sprite->SpriteFile = event.SpriteFile;
sprite->Color = event.Color;
particleComponent->LifeTime = event.ParticleLifeTime;
particleComponent->Flags = event.Flags;
particleComponent->Radius = event.Radius;
@@ -632,6 +661,40 @@ b2ParticleSystem* dd::Systems::PhysicsSystem::CreateParticleSystem(float radius,
return m_PhysicsWorld->CreateParticleSystem(&m_ParticleSystemDef);
}
bool dd::Systems::PhysicsSystem::OnContact(const dd::Events::Contact &event)
{
//Check if it is a brick colliding
auto brick = m_World->GetComponent<Components::Brick>(event.Entity1);
Components::Model* model;
if (!brick) {
brick = m_World->GetComponent<Components::Brick>(event.Entity2);
if (!brick) {
return false;
}
else {
model = m_World->GetComponent<Components::Model>(event.Entity2);
}
}
else {
model = m_World->GetComponent<Components::Model>(event.Entity1);
}
Events::CreateParticleSequence e;
e.EmitterLifeTime = 2;
//- glm::atan(event.Normal.x, event.Normal.y
e.EmittingAngle = glm::half_pi<float>();
e.Spread = 0;
e.NumberOfTicks = 1;
e.ParticleLifeTime = 1.f;
e.ParticlesPerTick = 1;
e.Position = glm::vec3(event.IntersectionPoint.x, event.IntersectionPoint.y, -10);
e.Radius = 0.1f;
e.SpriteFile = "Textures/Bricks/3.png";
e.Color = model->Color;
e.Speed = 100.f;
EventBroker->Publish(e);
return true;
}
dd::Systems::PhysicsSystem::~PhysicsSystem()