[Bf-blender-cvs] [8647c7d] master: Fix T38335: incorrect triangle index in raycast with more than 2 quads
Porteries Tristan
noreply at git.blender.org
Sat May 9 19:13:05 CEST 2015
Commit: 8647c7d5010a844349ea6f7d180408cafbbb4848
Author: Porteries Tristan
Date: Sat May 9 18:45:54 2015 +0200
Branches: master
https://developer.blender.org/rB8647c7d5010a844349ea6f7d180408cafbbb4848
Fix T38335: incorrect triangle index in raycast with more than 2 quads
eb81153896 broke the fix for T38335, and this fix was incomplete, now we iterate by triangles and polys in the same while block.
===================================================================
M source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
===================================================================
diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp b/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
index 5c5a4d3..48f8541 100644
--- a/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
+++ b/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
@@ -2436,7 +2436,9 @@ bool CcdShapeConstructionInfo::UpdateMesh(class KX_GameObject *gameobj, class RA
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);
if (poly->IsCollider()) {
@@ -2465,12 +2467,17 @@ bool CcdShapeConstructionInfo::UpdateMesh(class KX_GameObject *gameobj, class RA
*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) {
- p++;
- // if the poly is a quad we transform it in two triangles
- m_polygonIndexArray[p] = p;
+ t++;
+ // second triangle
+ m_polygonIndexArray[t] = p;
}
+ t++;
+ p++;
}
}
More information about the Bf-blender-cvs
mailing list