Browse Source

Renamed RayHitInfo variables

Ray 8 years ago
parent
commit
0880be638e
2 changed files with 7 additions and 7 deletions
  1. 5 5
      src/models.c
  2. 2 2
      src/raylib.h

+ 5 - 5
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);
         }
     }
 

+ 2 - 2
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