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

Code Cleanup: osl style

Browse Source
This commit is contained in:
Campbell Barton
2014-01-06 13:52:27 +11:00
parent ce6dce3b13
commit 64fc94e93f
4 changed files with 40 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
GNUmakefile
View File

@@ -243,13 +243,13 @@ test_style_c_qtc:
test_style_osl: test_style_osl:
# run our own checks on C/C++ style # run our own checks on C/C++ style
PYTHONIOENCODING=utf_8 python3 "$(BLENDER_DIR)/source/tools/check_source/check_style_c.py" "$(BLENDER_DIR)/intern/cycles/kernel/shaders" PYTHONIOENCODING=utf_8 python3 "$(BLENDER_DIR)/source/tools/check_source/check_style_c.py" "$(BLENDER_DIR)/intern/cycles/kernel/shaders" "$(BLENDER_DIR)/release/scripts/templates_osl"
test_style_osl_qtc: test_style_osl_qtc:
# run our own checks on C/C++ style # run our own checks on C/C++ style
USE_QTC_TASK=1 \ USE_QTC_TASK=1 \
PYTHONIOENCODING=utf_8 python3 "$(BLENDER_DIR)/source/tools/check_source/check_style_c.py" "$(BLENDER_DIR)/intern/cycles/kernel/shaders" > \ PYTHONIOENCODING=utf_8 python3 "$(BLENDER_DIR)/source/tools/check_source/check_style_c.py" "$(BLENDER_DIR)/intern/cycles/kernel/shaders" "$(BLENDER_DIR)/release/scripts/templates_osl" > \
test_style.tasks test_style.tasks
@echo "written: test_style.tasks" @echo "written: test_style.tasks"

4
intern/cycles/kernel/shaders/node_texture_coordinate.osl
View File

