diff options
Diffstat (limited to 'intern/cycles/util')
| -rw-r--r-- | intern/cycles/util/util_ies.cpp | 2 | ||||
| -rw-r--r-- | intern/cycles/util/util_ies.h | 2 | ||||
| -rw-r--r-- | intern/cycles/util/util_math_intersect.h | 22 |
3 files changed, 17 insertions, 9 deletions
diff --git a/intern/cycles/util/util_ies.cpp b/intern/cycles/util/util_ies.cpp index e1de2e0c6e4..277045d9bc4 100644 --- a/intern/cycles/util/util_ies.cpp +++ b/intern/cycles/util/util_ies.cpp @@ -293,7 +293,7 @@ bool IESFile::process_type_c() { if(h_angles[0] == 90.0f) { /* Some files are stored from 90° to 270°, so we just rotate them to the regular 0°-180° range here. */ - for(int i = 0; i < v_angles.size(); i++) { + for(int i = 0; i < h_angles.size(); i++) { h_angles[i] -= 90.0f; } } diff --git a/intern/cycles/util/util_ies.h b/intern/cycles/util/util_ies.h index 663ad649a9c..096b1fdf803 100644 --- a/intern/cycles/util/util_ies.h +++ b/intern/cycles/util/util_ies.h @@ -40,7 +40,7 @@ protected: bool process_type_c(); /* The brightness distribution is stored in spherical coordinates. - * The horizontal angles correspond to to theta in the regular notation + * The horizontal angles correspond to theta in the regular notation * and always span the full range from 0° to 360°. * The vertical angles correspond to phi and always start at 0°. */ vector<float> v_angles, h_angles; diff --git a/intern/cycles/util/util_math_intersect.h b/intern/cycles/util/util_math_intersect.h index 190c2f5d6b0..aa75783d378 100644 --- a/intern/cycles/util/util_math_intersect.h +++ b/intern/cycles/util/util_math_intersect.h @@ -186,12 +186,17 @@ ccl_device_forceinline bool ray_triangle_intersect( #undef dot3 } +/* Tests for an intersection between a ray and a quad defined by + * its midpoint, normal and sides. + * If ellipse is true, hits outside the ellipse that's enclosed by the + * quad are rejected. + */ ccl_device bool ray_quad_intersect(float3 ray_P, float3 ray_D, float ray_mint, float ray_maxt, float3 quad_P, float3 quad_u, float3 quad_v, float3 quad_n, float3 *isect_P, float *isect_t, - float *isect_u, float *isect_v) + float *isect_u, float *isect_v, bool ellipse) { /* Perform intersection test. */ float t = -(dot(ray_P, quad_n) - dot(quad_P, quad_n)) / dot(ray_D, quad_n); @@ -200,20 +205,23 @@ ccl_device bool ray_quad_intersect(float3 ray_P, float3 ray_D, } const float3 hit = ray_P + t*ray_D; const float3 inplane = hit - quad_P; - const float u = dot(inplane, quad_u) / dot(quad_u, quad_u) + 0.5f; - if(u < 0.0f || u > 1.0f) { + const float u = dot(inplane, quad_u) / dot(quad_u, quad_u); + if(u < -0.5f || u > 0.5f) { + return false; + } + const float v = dot(inplane, quad_v) / dot(quad_v, quad_v); + if(v < -0.5f || v > 0.5f) { return false; } - const float v = dot(inplane, quad_v) / dot(quad_v, quad_v) + 0.5f; - if(v < 0.0f || v > 1.0f) { + if(ellipse && (u*u + v*v > 0.25f)) { return false; } /* Store the result. */ /* TODO(sergey): Check whether we can avoid some checks here. */ if(isect_P != NULL) *isect_P = hit; if(isect_t != NULL) *isect_t = t; - if(isect_u != NULL) *isect_u = u; - if(isect_v != NULL) *isect_v = v; + if(isect_u != NULL) *isect_u = u + 0.5f; + if(isect_v != NULL) *isect_v = v + 0.5f; return true; } |