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

Convert all remaining enums to enum classes (!)

Browse Source
This commit is contained in:
Jérôme Leclercq
2021-05-25 00:08:50 +02:00
parent 8cdd0b51cb
commit 874fb3542e
122 changed files with 1082 additions and 2169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,21 +16,21 @@ namespace Nz
{
switch (primitive.type)
{
case PrimitiveType_Box:
case PrimitiveType::Box:
return std::make_shared<BoxCollider3D>(primitive.box.lengths, primitive.matrix);
case PrimitiveType_Cone:
case PrimitiveType::Cone:
return std::make_shared<ConeCollider3D>(primitive.cone.length, primitive.cone.radius, primitive.matrix);
case PrimitiveType_Plane:
case PrimitiveType::Plane:
return std::make_shared<BoxCollider3D>(Vector3f(primitive.plane.size.x, 0.01f, primitive.plane.size.y), primitive.matrix);
///TODO: PlaneGeom?
case PrimitiveType_Sphere:
case PrimitiveType::Sphere:
return std::make_shared<SphereCollider3D>(primitive.sphere.size, primitive.matrix.GetTranslation());
}
NazaraError("Primitive type not handled (0x" + NumberToString(primitive.type, 16) + ')');
NazaraError("Primitive type not handled (0x" + NumberToString(UnderlyingCast(primitive.type), 16) + ')');
return std::shared_ptr<Collider3D>();
}
}

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

@@ -84,11 +84,11 @@ namespace Nz
{
switch (coordSys)
{
case CoordSys_Global:
case CoordSys::Global:
m_forceAccumulator += force;
break;
case CoordSys_Local:
case CoordSys::Local:
m_forceAccumulator += GetRotation() * force;
break;
}
@@ -101,13 +101,13 @@ namespace Nz
{
switch (coordSys)
{
case CoordSys_Global:
case CoordSys::Global:
m_forceAccumulator += force;
m_torqueAccumulator += Vector3f::CrossProduct(point - GetMassCenter(CoordSys_Global), force);
m_torqueAccumulator += Vector3f::CrossProduct(point - GetMassCenter(CoordSys::Global), force);
break;
case CoordSys_Local:
return AddForce(m_matrix.Transform(force, 0.f), m_matrix.Transform(point), CoordSys_Global);
case CoordSys::Local:
return AddForce(m_matrix.Transform(force, 0.f), m_matrix.Transform(point), CoordSys::Global);
}
// On réveille le corps pour que le callback soit appelé et que les forces soient appliquées
@@ -118,11 +118,11 @@ namespace Nz
{
switch (coordSys)
{
case CoordSys_Global:
case CoordSys::Global:
m_torqueAccumulator += torque;
break;
case CoordSys_Local:
case CoordSys::Local:
m_torqueAccumulator += m_matrix.Transform(torque, 0.f);
break;
}
@@ -205,11 +205,11 @@ namespace Nz
switch (coordSys)
{
case CoordSys_Global:
case CoordSys::Global:
center = m_matrix.Transform(center);
break;
case CoordSys_Local:
case CoordSys::Local:
break; // Aucune opération à effectuer sur le centre de rotation
}