[Bf-blender-cvs] [f468904] master: NDOF: use like a joystick for cube picker (as with circle picker)
Campbell Barton
noreply at git.blender.org
Tue Feb 18 01:58:35 CET 2014
Commit: f468904e9be6a34b8bd266fe5a251abd83dfd4ca
Author: Campbell Barton
Date: Tue Feb 18 10:17:56 2014 +1100
https://developer.blender.org/rBf468904e9be6a34b8bd266fe5a251abd83dfd4ca
NDOF: use like a joystick for cube picker (as with circle picker)
===================================================================
M source/blender/editors/interface/interface_handlers.c
===================================================================
diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c
index a426cbd..a7f1795 100644
--- a/source/blender/editors/interface/interface_handlers.c
+++ b/source/blender/editors/interface/interface_handlers.c
@@ -4401,31 +4401,31 @@ static void ui_ndofedit_but_HSVCUBE(uiBut *but, uiHandleButtonData *data,
switch ((int)but->a1) {
case UI_GRAD_SV:
- hsv[2] += ndof->ry * sensitivity;
- hsv[1] += ndof->rx * sensitivity;
+ hsv[2] += ndof->rvec[2] * sensitivity;
+ hsv[1] += ndof->rvec[0] * sensitivity;
break;
case UI_GRAD_HV:
- hsv[0] += ndof->ry * sensitivity;
- hsv[2] += ndof->rx * sensitivity;
+ hsv[0] += ndof->rvec[2] * sensitivity;
+ hsv[2] += ndof->rvec[0] * sensitivity;
break;
case UI_GRAD_HS:
- hsv[0] += ndof->ry * sensitivity;
- hsv[1] += ndof->rx * sensitivity;
+ hsv[0] += ndof->rvec[2] * sensitivity;
+ hsv[1] += ndof->rvec[0] * sensitivity;
break;
case UI_GRAD_H:
- hsv[0] += ndof->ry * sensitivity;
+ hsv[0] += ndof->rvec[2] * sensitivity;
break;
case UI_GRAD_S:
- hsv[1] += ndof->ry * sensitivity;
+ hsv[1] += ndof->rvec[2] * sensitivity;
break;
case UI_GRAD_V:
- hsv[2] += ndof->ry * sensitivity;
+ hsv[2] += ndof->rvec[2] * sensitivity;
break;
case UI_GRAD_V_ALT:
/* vertical 'value' strip */
/* exception only for value strip - use the range set in but->min/max */
- hsv[2] += ndof->rx * sensitivity;
+ hsv[2] += ndof->rvec[0] * sensitivity;
CLAMP(hsv[2], but->softmin, but->softmax);
break;
More information about the Bf-blender-cvs
mailing list