Merge branch 'master' into add-IDirect3DRMMiniwinDevice-interface

This commit is contained in:
Anders Jenbo 2025-06-09 18:26:53 +02:00 committed by GitHub
commit 5d1ea2c1ba
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -689,8 +689,8 @@ bool RayIntersectsMeshTriangles(
{
DWORD groupCount = mesh->GetGroupCount();
for (DWORD g = 0; g < groupCount; ++g) {
DWORD vtxCount, faceCount, indexCount;
mesh->GetGroup(g, &vtxCount, &faceCount, nullptr, &indexCount, nullptr);
DWORD vtxCount, indexCount;
mesh->GetGroup(g, &vtxCount, nullptr, nullptr, &indexCount, nullptr);
std::vector<D3DRMVERTEX> vertices(vtxCount);
mesh->GetVertices(g, 0, vtxCount, vertices.data());
@ -698,7 +698,7 @@ bool RayIntersectsMeshTriangles(
mesh->GetGroup(g, nullptr, nullptr, nullptr, nullptr, indices.data());
// Iterate over each face and do ray-triangle tests
for (DWORD fi = 0; fi < faceCount; fi += 3) {
for (DWORD fi = 0; fi < indexCount; fi += 3) {
DWORD i0 = indices[fi + 0];
DWORD i1 = indices[fi + 1];
DWORD i2 = indices[fi + 2];