Merge remote-tracking branch 'origin/master' into LevelSystemAndSuch

2015-09-11 10:51:52 +02:00
parent c829315598 6932a22d7a
commit ead7c6c754
3 changed files with 6 additions and 4 deletions
@@ -78,6 +78,8 @@ private:
            e.Entity1 = m_PhysicsSystem->m_BodiesToEntities[contact->GetFixtureA()->GetBody()];
            e.Entity2 = m_PhysicsSystem->m_BodiesToEntities[contact->GetFixtureB()->GetBody()];

+            std::cout << e.Entity1 << " " << e.Entity2 << std::endl;
+
            m_PhysicsSystem->EventBroker->Publish(e);
        }
        void EndContact(b2Contact* contact)