kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fix T38335: incorrect triangle index in raycast with more than 2 quads

Browse Source 
eb81153896 broke the fix for T38335, and this fix was incomplete, now we iterate by triangles and polys in the same while block.
This commit is contained in:
Porteries Tristan 2015-05-09 18:45:54 +02:00
parent 2840a5de8f
commit 8647c7d501
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
View File

@ -2436,7 +2436,9 @@ bool CcdShapeConstructionInfo::UpdateMesh(class KX_GameObject *gameobj, class RA
m_polygonIndexArray.resize(tot_bt_tris); m_polygonIndexArray.resize(tot_bt_tris);
for (int p = 0; p < numpolys; p++) { int p = 0;
int t = 0;
while (t < tot_bt_tris) {
RAS_Polygon *poly = meshobj->GetPolygon(p); RAS_Polygon *poly = meshobj->GetPolygon(p);
if (poly->IsCollider()) { if (poly->IsCollider()) {
@ -2465,12 +2467,17 @@ bool CcdShapeConstructionInfo::UpdateMesh(class KX_GameObject *gameobj, class RA
*tri_pt++ = vert_remap_array[v_orig]; *tri_pt++ = vert_remap_array[v_orig];
} }
} }
m_polygonIndexArray[p] = p; // first triangle
m_polygonIndexArray[t] = p;
// if the poly is a quad we transform it in two triangles
if (poly->VertexCount() == 4) { if (poly->VertexCount() == 4) {
p++; t++;
// if the poly is a quad we transform it in two triangles // second triangle
m_polygonIndexArray[p] = p; m_polygonIndexArray[t] = p;
} }
t++;
p++;
} }
} }