Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: remove unused array member

Browse Source
This commit is contained in:
Campbell Barton
2018-08-01 16:32:22 +10:00
parent 6a39d72558
commit 583b2f9a3d
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
source/blender/blenlib/intern/math_geom.c
View File

@@ -2486,19 +2486,19 @@ bool isect_ray_aabb_v3_simple(
const float bb_min[3], const float bb_max[3],
float *tmin, float *tmax)
{
double t[7];
double t[6];
float hit_dist[2];
const double invdirx = (dir[0] > 1e-35f || dir[0] < -1e-35f) ? 1.0 / (double)dir[0] : DBL_MAX;
const double invdiry = (dir[1] > 1e-35f || dir[1] < -1e-35f) ? 1.0 / (double)dir[1] : DBL_MAX;
const double invdirz = (dir[2] > 1e-35f || dir[2] < -1e-35f) ? 1.0 / (double)dir[2] : DBL_MAX;
t[1] = (double)(bb_min[0] - orig[0]) * invdirx;
t[2] = (double)(bb_max[0] - orig[0]) * invdirx;
t[3] = (double)(bb_min[1] - orig[1]) * invdiry;
t[4] = (double)(bb_max[1] - orig[1]) * invdiry;
t[5] = (double)(bb_min[2] - orig[2]) * invdirz;
t[6] = (double)(bb_max[2] - orig[2]) * invdirz;
hit_dist[0] = (float)fmax(fmax(fmin(t[1], t[2]), fmin(t[3], t[4])), fmin(t[5], t[6]));
hit_dist[1] = (float)fmin(fmin(fmax(t[1], t[2]), fmax(t[3], t[4])), fmax(t[5], t[6]));
t[0] = (double)(bb_min[0] - orig[0]) * invdirx;
t[1] = (double)(bb_max[0] - orig[0]) * invdirx;
t[2] = (double)(bb_min[1] - orig[1]) * invdiry;
t[3] = (double)(bb_max[1] - orig[1]) * invdiry;
t[4] = (double)(bb_min[2] - orig[2]) * invdirz;
t[5] = (double)(bb_max[2] - orig[2]) * invdirz;
hit_dist[0] = (float)fmax(fmax(fmin(t[0], t[1]), fmin(t[2], t[3])), fmin(t[4], t[5]));
hit_dist[1] = (float)fmin(fmin(fmax(t[0], t[1]), fmax(t[2], t[3])), fmax(t[4], t[5]));
if ((hit_dist[1] < 0.0f || hit_dist[0] > hit_dist[1])) {
return false;
}