Page MenuHome
Differential D1223 Diff 6116 intern/cycles/kernel/kernel_camera.h

Changeset View

Standalone View

View Options

intern/cycles/kernel/kernel_camera.h

Show First 20 Lines • Show All 99 Lines • ▼ Show 20 Lines
#else #else
transform_motion_interpolate(&cameratoworld, transform_motion_interpolate(&cameratoworld,
((const DecompMotionTransform*)&kernel_data.cam.motion), ((const DecompMotionTransform*)&kernel_data.cam.motion),
ray->time); ray->time);
#endif #endif
} }
#endif #endif
ray->P = transform_point(&cameratoworld, ray->P); float3 tP = transform_point(&cameratoworld, ray->P);
ray->D = transform_direction(&cameratoworld, ray->D); float3 tD = transform_direction(&cameratoworld, ray->D);
ray->P = spherical_stereo_position(kg, tD, tP);
ray->D = spherical_stereo_direction(kg, tD, tP, ray->P);
ray->D = normalize(ray->D); ray->D = normalize(ray->D);
#ifdef __RAY_DIFFERENTIALS__ #ifdef __RAY_DIFFERENTIALS__
/* ray differential */ /* ray differential */
float3 Ddiff = transform_direction(&cameratoworld, Pcamera);
ray->dP = differential3_zero(); ray->dP = differential3_zero();
ray->dD.dx = normalize(Ddiff + float4_to_float3(kernel_data.cam.dx)) - normalize(Ddiff); tP = transform_perspective(&rastertocamera, make_float3(raster_x, raster_y, 0.0f));
sergeyUnsubmitted
Not Done
Inline Actions

Interesting, so derivatives can't be pre-calculated even for perspective camera when spherical 3D is used?

If so, i think it worth sticking to a single method as it is currently (don't think it's a bottleneck, having single code base is easier for maintenance) and remove derivatived pre-calculation from camera.cpp.

Other notes:

  • Some values are calculated twice (i.e. tP here is in fact Pcamera)
  • Rolling shutter needs to be taken into a care here?

P.S. Or maybe there is a trick to pre-calculate derivated for stereo 3d and perspective camera..

sergey: Interesting, so derivatives can't be pre-calculated even for perspective camera when spherical…
ray->dD.dy = normalize(Ddiff + float4_to_float3(kernel_data.cam.dy)) - normalize(Ddiff); tD = transform_direction(&cameratoworld, tP);
float3 Pdiff = spherical_stereo_position(kg, tD, tP);
float3 Ddiff = normalize(spherical_stereo_direction(kg, tD, tP, Pdiff));
tP = transform_perspective(&rastertocamera, make_float3(raster_x + 1.0f, raster_y, 0.0f));
tD = transform_direction(&cameratoworld, tP);
Pcamera = spherical_stereo_position(kg, tD, tP);
ray->dD.dx = normalize(spherical_stereo_direction(kg, tD, tP, Pcamera)) - Ddiff;
ray->dP.dx = Pcamera - Pdiff;
tP = transform_perspective(&rastertocamera, make_float3(raster_x, raster_y + 1.0f, 0.0f));
tD = transform_direction(&cameratoworld, tP);
Pcamera = spherical_stereo_position(kg, tD, tP);
ray->dD.dy = normalize(spherical_stereo_direction(kg, tD, tP, Pcamera)) - Ddiff;
/* dP.dy is zero, since the omnidirectional panorama only shift the eyes horizontally */
#endif #endif
#ifdef __CAMERA_CLIPPING__ #ifdef __CAMERA_CLIPPING__
/* clipping */ /* clipping */
float3 Pclip = normalize(Pcamera); float3 Pclip = normalize(Pcamera);
float z_inv = 1.0f / Pclip.z; float z_inv = 1.0f / Pclip.z;
ray->P += kernel_data.cam.nearclip*ray->D * z_inv; ray->P += kernel_data.cam.nearclip*ray->D * z_inv;
ray->t = kernel_data.cam.cliplength * z_inv; ray->t = kernel_data.cam.cliplength * z_inv;
▲ Show 20 Lines • Show All 126 Lines • ▼ Show 20 Lines
#else #else
transform_motion_interpolate(&cameratoworld, transform_motion_interpolate(&cameratoworld,
(const DecompMotionTransform*)&kernel_data.cam.motion, (const DecompMotionTransform*)&kernel_data.cam.motion,
ray->time); ray->time);
#endif #endif
} }
#endif #endif
ray->P = transform_point(&cameratoworld, ray->P); float3 tP = transform_point(&cameratoworld, ray->P);
ray->D = transform_direction(&cameratoworld, ray->D); float3 tD = transform_direction(&cameratoworld, ray->D);
ray->P = spherical_stereo_position(kg, tD, tP);
ray->D = spherical_stereo_direction(kg, tD, tP, ray->P);
ray->D = normalize(ray->D); ray->D = normalize(ray->D);
#ifdef __RAY_DIFFERENTIALS__ #ifdef __RAY_DIFFERENTIALS__
/* ray differential */ /* ray differential */
ray->dP = differential3_zero(); ray->dP = differential3_zero();
Pcamera = transform_perspective(&rastertocamera, make_float3(raster_x, raster_y, 0.0f)); tP = transform_perspective(&rastertocamera, make_float3(raster_x, raster_y, 0.0f));
float3 Ddiff = normalize(transform_direction(&cameratoworld, panorama_to_direction(kg, Pcamera.x, Pcamera.y))); tD = transform_direction(&cameratoworld, panorama_to_direction(kg, tP.x, tP.y));
float3 Pdiff = spherical_stereo_position(kg, tD, tP);
Pcamera = transform_perspective(&rastertocamera, make_float3(raster_x + 1.0f, raster_y, 0.0f)); float3 Ddiff = normalize(spherical_stereo_direction(kg, tD, tP, Pdiff));
ray->dD.dx = normalize(transform_direction(&cameratoworld, panorama_to_direction(kg, Pcamera.x, Pcamera.y))) - Ddiff;
sergeyUnsubmitted
Done
Inline Actions

