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

Physics3D: Rename PhysWorld to PhysWorld3D

Browse Source
This commit is contained in:
Lynix
2016-10-13 08:13:56 +02:00
parent 3765cba046
commit b52c7c57bf
12 changed files with 59 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/Nazara/Physics3D/Collider3D.cpp
View File

@@ -53,7 +53,7 @@ namespace Nz
// Si nous n'avons aucune instance, nous en créons une temporaire
if (m_handles.empty())
{
PhysWorld world;
PhysWorld3D world;
NewtonCollision* collision = CreateHandle(&world);
{
@@ -75,7 +75,7 @@ namespace Nz
// Si nous n'avons aucune instance, nous en créons une temporaire
if (m_handles.empty())
{
PhysWorld world;
PhysWorld3D world;
NewtonCollision* collision = CreateHandle(&world);
{
@@ -100,7 +100,7 @@ namespace Nz
// Si nous n'avons aucune instance, nous en créons une temporaire
if (m_handles.empty())
{
PhysWorld world;
PhysWorld3D world;
NewtonCollision* collision = CreateHandle(&world);
{
@@ -114,7 +114,7 @@ namespace Nz
return volume;
}
NewtonCollision* Collider3D::GetHandle(PhysWorld* world) const
NewtonCollision* Collider3D::GetHandle(PhysWorld3D* world) const
{
auto it = m_handles.find(world);
if (it == m_handles.end())
@@ -198,7 +198,7 @@ namespace Nz
return GeomType_Box;
}
NewtonCollision* BoxCollider3D::CreateHandle(PhysWorld* world) const
NewtonCollision* BoxCollider3D::CreateHandle(PhysWorld3D* world) const
{
return NewtonCreateBox(world->GetHandle(), m_lengths.x, m_lengths.y, m_lengths.z, 0, m_matrix);
}
@@ -232,7 +232,7 @@ namespace Nz
return GeomType_Capsule;
}
NewtonCollision* CapsuleCollider3D::CreateHandle(PhysWorld* world) const
NewtonCollision* CapsuleCollider3D::CreateHandle(PhysWorld3D* world) const
{
return NewtonCreateCapsule(world->GetHandle(), m_radius, m_length, 0, m_matrix);
}
@@ -256,7 +256,7 @@ namespace Nz
return GeomType_Compound;
}
NewtonCollision* CompoundCollider3D::CreateHandle(PhysWorld* world) const
NewtonCollision* CompoundCollider3D::CreateHandle(PhysWorld3D* world) const
{
NewtonCollision* compoundCollision = NewtonCreateCompoundCollision(world->GetHandle(), 0);
@@ -306,7 +306,7 @@ namespace Nz
return GeomType_Cone;
}
NewtonCollision* ConeCollider3D::CreateHandle(PhysWorld* world) const
NewtonCollision* ConeCollider3D::CreateHandle(PhysWorld3D* world) const
{
return NewtonCreateCone(world->GetHandle(), m_radius, m_length, 0, m_matrix);
}
@@ -340,7 +340,7 @@ namespace Nz
return GeomType_Compound;
}
NewtonCollision* ConvexCollider3D::CreateHandle(PhysWorld* world) const
NewtonCollision* ConvexCollider3D::CreateHandle(PhysWorld3D* world) const
{
return NewtonCreateConvexHull(world->GetHandle(), static_cast<int>(m_vertices.size()), reinterpret_cast<const float*>(m_vertices.data()), sizeof(Vector3f), m_tolerance, 0, m_matrix);
}
@@ -374,7 +374,7 @@ namespace Nz
return GeomType_Cylinder;
}
NewtonCollision* CylinderCollider3D::CreateHandle(PhysWorld* world) const
NewtonCollision* CylinderCollider3D::CreateHandle(PhysWorld3D* world) const
{
return NewtonCreateCylinder(world->GetHandle(), m_radius, m_length, 0, m_matrix);
}
@@ -399,7 +399,7 @@ namespace Nz
center->MakeZero();
}
NewtonCollision* NullCollider3D::CreateHandle(PhysWorld* world) const
NewtonCollision* NullCollider3D::CreateHandle(PhysWorld3D* world) const
{
return NewtonCreateNull(world->GetHandle());
}
@@ -441,7 +441,7 @@ namespace Nz
return GeomType_Sphere;
}
NewtonCollision* SphereCollider3D::CreateHandle(PhysWorld* world) const
NewtonCollision* SphereCollider3D::CreateHandle(PhysWorld3D* world) const
{
return NewtonCreateSphere(world->GetHandle(), m_radius, 0, Matrix4f::Translate(m_position));
}

18
src/Nazara/Physics3D/PhysWorld.cpp → src/Nazara/Physics3D/PhysWorld3D.cpp
View File

@@ -8,7 +8,7 @@
namespace Nz
{
PhysWorld::PhysWorld() :
PhysWorld3D::PhysWorld3D() :
m_gravity(Vector3f::Zero()),
m_stepSize(0.005f),
m_timestepAccumulator(0.f)
@@ -17,42 +17,42 @@ namespace Nz
NewtonWorldSetUserData(m_world, this);
}
PhysWorld::~PhysWorld()
PhysWorld3D::~PhysWorld3D()
{
NewtonDestroy(m_world);
}
Vector3f PhysWorld::GetGravity() const
Vector3f PhysWorld3D::GetGravity() const
{
return m_gravity;
}
NewtonWorld* PhysWorld::GetHandle() const
NewtonWorld* PhysWorld3D::GetHandle() const
{
return m_world;
}
float PhysWorld::GetStepSize() const
float PhysWorld3D::GetStepSize() const
{
return m_stepSize;
}
void PhysWorld::SetGravity(const Vector3f& gravity)
void PhysWorld3D::SetGravity(const Vector3f& gravity)
{
m_gravity = gravity;
}
void PhysWorld::SetSolverModel(unsigned int model)
void PhysWorld3D::SetSolverModel(unsigned int model)
{
NewtonSetSolverModel(m_world, model);
}
void PhysWorld::SetStepSize(float stepSize)
void PhysWorld3D::SetStepSize(float stepSize)
{
m_stepSize = stepSize;
}
void PhysWorld::Step(float timestep)
void PhysWorld3D::Step(float timestep)
{
m_timestepAccumulator += timestep;

4
src/Nazara/Physics3D/RigidBody3D.cpp
View File

@@ -12,12 +12,12 @@
namespace Nz
{
RigidBody3D::RigidBody3D(PhysWorld* world, const Matrix4f& mat) :
RigidBody3D::RigidBody3D(PhysWorld3D* world, const Matrix4f& mat) :
RigidBody3D(world, NullCollider3D::New(), mat)
{
}
RigidBody3D::RigidBody3D(PhysWorld* world, Collider3DRef geom, const Matrix4f& mat) :
RigidBody3D::RigidBody3D(PhysWorld3D* world, Collider3DRef geom, const Matrix4f& mat) :
m_geom(std::move(geom)),
m_matrix(mat),
m_forceAccumulator(Vector3f::Zero()),