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

Physics/PhysObject: Fixed class 

Former-commit-id: bb5b3995e6cd8f349ad0a09258976bf163e65201
This commit is contained in:
Lynix 2015-04-20 01:44:31 +02:00
parent 06b2651264
commit a7be4c6346
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,7 +10,7 @@
#include <Nazara/Physics/Debug.hpp> #include <Nazara/Physics/Debug.hpp>
NzPhysObject::NzPhysObject(NzPhysWorld* world, const NzMatrix4f& mat) : NzPhysObject::NzPhysObject(NzPhysWorld* world, const NzMatrix4f& mat) :
NzPhysObject(world, NzNullGeom::New(world), mat) NzPhysObject(world, NzNullGeom::New(), mat)
{ {
} }
@ -26,7 +26,7 @@ m_mass(0.f)
NazaraAssert(m_world, "Invalid world"); NazaraAssert(m_world, "Invalid world");
NazaraAssert(m_geom, "Invalid geometry"); NazaraAssert(m_geom, "Invalid geometry");
m_body = NewtonCreateDynamicBody(m_world->GetHandle(), m_geom->GetHandle(), m_matrix); m_body = NewtonCreateDynamicBody(m_world->GetHandle(), m_geom->GetHandle(m_world), m_matrix);
NewtonBodySetUserData(m_body, this); NewtonBodySetUserData(m_body, this);
} }
@ -42,13 +42,13 @@ m_mass(0.f)
NazaraAssert(m_world, "Invalid world"); NazaraAssert(m_world, "Invalid world");
NazaraAssert(m_geom, "Invalid geometry"); NazaraAssert(m_geom, "Invalid geometry");
m_body = NewtonCreateDynamicBody(m_world->GetHandle(), m_geom->GetHandle(), m_matrix); m_body = NewtonCreateDynamicBody(m_world->GetHandle(), m_geom->GetHandle(m_world), m_matrix);
NewtonBodySetUserData(m_body, this); NewtonBodySetUserData(m_body, this);
SetMass(object.m_mass); SetMass(object.m_mass);
} }
NzPhysObject::NzPhysObject(NzPhysObject&& object) : NzPhysObject::NzPhysObject(NzPhysObject&& object) :
m_matrix(std::move(object)), m_matrix(std::move(object.m_matrix)),
m_forceAccumulator(std::move(object.m_forceAccumulator)), m_forceAccumulator(std::move(object.m_forceAccumulator)),
m_torqueAccumulator(std::move(object.m_torqueAccumulator)), m_torqueAccumulator(std::move(object.m_torqueAccumulator)),
m_body(object.m_body), m_body(object.m_body),
@ -220,7 +220,7 @@ void NzPhysObject::SetGeom(NzPhysGeomRef geom)
if (geom) if (geom)
m_geom = geom; m_geom = geom;
else else
m_geom = NzNullGeom::New(m_world); m_geom = NzNullGeom::New();
} }
void NzPhysObject::SetGravityFactor(float gravityFactor) void NzPhysObject::SetGravityFactor(float gravityFactor)
@ -271,6 +271,8 @@ void NzPhysObject::SetRotation(const NzQuaternionf& rotation)
NzPhysObject& NzPhysObject::operator=(const NzPhysObject& object) NzPhysObject& NzPhysObject::operator=(const NzPhysObject& object)
{ {
NzPhysObject physObj(object);
return operator=(std::move(physObj));
} }
void NzPhysObject::UpdateBody() void NzPhysObject::UpdateBody()
@ -279,8 +281,6 @@ void NzPhysObject::UpdateBody()
/*for (std::set<PhysObjectListener*>::iterator it = m_listeners.begin(); it != m_listeners.end(); ++it) /*for (std::set<PhysObjectListener*>::iterator it = m_listeners.begin(); it != m_listeners.end(); ++it)
(*it)->PhysObjectOnUpdate(this);*/ (*it)->PhysObjectOnUpdate(this);*/
NzPhysObject physObj(object);
return operator=(std::move(physObj));
} }
NzPhysObject& NzPhysObject::operator=(NzPhysObject&& object) NzPhysObject& NzPhysObject::operator=(NzPhysObject&& object)