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

quiet float -> double conversion warnings and do some osl style edits.

Browse Source
This commit is contained in:
Campbell Barton
2012-12-03 13:58:08 +00:00
parent 6213c6d69b
commit 4a9c522125
5 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
intern/cycles/kernel/shaders/node_environment_texture.osl
View File

@@ -21,8 +21,8 @@
vector environment_texture_direction_to_equirectangular(vector dir)
{
float u = -atan2(dir[1], dir[0])/(2.0*M_PI) + 0.5;
float v = atan2(dir[2], hypot(dir[0], dir[1]))/M_PI + 0.5;
float u = -atan2(dir[1], dir[0]) / (2.0 * M_PI) + 0.5;
float v = atan2(dir[2], hypot(dir[0], dir[1])) / M_PI + 0.5;
return vector(u, v, 0.0);
}
@@ -31,8 +31,8 @@ vector environment_texture_direction_to_mirrorball(vector dir)
{
dir[1] -= 1.0;
float div = 2.0*sqrt(max(-0.5*dir[1], 0.0));
if(div > 0.0)
float div = 2.0 * sqrt(max(-0.5 * dir[1], 0.0));
if (div > 0.0)
dir /= div;
float u = 0.5*(dir[0] + 1.0);