diff options
| author | Scott Wu <> | 2016-10-15 01:11:42 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2016-10-15 01:26:59 +0300 |
| commit | 7fec7eee2070aac701f7918311a05ca2bfd1b3b0 (patch) | |
| tree | d6b09d91ba611033cdcc33eaece73a306b8e6cc3 /intern/cycles/kernel/kernel_camera.h | |
| parent | 05c727bb0062520152995932d99705d61227eeb6 (diff) | |
Cycles: use near clipping distance in panorama camera.
Reviewed By: sergey, brecht, dfelinto
Differential Revision: https://developer.blender.org/D1952
Diffstat (limited to 'intern/cycles/kernel/kernel_camera.h')
| -rw-r--r-- | intern/cycles/kernel/kernel_camera.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/intern/cycles/kernel/kernel_camera.h b/intern/cycles/kernel/kernel_camera.h index 8e0aa678cac..ed9726e1b51 100644 --- a/intern/cycles/kernel/kernel_camera.h +++ b/intern/cycles/kernel/kernel_camera.h @@ -221,14 +221,6 @@ ccl_device_inline void camera_sample_panorama(KernelGlobals *kg, /* create ray form raster position */ ray->P = make_float3(0.0f, 0.0f, 0.0f); - -#ifdef __CAMERA_CLIPPING__ - /* clipping */ - ray->t = kernel_data.cam.cliplength; -#else - ray->t = FLT_MAX; -#endif - ray->D = panorama_to_direction(kg, Pcamera.x, Pcamera.y); /* indicates ray should not receive any light, outside of the lens */ @@ -302,6 +294,14 @@ ccl_device_inline void camera_sample_panorama(KernelGlobals *kg, ray->dD.dy = spherical_stereo_direction(kg, tD, tP, Pcamera) - Ddiff; /* dP.dy is zero, since the omnidirectional panorama only shift the eyes horizontally */ #endif + +#ifdef __CAMERA_CLIPPING__ + /* clipping */ + ray->P += kernel_data.cam.nearclip*ray->D; + ray->t = kernel_data.cam.cliplength; +#else + ray->t = FLT_MAX; +#endif } /* Common */ |