[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49301] trunk/blender/source/blender: code cleanup: pass mouse position as int[2] rather then wmEvent
Campbell Barton
ideasman42 at gmail.com
Fri Jul 27 17:15:55 CEST 2012
Revision: 49301
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49301
Author: campbellbarton
Date: 2012-07-27 15:15:55 +0000 (Fri, 27 Jul 2012)
Log Message:
-----------
code cleanup: pass mouse position as int[2] rather then wmEvent
Modified Paths:
--------------
trunk/blender/source/blender/compositor/nodes/COM_ScaleNode.cpp
trunk/blender/source/blender/editors/include/ED_clip.h
trunk/blender/source/blender/editors/include/ED_image.h
trunk/blender/source/blender/editors/include/ED_mask.h
trunk/blender/source/blender/editors/mask/mask_add.c
trunk/blender/source/blender/editors/mask/mask_edit.c
trunk/blender/source/blender/editors/mask/mask_ops.c
trunk/blender/source/blender/editors/mask/mask_select.c
trunk/blender/source/blender/editors/space_clip/clip_editor.c
trunk/blender/source/blender/editors/space_clip/clip_ops.c
trunk/blender/source/blender/editors/space_clip/tracking_ops.c
trunk/blender/source/blender/editors/space_clip/tracking_select.c
trunk/blender/source/blender/editors/space_image/image_edit.c
trunk/blender/source/blender/editors/space_sequencer/sequencer_edit.c
Modified: trunk/blender/source/blender/compositor/nodes/COM_ScaleNode.cpp
===================================================================
--- trunk/blender/source/blender/compositor/nodes/COM_ScaleNode.cpp 2012-07-27 15:12:58 UTC (rev 49300)
+++ trunk/blender/source/blender/compositor/nodes/COM_ScaleNode.cpp 2012-07-27 15:15:55 UTC (rev 49301)
@@ -64,7 +64,7 @@
break;
case CMP_SCALE_RENDERPERCENT: {
- const RenderData *data = context->getRenderData();
+ const RenderData *rd = context->getRenderData();
ScaleFixedSizeOperation *operation = new ScaleFixedSizeOperation();
/* framing options */
@@ -72,8 +72,8 @@
operation->setIsCrop((bnode->custom2 & CMP_SCALE_RENDERSIZE_FRAME_CROP) != 0);
operation->setOffset(bnode->custom3, bnode->custom4);
- operation->setNewWidth(data->xsch * data->size / 100.0f);
- operation->setNewHeight(data->ysch * data->size / 100.0f);
+ operation->setNewWidth(rd->xsch * rd->size / 100.0f);
+ operation->setNewHeight(rd->ysch * rd->size / 100.0f);
inputSocket->relinkConnections(operation->getInputSocket(0), 0, graph);
outputSocket->relinkConnections(operation->getOutputSocket(0));
operation->getInputSocket(0)->getConnection()->setIgnoreResizeCheck(true);
Modified: trunk/blender/source/blender/editors/include/ED_clip.h
===================================================================
--- trunk/blender/source/blender/editors/include/ED_clip.h 2012-07-27 15:12:58 UTC (rev 49300)
+++ trunk/blender/source/blender/editors/include/ED_clip.h 2012-07-27 15:15:55 UTC (rev 49301)
@@ -39,7 +39,6 @@
struct Mask;
struct MovieClip;
struct SpaceClip;
-struct wmEvent;
/* ** clip_editor.c ** */
@@ -69,7 +68,7 @@
void ED_clip_point_undistorted_pos(struct SpaceClip *sc, const float co[2], float r_co[2]);
void ED_clip_point_stable_pos(struct SpaceClip *sc, struct ARegion *ar, float x, float y, float *xr, float *yr);
void ED_clip_point_stable_pos__reverse(struct SpaceClip *sc, struct ARegion *ar, const float co[2], float r_co[2]);
-void ED_clip_mouse_pos(struct SpaceClip *sc, struct ARegion *ar, struct wmEvent *event, float co[2]);
+void ED_clip_mouse_pos(struct SpaceClip *sc, struct ARegion *ar, const int mval[2], float co[2]);
int ED_space_clip_check_show_trackedit(struct SpaceClip *sc);
int ED_space_clip_check_show_maskedit(struct SpaceClip *sc);
Modified: trunk/blender/source/blender/editors/include/ED_image.h
===================================================================
--- trunk/blender/source/blender/editors/include/ED_image.h 2012-07-27 15:12:58 UTC (rev 49300)
+++ trunk/blender/source/blender/editors/include/ED_image.h 2012-07-27 15:15:55 UTC (rev 49301)
@@ -39,7 +39,6 @@
struct uiBlock;
struct wmWindowManager;
struct ARegion;
-struct wmEvent;
/* image_edit.c, exported for transform */
struct Image *ED_space_image(struct SpaceImage *sima);
@@ -63,7 +62,7 @@
void ED_image_get_size(struct Image *ima, int *width, int *height);
void ED_image_get_aspect(struct Image *ima, float *aspx, float *aspy);
void ED_image_get_uv_aspect(struct Image *ima, float *aspx, float *aspy);
-void ED_image_mouse_pos(struct SpaceImage *sima, struct ARegion *ar, struct wmEvent *event, float co[2]);
+void ED_image_mouse_pos(struct SpaceImage *sima, struct ARegion *ar, const int mval[2], float co[2]);
void ED_image_point_pos(struct SpaceImage *sima, struct ARegion *ar, float x, float y, float *xr, float *yr);
void ED_image_point_pos__reverse(struct SpaceImage *sima, struct ARegion *ar, const float co[2], float r_co[2]);
Modified: trunk/blender/source/blender/editors/include/ED_mask.h
===================================================================
--- trunk/blender/source/blender/editors/include/ED_mask.h 2012-07-27 15:12:58 UTC (rev 49300)
+++ trunk/blender/source/blender/editors/include/ED_mask.h 2012-07-27 15:15:55 UTC (rev 49301)
@@ -42,7 +42,7 @@
void ED_mask_get_aspect(struct ScrArea *sa, struct ARegion *ar, float *aspx, float *aspy);
void ED_mask_pixelspace_factor(struct ScrArea *sa, struct ARegion *ar, float *scalex, float *scaley);
-void ED_mask_mouse_pos(struct ScrArea *sa, struct ARegion *ar, struct wmEvent *event, float co[2]);
+void ED_mask_mouse_pos(struct ScrArea *sa, struct ARegion *ar, const int mval[2], float co[2]);
void ED_mask_point_pos(struct ScrArea *sa, struct ARegion *ar, float x, float y, float *xr, float *yr);
void ED_mask_point_pos__reverse(struct ScrArea *sa, struct ARegion *ar,
Modified: trunk/blender/source/blender/editors/mask/mask_add.c
===================================================================
--- trunk/blender/source/blender/editors/mask/mask_add.c 2012-07-27 15:12:58 UTC (rev 49300)
+++ trunk/blender/source/blender/editors/mask/mask_add.c 2012-07-27 15:15:55 UTC (rev 49301)
@@ -621,7 +621,7 @@
float co[2];
- ED_mask_mouse_pos(sa, ar, event, co);
+ ED_mask_mouse_pos(sa, ar, event->mval, co);
RNA_float_set_array(op->ptr, "location", co);
@@ -695,7 +695,7 @@
float co[2];
- ED_mask_mouse_pos(sa, ar, event, co);
+ ED_mask_mouse_pos(sa, ar, event->mval, co);
RNA_float_set_array(op->ptr, "location", co);
Modified: trunk/blender/source/blender/editors/mask/mask_edit.c
===================================================================
--- trunk/blender/source/blender/editors/mask/mask_edit.c 2012-07-27 15:12:58 UTC (rev 49300)
+++ trunk/blender/source/blender/editors/mask/mask_edit.c 2012-07-27 15:15:55 UTC (rev 49301)
@@ -90,20 +90,21 @@
/********************** registration *********************/
-void ED_mask_mouse_pos(ScrArea *sa, ARegion *ar, wmEvent *event, float co[2])
+/* takes event->mval */
+void ED_mask_mouse_pos(ScrArea *sa, ARegion *ar, const int mval[2], float co[2])
{
if (sa) {
switch (sa->spacetype) {
case SPACE_CLIP:
{
SpaceClip *sc = sa->spacedata.first;
- ED_clip_mouse_pos(sc, ar, event, co);
+ ED_clip_mouse_pos(sc, ar, mval, co);
BKE_mask_coord_from_movieclip(sc->clip, &sc->user, co, co);
break;
}
case SPACE_SEQ:
{
- UI_view2d_region_to_view(&ar->v2d, event->mval[0], event->mval[1], &co[0], &co[1]);
+ UI_view2d_region_to_view(&ar->v2d, mval[0], mval[1], &co[0], &co[1]);
break;
}
case SPACE_IMAGE:
@@ -111,7 +112,7 @@
float frame_size[2];
SpaceImage *sima = sa->spacedata.first;
ED_space_image_get_size_fl(sima, frame_size);
- ED_image_mouse_pos(sima, ar, event, co);
+ ED_image_mouse_pos(sima, ar, mval, co);
BKE_mask_coord_from_frame(co, co, frame_size);
break;
}
Modified: trunk/blender/source/blender/editors/mask/mask_ops.c
===================================================================
--- trunk/blender/source/blender/editors/mask/mask_ops.c 2012-07-27 15:12:58 UTC (rev 49300)
+++ trunk/blender/source/blender/editors/mask/mask_ops.c 2012-07-27 15:15:55 UTC (rev 49301)
@@ -446,7 +446,7 @@
float co[2], cv_score, feather_score;
const float threshold = 19;
- ED_mask_mouse_pos(sa, ar, event, co);
+ ED_mask_mouse_pos(sa, ar, event->mval, co);
ED_mask_get_size(sa, &width, &height);
cv_point = ED_mask_point_find_nearest(C, mask, co, threshold, &cv_masklay, &cv_spline, &is_handle, &cv_score);
@@ -511,7 +511,7 @@
copy_m3_m3(customdata->vec, point->bezt.vec);
if (BKE_mask_point_has_handle(point))
BKE_mask_point_handle(point, customdata->handle);
- ED_mask_mouse_pos(sa, ar, event, customdata->co);
+ ED_mask_mouse_pos(sa, ar, event->mval, customdata->co);
}
return customdata;
@@ -652,7 +652,7 @@
ScrArea *sa = CTX_wm_area(C);
ARegion *ar = CTX_wm_region(C);
- ED_mask_mouse_pos(sa, ar, event, co);
+ ED_mask_mouse_pos(sa, ar, event->mval, co);
sub_v2_v2v2(dco, co, data->co);
if (data->action == SLIDE_ACTION_HANDLE) {
Modified: trunk/blender/source/blender/editors/mask/mask_select.c
===================================================================
--- trunk/blender/source/blender/editors/mask/mask_select.c 2012-07-27 15:12:58 UTC (rev 49300)
+++ trunk/blender/source/blender/editors/mask/mask_select.c 2012-07-27 15:15:55 UTC (rev 49301)
@@ -348,7 +348,7 @@
float co[2];
- ED_mask_mouse_pos(sa, ar, event, co);
+ ED_mask_mouse_pos(sa, ar, event->mval, co);
RNA_float_set_array(op->ptr, "location", co);
@@ -688,7 +688,7 @@
const float threshold = 19;
int change = FALSE;
- ED_mask_mouse_pos(sa, ar, event, co);
+ ED_mask_mouse_pos(sa, ar, event->mval, co);
point = ED_mask_point_find_nearest(C, mask, co, threshold, &masklay, &spline, &is_handle, NULL);
Modified: trunk/blender/source/blender/editors/space_clip/clip_editor.c
===================================================================
--- trunk/blender/source/blender/editors/space_clip/clip_editor.c 2012-07-27 15:12:58 UTC (rev 49300)
+++ trunk/blender/source/blender/editors/space_clip/clip_editor.c 2012-07-27 15:15:55 UTC (rev 49301)
@@ -439,9 +439,10 @@
r_co[1] = (pos[1] * height * zoomy) + (float)sy;
}
-void ED_clip_mouse_pos(SpaceClip *sc, ARegion *ar, wmEvent *event, float co[2])
+/* takes event->mval */
+void ED_clip_mouse_pos(SpaceClip *sc, ARegion *ar, const int mval[2], float co[2])
{
- ED_clip_point_stable_pos(sc, ar, event->mval[0], event->mval[1], &co[0], &co[1]);
+ ED_clip_point_stable_pos(sc, ar, mval[0], mval[1], &co[0], &co[1]);
}
int ED_space_clip_check_show_trackedit(SpaceClip *sc)
Modified: trunk/blender/source/blender/editors/space_clip/clip_ops.c
===================================================================
--- trunk/blender/source/blender/editors/space_clip/clip_ops.c 2012-07-27 15:12:58 UTC (rev 49300)
+++ trunk/blender/source/blender/editors/space_clip/clip_ops.c 2012-07-27 15:15:55 UTC (rev 49301)
@@ -119,7 +119,7 @@
if (event) {
SpaceClip *sc = CTX_wm_space_clip(C);
- ED_clip_mouse_pos(sc, ar, event, location);
+ ED_clip_mouse_pos(sc, ar, event->mval, location);
mpos = location;
}
@@ -483,7 +483,7 @@
vpd->zoom = sc->zoom;
vpd->event_type = event->type;
- ED_clip_mouse_pos(sc, ar, event, vpd->location);
+ ED_clip_mouse_pos(sc, ar, event->mval, vpd->location);
WM_event_add_modal_handler(C, op);
}
@@ -605,7 +605,7 @@
float location[2];
- ED_clip_mouse_pos(sc, ar, event, location);
+ ED_clip_mouse_pos(sc, ar, event->mval, location);
RNA_float_set_array(op->ptr, "location", location);
return view_zoom_in_exec(C, op);
@@ -648,7 +648,7 @@
float location[2];
- ED_clip_mouse_pos(sc, ar, event, location);
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list