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

Cleanup: trackball direction calculation

Browse Source 
Remove z axis flipping, only needed because x & y were flipped.
This commit is contained in:
Campbell Barton
2019-08-04 01:18:23 +10:00
parent 5e5cf9ea9f
commit 7f8d620e20
1 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
source/blender/editors/space_view3d/view3d_edit.c
View File

@@ -185,28 +185,23 @@ typedef struct ViewOpsData {
#define TRACKBALLSIZE (1.1f) #define TRACKBALLSIZE (1.1f)
static void calctrackballvec(const rcti *rect, const int event_xy[2], float vec[3]) static void calctrackballvec(const rcti *rect, const int event_xy[2], float r_dir[3])
{ {
const float radius = TRACKBALLSIZE; const float radius = TRACKBALLSIZE;
const float t = radius / (float)M_SQRT2; const float t = radius / (float)M_SQRT2;
float x, y, z, d;
/* normalize x and y */ /* Normalize x and y. */
x = BLI_rcti_cent_x(rect) - event_xy[0]; r_dir[0] = (event_xy[0] - BLI_rcti_cent_x(rect)) / ((float)BLI_rcti_size_x(rect) / 4.0);
x /= (float)(BLI_rcti_size_x(rect) / 4); r_dir[1] = (event_xy[1] - BLI_rcti_cent_x(rect)) / ((float)BLI_rcti_size_y(rect) / 2.0);
y = BLI_rcti_cent_y(rect) - event_xy[1]; const float d = len_v2(r_dir);
y /= (float)(BLI_rcti_size_y(rect) / 2); if (d < t) {
d = sqrtf(x * x + y * y); /* Inside sphere. */
if (d < t) { /* Inside sphere */ r_dir[2] = sqrtf(SQUARE(radius) - SQUARE(d));
z = sqrtf(radius * radius - d * d);
} }
else { /* On hyperbola */ else {
z = t * t / d; /* On hyperbola. */
r_dir[2] = SQUARE(t) / d;
} }
vec[0] = x;
vec[1] = y;
vec[2] = -z; /* yah yah! */
} }
/** /**