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

collisions remade

Browse Source
This commit is contained in:
viktorljung
2015-09-17 16:52:43 +02:00
parent 442554812d
commit c0155b7900
5 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/Physics/PhysicsSystem.h
+3 -2
View File
@@ -90,11 +90,12 @@ private:
Events::Contact e;
e.Entity1 = m_PhysicsSystem->m_BodiesToEntities[contact->GetFixtureA()->GetBody()];
e.Entity2 = m_PhysicsSystem->m_BodiesToEntities[contact->GetFixtureB()->GetBody()];
e.Normal = glm::normalize(glm::vec2(worldManifold.normal.x, worldManifold.normal.y));
e.Normal = glm::normalize(glm::vec2(contact->GetManifold()->localNormal.x, contact->GetManifold()->localNormal.y));
e.SignificantNormal = glm::normalize((glm::abs(e.Normal.x) > glm::abs(e.Normal.y)) ? glm::vec2(e.Normal.x, 0) : glm::vec2(0, e.Normal.y));
m_PhysicsSystem->EventBroker->Publish(e);
LOG_INFO("Entity1 = %i, Entity2 = %i\n", e.Entity1, e.Entity2);
LOG_INFO("Entity1 = %i, Entity2 = %i\n Normal: %f, %f", e.Entity1, e.Entity2, e.SignificantNormal.x, e.SignificantNormal.y);
}
void EndContact(b2Contact* contact)
{