Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: replace inline dot-product with dot_v4v4

Browse Source
This commit is contained in:
Campbell Barton
2020-05-01 15:04:05 +10:00
parent ff1174e52c
commit aff5e18adb
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/blender/render/intern/source/render_texture.c
View File

@@ -761,8 +761,7 @@ static int voronoiTex(const Tex *tex, const float texvec[3], TexResult *texres)
} }
voronoi(texvec[0], texvec[1], texvec[2], da, pa, tex->vn_mexp, tex->vn_distm); voronoi(texvec[0], texvec[1], texvec[2], da, pa, tex->vn_mexp, tex->vn_distm);
texres->tin = sc * fabsf(tex->vn_w1 * da[0] + tex->vn_w2 * da[1] + tex->vn_w3 * da[2] + texres->tin = sc * fabsf(dot_v4v4(&tex->vn_w1, da));
tex->vn_w4 * da[3]);
if (tex->vn_coltype) { if (tex->vn_coltype) {
float ca[3]; /* cell color */ float ca[3]; /* cell color */
@@ -809,14 +808,11 @@ static int voronoiTex(const Tex *tex, const float texvec[3], TexResult *texres)
/* calculate bumpnormal */ /* calculate bumpnormal */
voronoi(texvec[0] + offs, texvec[1], texvec[2], da, pa, tex->vn_mexp, tex->vn_distm); voronoi(texvec[0] + offs, texvec[1], texvec[2], da, pa, tex->vn_mexp, tex->vn_distm);
texres->nor[0] = sc * fabsf(tex->vn_w1 * da[0] + tex->vn_w2 * da[1] + tex->vn_w3 * da[2] + texres->nor[0] = sc * fabsf(dot_v4v4(&tex->vn_w1, da));
tex->vn_w4 * da[3]);
voronoi(texvec[0], texvec[1] + offs, texvec[2], da, pa, tex->vn_mexp, tex->vn_distm); voronoi(texvec[0], texvec[1] + offs, texvec[2], da, pa, tex->vn_mexp, tex->vn_distm);
texres->nor[1] = sc * fabsf(tex->vn_w1 * da[0] + tex->vn_w2 * da[1] + tex->vn_w3 * da[2] + texres->nor[1] = sc * fabsf(dot_v4v4(&tex->vn_w1, da));
tex->vn_w4 * da[3]);
voronoi(texvec[0], texvec[1], texvec[2] + offs, da, pa, tex->vn_mexp, tex->vn_distm); voronoi(texvec[0], texvec[1], texvec[2] + offs, da, pa, tex->vn_mexp, tex->vn_distm);
texres->nor[2] = sc * fabsf(tex->vn_w1 * da[0] + tex->vn_w2 * da[1] + tex->vn_w3 * da[2] + texres->nor[2] = sc * fabsf(dot_v4v4(&tex->vn_w1, da));
tex->vn_w4 * da[3]);
tex_normal_derivate(tex, texres); tex_normal_derivate(tex, texres);
rv |= TEX_NOR; rv |= TEX_NOR;