blender
/
blender
129
397
Fork 571
Code Issues 6.2k Pull Requests 753 Projects 19 Wiki Activity

Cleanup: Silence some arithmetic overflow warnings

This commit is contained in:
Germano Cavalcante 2020-08-12 18:13:01 -03:00
parent c5e469a3e4
commit 5319eb36a5
1 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
source/blender/blenkernel/intern/collision.c
View File

@ -774,21 +774,21 @@ static int cloth_collision_response_static(ClothModifierData *clmd,
impulse = magtangent / 1.5;
VECADDMUL(i1, vrel_t_pre, w1 * impulse);
VECADDMUL(i2, vrel_t_pre, w2 * impulse);
VECADDMUL(i1, vrel_t_pre, (double)w1 * impulse);
VECADDMUL(i2, vrel_t_pre, (double)w2 * impulse);
if (!is_hair) {
VECADDMUL(i3, vrel_t_pre, w3 * impulse);
VECADDMUL(i3, vrel_t_pre, (double)w3 * impulse);
}
}
/* Apply velocity stopping impulse. */
impulse = magrelVel / 1.5f;
VECADDMUL(i1, collpair->normal, w1 * impulse);
VECADDMUL(i2, collpair->normal, w2 * impulse);
VECADDMUL(i1, collpair->normal, (double)w1 * impulse);
VECADDMUL(i2, collpair->normal, (double)w2 * impulse);
if (!is_hair) {
VECADDMUL(i3, collpair->normal, w3 * impulse);
VECADDMUL(i3, collpair->normal, (double)w3 * impulse);
}
if ((magrelVel < 0.1f * d * time_multiplier) && (d > ALMOST_ZERO)) {
@ -927,25 +927,25 @@ static int cloth_selfcollision_response_static(ClothModifierData *clmd,
impulse = magtangent / 1.5;
VECADDMUL(ia[0], vrel_t_pre, w1 * impulse);
VECADDMUL(ia[1], vrel_t_pre, w2 * impulse);
VECADDMUL(ia[2], vrel_t_pre, w3 * impulse);
VECADDMUL(ia[0], vrel_t_pre, (double)w1 * impulse);
VECADDMUL(ia[1], vrel_t_pre, (double)w2 * impulse);
VECADDMUL(ia[2], vrel_t_pre, (double)w3 * impulse);
VECADDMUL(ib[0], vrel_t_pre, -u1 * impulse);
VECADDMUL(ib[1], vrel_t_pre, -u2 * impulse);
VECADDMUL(ib[2], vrel_t_pre, -u3 * impulse);
VECADDMUL(ib[0], vrel_t_pre, (double)u1 * -impulse);
VECADDMUL(ib[1], vrel_t_pre, (double)u2 * -impulse);
VECADDMUL(ib[2], vrel_t_pre, (double)u3 * -impulse);
}
/* Apply velocity stopping impulse. */
impulse = magrelVel / 3.0f;
VECADDMUL(ia[0], collpair->normal, w1 * impulse);
VECADDMUL(ia[1], collpair->normal, w2 * impulse);
VECADDMUL(ia[2], collpair->normal, w3 * impulse);
VECADDMUL(ia[0], collpair->normal, (double)w1 * impulse);
VECADDMUL(ia[1], collpair->normal, (double)w2 * impulse);
VECADDMUL(ia[2], collpair->normal, (double)w3 * impulse);
VECADDMUL(ib[0], collpair->normal, -u1 * impulse);
VECADDMUL(ib[1], collpair->normal, -u2 * impulse);
VECADDMUL(ib[2], collpair->normal, -u3 * impulse);
VECADDMUL(ib[0], collpair->normal, (double)u1 * -impulse);
VECADDMUL(ib[1], collpair->normal, (double)u2 * -impulse);
VECADDMUL(ib[2], collpair->normal, (double)u3 * -impulse);
if ((magrelVel < 0.1f * d * time_multiplier) && (d > ALMOST_ZERO)) {
repulse = MIN2(d / time_multiplier, 0.1f * d * time_multiplier - magrelVel);
@ -957,13 +957,13 @@ static int cloth_selfcollision_response_static(ClothModifierData *clmd,
repulse = max_ff(impulse, repulse);
impulse = repulse / 1.5f;
VECADDMUL(ia[0], collpair->normal, w1 * impulse);
VECADDMUL(ia[1], collpair->normal, w2 * impulse);
VECADDMUL(ia[2], collpair->normal, w3 * impulse);
VECADDMUL(ia[0], collpair->normal, (double)w1 * impulse);
VECADDMUL(ia[1], collpair->normal, (double)w2 * impulse);
VECADDMUL(ia[2], collpair->normal, (double)w3 * impulse);
VECADDMUL(ib[0], collpair->normal, -u1 * impulse);
VECADDMUL(ib[1], collpair->normal, -u2 * impulse);
VECADDMUL(ib[2], collpair->normal, -u3 * impulse);
VECADDMUL(ib[0], collpair->normal, (double)u1 * -impulse);
VECADDMUL(ib[1], collpair->normal, (double)u2 * -impulse);
VECADDMUL(ib[2], collpair->normal, (double)u3 * -impulse);
}
result = 1;
@ -977,9 +977,9 @@ static int cloth_selfcollision_response_static(ClothModifierData *clmd,
VECADDMUL(ia[1], collpair->normal, w2 * impulse);
VECADDMUL(ia[2], collpair->normal, w3 * impulse);
VECADDMUL(ib[0], collpair->normal, -u1 * impulse);
VECADDMUL(ib[1], collpair->normal, -u2 * impulse);
VECADDMUL(ib[2], collpair->normal, -u3 * impulse);
VECADDMUL(ib[0], collpair->normal, u1 * -impulse);
VECADDMUL(ib[1], collpair->normal, u2 * -impulse);
VECADDMUL(ib[2], collpair->normal, u3 * -impulse);
result = 1;
}