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

Physics/PhysObject: Added Copy/Move constructor/operator 

Former-commit-id: 3cec9759476de4eb1adb470d436aa40698357c50
This commit is contained in:
Lynix 2015-04-19 23:20:13 +02:00
parent f7d6107ec7
commit 61c6baeabe
2 changed files with 63 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/Nazara/Physics/PhysObject.hpp
View File

@ -23,6 +23,8 @@ class NAZARA_API NzPhysObject : NzNonCopyable
public:
NzPhysObject(NzPhysWorld* world, const NzMatrix4f& mat = NzMatrix4f::Identity());
NzPhysObject(NzPhysWorld* world, NzPhysGeomRef geom, const NzMatrix4f& mat = NzMatrix4f::Identity());
NzPhysObject(const NzPhysObject& object);
NzPhysObject(NzPhysObject&& object);
~NzPhysObject();
void AddForce(const NzVector3f& force, nzCoordSys coordSys = nzCoordSys_Global);
@ -54,16 +56,19 @@ class NAZARA_API NzPhysObject : NzNonCopyable
void SetPosition(const NzVector3f& position);
void SetRotation(const NzQuaternionf& rotation);
NzPhysObject& operator=(NzPhysObject object);
NzPhysObject& operator=(NzPhysObject&& object);
private:
void UpdateBody();
static void ForceAndTorqueCallback(const NewtonBody* body, float timeStep, int threadIndex);
static void TransformCallback(const NewtonBody* body, const float* matrix, int threadIndex);
NzMatrix4f m_matrix;
NzPhysGeomRef m_geom;
NzVector3f m_forceAccumulator;
NzVector3f m_torqueAccumulator;
NewtonBody* m_body;
NzPhysGeomRef m_geom;
NzPhysWorld* m_world;
float m_gravityFactor;
float m_mass;

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

@ -16,9 +16,9 @@ NzPhysObject(world, NzNullGeom::New(world), mat)
NzPhysObject::NzPhysObject(NzPhysWorld* world, NzPhysGeomRef geom, const NzMatrix4f& mat) :
m_matrix(mat),
m_geom(std::move(geom)),
m_forceAccumulator(NzVector3f::Zero()),
m_torqueAccumulator(NzVector3f::Zero()),
m_geom(std::move(geom)),
m_world(world),
m_gravityFactor(1.f),
m_mass(0.f)
@ -26,13 +26,44 @@ m_mass(0.f)
NazaraAssert(m_world, "Invalid world");
NazaraAssert(m_geom, "Invalid geometry");
m_body = NewtonCreateDynamicBody(world->GetHandle(), m_geom->GetHandle(), mat);
m_body = NewtonCreateDynamicBody(m_world->GetHandle(), m_geom->GetHandle(), m_matrix);
NewtonBodySetUserData(m_body, this);
}
NzPhysObject::NzPhysObject(const NzPhysObject& object) :
m_matrix(object.m_matrix),
m_geom(object.m_geom),
m_forceAccumulator(NzVector3f::Zero()),
m_torqueAccumulator(NzVector3f::Zero()),
m_world(object.m_world),
m_gravityFactor(object.m_gravityFactor),
m_mass(0.f)
{
NazaraAssert(m_world, "Invalid world");
NazaraAssert(m_geom, "Invalid geometry");
m_body = NewtonCreateDynamicBody(m_world->GetHandle(), m_geom->GetHandle(), m_matrix);
NewtonBodySetUserData(m_body, this);
SetMass(object.m_mass);
}
NzPhysObject::NzPhysObject(NzPhysObject&& object) :
m_matrix(std::move(object)),
m_forceAccumulator(std::move(object.m_forceAccumulator)),
m_torqueAccumulator(std::move(object.m_torqueAccumulator)),
m_body(object.m_body),
m_geom(std::move(object.m_geom)),
m_world(object.m_world),
m_gravityFactor(object.m_gravityFactor),
m_mass(object.m_mass)
{
object.m_body = nullptr;
}
NzPhysObject::~NzPhysObject()
{
NewtonDestroyBody(m_world->GetHandle(), m_body);
if (m_body)
NewtonDestroyBody(m_world->GetHandle(), m_body);
}
void NzPhysObject::AddForce(const NzVector3f& force, nzCoordSys coordSys)
@ -238,6 +269,13 @@ void NzPhysObject::SetRotation(const NzQuaternionf& rotation)
UpdateBody();
}
NzPhysObject& NzPhysObject::operator=(NzPhysObject object)
{
std::swap(*this, object);
return *this;
}
void NzPhysObject::UpdateBody()
{
NewtonBodySetMatrix(m_body, m_matrix);
@ -246,6 +284,22 @@ void NzPhysObject::UpdateBody()
(*it)->PhysObjectOnUpdate(this);*/
}
NzPhysObject& NzPhysObject::operator=(NzPhysObject&& object)
{
m_body = object.m_body;
m_forceAccumulator = std::move(object.m_forceAccumulator);
m_geom = std::move(object.m_geom);
m_gravityFactor = object.m_gravityFactor;
m_mass = object.m_mass;
m_matrix = std::move(object.m_matrix);
m_torqueAccumulator = std::move(object.m_torqueAccumulator);
m_world = object.m_world;
object.m_body = nullptr;
return *this;
}
void NzPhysObject::ForceAndTorqueCallback(const NewtonBody* body, float timeStep, int threadIndex)
{
NazaraUnused(timeStep);