MrMonopoly/raylib
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed CheckCollisionPointPolygon to CheckCollisionPointPoly

Browse Source
This commit is contained in:
KirottuM 2021-02-05 18:49:47 +02:00
parent d2ff3c271e
commit cdcff62411
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/raylib.h
View File

@ -1130,7 +1130,7 @@ RLAPI bool CheckCollisionPointRec(Vector2 point, Rectangle rec);
RLAPI bool CheckCollisionPointCircle(Vector2 point, Vector2 center, float radius); // Check if point is inside circle RLAPI bool CheckCollisionPointCircle(Vector2 point, Vector2 center, float radius); // Check if point is inside circle
RLAPI bool CheckCollisionPointTriangle(Vector2 point, Vector2 p1, Vector2 p2, Vector2 p3); // Check if point is inside a triangle RLAPI bool CheckCollisionPointTriangle(Vector2 point, Vector2 p1, Vector2 p2, Vector2 p3); // Check if point is inside a triangle
RLAPI bool CheckCollisionLines(Vector2 startPos1, Vector2 endPos1, Vector2 startPos2, Vector2 endPos2, Vector2 *collisionPoint); // Check the collision between two lines defined by two points each, returns collision point by reference RLAPI bool CheckCollisionLines(Vector2 startPos1, Vector2 endPos1, Vector2 startPos2, Vector2 endPos2, Vector2 *collisionPoint); // Check the collision between two lines defined by two points each, returns collision point by reference
RLAPI bool CheckCollisionPointPolygon(Vector2 polygon[], int vertexCount, Vector2 point); // Check if point is inside a polygon RLAPI bool CheckCollisionPointPolygon(Vector2 point, Vector2 *polygon, int vertexCount); // Check if point is inside a polygon
RLAPI Rectangle GetCollisionRec(Rectangle rec1, Rectangle rec2); // Get collision rectangle for two rectangles collision RLAPI Rectangle GetCollisionRec(Rectangle rec1, Rectangle rec2); // Get collision rectangle for two rectangles collision
//------------------------------------------------------------------------------------ //------------------------------------------------------------------------------------

3
src/shapes.c
View File

@ -1526,7 +1526,7 @@ bool CheckCollisionLines(Vector2 startPos1, Vector2 endPos1, Vector2 startPos2,
// Another function from GeeksForGeeks // Another function from GeeksForGeeks
// Returns true if the point p lies inside the polygon[] with n vertices // Returns true if the point p lies inside the polygon[] with n vertices
bool CheckCollisionPointPolygon(Vector2 polygon[], int vertexCount, Vector2 point) bool CheckCollisionPointPoly(Vector2 point, Vector2 *polygon, int vertexCount)
{ {
// There must be at least 3 vertices in polygon[] // There must be at least 3 vertices in polygon[]
if (vertexCount < 3) return false; if (vertexCount < 3) return false;
@ -1643,7 +1643,6 @@ static float EaseCubicInOut(float t, float b, float c, float d)
// Point inside polygon checking code // Point inside polygon checking code
// Credit to https://www.geeksforgeeks.org/how-to-check-if-a-given-point-lies-inside-a-polygon/ // Credit to https://www.geeksforgeeks.org/how-to-check-if-a-given-point-lies-inside-a-polygon/
#define INF 10000
// Given three colinear points p, q, r, the function checks if // Given three colinear points p, q, r, the function checks if
// point q lies on line segment 'pr' // point q lies on line segment 'pr'
static bool OnSegment(Vector2 p, Vector2 q, Vector2 r) static bool OnSegment(Vector2 p, Vector2 q, Vector2 r)