blender
/
blender
136
411
Fork 595
Code Issues 6.3k Pull Requests 776 Projects 19 Wiki Activity

Node: Gabor Noise Texture #110802

Open
Charlie Jolly wants to merge 68 commits from CharlieJolly/blender:gabor into main
pull from: CharlieJolly/blender:gabor
merge into: blender:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 43 Commits 68 Files Changed 23 +5 -5
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 70430f9a56 - Show all commits

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

@ -402,9 +402,9 @@ float gabor_noise(point p,
if (gp.mode == "gabor" || gp.mode == "gabor_ring" || gp.mode == "gabor_cross" ||
gp.mode == "gabor_square")
{
float impulse_scale = M_SQRT2;
float impulse_scale = 1.2613446229;
if (impulses > 1.0) {
impulse_scale = M_SQRT2 * sqrt(gp.impulses);
impulse_scale = 1.2613446229 * sqrt(gp.impulses);
}
g = g / impulse_scale;
}

2
intern/cycles/kernel/svm/gabor.h
View File

@ -385,7 +385,7 @@ ccl_device float gabor_noise(float3 p,
if (gp.mode == SHD_GABOR_MODE_GABOR || gp.mode == SHD_GABOR_MODE_RING ||
gp.mode == SHD_GABOR_MODE_CROSS || gp.mode == SHD_GABOR_MODE_SQUARE)
{
float impulse_scale = impulses > 1.0f ? M_SQRT2_F * sqrt(gp.impulses) : M_SQRT2_F;
float impulse_scale = impulses > 1.0f ? 1.2613446229f * sqrt(gp.impulses) : 1.2613446229f;
g = g / impulse_scale;
}

4
source/blender/nodes/shader/nodes/node_shader_tex_gabor.cc
View File

@ -570,8 +570,8 @@ static float gabor_noise(const float3 p,
if (gp.mode == SHD_GABOR_MODE_GABOR || gp.mode == SHD_GABOR_MODE_RING ||
gp.mode == SHD_GABOR_MODE_CROSS || gp.mode == SHD_GABOR_MODE_SQUARE)
{
const float impulse_scale = impulses > 1.0 ? float(M_SQRT2) * math::sqrt(gp.impulses) :
float(M_SQRT2);
const float impulse_scale = impulses > 1.0 ? 1.2613446229f * math::sqrt(gp.impulses) :
1.2613446229f;
g = g / impulse_scale;
}