intern/cycles/kernel/osl/shaders/node_gabor_texture.osl

@@ -16,6 +16,7 @@
 /* See GLSL implementation for code comments. */
 
 #include "node_hash.h"
+#include "node_math.h"
 #include "node_noise.h"
 #include "stdcycles.h"
 #include "vector2.h"
@@ -33,6 +34,7 @@ struct GaborParams {
   float phase;
   float phase_variance;
   float rotation;
+  float init_rotation;
   float rot_variance;
   float tilt_randomness;
   float cell_randomness;
@@ -123,14 +125,14 @@ vector gabor_sample(GaborParams gp, vector3 cell, int seed, output float phi)
   float pvar = mix(0.0, rand_values.z, gp.phase_variance);
   phi = M_2PI * pvar + gp.phase;
 
-  float ovar = M_PI * (rand_values.x) * gp.rot_variance;
-  float omega_t = ovar - gp.rotation;
+  float omega_t = M_PI * (rand_values.x) * gp.rot_variance - gp.rotation - gp.init_rotation;
   float cos_omega_p = clamp(rand_values.y * gp.tilt_randomness, -1.0, 1.0);
   float sin_omega_p = sqrt(1.0 - cos_omega_p * cos_omega_p);
   float sin_omega_t = sin(omega_t);
   float cos_omega_t = cos(omega_t);
+
   return mix(normalize(vector(cos_omega_t * sin_omega_p, sin_omega_t * sin_omega_p, cos_omega_p)),
-             normalize(gp.direction),
+             normalize(transform(euler_to_mat(vector3(0.0, 0.0, -gp.rotation)), gp.direction)),
              gp.anisotropy);
 }
 
