kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Dynapaint: fix use of normal normalization in dynamicPaint_generateBakeData().

Browse Source 
Vertex's normal is always normalized - and its conversion from short to float should not change that!
On the other hand, linear interpolation of three normals **does not give a normalized vector**
(unless all three inputs are exactly the same).

Also, minor optimization, avoid recomputing that interpolated normal twice for each PaintUVPoint.
This commit is contained in:
Bastien Montagne 2016-05-19 14:06:46 +02:00
parent c9f1ed1e4c
commit 4b810127ba
1 changed files with 27 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
source/blender/blenkernel/intern/dynamicpaint.c
View File

@ -4718,6 +4718,8 @@ static int dynamicPaint_generateBakeData(DynamicPaintSurface *surface, const Sce
#pragma omp parallel for schedule(static) #pragma omp parallel for schedule(static)
for (index = 0; index < sData->total_points; index++) { for (index = 0; index < sData->total_points; index++) {
float prev_point[3] = {0.0f, 0.0f, 0.0f}; float prev_point[3] = {0.0f, 0.0f, 0.0f};
float temp_nor[3];
if (do_velocity_data && !new_bdata) { if (do_velocity_data && !new_bdata) {
copy_v3_v3(prev_point, bData->realCoord[bData->s_pos[index]].v); copy_v3_v3(prev_point, bData->realCoord[bData->s_pos[index]].v);
} }
@ -4726,15 +4728,14 @@ static int dynamicPaint_generateBakeData(DynamicPaintSurface *surface, const Sce
*/ */
if (surface->format == MOD_DPAINT_SURFACE_F_IMAGESEQ) { if (surface->format == MOD_DPAINT_SURFACE_F_IMAGESEQ) {
float n1[3], n2[3], n3[3]; float n1[3], n2[3], n3[3];
ImgSeqFormatData *f_data = (ImgSeqFormatData *)sData->format_data; const ImgSeqFormatData *f_data = (ImgSeqFormatData *)sData->format_data;
PaintUVPoint *tPoint = &((PaintUVPoint *)f_data->uv_p)[index]; const PaintUVPoint *tPoint = &((PaintUVPoint *)f_data->uv_p)[index];
int ss;
bData->s_num[index] = (surface->flags & MOD_DPAINT_ANTIALIAS) ? 5 : 1; bData->s_num[index] = (surface->flags & MOD_DPAINT_ANTIALIAS) ? 5 : 1;
bData->s_pos[index] = index * bData->s_num[index]; bData->s_pos[index] = index * bData->s_num[index];
/* per sample coordinates */ /* per sample coordinates */
for (ss = 0; ss < bData->s_num[index]; ss++) { for (int ss = 0; ss < bData->s_num[index]; ss++) {
interp_v3_v3v3v3(bData->realCoord[bData->s_pos[index] + ss].v, interp_v3_v3v3v3(bData->realCoord[bData->s_pos[index] + ss].v,
canvas_verts[tPoint->v1].v, canvas_verts[tPoint->v1].v,
canvas_verts[tPoint->v2].v, canvas_verts[tPoint->v2].v,
@ -4747,11 +4748,18 @@ static int dynamicPaint_generateBakeData(DynamicPaintSurface *surface, const Sce
normal_short_to_float_v3(n2, mvert[tPoint->v2].no); normal_short_to_float_v3(n2, mvert[tPoint->v2].no);
normal_short_to_float_v3(n3, mvert[tPoint->v3].no); normal_short_to_float_v3(n3, mvert[tPoint->v3].no);
interp_v3_v3v3v3(bData->bNormal[index].invNorm, interp_v3_v3v3v3(temp_nor, n1, n2, n3, f_data->barycentricWeights[index * bData->s_num[index]].v);
n1, n2, n3, f_data->barycentricWeights[index * bData->s_num[index]].v); normalize_v3(temp_nor);
mul_mat3_m4_v3(ob->obmat, bData->bNormal[index].invNorm); if (ELEM(surface->type, MOD_DPAINT_SURFACE_T_DISPLACE, MOD_DPAINT_SURFACE_T_WAVE)) {
normalize_v3(bData->bNormal[index].invNorm); /* Prepare surface normal directional scale to easily convert
negate_v3(bData->bNormal[index].invNorm); * brush intersection amount between global and local space */
float scaled_nor[3];
mul_v3_v3v3(scaled_nor, temp_nor, ob->size);
bData->bNormal[index].normal_scale = len_v3(scaled_nor);
}
mul_mat3_m4_v3(ob->obmat, temp_nor);
normalize_v3(temp_nor);
negate_v3_v3(bData->bNormal[index].invNorm, temp_nor);
} }
else if (surface->format == MOD_DPAINT_SURFACE_F_VERTEX) { else if (surface->format == MOD_DPAINT_SURFACE_F_VERTEX) {
int ss; int ss;
@ -4778,35 +4786,17 @@ static int dynamicPaint_generateBakeData(DynamicPaintSurface *surface, const Sce
} }
/* normal */ /* normal */
normal_short_to_float_v3(bData->bNormal[index].invNorm, mvert[index].no); normal_short_to_float_v3(temp_nor, mvert[index].no);
mul_mat3_m4_v3(ob->obmat, bData->bNormal[index].invNorm); if (ELEM(surface->type, MOD_DPAINT_SURFACE_T_DISPLACE, MOD_DPAINT_SURFACE_T_WAVE)) {
normalize_v3(bData->bNormal[index].invNorm); /* Prepare surface normal directional scale to easily convert
negate_v3(bData->bNormal[index].invNorm); * brush intersection amount between global and local space */
} float scaled_nor[3];
mul_v3_v3v3(scaled_nor, temp_nor, ob->size);
/* Prepare surface normal directional scale to easily convert bData->bNormal[index].normal_scale = len_v3(scaled_nor);
* brush intersection amount between global and local space */
if (surface->type == MOD_DPAINT_SURFACE_T_DISPLACE ||
surface->type == MOD_DPAINT_SURFACE_T_WAVE)
{
float temp_nor[3];
if (surface->format == MOD_DPAINT_SURFACE_F_VERTEX) {
normal_short_to_float_v3(temp_nor, mvert[index].no);
normalize_v3(temp_nor);
} }
else { mul_mat3_m4_v3(ob->obmat, temp_nor);
float n1[3], n2[3], n3[3]; normalize_v3(temp_nor);
ImgSeqFormatData *f_data = (ImgSeqFormatData *)sData->format_data; negate_v3_v3(bData->bNormal[index].invNorm, temp_nor);
PaintUVPoint *tPoint = &((PaintUVPoint *)f_data->uv_p)[index];
normal_short_to_float_v3(n1, mvert[tPoint->v1].no);
normal_short_to_float_v3(n2, mvert[tPoint->v2].no);
normal_short_to_float_v3(n3, mvert[tPoint->v3].no);
interp_v3_v3v3v3(temp_nor, n1, n2, n3, f_data->barycentricWeights[index * bData->s_num[index]].v);
}
mul_v3_v3(temp_nor, ob->size);
bData->bNormal[index].normal_scale = len_v3(temp_nor);
} }
/* calculate speed vector */ /* calculate speed vector */