From 6ee0327594b2308b3111e1b8a7e52ed5959899fc Mon Sep 17 00:00:00 2001 From: Porteries Tristan Date: Fri, 8 May 2015 20:55:50 +0200 Subject: Fix T38335: incorrect triangle index in raycast result Previously we forgot to do a special operation for indexes to convert a quad to two triangles. --- source/gameengine/Physics/Bullet/CcdPhysicsController.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'source/gameengine') diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp b/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp index b6d2f849437..4285093fde0 100644 --- a/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp +++ b/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp @@ -2382,7 +2382,6 @@ bool CcdShapeConstructionInfo::UpdateMesh(class KX_GameObject *gameobj, class RA * RAS Mesh Update * * */ - /* Note!, gameobj can be NULL here */ /* transverts are only used for deformed RAS_Meshes, the RAS_TexVert data @@ -2437,7 +2436,7 @@ bool CcdShapeConstructionInfo::UpdateMesh(class KX_GameObject *gameobj, class RA m_polygonIndexArray.resize(tot_bt_tris); - for (int p = 0; p < numpolys; p++) { + for (int p = 0; p < numpolys;) { RAS_Polygon *poly = meshobj->GetPolygon(p); if (poly->IsCollider()) { @@ -2466,7 +2465,12 @@ bool CcdShapeConstructionInfo::UpdateMesh(class KX_GameObject *gameobj, class RA *tri_pt++ = vert_remap_array[v_orig]; } } - m_polygonIndexArray[p] = p; /* dumb counting */ + m_polygonIndexArray[p] = p; + if (poly->VertexCount() == 4) { + // if the poly is a quad we transform it in two triangles + m_polygonIndexArray[p + 1] = p++; + } + p++; } } -- cgit v1.2.3