diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-02-21 12:49:55 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-02-21 15:30:29 +0300 |
commit | a97bc1bedf6fa63cbafbc9f004f9a6c8f472ae44 (patch) | |
tree | 7d9995efdd3c5afac27b1ec75f238a1e3f548fa2 /intern/cycles/kernel/shaders | |
parent | 3445ff0f93c167020ee81062e9d6877399f358c6 (diff) |
Fix T43755: Wireframe attribute doesn't work with displace
This attribute missed derivatives calculation.
Not totally sure what's the proper approach for algebraic derivative
calculation, so calculating them by definition. This isn't fastest
way to do it in this case and could be replaced with some smarter magic
in the wireframe calculation loop.
At least currently implemented approach is better than nothing.
Diffstat (limited to 'intern/cycles/kernel/shaders')
-rw-r--r-- | intern/cycles/kernel/shaders/node_wireframe.osl | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/intern/cycles/kernel/shaders/node_wireframe.osl b/intern/cycles/kernel/shaders/node_wireframe.osl index 936e9bb5754..1ab0a6536eb 100644 --- a/intern/cycles/kernel/shaders/node_wireframe.osl +++ b/intern/cycles/kernel/shaders/node_wireframe.osl @@ -18,10 +18,21 @@ #include "oslutil.h" shader node_wireframe( + string bump_offset = "center", int use_pixel_size = 0, float Size = 0.01, output float Fac = 0.0) { Fac = wireframe("triangles", Size, use_pixel_size); + if (bump_offset == "dx") { + point dx = Dx(P); + P -= dx; + Fac += (Fac - wireframe("triangles", Size, use_pixel_size)) / length(dx); + } + else if (bump_offset == "dy") { + point dy = Dy(P); + P -= dy; + Fac += (Fac - wireframe("triangles", Size, use_pixel_size)) / length(dy); + } } |