Code Cleanup: osl style
authorCampbell Barton <ideasman42@gmail.com>
Mon, 6 Jan 2014 02:52:27 +0000 (13:52 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 6 Jan 2014 02:58:33 +0000 (13:58 +1100)
GNUmakefile
intern/cycles/kernel/shaders/node_texture_coordinate.osl
release/scripts/templates_osl/gabor_noise.osl
release/scripts/templates_osl/lyapunov_texture.osl

index e6998cf1c9637ff88315498fcf702301597bbc24..95c628fcae7ceb470e721af0e499422d9802bed4 100644 (file)
@@ -243,13 +243,13 @@ test_style_c_qtc:
 
 test_style_osl:
        # 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:
        # run our own checks on C/C++ style
        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
        @echo "written: test_style.tasks"
 
index fdd0a51013bcc1cefc8a6637e16e7de79e1bc740..8fdf469df216780e5e4c49f29d384a316c076138 100644 (file)
@@ -46,11 +46,11 @@ shader node_texture_coordinate(
                        getattribute("geom:dupli_generated", Generated); 
                        getattribute("geom:dupli_uv", UV);
                }
-               else if(is_volume) {
+               else if (is_volume) {
                        Generated = transform("object", P);
 
                        matrix tfm;
-                       if(getattribute("geom:generated_transform", tfm))
+                       if (getattribute("geom:generated_transform", tfm))
                                Generated = transform(tfm, Generated);
 
                        getattribute("geom:uv", UV);
index 1f5910685d2960168a74ae0e44e1f22e5613bf8c..9c8615afb353a38655b7b370ea4f7bddfd630180 100644 (file)
@@ -6,12 +6,12 @@ shader gabor_noise(
        float Bandwidth = 1.0,
        float Impulses = 16,
        output float Gabor = 0.8)
-{   
+{
        Gabor = noise("gabor", Point,
-                       "direction", Direction,
-                       "anisotropic", Anisotropic,
-                       "do_filter", 1, // Set to 0 to disable filtering/anti-aliasing 
-                       "bandwidth", Bandwidth,
-                       "impulses", Impulses);
+                     "direction", Direction,
+                     "anisotropic", Anisotropic,
+                     "do_filter", 1, // Set to 0 to disable filtering/anti-aliasing 
+                     "bandwidth", Bandwidth,
+                     "impulses", Impulses);
 }
 
index d8817b4087c1e8f39f7f8a9dc514261d640d22f9..b658c076139680813d9df824a64e0c7d417cdbbe 100644 (file)
@@ -23,7 +23,7 @@
  * More information: https://developer.blender.org/T32305
  */
  
- /* Fac_Type
+/* Fac_Type
  * 0, SPREAD,  Spread indices for fac output
  * 1, ABS,             Absolute values from indices
  * 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;
 
        /* Pre-iteration */
-       for(int i = 0; i < iter_pre; i++) {
-               x = p1*sin(x+a) * sin(x+a)+p2;
-               x = p1*sin(x+b) * sin(x+b)+p2;
-               x = p1*sin(x+c) * sin(x+c)+p2;
+       for (int i = 0; i < iter_pre; i++) {
+               x = p1 * sin(x + a) * sin(x + a) + p2;
+               x = p1 * sin(x + b) * sin(x + b) + p2;
+               x = p1 * sin(x + c) * sin(x + c) + p2;
        }
 
        if (nabla_pre != 0.0) {
                float x_pre = x;
 
-               x = p1*sin(x+a)*sin(x+a)+p2;
-               x = p1*sin(x+b)*sin(x+b)+p2;
-               x = p1*sin(x+c)*sin(x+c)+p2;
-               x = x*nabla_pre + x_pre*(1.0-nabla_pre);
+               x = p1 * sin(x + a) * sin(x + a) + p2;
+               x = p1 * sin(x + b) * sin(x + b) + p2;
+               x = p1 * sin(x + c) * sin(x + c) + p2;
+               x = x * nabla_pre + x_pre * (1.0 - nabla_pre);
        }
 
        /* Main-iteration */
-       for(int i = 0; i < iter_main; i++) {
-               x = p1*sin(x+a)*sin(x+a)+p2;
-               derivation = 2.0*p1*sin(x+a)*cos(x+a);
+       for (int i = 0; i < iter_main; i++) {
+               x = p1 * sin(x + a) * sin(x + a) + p2;
+               derivation = 2.0 *p1 *sin(x + a) * cos(x + a);
                if (derivation != 0.0) { index += log(fabs(derivation)); iter++; }
 
-               x = p1*sin(x+b)*sin(x+b)+p2;
-               derivation = 2.0*p1*sin(x+b)*cos(x+b);
+               x = p1 * sin(x + b) * sin(x + b) + p2;
+               derivation = 2.0 *p1 *sin(x + b) * cos(x + b);
                if (derivation != 0.0) { index += log(fabs(derivation)); iter++; }
 
-               x = p1*sin(x+c)*sin(x+c)+p2;
-               derivation = 2.0*p1*sin(x+c)*cos(x+c);
+               x = p1 * sin(x + c) * sin(x + c) + p2;
+               derivation = 2.0 *p1 *sin(x + c) * cos(x + c);
                if (derivation != 0.0) { index += log(fabs(derivation)); iter++; }
        }
 
        if (nabla_main == 0.0) {
-               index = (iter != 0) ? index/(float)(iter) : 0.0;
+               index = (iter != 0) ? index / (float)(iter) : 0.0;
        }
        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;
-               derivation = 2.0*p1*sin(x+a)*cos(x+a);
+               x = p1 * sin(x + a) * sin(x + a) + p2;
+               derivation = 2.0 *p1 *sin(x + a) * cos(x + a);
                if (derivation != 0.0) { index += log(fabs(derivation)); iter++; }
 
-               x = p1*sin(x+b)*sin(x+b)+p2;
-               derivation = 2.0*p1*sin(x+b)*cos(x+b);
+               x = p1 * sin(x + b) * sin(x + b) + p2;
+               derivation = 2.0 *p1 *sin(x + b) * cos(x + b);
                if (derivation != 0.0) { index += log(fabs(derivation)); iter++; }
 
-               x = p1*sin(x+c)*sin(x+c)+p2;
-               derivation = 2.0*p1*sin(x+c)*cos(x+c);
+               x = p1 * sin(x + c) * sin(x + c) + p2;
+               derivation = 2.0 *p1 *sin(x + c) * cos(x + c);
                if (derivation != 0.0) { index += log(fabs(derivation)); iter++; }
 
-               index = (iter != 0) ? index/(float)(iter) : 0.0;
-               index = index*nabla_main + index_pre*(1.0-nabla_main);
+               index = (iter != 0) ? index / (float)(iter) : 0.0;
+               index = index * nabla_main + index_pre * (1.0 - nabla_main);
        }
 
        return index;
@@ -127,12 +127,12 @@ shader node_lyapunov(
        output color Color = 0.0)
 {
        /* 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 */
-       if(index > 0.0 && (Render_Type != 0)) {
+       if (index > 0.0 && (Render_Type != 0)) {
                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;
        }
        else if (index < 0.0 && (Render_Type != 1)) {
@@ -152,7 +152,7 @@ shader node_lyapunov(
                index = fabs(index);
        }
        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;