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

Physics/Geom: Improved Geom class

Browse Source 
Renamed BaseGeom to PhysGeom, made it a reference-counted class


Former-commit-id: 5b3a2921addb537c2744346edc9c74eafb3260b0
This commit is contained in:
Lynix
2015-04-19 18:01:45 +02:00
parent 697e6714db
commit 1642536a0e
5 changed files with 243 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,55 +4,35 @@
#include <Nazara/Physics/PhysObject.hpp>
#include <Nazara/Physics/Config.hpp>
#include <Nazara/Physics/Geom.hpp>
#include <Nazara/Physics/PhysWorld.hpp>
#include <Newton/Newton.h>
#include <algorithm>
#include <Nazara/Physics/Debug.hpp>
NzPhysObject::NzPhysObject(NzPhysWorld* world, const NzMatrix4f& mat) :
m_matrix(mat),
m_forceAccumulator(NzVector3f::Zero()),
m_torqueAccumulator(NzVector3f::Zero()),
m_world(world),
m_ownsGeom(true),
m_gravityFactor(1.f),
m_mass(0.f)
NzPhysObject(world, NzNullGeom::New(world), mat)
{
#if NAZARA_PHYSICS_SAFE
if (!world)
NazaraError("Invalid physics world"); ///TODO: Unexcepted
#endif
m_geom = new NzNullGeom(world);
m_body = NewtonCreateDynamicBody(world->GetHandle(), m_geom->GetHandle(), mat);
NewtonBodySetUserData(m_body, this);
}
NzPhysObject::NzPhysObject(NzPhysWorld* world, const NzBaseGeom* geom, const NzMatrix4f& mat) :
NzPhysObject::NzPhysObject(NzPhysWorld* world, NzPhysGeomRef geom, const NzMatrix4f& mat) :
m_matrix(mat),
m_forceAccumulator(NzVector3f::Zero()),
m_torqueAccumulator(NzVector3f::Zero()),
m_geom(geom),
m_geom(std::move(geom)),
m_world(world),
m_ownsGeom(false),
m_gravityFactor(1.f),
m_mass(0.f)
{
#if NAZARA_PHYSICS_SAFE
if (!world)
NazaraError("Invalid physics world"); ///TODO: Unexcepted
#endif
NazaraAssert(m_world, "Invalid world");
NazaraAssert(m_geom, "Invalid geometry");
m_body = NewtonCreateDynamicBody(world->GetHandle(), geom->GetHandle(), mat);
m_body = NewtonCreateDynamicBody(world->GetHandle(), m_geom->GetHandle(), mat);
NewtonBodySetUserData(m_body, this);
}
NzPhysObject::~NzPhysObject()
{
NewtonDestroyBody(m_world->GetHandle(), m_body);
if (m_ownsGeom)
delete m_geom;
}
void NzPhysObject::AddForce(const NzVector3f& force, nzCoordSys coordSys)
@@ -112,6 +92,14 @@ void NzPhysObject::EnableAutoSleep(bool autoSleep)
NewtonBodySetAutoSleep(m_body, autoSleep);
}
NzBoxf NzPhysObject::GetAABB() const
{
NzVector3f min, max;
NewtonBodyGetAABB(m_body, min, max);
return NzBoxf(min, max);
}
NzVector3f NzPhysObject::GetAngularVelocity() const
{
NzVector3f angularVelocity;
@@ -120,6 +108,11 @@ NzVector3f NzPhysObject::GetAngularVelocity() const
return angularVelocity;
}
const NzPhysGeomRef& NzPhysObject::GetGeom() const
{
return m_geom;
}
float NzPhysObject::GetGravityFactor() const
{
return m_gravityFactor;
@@ -191,6 +184,14 @@ bool NzPhysObject::IsSleeping() const
return NewtonBodyGetSleepState(m_body) != 0;
}
void NzPhysObject::SetGeom(NzPhysGeomRef geom)
{
if (geom)
m_geom = geom;
else
m_geom = NzNullGeom::New(m_world);
}
void NzPhysObject::SetGravityFactor(float gravityFactor)
{
m_gravityFactor = gravityFactor;
@@ -240,6 +241,7 @@ void NzPhysObject::SetRotation(const NzQuaternionf& rotation)
void NzPhysObject::UpdateBody()
{
NewtonBodySetMatrix(m_body, m_matrix);
/*for (std::set<PhysObjectListener*>::iterator it = m_listeners.begin(); it != m_listeners.end(); ++it)
(*it)->PhysObjectOnUpdate(this);*/
}