b2Shape_RayCast takes b2RayCastInput for max fraction

erincatto · Aug 31, 2024 · d46d4d3 · d46d4d3
1 parent 4c34ca1
commit d46d4d3
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 18 deletions.
diff --git a/include/box2d/box2d.h b/include/box2d/box2d.h
@@ -521,7 +521,7 @@ B2_API bool b2Shape_AreHitEventsEnabled( b2ShapeId shapeId );
 B2_API bool b2Shape_TestPoint( b2ShapeId shapeId, b2Vec2 point );
 
 /// Ray cast a shape directly
-B2_API b2CastOutput b2Shape_RayCast( b2ShapeId shapeId, b2Vec2 origin, b2Vec2 translation );
+B2_API b2CastOutput b2Shape_RayCast( b2ShapeId shapeId, const b2RayCastInput* input );
 
 /// Get a copy of the shape's circle. Asserts the type is correct.
 B2_API b2Circle b2Shape_GetCircle( b2ShapeId shapeId );

diff --git a/src/shape.c b/src/shape.c
@@ -22,11 +22,6 @@ static b2Shape* b2GetShape( b2World* world, b2ShapeId shapeId )
 	return shape;
 }
 
-b2Transform b2GetOwnerTransform( b2World* world, b2Shape* shape )
-{
-	return b2GetBodyTransform( world, shape->bodyId );
-}
-
 static b2ChainShape* b2GetChainShape( b2World* world, b2ChainId chainId )
 {
 	int id = chainId.index1 - 1;
@@ -766,7 +761,7 @@ bool b2Shape_TestPoint( b2ShapeId shapeId, b2Vec2 point )
 	b2World* world = b2GetWorld( shapeId.world0 );
 	b2Shape* shape = b2GetShape( world, shapeId );
 
-	b2Transform transform = b2GetOwnerTransform( world, shape );
+	b2Transform transform = b2GetBodyTransform( world, shape->bodyId );
 	b2Vec2 localPoint = b2InvTransformPoint( transform, point );
 
 	switch ( shape->type )
@@ -785,40 +780,41 @@ bool b2Shape_TestPoint( b2ShapeId shapeId, b2Vec2 point )
 	}
 }
 
-b2CastOutput b2Shape_RayCast( b2ShapeId shapeId, b2Vec2 origin, b2Vec2 translation )
+// todo_erin untested
+b2CastOutput b2Shape_RayCast( b2ShapeId shapeId, const b2RayCastInput* input )
 {
 	b2World* world = b2GetWorld( shapeId.world0 );
 	b2Shape* shape = b2GetShape( world, shapeId );
 
-	b2Transform transform = b2GetOwnerTransform( world, shape );
+	b2Transform transform = b2GetBodyTransform( world, shape->bodyId );
 
 	// input in local coordinates
-	b2RayCastInput input;
-	input.maxFraction = 1.0f;
-	input.origin = b2InvTransformPoint( transform, origin );
-	input.translation = b2InvRotateVector( transform.q, translation );
+	b2RayCastInput localInput;
+	localInput.origin = b2InvTransformPoint( transform, input->origin );
+	localInput.translation = b2InvRotateVector( transform.q, input->translation );
+	localInput.maxFraction = input->maxFraction;
 
 	b2CastOutput output = { 0 };
 	switch ( shape->type )
 	{
 		case b2_capsuleShape:
-			output = b2RayCastCapsule( &input, &shape->capsule );
+			output = b2RayCastCapsule( &localInput, &shape->capsule );
 			break;
 
 		case b2_circleShape:
-			output = b2RayCastCircle( &input, &shape->circle );
+			output = b2RayCastCircle( &localInput, &shape->circle );
 			break;
 
 		case b2_segmentShape:
-			output = b2RayCastSegment( &input, &shape->segment, false );
+			output = b2RayCastSegment( &localInput, &shape->segment, false );
 			break;
 
 		case b2_polygonShape:
-			output = b2RayCastPolygon( &input, &shape->polygon );
+			output = b2RayCastPolygon( &localInput, &shape->polygon );
 			break;
 
 		case b2_chainSegmentShape:
-			output = b2RayCastSegment( &input, &shape->chainSegment.segment, true );
+			output = b2RayCastSegment( &localInput, &shape->chainSegment.segment, true );
 			break;
 
 		default:
@@ -832,6 +828,7 @@ b2CastOutput b2Shape_RayCast( b2ShapeId shapeId, b2Vec2 origin, b2Vec2 translati
 		output.normal = b2RotateVector( transform.q, output.normal );
 		output.point = b2TransformPoint( transform, output.point );
 	}
+
 	return output;
 }