celisej567/Nuake
1
0
Fork 0
mirror of https://github.com/antopilo/Nuake.git synced 2026-09-21 20:08:40 +03:00
Code Issues Packages Projects Releases Wiki Activity

Re-enabled mesh colliders

Browse Source
This commit is contained in:
antopilo
2025-04-21 11:36:42 -04:00
parent 163c3887ac
commit 23cf27b120
1 changed files with 27 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
Nuake/Source/Nuake/Scene/Systems/PhysicsSystem.cpp
View File

@@ -203,20 +203,19 @@ namespace Nuake
auto& meshColliderComponent = meshColliderView.get<MeshColliderComponent>(e);
if (!meshColliderComponent.Shape)
{
const auto& modelComponent = entity.GetComponent<ModelComponent>();
//if (modelComponent.ModelResource.Get<Model>())
//{
// uint32_t subMeshId = meshColliderComponent.SubMesh;
// const std::vector<Ref<Mesh>>& submeshes = modelComponent.ModelResource.Get<Model>()->GetMeshes();
// if (subMeshId >= submeshes.size())
// {
// Logger::Log("Cannot create mesh collider, invalid submesh ID", "physics", WARNING);
// }
//
// Ref<Mesh> mesh = submeshes[subMeshId];
// meshColliderComponent.Shape = CreateRef<Physics::MeshShape>(mesh);
//}
auto& modelComponent = entity.GetComponent<ModelComponent>();
if (modelComponent.ModelResource.Get<Model>())
{
uint32_t subMeshId = meshColliderComponent.SubMesh;
const std::vector<Ref<Mesh>>& submeshes = modelComponent.ModelResource.Get<Model>()->GetMeshes();
if (subMeshId >= submeshes.size())
{
Logger::Log("Cannot create mesh collider, invalid submesh ID", "physics", WARNING);
}
Ref<Mesh> mesh = submeshes[subMeshId];
meshColliderComponent.Shape = CreateRef<Physics::MeshShape>(mesh);
}
}
}
}
@@ -276,24 +275,23 @@ namespace Nuake
Logger::Log("Cannot use mesh collider without model component", "physics", WARNING);
}
const auto& modelComponent = ent.GetComponent<ModelComponent>();
const auto& component = ent.GetComponent<MeshColliderComponent>();
auto& modelComponent = ent.GetComponent<ModelComponent>();
auto& component = ent.GetComponent<MeshColliderComponent>();
isTrigger = component.IsTrigger;
//modelComponent.ModelResource.Data()
//if (modelComponent.ModelResource.Get<Model>())
//{
// uint32_t subMeshId = component.SubMesh;
// const std::vector<Ref<Mesh>>& submeshes = modelComponent.ModelResource.Get<Model>()->GetMeshes();
// if (subMeshId >= submeshes.size())
// {
// Logger::Log("Cannot create mesh collider, invalid submesh ID", "physics", WARNING);
// }
//
// Ref<Mesh> mesh = submeshes[subMeshId];
// shape = CreateRef<Physics::MeshShape>(mesh);
//}
if (modelComponent.ModelResource.Get<Model>())
{
uint32_t subMeshId = component.SubMesh;
const std::vector<Ref<Mesh>>& submeshes = modelComponent.ModelResource.Get<Model>()->GetMeshes();
if (subMeshId >= submeshes.size())
{
Logger::Log("Cannot create mesh collider, invalid submesh ID", "physics", WARNING);
}
Ref<Mesh> mesh = submeshes[subMeshId];
shape = CreateRef<Physics::MeshShape>(mesh);
}
}
if (!shape)