From 0880be638e94bafb49aaa7465973716938306145 Mon Sep 17 00:00:00 2001 From: Ray Date: Wed, 10 May 2017 00:57:48 +0200 Subject: [PATCH] Renamed RayHitInfo variables --- src/models.c | 10 +++++----- src/raylib.h | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/models.c b/src/models.c index 2459edf1..0a692f5c 100644 --- a/src/models.c +++ b/src/models.c @@ -1541,11 +1541,11 @@ RayHitInfo GetCollisionRayTriangle(Ray ray, Vector3 p1, Vector3 p2, Vector3 p3) result.hit = true; result.distance = t; result.hit = true; - result.hitNormal = VectorCrossProduct(edge1, edge2); - VectorNormalize(&result.hitNormal); + result.normal = VectorCrossProduct(edge1, edge2); + VectorNormalize(&result.normal); Vector3 rayDir = ray.direction; VectorScale(&rayDir, t); - result.hitPosition = VectorAdd(ray.position, rayDir); + result.position = VectorAdd(ray.position, rayDir); } return result; @@ -1568,8 +1568,8 @@ RayHitInfo GetCollisionRayGround(Ray ray, float groundHeight) VectorScale(&rayDir, t); result.hit = true; result.distance = t; - result.hitNormal = (Vector3){ 0.0, 1.0, 0.0 }; - result.hitPosition = VectorAdd(ray.position, rayDir); + result.normal = (Vector3){ 0.0, 1.0, 0.0 }; + result.position = VectorAdd(ray.position, rayDir); } } diff --git a/src/raylib.h b/src/raylib.h index b8913c8d..e49081b5 100644 --- a/src/raylib.h +++ b/src/raylib.h @@ -479,8 +479,8 @@ typedef struct Ray { typedef struct RayHitInfo { bool hit; // Did the ray hit something? float distance; // Distance to nearest hit - Vector3 hitPosition; // Position of nearest hit - Vector3 hitNormal; // Surface normal of hit + Vector3 position; // Position of nearest hit + Vector3 normal; // Surface normal of hit } RayHitInfo; // Wave type, defines audio wave data