From a3c4b2995e2c7b2699cdf33913daf509ffa1c2c1 Mon Sep 17 00:00:00 2001 From: Erwin Coumans Date: Fri, 22 May 2020 15:13:56 -0700 Subject: [PATCH] also allow reportHitNumber for single pybullet.rayTest (not just rayTestBatch) --- examples/pybullet/pybullet.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/examples/pybullet/pybullet.c b/examples/pybullet/pybullet.c index f0789b258..bfcaa4d4b 100644 --- a/examples/pybullet/pybullet.c +++ b/examples/pybullet/pybullet.c @@ -6529,12 +6529,13 @@ static PyObject* pybullet_rayTestObsolete(PyObject* self, PyObject* args, PyObje double from[3]; double to[3]; b3PhysicsClientHandle sm = 0; - static char* kwlist[] = {"rayFromPosition", "rayToPosition", "collisionFilterMask", "physicsClientId", NULL}; + int reportHitNumber = -1; + static char* kwlist[] = {"rayFromPosition", "rayToPosition", "collisionFilterMask", "reportHitNumber", "physicsClientId", NULL}; int physicsClientId = 0; int collisionFilterMask = -1; - if (!PyArg_ParseTupleAndKeywords(args, keywds, "OO|ii", kwlist, - &rayFromObj, &rayToObj, &collisionFilterMask, &physicsClientId)) + if (!PyArg_ParseTupleAndKeywords(args, keywds, "OO|iii", kwlist, + &rayFromObj, &rayToObj, &collisionFilterMask, &reportHitNumber, &physicsClientId)) return NULL; sm = getPhysicsClient(physicsClientId); @@ -6556,7 +6557,10 @@ static PyObject* pybullet_rayTestObsolete(PyObject* self, PyObject* args, PyObje { b3RaycastBatchSetCollisionFilterMask(commandHandle, collisionFilterMask); } - + if (reportHitNumber >= 0) + { + b3RaycastBatchSetReportHitNumber(commandHandle, reportHitNumber); + } statusHandle = b3SubmitClientCommandAndWaitStatus(sm, commandHandle); statusType = b3GetStatusType(statusHandle); if (statusType == CMD_REQUEST_RAY_CAST_INTERSECTIONS_COMPLETED)