blender/blender
162
515
Fork 780
Code Issues 6.8k Pull Requests 928 Projects 19 Wiki Activity

Add Fractal Voronoi Noise V.2 #106827

Merged
Jacques Lucke merged 77 commits from Hoshinova/blender:add-fractal-voronoi into main 2023-06-13 09:18:18 +02:00
Conversation 77 Commits 77 Files Changed 20 +8 -4
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 7e67959031 - Show all commits

12
source/blender/blenlib/intern/noise.cc
View File

@ -1506,7 +1506,8 @@ VoronoiOutput voronoi_smooth_f1(const VoronoiParams &params,
smoothDistance = mix(smoothDistance, distanceToPoint, h) - correctionFactor;
correctionFactor /= 1.0f + 3.0f * params.smoothness;
float3 cellColor = hash_float_to_float3(cellPosition + cellOffset);
if (calc_color) { /* Only compute Color if necessary, as it is very expensive */
if (calc_color) {
/* Only compute Color output if necessary, as it is very expensive. */
smoothColor = mix(smoothColor, cellColor, h) - correctionFactor;
}
smoothPosition = mix(smoothPosition, pointPosition, h) - correctionFactor;
@ -1667,7 +1668,8 @@ VoronoiOutput voronoi_smooth_f1(const VoronoiParams &params,
float correctionFactor = params.smoothness * h * (1.0f - h);
smoothDistance = mix(smoothDistance, distanceToPoint, h) - correctionFactor;
correctionFactor /= 1.0f + 3.0f * params.smoothness;
if (calc_color) { /* Only compute Color if necessary, as it is very expensive */
if (calc_color) {
/* Only compute Color output if necessary, as it is very expensive. */
float3 cellColor = hash_float_to_float3(cellPosition + cellOffset);
smoothColor = mix(smoothColor, cellColor, h) - correctionFactor;
}
@ -1865,7 +1867,8 @@ VoronoiOutput voronoi_smooth_f1(const VoronoiParams &params,
float correctionFactor = params.smoothness * h * (1.0f - h);
smoothDistance = mix(smoothDistance, distanceToPoint, h) - correctionFactor;
correctionFactor /= 1.0f + 3.0f * params.smoothness;
if (calc_color) { /* Only compute Color if necessary, as it is very expensive */
if (calc_color) {
/* Only compute Color output if necessary, as it is very expensive. */
float3 cellColor = hash_float_to_float3(cellPosition + cellOffset);
smoothColor = mix(smoothColor, cellColor, h) - correctionFactor;
}
@ -2079,7 +2082,8 @@ VoronoiOutput voronoi_smooth_f1(const VoronoiParams &params,
float correctionFactor = params.smoothness * h * (1.0f - h);
Hoshinova marked this conversation as resolved Outdated
Jacques Lucke commented 2023-06-08 14:53:48 +02:00
Outdated
Review
Copy Link

Comment style: move comment to its own line below and end with a ..

Comment style: move comment to its own line below and end with a `.`.
smoothDistance = mix(smoothDistance, distanceToPoint, h) - correctionFactor;
correctionFactor /= 1.0f + 3.0f * params.smoothness;
if (calc_color) { /* Only compute Color if necessary, as it is very expensive */
if (calc_color) {
/* Only compute Color output if necessary, as it is very expensive. */
float3 cellColor = hash_float_to_float3(cellPosition + cellOffset);
smoothColor = mix(smoothColor, cellColor, h) - correctionFactor;
}