If eye is STEREO_NONE then panorama_stereo_position will give same position as camera and all this code seems to be same as the case above and we can avoid this duplication?

sergey: If eye is `STEREO_NONE` then `panorama_stereo_position` will give same position as camera and…
dfelintoAuthorUnsubmitted
Not Done
Inline Actions

Correct, and this is what I had in a previous patch. I just tried to make the changes less intrusives (and with less impact on general performance for the non-spherical stereo use case). I will remove this, then.

dfelinto: Correct, and this is what I had in a previous patch. I just tried to make the changes less…
tP = transform_perspective(&rastertocamera, make_float3(raster_x + 1.0f, raster_y, 0.0f));
sergeyUnsubmitted
Not Done
Inline Actions

This chunk is same as above apart from panorama_to_direction part.

Thinking loud: would it be more clear to move this to an utility function with an argument denoting whether derivatives are calculated for panorama camera?

sergey: This chunk is same as above apart from `panorama_to_direction` part. Thinking loud: would it…
Pcamera = transform_perspective(&rastertocamera, make_float3(raster_x, raster_y + 1.0f, 0.0f)); tD = transform_direction(&cameratoworld, panorama_to_direction(kg, tP.x, tP.y));
ray->dD.dy = normalize(transform_direction(&cameratoworld, panorama_to_direction(kg, Pcamera.x, Pcamera.y))) - Ddiff; Pcamera = spherical_stereo_position(kg, tD, tP);
ray->dD.dx = normalize(spherical_stereo_direction(kg, tD, tP, Pcamera)) - Ddiff;
ray->dP.dx = Pcamera - Pdiff;
tP = transform_perspective(&rastertocamera, make_float3(raster_x, raster_y + 1.0f, 0.0f));
tD = transform_direction(&cameratoworld, panorama_to_direction(kg, tP.x, tP.y));
Pcamera = spherical_stereo_position(kg, tD, tP);
ray->dD.dy = normalize(spherical_stereo_direction(kg, tD, tP, Pcamera)) - Ddiff;
/* dP.dy is zero, since the omnidirectional panorama only shift the eyes horizontally */
#endif #endif
} }
/* Common */ /* Common */
ccl_device void camera_sample(KernelGlobals *kg, int x, int y, float filter_u, float filter_v, ccl_device void camera_sample(KernelGlobals *kg, int x, int y, float filter_u, float filter_v,
float lens_u, float lens_v, float time, ccl_addr_space Ray *ray) float lens_u, float lens_v, float time, ccl_addr_space Ray *ray)
{ {
▲ Show 20 Lines • Show All 115 Lines • Show Last 20 Lines