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

direction to equisolid - final fix for [#31307] Cycles panoramic fisheye lens and vector pass problem

Browse Source
This commit is contained in:
Dalai Felinto
2012-05-07 16:51:55 +00:00
parent 4bbcb7714e
commit 9a731205e9
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
intern/cycles/kernel/kernel_projection.h
View File

@@ -74,7 +74,7 @@ __device float3 equirectangular_to_direction(float u, float v)
cos(theta)); cos(theta));
} }
/* Fisheye <- Cartesian direction */ /* Fisheye <-> Cartesian direction */
__device float2 direction_to_fisheye(float3 dir, float fov) __device float2 direction_to_fisheye(float3 dir, float fov)
{ {
@@ -109,11 +109,14 @@ __device float3 fisheye_to_direction(float u, float v, float fov)
); );
} }
__device float2 direction_to_fisheye_equisolid(float3 dir, float lens, float fov, float width, float height) __device float2 direction_to_fisheye_equisolid(float3 dir, float lens, float width, float height)
{ {
/* XXX not implemented yet */ float theta = acosf(dir.x);
float u = -atan2f(dir.y, dir.x)/(2.0f*M_PI_F) + 0.5f; float r = 2.0f * lens * sinf(theta * 0.25f);
float v = atan2f(dir.z, hypotf(dir.x, dir.y))/M_PI_F + 0.5f; float phi = atan2f(dir.z, dir.y);
float u = r * cosf(phi) / width + 0.5f;
float v = r * sinf(phi) / height + 0.5f;
return make_float2(u, v); return make_float2(u, v);
} }
@@ -197,7 +200,7 @@ __device float2 direction_to_panorama(KernelGlobals *kg, float3 dir)
case PANORAMA_FISHEYE_EQUISOLID: case PANORAMA_FISHEYE_EQUISOLID:
default: default:
return direction_to_fisheye_equisolid(dir, kernel_data.cam.fisheye_lens, return direction_to_fisheye_equisolid(dir, kernel_data.cam.fisheye_lens,
kernel_data.cam.fisheye_fov, kernel_data.cam.sensorwidth, kernel_data.cam.sensorheight); kernel_data.cam.sensorwidth, kernel_data.cam.sensorheight);
} }
} }