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

fixes

Browse Source
This commit is contained in:
viktorljung
2015-10-07 14:41:59 +02:00
parent 3f44547d25
commit 1462ca6111
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/Physics/PhysicsSystem.cpp
+2 -2
View File
@@ -14,7 +14,7 @@ void dd::Systems::PhysicsSystem::Initialize()
m_PhysicsWorld = new b2World(m_Gravity); m_PhysicsWorld = new b2World(m_Gravity);
m_PhysicsWorld->SetContactListener(m_ContactListener); m_PhysicsWorld->SetContactListener(m_ContactListener);
InitializeWater(); InitializeWater();
EVENT_SUBSCRIBE_MEMBER(m_SetImpulse, PhysicsSystem::SetImpulse); EVENT_SUBSCRIBE_MEMBER(m_SetImpulse, &PhysicsSystem::SetImpulse);
EVENT_SUBSCRIBE_MEMBER(m_EPause, &PhysicsSystem::OnPause); EVENT_SUBSCRIBE_MEMBER(m_EPause, &PhysicsSystem::OnPause);
} }
@@ -170,7 +170,7 @@ void dd::Systems::PhysicsSystem::Update(double dt)
b2Vec2 *positionBuffer = m_ParticleSystem[e]->GetPositionBuffer(); b2Vec2 *positionBuffer = m_ParticleSystem[e]->GetPositionBuffer();
for (auto i : m_EntitiesToParticleHandle[e]) { for (auto i : m_EntitiesToParticleHandle[e]) {
EntityID entity = i.first; EntityID entity = i.first;
b2ParticleHandle *particleH = i.second; const b2ParticleHandle *particleH = i.second;
b2Vec2 positionB2 = positionBuffer[particleH->GetIndex()]; b2Vec2 positionB2 = positionBuffer[particleH->GetIndex()];
glm::vec2 position = glm::vec2(positionB2.x, positionB2.y); glm::vec2 position = glm::vec2(positionB2.x, positionB2.y);