Page MenuHome
Differential D10021 Diff 32492 source/blender/gpencil_modifiers/intern/MOD_gpencilnoise.c

Changeset View

Standalone View

View Options

source/blender/gpencil_modifiers/intern/MOD_gpencilnoise.c

Context not available.
return (mmd->flag & GP_NOISE_USE_RANDOM) != 0; return (mmd->flag & GP_NOISE_USE_RANDOM) != 0;
} }
static float *noise_table(int len, int seed) static float *noise_table(int len, int offset, int seed)
{ {
float *table = MEM_callocN(sizeof(float) * len, __func__); float *table = MEM_callocN(sizeof(float) * len, __func__);
for (int i = 0; i < len; i++) { for (int i = 0; i < len; i++) {
table[i] = BLI_hash_int_01(BLI_hash_int_2d(seed, i + 1)); table[i] = BLI_hash_int_01(BLI_hash_int_2d(seed, i + offset + 1));
} }
return table; return table;
} }
Context not available.
/* Sanitize as it can create out of bound reads. */ /* Sanitize as it can create out of bound reads. */
float noise_scale = clamp_f(mmd->noise_scale, 0.0f, 1.0f); float noise_scale = clamp_f(mmd->noise_scale, 0.0f, 1.0f);
float noise_offset = clamp_f(mmd->noise_offset, 0.0f, 100.0f);
int len = ceilf(gps->totpoints * noise_scale) + 1; int len = ceilf(gps->totpoints * noise_scale) + 2;
float *noise_table_position = (mmd->factor > 0.0f) ? noise_table(len, seed + 2) : NULL; float *noise_table_position = (mmd->factor > 0.0f) ? noise_table(len, (int)floor(noise_offset), seed + 2) : NULL;
float *noise_table_strength = (mmd->factor_strength > 0.0f) ? noise_table(len, seed + 3) : NULL; float *noise_table_strength = (mmd->factor_strength > 0.0f) ? noise_table(len, (int)floor(noise_offset), seed + 3) : NULL;
float *noise_table_thickness = (mmd->factor_thickness > 0.0f) ? noise_table(len, seed) : NULL; float *noise_table_thickness = (mmd->factor_thickness > 0.0f) ? noise_table(len, (int)floor(noise_offset), seed) : NULL;
float *noise_table_uvs = (mmd->factor_uvs > 0.0f) ? noise_table(len, seed + 4) : NULL; float *noise_table_uvs = (mmd->factor_uvs > 0.0f) ? noise_table(len, (int)floor(noise_offset), seed + 4) : NULL;
/* Calculate stroke normal. */ /* Calculate stroke normal. */
if (gps->totpoints > 2) { if (gps->totpoints > 2) {
Context not available.
cross_v3_v3v3(vec2, vec1, normal); cross_v3_v3v3(vec2, vec1, normal);
normalize_v3(vec2); normalize_v3(vec2);
float noise = table_sample(noise_table_position, i * noise_scale); float noise = table_sample(noise_table_position, i * noise_scale + fractf(noise_offset));
madd_v3_v3fl(&pt->x, vec2, (noise * 2.0f - 1.0f) * weight * mmd->factor * 0.1f); madd_v3_v3fl(&pt->x, vec2, (noise * 2.0f - 1.0f) * weight * mmd->factor * 0.1f);
} }
if (mmd->factor_thickness > 0.0f) { if (mmd->factor_thickness > 0.0f) {
float noise = table_sample(noise_table_thickness, i * noise_scale); float noise = table_sample(noise_table_thickness, i * noise_scale + fractf(noise_offset));
pt->pressure *= max_ff(1.0f + (noise * 2.0f - 1.0f) * weight * mmd->factor_thickness, 0.0f); pt->pressure *= max_ff(1.0f + (noise * 2.0f - 1.0f) * weight * mmd->factor_thickness, 0.0f);
CLAMP_MIN(pt->pressure, GPENCIL_STRENGTH_MIN); CLAMP_MIN(pt->pressure, GPENCIL_STRENGTH_MIN);
} }
if (mmd->factor_strength > 0.0f) { if (mmd->factor_strength > 0.0f) {
float noise = table_sample(noise_table_strength, i * noise_scale); float noise = table_sample(noise_table_strength, i * noise_scale + fractf(noise_offset));
pt->strength *= max_ff(1.0f - noise * weight * mmd->factor_strength, 0.0f); pt->strength *= max_ff(1.0f - noise * weight * mmd->factor_strength, 0.0f);
CLAMP(pt->strength, GPENCIL_STRENGTH_MIN, 1.0f); CLAMP(pt->strength, GPENCIL_STRENGTH_MIN, 1.0f);
} }
if (mmd->factor_uvs > 0.0f) { if (mmd->factor_uvs > 0.0f) {
float noise = table_sample(noise_table_uvs, i * noise_scale); float noise = table_sample(noise_table_uvs, i * noise_scale + fractf(noise_offset));
pt->uv_rot += (noise * 2.0f - 1.0f) * weight * mmd->factor_uvs * M_PI_2; pt->uv_rot += (noise * 2.0f - 1.0f) * weight * mmd->factor_uvs * M_PI_2;
CLAMP(pt->uv_rot, -M_PI_2, M_PI_2); CLAMP(pt->uv_rot, -M_PI_2, M_PI_2);
} }
Context not available.
uiItemR(col, ptr, "factor_thickness", 0, IFACE_("Thickness"), ICON_NONE); uiItemR(col, ptr, "factor_thickness", 0, IFACE_("Thickness"), ICON_NONE);
uiItemR(col, ptr, "factor_uvs", 0, IFACE_("UV"), ICON_NONE); uiItemR(col, ptr, "factor_uvs", 0, IFACE_("UV"), ICON_NONE);
uiItemR(col, ptr, "noise_scale", 0, NULL, ICON_NONE); uiItemR(col, ptr, "noise_scale", 0, NULL, ICON_NONE);
uiItemR(col, ptr, "noise_offset", 0, NULL, ICON_NONE);
gpencil_modifier_panel_end(layout, ptr); gpencil_modifier_panel_end(layout, ptr);
} }
Context not available.