From a8c87bad22e618fab19521b4e2d162d19946db98 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Fri, 11 Mar 2016 21:22:19 +0500 Subject: Cycles: Cleanup, spherical_stereo_direction will return normalized direction Previously each call of this function was followed by a normaliztion, now it is done in the function itself with an according note around the function. --- intern/cycles/kernel/kernel_projection.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'intern/cycles/kernel/kernel_projection.h') diff --git a/intern/cycles/kernel/kernel_projection.h b/intern/cycles/kernel/kernel_projection.h index aedcbddbd98..e561cfaebe0 100644 --- a/intern/cycles/kernel/kernel_projection.h +++ b/intern/cycles/kernel/kernel_projection.h @@ -241,20 +241,22 @@ ccl_device float3 spherical_stereo_position(KernelGlobals *kg, return pos + (side * interocular_offset); } +/* NOTE: Ensures direction is normalized. */ ccl_device float3 spherical_stereo_direction(KernelGlobals *kg, float3 dir, float3 pos, float3 newpos) { + const float3 normalized_dir = normalize(dir); /* Interocular offset of zero means either no stereo, or stereo without * spherical stereo. */ if(kernel_data.cam.interocular_offset == 0.0f) { - return dir; + return normalized_dir; } - float3 screenpos = pos + (normalize(dir) * kernel_data.cam.convergence_distance); - return screenpos - newpos; + float3 screenpos = pos + (normalized_dir * kernel_data.cam.convergence_distance); + return normalize(screenpos - newpos); } CCL_NAMESPACE_END -- cgit v1.2.3