renamed the `collideVsAABB` function, and change the call to it to be more generic (based on `shapeType`