blender
/
blender
136
411
Fork 595
Code Issues 6.3k Pull Requests 775 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 +8 -8
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 37968e3b74 - Show all commits

16
source/blender/gpu/shaders/material/gpu_shader_material_fractal_noise.glsl
View File

@ -15,7 +15,7 @@ float fractal_noise(float p, float octaves, float roughness, float lacunarity, b
octaves = clamp(octaves, 0.0, 15.0);
int n = int(octaves);
for (int i = 0; i <= n; i++) {
float t = snoise(fscale * co);
float t = snoise(fscale * p);
sum += t * amp;
maxamp += amp;
amp *= clamp(roughness, 0.0, 1.0);
@ -23,7 +23,7 @@ float fractal_noise(float p, float octaves, float roughness, float lacunarity, b
}
float rmd = octaves - floor(octaves);
if (rmd != 0.0) {
float t = snoise(fscale * co);
float t = snoise(fscale * p);
float sum2 = sum + t * amp;
return normalize ? mix(0.5 * sum / maxamp + 0.5, 0.5 * sum2 / (maxamp + amp) + 0.5, rmd) :
mix(sum, sum2, rmd);
@ -43,7 +43,7 @@ float fractal_noise(vec2 p, float octaves, float roughness, float lacunarity, bo
octaves = clamp(octaves, 0.0, 15.0);
int n = int(octaves);
for (int i = 0; i <= n; i++) {
float t = snoise(fscale * co);
float t = snoise(fscale * p);
sum += t * amp;
maxamp += amp;
amp *= clamp(roughness, 0.0, 1.0);
@ -51,7 +51,7 @@ float fractal_noise(vec2 p, float octaves, float roughness, float lacunarity, bo
}
float rmd = octaves - floor(octaves);
if (rmd != 0.0) {
float t = snoise(fscale * co);
float t = snoise(fscale * p);
float sum2 = sum + t * amp;
return normalize ? mix(0.5 * sum / maxamp + 0.5, 0.5 * sum2 / (maxamp + amp) + 0.5, rmd) :
mix(sum, sum2, rmd);
@ -71,7 +71,7 @@ float fractal_noise(vec3 p, float octaves, float roughness, float lacunarity, bo
octaves = clamp(octaves, 0.0, 15.0);
int n = int(octaves);
for (int i = 0; i <= n; i++) {
float t = snoise(fscale * co);
float t = snoise(fscale * p);
sum += t * amp;
maxamp += amp;
amp *= clamp(roughness, 0.0, 1.0);
@ -79,7 +79,7 @@ float fractal_noise(vec3 p, float octaves, float roughness, float lacunarity, bo
}
float rmd = octaves - floor(octaves);
if (rmd != 0.0) {
float t = snoise(fscale * co);
float t = snoise(fscale * p);
float sum2 = sum + t * amp;
return normalize ? mix(0.5 * sum / maxamp + 0.5, 0.5 * sum2 / (maxamp + amp) + 0.5, rmd) :
mix(sum, sum2, rmd);
@ -99,7 +99,7 @@ float fractal_noise(vec4 p, float octaves, float roughness, float lacunarity, bo
octaves = clamp(octaves, 0.0, 15.0);
int n = int(octaves);
for (int i = 0; i <= n; i++) {
float t = snoise(fscale * co);
float t = snoise(fscale * p);
sum += t * amp;
maxamp += amp;
amp *= clamp(roughness, 0.0, 1.0);
@ -107,7 +107,7 @@ float fractal_noise(vec4 p, float octaves, float roughness, float lacunarity, bo
}
float rmd = octaves - floor(octaves);
if (rmd != 0.0) {
float t = snoise(fscale * co);
float t = snoise(fscale * p);
float sum2 = sum + t * amp;
return normalize ? mix(0.5 * sum / maxamp + 0.5, 0.5 * sum2 / (maxamp + amp) + 0.5, rmd) :
mix(sum, sum2, rmd);