@@ -288,7 +290,8 @@ GaborParams gabor_parameters(vector direction,
   gp.mode = mode;
   gp.direction = direction;
   gp.phase = phase;
-  gp.rotation = rotation;
+  gp.rotation = 0.0;
+  gp.init_rotation = rotation;
   gp.phase_variance = phase_variance;
   gp.tilt_randomness = tilt_randomness;
   gp.cell_randomness = cell_randomness;

intern/cycles/kernel/svm/gabor.h

@@ -27,6 +27,7 @@ typedef struct GaborParams {
   float phase;
   float phase_variance;
   float rotation;
+  float init_rotation;
   float rot_variance;
   float tilt_randomness;
   float cell_randomness;
@@ -112,15 +113,16 @@ ccl_device float3 gabor_sample(GaborParams gp, float3 cell, int seed, ccl_privat
   float pvar = mix(0.0f, rand_values.z, gp.phase_variance);
   *phi = M_2PI_F * pvar + gp.phase;
 
-  float ovar = M_PI_F * (rand_values.x);
-  float omega_t = ovar * gp.rot_variance - gp.rotation;
+  float omega_t = M_PI_F * (rand_values.x) * gp.rot_variance - gp.rotation - gp.init_rotation;
   float cos_omega_p = clamp(rand_values.y * gp.tilt_randomness, -1.0f, 1.0f);
   float sin_omega_p = sqrtf(1.0f - cos_omega_p * cos_omega_p);
   float sin_omega_t = sin(omega_t);
   float cos_omega_t = cos(omega_t);
+
+  Transform rotationTransform = euler_to_transform(make_float3(0.0f, 0.0f, -gp.rotation));
   return mix(
       normalize(make_float3(cos_omega_t * sin_omega_p, sin_omega_t * sin_omega_p, cos_omega_p)),
-      normalize(gp.direction),
+      normalize(transform_direction(&rotationTransform, gp.direction)),
       gp.anisotropy);
 }
 
@@ -319,7 +321,8 @@ ccl_device GaborParams gabor_parameters(float3 direction,
   gp.mode = mode;
   gp.direction = direction;
   gp.phase = phase;
-  gp.rotation = rotation;
+  gp.rotation = 0.0f;
+  gp.init_rotation = rotation;
   gp.phase_variance = phase_variance;
   gp.tilt_randomness = tilt_randomness;
   gp.cell_randomness = cell_randomness;

source/blender/gpu/shaders/material/gpu_shader_material_tex_gabor.glsl

@@ -1,4 +1,5 @@
 #pragma BLENDER_REQUIRE(gpu_shader_common_hash.glsl)
+#pragma BLENDER_REQUIRE(gpu_shader_common_math_utils.glsl)
 
 /* Gabor Noise
  *
@@ -60,6 +61,7 @@ struct GaborParams {
   float phase;
   float phase_variance;
   float rotation;
+  float init_rotation;
   float rot_variance;
   float tilt_randomness;
   float cell_randomness;
@@ -157,8 +159,7 @@ vec3 gabor_sample(GaborParams gp, vec3 cell, int seed, out float phi)
   phi = M_2PI * pvar + gp.phase;
 
   /* Isotropic direction. */
-  float ovar = M_PI * (rand_values.x);
-  float omega_t = ovar * gp.rot_variance - gp.rotation;
+  float omega_t = M_PI * (rand_values.x) * gp.rot_variance - gp.rotation - gp.init_rotation;
   float cos_omega_p = clamp(rand_values.y * gp.tilt_randomness, -1.0, 1.0);
   float sin_omega_p = sqrt(1.0 - cos_omega_p * cos_omega_p);
   float sin_omega_t = sin(omega_t);
@@ -166,7 +167,7 @@ vec3 gabor_sample(GaborParams gp, vec3 cell, int seed, out float phi)
 
   /* Mix between Isotropic and Anisotropic direction. */
   return mix(normalize(vec3(cos_omega_t * sin_omega_p, sin_omega_t * sin_omega_p, cos_omega_p)),
-             normalize(gp.direction),
+             normalize(euler_to_mat3(vec3(0.0, 0.0, -gp.rotation)) * gp.direction),
              gp.anisotropy);
 }
 
@@ -333,7 +334,8 @@ GaborParams gabor_parameters(vec3 direction,
   gp.mode = mode;
   gp.direction = direction;
   gp.phase = phase;
-  gp.rotation = rotation;
+  gp.rotation = 0.0;
+  gp.init_rotation = rotation;
   gp.phase_variance = phase_variance;
   gp.tilt_randomness = tilt_randomness;
   gp.cell_randomness = cell_randomness;

source/blender/nodes/shader/nodes/node_shader_tex_gabor.cc

@@ -27,6 +27,8 @@
 #include "BKE_texture.h"
 
 #include "BLI_hash.hh"
+#include "BLI_math_matrix.h"
+#include "BLI_math_rotation.h"
 #include "BLI_math_vector.hh"
 #include "BLI_noise.hh"
 
@@ -197,6 +199,7 @@ typedef struct GaborParams {
   float phase;
   float phase_variance;
   float rotation;
+  float init_rotation;
   float rot_variance;
   float tilt_randomness;
   float cell_randomness;
@@ -280,21 +283,31 @@ static float3 gabor_kernel(const GaborParams gp,
   return r * g;
 }
 
+static float3 rotate_z(const float3 &vector, float angle)
+{
+  float mat[3][3];
+  float3 result = vector;
+  eul_to_mat3(mat, float3(0.0f, 0.0f, angle));
+  mul_m3_v3(mat, result);
+  return result;
+}
+
 static float3 gabor_sample(const GaborParams gp, const float3 cell, const int seed, float &phi)
 {
   const float3 rand_values = noise::hash_float_to_float3(float4(cell, float(seed))) * 2.0f - 1.0f;
   const float pvar = math::interpolate(0.0f, rand_values.z, gp.phase_variance);
   phi = 2.0f * float(M_PI) * pvar + gp.phase;
 
-  const float ovar = float(M_PI) * (rand_values.x);
-  const float omega_t = ovar * gp.rot_variance - gp.rotation;
+  const float omega_t = float(M_PI) * (rand_values.x) * gp.rot_variance - gp.rotation -
+                        gp.init_rotation;
   const float cos_omega_p = math::clamp(rand_values.y * gp.tilt_randomness, -1.0f, 1.0f);
   const float sin_omega_p = math::sqrt(1.0f - cos_omega_p * cos_omega_p);
   const float sin_omega_t = math::sin(omega_t);
   const float cos_omega_t = math::cos(omega_t);
+
   return math::interpolate(
       math::normalize(float3(cos_omega_t * sin_omega_p, sin_omega_t * sin_omega_p, cos_omega_p)),
-      math::normalize(gp.direction),
+      math::normalize(rotate_z(gp.direction, -gp.rotation)),
       gp.anisotropy);
 }
 
@@ -458,7 +471,7 @@ static float gabor_fractal_noise(FractalParams fp,
   }
   const int n = int(octaves);
   for (int i = 0; i <= n; i++) {
-    int seed = use_origin_offset * i * GABOR_SEED;
+    const int seed = use_origin_offset * i * GABOR_SEED;
     const float t = (dimensions == 3) ? gabor_grid_3d(gp, fscale * p, scale, periodic, seed) :
                                         gabor_grid_2d(gp, fscale * p, scale, periodic, seed);
     gp.frequency *= fp.fre_lacunarity;
@@ -470,7 +483,7 @@ static float gabor_fractal_noise(FractalParams fp,
   }
   float rmd = octaves - math::floor(octaves);
   if (rmd != 0.0f) {
-    int seed = use_origin_offset * (n + 1) * GABOR_SEED;
+    const int seed = use_origin_offset * (n + 1) * GABOR_SEED;
     const float t = (dimensions == 3) ? gabor_grid_3d(gp, fscale * p, scale, periodic, seed) :
                                         gabor_grid_2d(gp, fscale * p, scale, periodic, seed);
     const float sum2 = sum + t * amp;
@@ -503,7 +516,8 @@ static GaborParams gabor_parameters(float3 direction,
   gp.mode = mode;
   gp.direction = direction;
   gp.phase = phase;
-  gp.rotation = rotation;
+  gp.rotation = 0.0f;
+  gp.init_rotation = rotation;
   gp.phase_variance = phase_variance;
   gp.tilt_randomness = tilt_randomness;
   gp.cell_randomness = cell_randomness;