archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Replace sqrt with hypot for wipe-effect & transform code

Browse Source
This commit is contained in:
Campbell Barton
2014-06-14 17:27:50 +10:00
parent 94d4b31323
commit 8cd9d784c7
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/editors/transform/transform_input.c
View File

@@ -64,18 +64,18 @@ static void InputSpring(TransInfo *UNUSED(t), MouseInput *mi, const int mval[2],
/* calculate ratio for shiftkey pos, and for total, and blend these for precision */
dx = (float)(mi->center[0] - mi->precision_mval[0]);
dy = (float)(mi->center[1] - mi->precision_mval[1]);
ratio = sqrtf(dx * dx + dy * dy);
ratio = hypotf(dx, dy);
dx = (float)(mi->center[0] - mval[0]);
dy = (float)(mi->center[1] - mval[1]);
precise_ratio = sqrtf(dx * dx + dy * dy);
precise_ratio = hypotf(dx, dy);
ratio = (ratio + (precise_ratio - ratio) / 10.0f) / mi->factor;
}
else {
dx = (float)(mi->center[0] - mval[0]);
dy = (float)(mi->center[1] - mval[1]);
ratio = sqrtf(dx * dx + dy * dy) / mi->factor;
ratio = hypotf(dx, dy) / mi->factor;
}
output[0] = ratio;
@@ -195,7 +195,7 @@ static void InputCustomRatioFlip(TransInfo *UNUSED(t), MouseInput *mi, const int
dx = data[2] - data[0];
dy = data[3] - data[1];
length = sqrt(dx * dx + dy * dy);
length = hypot(dx, dy);
if (mi->precision) {
/* deal with Shift key by adding motion / 10 to motion before shift press */