summaryrefslogtreecommitdiffhomepage
path: root/src/models.c
diff options
context:
space:
mode:
authorRay <[email protected]>2016-12-05 01:14:18 +0100
committerRay <[email protected]>2016-12-05 01:14:18 +0100
commit377dcb025fb6957f73263e1913dfc5f29ba21a58 (patch)
tree0a2c8faaa47a09dd49567d9487fd518f75d50b41 /src/models.c
parentab9f5d578025f71abd3b242170d6fb8ea6c2c297 (diff)
downloadraylib-377dcb025fb6957f73263e1913dfc5f29ba21a58.tar.gz
raylib-377dcb025fb6957f73263e1913dfc5f29ba21a58.zip
Corrected some warnings
Diffstat (limited to 'src/models.c')
-rw-r--r--src/models.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/models.c b/src/models.c
index 48f8b813..97c84abc 100644
--- a/src/models.c
+++ b/src/models.c
@@ -707,6 +707,7 @@ Model LoadModelFromRES(const char *rresName, int resId)
else
{
// Depending on type, skip the right amount of parameters
+ /* Review
switch (infoHeader.type)
{
case 0: fseek(rresFile, 6, SEEK_CUR); break; // IMAGE: Jump 6 bytes of parameters
@@ -716,6 +717,7 @@ Model LoadModelFromRES(const char *rresName, int resId)
case 4: break; // RAW: No parameters
default: break;
}
+ */
// Jump DATA to read next infoHeader
fseek(rresFile, infoHeader.size, SEEK_CUR);
@@ -1517,8 +1519,8 @@ bool CheckCollisionRayBox(Ray ray, BoundingBox box)
t[3] = (box.max.y - ray.position.y)/ray.direction.y;
t[4] = (box.min.z - ray.position.z)/ray.direction.z;
t[5] = (box.max.z - ray.position.z)/ray.direction.z;
- t[6] = fmax(fmax(fmin(t[0], t[1]), fmin(t[2], t[3])), fmin(t[4], t[5]));
- t[7] = fmin(fmin(fmax(t[0], t[1]), fmax(t[2], t[3])), fmax(t[4], t[5]));
+ t[6] = (float)fmax(fmax(fmin(t[0], t[1]), fmin(t[2], t[3])), fmin(t[4], t[5]));
+ t[7] = (float)fmin(fmin(fmax(t[0], t[1]), fmax(t[2], t[3])), fmax(t[4], t[5]));
collision = !(t[7] < 0 || t[6] > t[7]);