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

JoltPhysics3D/JoltCollider3D: Add Mesh JoltMeshCollider3D

This commit is contained in:
SirLynix 2023-06-02 17:47:25 +02:00
parent d310bf478b
commit 1672765936
3 changed files with 75 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/Nazara/JoltPhysics3D/Enums.hpp
View File

@ -15,6 +15,7 @@ namespace Nz
Capsule, Capsule,
Compound, Compound,
Convex, Convex,
Mesh,
Sphere, Sphere,
ScaleDecoration, ScaleDecoration,

12
include/Nazara/JoltPhysics3D/JoltCollider3D.hpp
View File

@ -123,6 +123,18 @@ namespace Nz
JoltColliderType3D GetType() const override; JoltColliderType3D GetType() const override;
}; };
class NAZARA_JOLTPHYSICS3D_API JoltMeshCollider3D final : public JoltCollider3D
{
public:
JoltMeshCollider3D(SparsePtr<const Vector3f> vertices, std::size_t vertexCount, SparsePtr<const UInt16> indices, std::size_t indexCount);
JoltMeshCollider3D(SparsePtr<const Vector3f> vertices, std::size_t vertexCount, SparsePtr<const UInt32> indices, std::size_t indexCount);
~JoltMeshCollider3D() = default;
void BuildDebugMesh(std::vector<Vector3f>& vertices, std::vector<UInt16>& indices, const Matrix4f& offsetMatrix) const override;
JoltColliderType3D GetType() const override;
};
class NAZARA_JOLTPHYSICS3D_API JoltSphereCollider3D final : public JoltCollider3D class NAZARA_JOLTPHYSICS3D_API JoltSphereCollider3D final : public JoltCollider3D
{ {
public: public:

62
src/Nazara/JoltPhysics3D/JoltCollider3D.cpp
View File

@ -15,6 +15,7 @@
#include <Jolt/Physics/Collision/Shape/BoxShape.h> #include <Jolt/Physics/Collision/Shape/BoxShape.h>
#include <Jolt/Physics/Collision/Shape/CapsuleShape.h> #include <Jolt/Physics/Collision/Shape/CapsuleShape.h>
#include <Jolt/Physics/Collision/Shape/ConvexHullShape.h> #include <Jolt/Physics/Collision/Shape/ConvexHullShape.h>
#include <Jolt/Physics/Collision/Shape/MeshShape.h>
#include <Jolt/Physics/Collision/Shape/RotatedTranslatedShape.h> #include <Jolt/Physics/Collision/Shape/RotatedTranslatedShape.h>
#include <Jolt/Physics/Collision/Shape/SphereShape.h> #include <Jolt/Physics/Collision/Shape/SphereShape.h>
#include <Jolt/Physics/Collision/Shape/StaticCompoundShape.h> #include <Jolt/Physics/Collision/Shape/StaticCompoundShape.h>
@ -352,6 +353,67 @@ namespace Nz
return JoltColliderType3D::Convex; return JoltColliderType3D::Convex;
} }
/******************************** JoltMeshCollider3D *********************************/
JoltMeshCollider3D::JoltMeshCollider3D(SparsePtr<const Vector3f> vertices, std::size_t vertexCount, SparsePtr<const UInt16> indices, std::size_t indexCount)
{
std::unique_ptr<JPH::MeshShapeSettings> settings = std::make_unique<JPH::MeshShapeSettings>();
settings->mTriangleVertices.resize(vertexCount);
for (std::size_t i = 0; i < vertexCount; ++i)
{
settings->mTriangleVertices[i].x = vertices[i].x;
settings->mTriangleVertices[i].y = vertices[i].y;
settings->mTriangleVertices[i].z = vertices[i].z;
}
std::size_t triangleCount = indexCount / 3;
settings->mIndexedTriangles.resize(triangleCount);
for (std::size_t i = 0; i < triangleCount; ++i)
{
settings->mIndexedTriangles[i].mIdx[0] = indices[i * 3 + 0];
settings->mIndexedTriangles[i].mIdx[1] = indices[i * 3 + 1];
settings->mIndexedTriangles[i].mIdx[2] = indices[i * 3 + 2];
}
settings->Sanitize();
SetupShapeSettings(std::move(settings));
}
JoltMeshCollider3D::JoltMeshCollider3D(SparsePtr<const Vector3f> vertices, std::size_t vertexCount, SparsePtr<const UInt32> indices, std::size_t indexCount)
{
std::unique_ptr<JPH::MeshShapeSettings> settings = std::make_unique<JPH::MeshShapeSettings>();
settings->mTriangleVertices.resize(vertexCount);
for (std::size_t i = 0; i < vertexCount; ++i)
{
settings->mTriangleVertices[i].x = vertices[i].x;
settings->mTriangleVertices[i].y = vertices[i].y;
settings->mTriangleVertices[i].z = vertices[i].z;
}
std::size_t triangleCount = indexCount / 3;
settings->mIndexedTriangles.resize(triangleCount);
for (std::size_t i = 0; i < triangleCount; ++i)
{
settings->mIndexedTriangles[i].mIdx[0] = indices[i * 3 + 0];
settings->mIndexedTriangles[i].mIdx[1] = indices[i * 3 + 1];
settings->mIndexedTriangles[i].mIdx[2] = indices[i * 3 + 2];
}
settings->Sanitize();
SetupShapeSettings(std::move(settings));
}
void JoltMeshCollider3D::BuildDebugMesh(std::vector<Vector3f>& vertices, std::vector<UInt16>& indices, const Matrix4f& offsetMatrix) const
{
}
JoltColliderType3D JoltMeshCollider3D::GetType() const
{
return JoltColliderType3D::Mesh;
}
/******************************** JoltSphereCollider3D *********************************/ /******************************** JoltSphereCollider3D *********************************/
JoltSphereCollider3D::JoltSphereCollider3D(float radius) JoltSphereCollider3D::JoltSphereCollider3D(float radius)