diff options
author | Thomas Dinges <blender@dingto.org> | 2012-11-20 18:18:56 +0400 |
---|---|---|
committer | Thomas Dinges <blender@dingto.org> | 2012-11-20 18:18:56 +0400 |
commit | f92359cc2998126395ff772f1f0d20867c058be0 (patch) | |
tree | db7328000193b8397a4e30093cad5c4b1445d46f /intern/cycles/kernel | |
parent | ebaf1306b8167ea28be61980305a53b3c54cc4dc (diff) |
Fix [#33239] Cycles OSL : Environment Texture Rotation Incorrect:
* Projection mappings were not implemented yet.
Diffstat (limited to 'intern/cycles/kernel')
-rw-r--r-- | intern/cycles/kernel/shaders/node_environment_texture.osl | 32 |
1 files changed, 31 insertions, 1 deletions
diff --git a/intern/cycles/kernel/shaders/node_environment_texture.osl b/intern/cycles/kernel/shaders/node_environment_texture.osl index bad62e56ab4..a177f0ad1ad 100644 --- a/intern/cycles/kernel/shaders/node_environment_texture.osl +++ b/intern/cycles/kernel/shaders/node_environment_texture.osl @@ -19,14 +19,44 @@ #include "stdosl.h" #include "node_color.h" +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; + + return vector(u, v, 0.0); +} + +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) + dir /= div; + + float u = 0.5*(dir[0] + 1.0); + float v = 0.5*(dir[2] + 1.0); + + return vector(u, v, 0.0); +} + shader node_environment_texture( vector Vector = P, string filename = "", + string projection = "Equirectangular", string color_space = "sRGB", output color Color = color(0.0, 0.0, 0.0), output float Alpha = 1.0) { - Color = (color)environment(filename, Vector, "alpha", Alpha); + vector Vec = normalize(Vector); + + if (projection == "Equirectangular") { + Vec = environment_texture_direction_to_equirectangular(Vec); + } + else { + Vec = environment_texture_direction_to_mirrorball(Vec); + } + + Color = (color)texture(filename, Vec[0], 1.0 - Vec[1], "wrap", "periodic", "alpha", Alpha); if (color_space == "sRGB") Color = color_srgb_to_scene_linear(Color); |