sid/NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/DigitalPulseSoftware/NazaraEngine

Browse Source 
Former-commit-id: 92e5665db87f810ea4e93729248ddf0d2cd16c1e [formerly 562b7d56979496c390b03d30cc7a709935c954d4]
Former-commit-id: f8b1a7bbef8e659068b0c320300166970bf6a3f6
This commit is contained in:
Lynix
2016-06-01 08:42:58 +02:00
parent fc24b786c7 94ff113930
commit fe079bf566
14 changed files with 114 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Nazara/Physics/PhysObject.cpp
View File

@@ -68,7 +68,7 @@ namespace Nz
PhysObject::~PhysObject()
{
if (m_body)
NewtonDestroyBody(m_world->GetHandle(), m_body);
NewtonDestroyBody(m_body);
}
void PhysObject::AddForce(const Vector3f& force, CoordSys coordSys)
@@ -304,11 +304,13 @@ namespace Nz
Vector3f min, max;
NewtonBodyGetAABB(m_body, min, max);
NewtonWorldForEachBodyInAABBDo(m_world->GetHandle(), min, max, [](const NewtonBody* const body, void* const userData)
NewtonWorldForEachBodyInAABBDo(m_world->GetHandle(), min, max, [](const NewtonBody* const body, void* const userData) -> int
{
NazaraUnused(userData);
NewtonBodySetSleepState(body, 0);
}, nullptr);
return 1;
},
nullptr);
}
/*for (std::set<PhysObjectListener*>::iterator it = m_listeners.begin(); it != m_listeners.end(); ++it)
(*it)->PhysObjectOnUpdate(this);*/
@@ -317,7 +319,7 @@ namespace Nz
PhysObject& PhysObject::operator=(PhysObject&& object)
{
if (m_body)
NewtonDestroyBody(m_world->GetHandle(), m_body);
NewtonDestroyBody(m_body);
m_body = object.m_body;
m_forceAccumulator = std::move(object.m_forceAccumulator);