diff options
| author | Crydsch <[email protected]> | 2021-06-03 20:15:27 +0200 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-06-03 20:15:27 +0200 |
| commit | edeaff4bd4010eaa46f09f47d0b78f27b4ff836e (patch) | |
| tree | dc9c42779ae678ff65f29937dfe502e3ff6312da /src/raylib.h | |
| parent | 2370af598e84c8594b8d1a4f6e17925b48949db7 (diff) | |
| download | raylib-edeaff4bd4010eaa46f09f47d0b78f27b4ff836e.tar.gz raylib-edeaff4bd4010eaa46f09f47d0b78f27b4ff836e.zip | |
Better collisions (#1803)
* review collisions ray-box and ray-sphere
* Applied raysan's refactor
Improved GetRayCollisionBox
* Replace GetRayCollisionGround with GetCollisionQuad
* Update example core_3d_picking
* Update example models_loading
* Fixed issues after merge
* remove debug stuff
Co-authored-by: Cry dsch <[email protected]>
Diffstat (limited to 'src/raylib.h')
| -rw-r--r-- | src/raylib.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/raylib.h b/src/raylib.h index db9bb401..0babd0ef 100644 --- a/src/raylib.h +++ b/src/raylib.h @@ -1447,10 +1447,10 @@ RLAPI bool CheckCollisionBoxes(BoundingBox box1, BoundingBox box2); RLAPI bool CheckCollisionBoxSphere(BoundingBox box, Vector3 center, float radius); // Detect collision between box and sphere RLAPI RayCollision GetRayCollisionSphere(Ray ray, Vector3 center, float radius); // Get collision info between ray and sphere RLAPI RayCollision GetRayCollisionBox(Ray ray, BoundingBox box); // Get collision info between ray and box -RLAPI RayCollision GetRayCollisionMesh(Ray ray, Mesh mesh, Matrix transform); // Get collision info between ray and mesh RLAPI RayCollision GetRayCollisionModel(Ray ray, Model model); // Get collision info between ray and model +RLAPI RayCollision GetRayCollisionMesh(Ray ray, Mesh mesh, Matrix transform); // Get collision info between ray and mesh RLAPI RayCollision GetRayCollisionTriangle(Ray ray, Vector3 p1, Vector3 p2, Vector3 p3); // Get collision info between ray and triangle -RLAPI RayCollision GetRayCollisionGround(Ray ray, float groundHeight); // Get collision info between ray and ground plane (Y-normal plane) +RLAPI RayCollision GetRayCollisionQuad(Ray ray, Vector3 p1, Vector3 p2, Vector3 p3, Vector3 p4); // Get collision info between ray and quad //------------------------------------------------------------------------------------ // Audio Loading and Playing Functions (Module: audio) |