@@ -46,11 +46,11 @@ shader node_texture_coordinate(
getattribute("geom:dupli_generated", Generated); getattribute("geom:dupli_generated", Generated);
getattribute("geom:dupli_uv", UV); getattribute("geom:dupli_uv", UV);
} }
else if(is_volume) { else if (is_volume) {
Generated = transform("object", P); Generated = transform("object", P);
matrix tfm; matrix tfm;
if(getattribute("geom:generated_transform", tfm)) if (getattribute("geom:generated_transform", tfm))
Generated = transform(tfm, Generated); Generated = transform(tfm, Generated);
getattribute("geom:uv", UV); getattribute("geom:uv", UV);

12
release/scripts/templates_osl/gabor_noise.osl
View File

@@ -6,12 +6,12 @@ shader gabor_noise(
float Bandwidth = 1.0, float Bandwidth = 1.0,
float Impulses = 16, float Impulses = 16,
output float Gabor = 0.8) output float Gabor = 0.8)
{ {
Gabor = noise("gabor", Point, Gabor = noise("gabor", Point,
"direction", Direction, "direction", Direction,
"anisotropic", Anisotropic, "anisotropic", Anisotropic,
"do_filter", 1, // Set to 0 to disable filtering/anti-aliasing "do_filter", 1, // Set to 0 to disable filtering/anti-aliasing
"bandwidth", Bandwidth, "bandwidth", Bandwidth,
"impulses", Impulses); "impulses", Impulses);
} }

60
release/scripts/templates_osl/lyapunov_texture.osl
View File

@@ -23,7 +23,7 @@
* More information: https://developer.blender.org/T32305 * More information: https://developer.blender.org/T32305
*/ */
/* Fac_Type /* Fac_Type
* 0, SPREAD, Spread indices for fac output * 0, SPREAD, Spread indices for fac output
* 1, ABS, Absolute values from indices * 1, ABS, Absolute values from indices
* 2, COLOR, Get fac output from used colors * 2, COLOR, Get fac output from used colors
@@ -54,56 +54,56 @@ float lyapunov(point p, float iteration_pre, float iteration_main, float p1, flo
int iter = 0; int iter = 0;
/* Pre-iteration */ /* Pre-iteration */
for(int i = 0; i < iter_pre; i++) { for (int i = 0; i < iter_pre; i++) {
x = p1*sin(x+a) * sin(x+a)+p2; x = p1 * sin(x + a) * sin(x + a) + p2;
x = p1*sin(x+b) * sin(x+b)+p2; x = p1 * sin(x + b) * sin(x + b) + p2;
x = p1*sin(x+c) * sin(x+c)+p2; x = p1 * sin(x + c) * sin(x + c) + p2;
} }
if (nabla_pre != 0.0) { if (nabla_pre != 0.0) {
float x_pre = x; float x_pre = x;
x = p1*sin(x+a)*sin(x+a)+p2; x = p1 * sin(x + a) * sin(x + a) + p2;
x = p1*sin(x+b)*sin(x+b)+p2; x = p1 * sin(x + b) * sin(x + b) + p2;
x = p1*sin(x+c)*sin(x+c)+p2; x = p1 * sin(x + c) * sin(x + c) + p2;
x = x*nabla_pre + x_pre*(1.0-nabla_pre); x = x * nabla_pre + x_pre * (1.0 - nabla_pre);
} }
/* Main-iteration */ /* Main-iteration */
for(int i = 0; i < iter_main; i++) { for (int i = 0; i < iter_main; i++) {
x = p1*sin(x+a)*sin(x+a)+p2; x = p1 * sin(x + a) * sin(x + a) + p2;
derivation = 2.0*p1*sin(x+a)*cos(x+a); derivation = 2.0 *p1 *sin(x + a) * cos(x + a);
if (derivation != 0.0) { index += log(fabs(derivation)); iter++; } if (derivation != 0.0) { index += log(fabs(derivation)); iter++; }
x = p1*sin(x+b)*sin(x+b)+p2; x = p1 * sin(x + b) * sin(x + b) + p2;
derivation = 2.0*p1*sin(x+b)*cos(x+b); derivation = 2.0 *p1 *sin(x + b) * cos(x + b);
if (derivation != 0.0) { index += log(fabs(derivation)); iter++; } if (derivation != 0.0) { index += log(fabs(derivation)); iter++; }
x = p1*sin(x+c)*sin(x+c)+p2; x = p1 * sin(x + c) * sin(x + c) + p2;
derivation = 2.0*p1*sin(x+c)*cos(x+c); derivation = 2.0 *p1 *sin(x + c) * cos(x + c);
if (derivation != 0.0) { index += log(fabs(derivation)); iter++; } if (derivation != 0.0) { index += log(fabs(derivation)); iter++; }
} }
if (nabla_main == 0.0) { if (nabla_main == 0.0) {
index = (iter != 0) ? index/(float)(iter) : 0.0; index = (iter != 0) ? index / (float)(iter) : 0.0;
} }
else { else {
float index_pre = (iter != 0) ? index/(float)(iter) : 0.0; float index_pre = (iter != 0) ? index / (float)(iter) : 0.0;
x = p1*sin(x+a)*sin(x+a)+p2; x = p1 * sin(x + a) * sin(x + a) + p2;
derivation = 2.0*p1*sin(x+a)*cos(x+a); derivation = 2.0 *p1 *sin(x + a) * cos(x + a);
if (derivation != 0.0) { index += log(fabs(derivation)); iter++; } if (derivation != 0.0) { index += log(fabs(derivation)); iter++; }
x = p1*sin(x+b)*sin(x+b)+p2; x = p1 * sin(x + b) * sin(x + b) + p2;
derivation = 2.0*p1*sin(x+b)*cos(x+b); derivation = 2.0 *p1 *sin(x + b) * cos(x + b);
if (derivation != 0.0) { index += log(fabs(derivation)); iter++; } if (derivation != 0.0) { index += log(fabs(derivation)); iter++; }
x = p1*sin(x+c)*sin(x+c)+p2; x = p1 * sin(x + c) * sin(x + c) + p2;
derivation = 2.0*p1*sin(x+c)*cos(x+c); derivation = 2.0 *p1 *sin(x + c) * cos(x + c);
if (derivation != 0.0) { index += log(fabs(derivation)); iter++; } if (derivation != 0.0) { index += log(fabs(derivation)); iter++; }
index = (iter != 0) ? index/(float)(iter) : 0.0; index = (iter != 0) ? index / (float)(iter) : 0.0;
index = index*nabla_main + index_pre*(1.0-nabla_main); index = index * nabla_main + index_pre * (1.0 - nabla_main);
} }
return index; return index;
@@ -127,12 +127,12 @@ shader node_lyapunov(
output color Color = 0.0) output color Color = 0.0)
{ {
/* Calculate Texture */ /* Calculate Texture */
float index = lyapunov(Pos*Scale, Pre_Iteration, Main_Iteration, Param1, Param2); float index = lyapunov(Pos * Scale, Pre_Iteration, Main_Iteration, Param1, Param2);
/* Calculate Color */ /* Calculate Color */
if(index > 0.0 && (Render_Type != 0)) { if (index > 0.0 && (Render_Type != 0)) {
index *= Pos_Scale; index *= Pos_Scale;
if(index > 1.0) { index = 1.0; } if (index > 1.0) { index = 1.0; }
Color = (Pos_Color - Mid_Color) * index + Mid_Color; Color = (Pos_Color - Mid_Color) * index + Mid_Color;
} }
else if (index < 0.0 && (Render_Type != 1)) { else if (index < 0.0 && (Render_Type != 1)) {
@@ -152,7 +152,7 @@ shader node_lyapunov(
index = fabs(index); index = fabs(index);
} }
else if (Fac_Type == 2) { else if (Fac_Type == 2) {
index = (Color[0]+Color[1]+Color[2]) * (1.0/3.0); index = (Color[0] + Color[1] + Color[2]) * (1.0 / 3.0);
} }
Fac = index; Fac = index;