[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60697] trunk/blender/source/blender/ editors: transform - use 2d float's for the viewport center ( allows for vector math functions to be used more easily).
Campbell Barton
ideasman42 at gmail.com
Sat Oct 12 05:42:09 CEST 2013
Revision: 60697
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60697
Author: campbellbarton
Date: 2013-10-12 03:42:06 +0000 (Sat, 12 Oct 2013)
Log Message:
-----------
transform - use 2d float's for the viewport center (allows for vector math functions to be used more easily).
Modified Paths:
--------------
trunk/blender/source/blender/editors/include/ED_transform.h
trunk/blender/source/blender/editors/mesh/editmesh_bevel.c
trunk/blender/source/blender/editors/mesh/editmesh_inset.c
trunk/blender/source/blender/editors/transform/transform.c
trunk/blender/source/blender/editors/transform/transform.h
trunk/blender/source/blender/editors/transform/transform_generics.c
trunk/blender/source/blender/editors/transform/transform_input.c
trunk/blender/source/blender/editors/util/ed_util.c
Modified: trunk/blender/source/blender/editors/include/ED_transform.h
===================================================================
--- trunk/blender/source/blender/editors/include/ED_transform.h 2013-10-12 02:19:37 UTC (rev 60696)
+++ trunk/blender/source/blender/editors/include/ED_transform.h 2013-10-12 03:42:06 UTC (rev 60697)
@@ -103,7 +103,7 @@
* returns 1 if successful, 0 otherwise (usually means there's no selection)
* (if 0 is returns, *vec is unmodified)
* */
-int calculateTransformCenter(struct bContext *C, int centerMode, float cent3d[3], int cent2d[2]);
+int calculateTransformCenter(struct bContext *C, int centerMode, float cent3d[3], float cent2d[2]);
struct TransInfo;
struct ScrArea;
Modified: trunk/blender/source/blender/editors/mesh/editmesh_bevel.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_bevel.c 2013-10-12 02:19:37 UTC (rev 60696)
+++ trunk/blender/source/blender/editors/mesh/editmesh_bevel.c 2013-10-12 03:42:06 UTC (rev 60697)
@@ -64,7 +64,7 @@
float shift_factor; /* The current factor when shift is pressed. Negative when shift not active. */
/* modal only */
- int mcenter[2];
+ float mcenter[2];
BMBackup mesh_backup;
void *draw_handle_pixel;
short twtype;
Modified: trunk/blender/source/blender/editors/mesh/editmesh_inset.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_inset.c 2013-10-12 02:19:37 UTC (rev 60696)
+++ trunk/blender/source/blender/editors/mesh/editmesh_inset.c 2013-10-12 03:42:06 UTC (rev 60697)
@@ -68,7 +68,7 @@
NumInput num_input;
/* modal only */
- int mcenter[2];
+ float mcenter[2];
BMBackup mesh_backup;
void *draw_handle_pixel;
short twtype;
Modified: trunk/blender/source/blender/editors/transform/transform.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform.c 2013-10-12 02:19:37 UTC (rev 60696)
+++ trunk/blender/source/blender/editors/transform/transform.c 2013-10-12 03:42:06 UTC (rev 60697)
@@ -1360,7 +1360,7 @@
}
}
-int calculateTransformCenter(bContext *C, int centerMode, float cent3d[3], int cent2d[2])
+int calculateTransformCenter(bContext *C, int centerMode, float cent3d[3], float cent2d[2])
{
TransInfo *t = MEM_callocN(sizeof(TransInfo), "TransInfo data");
int success;
@@ -1390,7 +1390,7 @@
calculateCenter(t);
if (cent2d) {
- copy_v2_v2_int(cent2d, t->center2d);
+ copy_v2_v2(cent2d, t->center2d);
}
if (cent3d) {
@@ -7238,7 +7238,7 @@
void initTimeScale(TransInfo *t)
{
- int center[2];
+ float center[2];
/* this tool is only really available in the Action Editor
* AND NLA Editor (for strip scaling)
@@ -7253,7 +7253,7 @@
/* recalculate center2d to use CFRA and mouse Y, since that's
* what is used in time scale */
t->center[0] = t->scene->r.cfra;
- projectIntView(t, t->center, center);
+ projectFloatView(t, t->center, center);
center[1] = t->imval[1];
/* force a reinit with the center2d used here */
Modified: trunk/blender/source/blender/editors/transform/transform.h
===================================================================
--- trunk/blender/source/blender/editors/transform/transform.h 2013-10-12 02:19:37 UTC (rev 60696)
+++ trunk/blender/source/blender/editors/transform/transform.h 2013-10-12 03:42:06 UTC (rev 60697)
@@ -271,7 +271,7 @@
int imval[2]; /* initial mouse position */
char precision;
int precision_mval[2]; /* mouse position when precision key was pressed */
- int center[2];
+ float center[2];
float factor;
void *data; /* additional data, if needed by the particular function */
} MouseInput;
@@ -300,7 +300,7 @@
float prop_size; /* proportional circle radius */
char proptext[20]; /* proportional falloff text */
float center[3]; /* center of transformation */
- int center2d[2]; /* center in screen coordinates */
+ float center2d[2]; /* center in screen coordinates */
int imval[2]; /* initial mouse position */
short event_type; /* event->type used to invoke transform */
short idx_max; /* maximum index on the input vector */
@@ -687,7 +687,7 @@
INPUT_CUSTOM_RATIO_FLIP
} MouseInputMode;
-void initMouseInput(TransInfo *t, MouseInput *mi, const int center[2], const int mval[2]);
+void initMouseInput(TransInfo *t, MouseInput *mi, const float center[2], const int mval[2]);
void initMouseInputMode(TransInfo *t, MouseInput *mi, MouseInputMode mode);
int handleMouseInput(struct TransInfo *t, struct MouseInput *mi, const struct wmEvent *event);
void applyMouseInput(struct TransInfo *t, struct MouseInput *mi, const int mval[2], float output[3]);
Modified: trunk/blender/source/blender/editors/transform/transform_generics.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform_generics.c 2013-10-12 02:19:37 UTC (rev 60696)
+++ trunk/blender/source/blender/editors/transform/transform_generics.c 2013-10-12 03:42:06 UTC (rev 60697)
@@ -1484,10 +1484,10 @@
copy_v3_v3(vec, t->center);
mul_m4_v3(ob->obmat, vec);
- projectIntView(t, vec, t->center2d);
+ projectFloatView(t, vec, t->center2d);
}
else {
- projectIntView(t, t->center, t->center2d);
+ projectFloatView(t, t->center, t->center2d);
}
}
@@ -1691,7 +1691,7 @@
Object *ob = OBACT;
if (ob) {
copy_v3_v3(t->center, ob->obmat[3]);
- projectIntView(t, t->center, t->center2d);
+ projectFloatView(t, t->center, t->center2d);
}
}
break;
@@ -1723,7 +1723,7 @@
axis[1] = t->center[1] - 6.0f * axis[1];
axis[2] = t->center[2] - 6.0f * axis[2];
- projectIntView(t, axis, t->center2d);
+ projectFloatView(t, axis, t->center2d);
/* rotate only needs correct 2d center, grab needs ED_view3d_calc_zfac() value */
if (t->mode == TFM_TRANSLATION) {
Modified: trunk/blender/source/blender/editors/transform/transform_input.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform_input.c 2013-10-12 02:19:37 UTC (rev 60696)
+++ trunk/blender/source/blender/editors/transform/transform_input.c 2013-10-12 03:42:06 UTC (rev 60697)
@@ -279,7 +279,7 @@
output[0] = *angle;
}
-void initMouseInput(TransInfo *UNUSED(t), MouseInput *mi, const int center[2], const int mval[2])
+void initMouseInput(TransInfo *UNUSED(t), MouseInput *mi, const float center[2], const int mval[2])
{
mi->factor = 0;
mi->precision = 0;
Modified: trunk/blender/source/blender/editors/util/ed_util.c
===================================================================
--- trunk/blender/source/blender/editors/util/ed_util.c 2013-10-12 02:19:37 UTC (rev 60696)
+++ trunk/blender/source/blender/editors/util/ed_util.c 2013-10-12 03:42:06 UTC (rev 60697)
@@ -258,7 +258,7 @@
void ED_region_draw_mouse_line_cb(const bContext *C, ARegion *ar, void *arg_info)
{
wmWindow *win = CTX_wm_window(C);
- const int *mval_src = (int *)arg_info;
+ const float *mval_src = (float *)arg_info;
const int mval_dst[2] = {win->eventstate->x - ar->winrct.xmin,
win->eventstate->y - ar->winrct.ymin};
@@ -266,7 +266,7 @@
setlinestyle(3);
glBegin(GL_LINE_STRIP);
glVertex2iv(mval_dst);
- glVertex2iv(mval_src);
+ glVertex2fv(mval_src);
glEnd();
setlinestyle(0);
}
More information about the Bf-blender-cvs
mailing list