[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52894] trunk/blender/intern/cycles/kernel /shaders: OSL Shader Files:
Thomas Dinges
blender at dingto.org
Tue Dec 11 17:06:06 CET 2012
Revision: 52894
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52894
Author: dingto
Date: 2012-12-11 16:06:03 +0000 (Tue, 11 Dec 2012)
Log Message:
-----------
OSL Shader Files:
* Simplify default color values, where each component was the same.
* Initialize closures as Null Closure, rather than assigning an existing closure, gets overwritten anyways.
Modified Paths:
--------------
trunk/blender/intern/cycles/kernel/shaders/node_add_closure.osl
trunk/blender/intern/cycles/kernel/shaders/node_ambient_occlusion.osl
trunk/blender/intern/cycles/kernel/shaders/node_attribute.osl
trunk/blender/intern/cycles/kernel/shaders/node_background.osl
trunk/blender/intern/cycles/kernel/shaders/node_brick_texture.osl
trunk/blender/intern/cycles/kernel/shaders/node_brightness.osl
trunk/blender/intern/cycles/kernel/shaders/node_checker_texture.osl
trunk/blender/intern/cycles/kernel/shaders/node_combine_rgb.osl
trunk/blender/intern/cycles/kernel/shaders/node_convert_from_color.osl
trunk/blender/intern/cycles/kernel/shaders/node_convert_from_float.osl
trunk/blender/intern/cycles/kernel/shaders/node_convert_from_int.osl
trunk/blender/intern/cycles/kernel/shaders/node_convert_from_normal.osl
trunk/blender/intern/cycles/kernel/shaders/node_convert_from_point.osl
trunk/blender/intern/cycles/kernel/shaders/node_diffuse_bsdf.osl
trunk/blender/intern/cycles/kernel/shaders/node_emission.osl
trunk/blender/intern/cycles/kernel/shaders/node_environment_texture.osl
trunk/blender/intern/cycles/kernel/shaders/node_gamma.osl
trunk/blender/intern/cycles/kernel/shaders/node_glass_bsdf.osl
trunk/blender/intern/cycles/kernel/shaders/node_glossy_bsdf.osl
trunk/blender/intern/cycles/kernel/shaders/node_gradient_texture.osl
trunk/blender/intern/cycles/kernel/shaders/node_hsv.osl
trunk/blender/intern/cycles/kernel/shaders/node_image_texture.osl
trunk/blender/intern/cycles/kernel/shaders/node_invert.osl
trunk/blender/intern/cycles/kernel/shaders/node_magic_texture.osl
trunk/blender/intern/cycles/kernel/shaders/node_mix.osl
trunk/blender/intern/cycles/kernel/shaders/node_mix_closure.osl
trunk/blender/intern/cycles/kernel/shaders/node_musgrave_texture.osl
trunk/blender/intern/cycles/kernel/shaders/node_noise_texture.osl
trunk/blender/intern/cycles/kernel/shaders/node_output_surface.osl
trunk/blender/intern/cycles/kernel/shaders/node_output_volume.osl
trunk/blender/intern/cycles/kernel/shaders/node_refraction_bsdf.osl
trunk/blender/intern/cycles/kernel/shaders/node_rgb_curves.osl
trunk/blender/intern/cycles/kernel/shaders/node_rgb_ramp.osl
trunk/blender/intern/cycles/kernel/shaders/node_separate_rgb.osl
trunk/blender/intern/cycles/kernel/shaders/node_sky_texture.osl
trunk/blender/intern/cycles/kernel/shaders/node_translucent_bsdf.osl
trunk/blender/intern/cycles/kernel/shaders/node_transparent_bsdf.osl
trunk/blender/intern/cycles/kernel/shaders/node_value.osl
trunk/blender/intern/cycles/kernel/shaders/node_velvet_bsdf.osl
trunk/blender/intern/cycles/kernel/shaders/node_voronoi_texture.osl
trunk/blender/intern/cycles/kernel/shaders/node_ward_bsdf.osl
trunk/blender/intern/cycles/kernel/shaders/node_wave_texture.osl
Modified: trunk/blender/intern/cycles/kernel/shaders/node_add_closure.osl
===================================================================
--- trunk/blender/intern/cycles/kernel/shaders/node_add_closure.osl 2012-12-11 15:56:11 UTC (rev 52893)
+++ trunk/blender/intern/cycles/kernel/shaders/node_add_closure.osl 2012-12-11 16:06:03 UTC (rev 52894)
@@ -19,9 +19,9 @@
#include "stdosl.h"
shader node_add_closure(
- closure color Closure1 = background(),
- closure color Closure2 = background(),
- output closure color Closure = background())
+ closure color Closure1 = 0,
+ closure color Closure2 = 0,
+ output closure color Closure = 0)
{
Closure = Closure1 + Closure2;
}
Modified: trunk/blender/intern/cycles/kernel/shaders/node_ambient_occlusion.osl
===================================================================
--- trunk/blender/intern/cycles/kernel/shaders/node_ambient_occlusion.osl 2012-12-11 15:56:11 UTC (rev 52893)
+++ trunk/blender/intern/cycles/kernel/shaders/node_ambient_occlusion.osl 2012-12-11 16:06:03 UTC (rev 52894)
@@ -20,8 +20,8 @@
shader node_ambient_occlusion(
normal NormalIn = N,
- color Color = color(0.8, 0.8, 0.8),
- output closure color AO = ambient_occlusion())
+ color Color = 0.8,
+ output closure color AO = 0)
{
AO = Color * ambient_occlusion();
}
Modified: trunk/blender/intern/cycles/kernel/shaders/node_attribute.osl
===================================================================
--- trunk/blender/intern/cycles/kernel/shaders/node_attribute.osl 2012-12-11 15:56:11 UTC (rev 52893)
+++ trunk/blender/intern/cycles/kernel/shaders/node_attribute.osl 2012-12-11 16:06:03 UTC (rev 52894)
@@ -22,7 +22,7 @@
string bump_offset = "center",
string name = "",
output point Vector = point(0.0, 0.0, 0.0),
- output color Color = color(0.0, 0.0, 0.0),
+ output color Color = 0.0,
output float Fac = 0.0)
{
getattribute(name, Color);
Modified: trunk/blender/intern/cycles/kernel/shaders/node_background.osl
===================================================================
--- trunk/blender/intern/cycles/kernel/shaders/node_background.osl 2012-12-11 15:56:11 UTC (rev 52893)
+++ trunk/blender/intern/cycles/kernel/shaders/node_background.osl 2012-12-11 16:06:03 UTC (rev 52894)
@@ -19,9 +19,9 @@
#include "stdosl.h"
shader node_background(
- color Color = color(0.8, 0.8, 0.8),
+ color Color = 0.8,
float Strength = 1.0,
- output closure color Background = background())
+ output closure color Background = 0)
{
Background = Color * Strength * background();
}
Modified: trunk/blender/intern/cycles/kernel/shaders/node_brick_texture.osl
===================================================================
--- trunk/blender/intern/cycles/kernel/shaders/node_brick_texture.osl 2012-12-11 15:56:11 UTC (rev 52893)
+++ trunk/blender/intern/cycles/kernel/shaders/node_brick_texture.osl 2012-12-11 16:06:03 UTC (rev 52894)
@@ -65,16 +65,16 @@
float Squash = 1.0,
int SquashFrequency = 1,
point Vector = P,
- color Color1 = color(0.2, 0.2, 0.2),
- color Color2 = color(0.8, 0.8, 0.8),
- color Mortar = color(0.0, 0.0, 0.0),
+ color Color1 = 0.2,
+ color Color2 = 0.8,
+ color Mortar = 0.0,
float Scale = 5.0,
float MortarSize = 0.02,
float Bias = 0.0,
float BrickWidth = 0.5,
float RowHeight = 0.25,
output float Fac = 0.0,
- output color Color = color(0.2, 0.2, 0.2))
+ output color Color = 0.2)
{
point p = Vector;
Modified: trunk/blender/intern/cycles/kernel/shaders/node_brightness.osl
===================================================================
--- trunk/blender/intern/cycles/kernel/shaders/node_brightness.osl 2012-12-11 15:56:11 UTC (rev 52893)
+++ trunk/blender/intern/cycles/kernel/shaders/node_brightness.osl 2012-12-11 16:06:03 UTC (rev 52894)
@@ -19,10 +19,10 @@
#include "stdosl.h"
shader node_brightness(
- color ColorIn = color(0.8, 0.8, 0.8),
+ color ColorIn = 0.8,
float Bright = 0.0,
float Contrast = 0.0,
- output color ColorOut = color(0.8, 0.8, 0.8))
+ output color ColorOut = 0.8)
{
float a = 1.0 + Contrast;
float b = Bright - Contrast*0.5;
Modified: trunk/blender/intern/cycles/kernel/shaders/node_checker_texture.osl
===================================================================
--- trunk/blender/intern/cycles/kernel/shaders/node_checker_texture.osl 2012-12-11 15:56:11 UTC (rev 52893)
+++ trunk/blender/intern/cycles/kernel/shaders/node_checker_texture.osl 2012-12-11 16:06:03 UTC (rev 52894)
@@ -44,10 +44,10 @@
matrix mapping = matrix(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0),
float Scale = 5.0,
point Vector = P,
- color Color1 = color(0.8, 0.8, 0.8),
- color Color2 = color(0.2, 0.2, 0.2),
+ color Color1 = 0.8,
+ color Color2 = 0.2,
output float Fac = 0.0,
- output color Color = color(0.0, 0.0, 0.0))
+ output color Color = 0.0)
{
point p = Vector;
Modified: trunk/blender/intern/cycles/kernel/shaders/node_combine_rgb.osl
===================================================================
--- trunk/blender/intern/cycles/kernel/shaders/node_combine_rgb.osl 2012-12-11 15:56:11 UTC (rev 52893)
+++ trunk/blender/intern/cycles/kernel/shaders/node_combine_rgb.osl 2012-12-11 16:06:03 UTC (rev 52894)
@@ -22,7 +22,7 @@
float R = 0.0,
float G = 0.0,
float B = 0.0,
- output color Image = color(0.8, 0.8, 0.8))
+ output color Image = 0.8)
{
Image = color(R, G, B);
}
Modified: trunk/blender/intern/cycles/kernel/shaders/node_convert_from_color.osl
===================================================================
--- trunk/blender/intern/cycles/kernel/shaders/node_convert_from_color.osl 2012-12-11 15:56:11 UTC (rev 52893)
+++ trunk/blender/intern/cycles/kernel/shaders/node_convert_from_color.osl 2012-12-11 16:06:03 UTC (rev 52894)
@@ -19,7 +19,7 @@
#include "stdosl.h"
shader node_convert_from_color(
- color Color = color(0.0, 0.0, 0.0),
+ color Color = 0.0,
output string String = "",
output float Val = 0.0,
output int ValInt = 0,
Modified: trunk/blender/intern/cycles/kernel/shaders/node_convert_from_float.osl
===================================================================
--- trunk/blender/intern/cycles/kernel/shaders/node_convert_from_float.osl 2012-12-11 15:56:11 UTC (rev 52893)
+++ trunk/blender/intern/cycles/kernel/shaders/node_convert_from_float.osl 2012-12-11 16:06:03 UTC (rev 52894)
@@ -22,7 +22,7 @@
float Val = 0.0,
output string String = "",
output int ValInt = 0,
- output color Color = color(0.0, 0.0, 0.0),
+ output color Color = 0.0,
output vector Vector = vector(0.0, 0.0, 0.0),
output point Point = point(0.0, 0.0, 0.0),
output normal Normal = normal(0.0, 0.0, 0.0))
Modified: trunk/blender/intern/cycles/kernel/shaders/node_convert_from_int.osl
===================================================================
--- trunk/blender/intern/cycles/kernel/shaders/node_convert_from_int.osl 2012-12-11 15:56:11 UTC (rev 52893)
+++ trunk/blender/intern/cycles/kernel/shaders/node_convert_from_int.osl 2012-12-11 16:06:03 UTC (rev 52894)
@@ -22,7 +22,7 @@
int ValInt = 0,
output string String = "",
output float Val = 0.0,
- output color Color = color(0.0, 0.0, 0.0),
+ output color Color = 0.0,
output vector Vector = vector(0.0, 0.0, 0.0),
output point Point = point(0.0, 0.0, 0.0),
output normal Normal = normal(0.0, 0.0, 0.0))
Modified: trunk/blender/intern/cycles/kernel/shaders/node_convert_from_normal.osl
===================================================================
--- trunk/blender/intern/cycles/kernel/shaders/node_convert_from_normal.osl 2012-12-11 15:56:11 UTC (rev 52893)
+++ trunk/blender/intern/cycles/kernel/shaders/node_convert_from_normal.osl 2012-12-11 16:06:03 UTC (rev 52894)
@@ -24,7 +24,7 @@
output float Val = 0.0,
output int ValInt = 0,
output vector Vector = vector(0.0, 0.0, 0.0),
- output color Color = color(0.0, 0.0, 0.0),
+ output color Color = 0.0,
output point Point = point(0.0, 0.0, 0.0))
{
Val = (Normal[0] + Normal[1] + Normal[2]) * (1.0 / 3.0);
Modified: trunk/blender/intern/cycles/kernel/shaders/node_convert_from_point.osl
===================================================================
--- trunk/blender/intern/cycles/kernel/shaders/node_convert_from_point.osl 2012-12-11 15:56:11 UTC (rev 52893)
+++ trunk/blender/intern/cycles/kernel/shaders/node_convert_from_point.osl 2012-12-11 16:06:03 UTC (rev 52894)
@@ -24,7 +24,7 @@
output float Val = 0.0,
output int ValInt = 0,
output vector Vector = vector(0.0, 0.0, 0.0),
- output color Color = color(0.0, 0.0, 0.0),
+ output color Color = 0.0,
output normal Normal = normal(0.0, 0.0, 0.0))
{
Val = (Point[0] + Point[1] + Point[2]) * (1.0 / 3.0);
Modified: trunk/blender/intern/cycles/kernel/shaders/node_diffuse_bsdf.osl
===================================================================
--- trunk/blender/intern/cycles/kernel/shaders/node_diffuse_bsdf.osl 2012-12-11 15:56:11 UTC (rev 52893)
+++ trunk/blender/intern/cycles/kernel/shaders/node_diffuse_bsdf.osl 2012-12-11 16:06:03 UTC (rev 52894)
@@ -19,10 +19,10 @@
#include "stdosl.h"
shader node_diffuse_bsdf(
- color Color = color(0.8, 0.8, 0.8),
+ color Color = 0.8,
float Roughness = 0.0,
normal Normal = N,
- output closure color BSDF = diffuse(Normal))
+ output closure color BSDF = 0)
{
if (Roughness == 0.0)
BSDF = Color * diffuse(Normal);
Modified: trunk/blender/intern/cycles/kernel/shaders/node_emission.osl
===================================================================
--- trunk/blender/intern/cycles/kernel/shaders/node_emission.osl 2012-12-11 15:56:11 UTC (rev 52893)
+++ trunk/blender/intern/cycles/kernel/shaders/node_emission.osl 2012-12-11 16:06:03 UTC (rev 52894)
@@ -20,9 +20,9 @@
shader node_emission(
int TotalPower = 0,
- color Color = color(0.8, 0.8, 0.8),
+ color Color = 0.8,
float Strength = 1.0,
- output closure color Emission = emission())
+ output closure color Emission = 0)
{
if (TotalPower)
Emission = ((Strength / surfacearea()) * Color) * emission();
Modified: trunk/blender/intern/cycles/kernel/shaders/node_environment_texture.osl
===================================================================
--- trunk/blender/intern/cycles/kernel/shaders/node_environment_texture.osl 2012-12-11 15:56:11 UTC (rev 52893)
+++ trunk/blender/intern/cycles/kernel/shaders/node_environment_texture.osl 2012-12-11 16:06:03 UTC (rev 52894)
@@ -48,7 +48,7 @@
string filename = "",
string projection = "Equirectangular",
string color_space = "sRGB",
- output color Color = color(0.0, 0.0, 0.0),
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list