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

Cleanup: style

Browse Source
This commit is contained in:
Campbell Barton
2014-09-30 02:04:34 +10:00
parent ec8fb6dbef
commit 927099ceb8
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
intern/cycles/kernel/shaders/node_brick_texture.osl
View File

@@ -93,6 +93,6 @@ shader node_brick_texture(
Col[2] = facm * (Color1[2]) + tint * Color2[2]; Col[2] = facm * (Color1[2]) + tint * Color2[2];
} }
Color = (Fac == 1.0) ? Mortar: Col; Color = (Fac == 1.0) ? Mortar : Col;
} }

6
intern/cycles/kernel/shaders/node_fresnel.h
View File

@@ -36,14 +36,14 @@ float fresnel_dielectric_cos(float cosi, float eta)
color fresnel_conductor(float cosi, color eta, color k) color fresnel_conductor(float cosi, color eta, color k)
{ {
color cosi2 = color(cosi*cosi); color cosi2 = color(cosi * cosi);
color one = color(1, 1, 1); color one = color(1, 1, 1);
color tmp_f = eta * eta + k * k; color tmp_f = eta * eta + k * k;
color tmp = tmp_f * cosi2; color tmp = tmp_f * cosi2;
color Rparl2 = (tmp - (2.0 * eta * cosi) + one) / color Rparl2 = (tmp - (2.0 * eta * cosi) + one) /
(tmp + (2.0 * eta * cosi) + one); (tmp + (2.0 * eta * cosi) + one);
color Rperp2 = (tmp_f - (2.0 * eta * cosi) + cosi2) / color Rperp2 = (tmp_f - (2.0 * eta * cosi) + cosi2) /
(tmp_f + (2.0 * eta * cosi) + cosi2); (tmp_f + (2.0 * eta * cosi) + cosi2);
return (Rparl2 + Rperp2) * 0.5; return (Rparl2 + Rperp2) * 0.5;
} }

2
intern/cycles/kernel/shaders/node_geometry.osl
View File

@@ -49,7 +49,7 @@ shader node_geometry(
/* try to create spherical tangent from generated coordinates */ /* try to create spherical tangent from generated coordinates */
if (getattribute("geom:generated", generated)) { if (getattribute("geom:generated", generated)) {
normal data = normal(-(generated[1]-0.5), (generated[0]-0.5), 0.0); normal data = normal(-(generated[1] - 0.5), (generated[0] - 0.5), 0.0);
vector T = transform("object", "world", data); vector T = transform("object", "world", data);
Tangent = cross(Normal, normalize(cross(T, Normal))); Tangent = cross(Normal, normalize(cross(T, Normal)));
} }

6
release/scripts/templates_osl/fresnel_conductive.osl
View File

@@ -16,14 +16,14 @@
color fresnel_conductor(float cosi, color eta, color k) color fresnel_conductor(float cosi, color eta, color k)
{ {
color cosi2 = color(cosi*cosi); color cosi2 = color(cosi * cosi);
color one = color(1, 1, 1); color one = color(1, 1, 1);
color tmp_f = eta * eta + k * k; color tmp_f = eta * eta + k * k;
color tmp = tmp_f * cosi2; color tmp = tmp_f * cosi2;
color Rparl2 = (tmp - (2.0 * eta * cosi) + one) / color Rparl2 = (tmp - (2.0 * eta * cosi) + one) /
(tmp + (2.0 * eta * cosi) + one); (tmp + (2.0 * eta * cosi) + one);
color Rperp2 = (tmp_f - (2.0 * eta * cosi) + cosi2) / color Rperp2 = (tmp_f - (2.0 * eta * cosi) + cosi2) /
(tmp_f + (2.0 * eta * cosi) + cosi2); (tmp_f + (2.0 * eta * cosi) + cosi2);
return (Rparl2 + Rperp2) * 0.5; return (Rparl2 + Rperp2) * 0.5;
} }