[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48082] trunk/blender/source: Changes in clip editor's public api to make it's more clear
Sergey Sharybin
sergey.vfx at gmail.com
Tue Jun 19 16:26:34 CEST 2012
Revision: 48082
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48082
Author: nazgul
Date: 2012-06-19 14:26:29 +0000 (Tue, 19 Jun 2012)
Log Message:
-----------
Changes in clip editor's public api to make it's more clear
whether getting of some property happens or this property is
being changed.
Also made it more clear whether affecting property belongs
to clip or mask datablock.
Modified Paths:
--------------
trunk/blender/source/blender/editors/gpencil/gpencil_edit.c
trunk/blender/source/blender/editors/include/ED_clip.h
trunk/blender/source/blender/editors/mask/mask_edit.c
trunk/blender/source/blender/editors/mask/mask_select.c
trunk/blender/source/blender/editors/screen/screen_ops.c
trunk/blender/source/blender/editors/space_clip/clip_dopesheet_draw.c
trunk/blender/source/blender/editors/space_clip/clip_dopesheet_ops.c
trunk/blender/source/blender/editors/space_clip/clip_draw.c
trunk/blender/source/blender/editors/space_clip/clip_editor.c
trunk/blender/source/blender/editors/space_clip/clip_graph_draw.c
trunk/blender/source/blender/editors/space_clip/clip_graph_ops.c
trunk/blender/source/blender/editors/space_clip/clip_ops.c
trunk/blender/source/blender/editors/space_clip/clip_utils.c
trunk/blender/source/blender/editors/space_clip/space_clip.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/transform/transform.c
trunk/blender/source/blender/editors/transform/transform_conversions.c
trunk/blender/source/blender/editors/transform/transform_generics.c
trunk/blender/source/blender/makesrna/intern/rna_space.c
trunk/blender/source/blenderplayer/bad_level_call_stubs/stubs.c
Modified: trunk/blender/source/blender/editors/gpencil/gpencil_edit.c
===================================================================
--- trunk/blender/source/blender/editors/gpencil/gpencil_edit.c 2012-06-19 14:09:44 UTC (rev 48081)
+++ trunk/blender/source/blender/editors/gpencil/gpencil_edit.c 2012-06-19 14:26:29 UTC (rev 48082)
@@ -146,7 +146,7 @@
case SPACE_CLIP: /* Nodes Editor */
{
SpaceClip *sc = (SpaceClip *)CTX_wm_space_data(C);
- MovieClip *clip = ED_space_clip(sc);
+ MovieClip *clip = ED_space_clip_get_clip(sc);
if (clip) {
if (sc->gpencil_src == SC_GPENCIL_SRC_TRACK) {
Modified: trunk/blender/source/blender/editors/include/ED_clip.h
===================================================================
--- trunk/blender/source/blender/editors/include/ED_clip.h 2012-06-19 14:09:44 UTC (rev 48081)
+++ trunk/blender/source/blender/editors/include/ED_clip.h 2012-06-19 14:26:29 UTC (rev 48082)
@@ -41,7 +41,7 @@
struct SpaceClip;
struct wmEvent;
-/* clip_editor.c */
+/* ** clip_editor.c ** */
int ED_space_clip_poll(struct bContext *C);
int ED_space_clip_view_clip_poll(struct bContext *C);
@@ -50,40 +50,44 @@
int ED_space_clip_maskedit_poll(struct bContext *C);
int ED_space_clip_maskedit_mask_poll(bContext *C);
-void ED_space_clip_set(struct bContext *C, struct bScreen *screen, struct SpaceClip *sc, struct MovieClip *clip);
-struct MovieClip *ED_space_clip(struct SpaceClip *sc);
-struct Mask *ED_space_clip_mask(struct SpaceClip *sc);
-void ED_space_clip_size(struct SpaceClip *sc, int *width, int *height);
-void ED_space_clip_zoom(struct SpaceClip *sc, ARegion *ar, float *zoomx, float *zoomy);
-void ED_space_clip_aspect(struct SpaceClip *sc, float *aspx, float *aspy);
-void ED_space_clip_aspect_dimension_aware(struct SpaceClip *sc, float *aspx, float *aspy);
+struct MovieClip *ED_space_clip_get_clip(struct SpaceClip *sc);
+void ED_space_clip_set_clip(struct bContext *C, struct bScreen *screen, struct SpaceClip *sc, struct MovieClip *clip);
-int ED_space_clip_clip_framenr(struct SpaceClip *sc);
+void ED_space_clip_get_zoom(struct SpaceClip *sc, ARegion *ar, float *zoomx, float *zoomy);
-void ED_space_clip_mask_size(struct SpaceClip *sc, int *width, int *height);
-void ED_space_clip_mask_aspect(struct SpaceClip *sc, float *aspx, float *aspy);
+void ED_space_clip_get_clip_size(struct SpaceClip *sc, int *width, int *height);
+void ED_space_clip_get_clip_aspect(struct SpaceClip *sc, float *aspx, float *aspy);
+void ED_space_clip_get_clip_aspect_dimension_aware(struct SpaceClip *sc, float *aspx, float *aspy);
+int ED_space_clip_get_clip_frame_number(struct SpaceClip *sc);
+
struct ImBuf *ED_space_clip_get_buffer(struct SpaceClip *sc);
struct ImBuf *ED_space_clip_get_stable_buffer(struct SpaceClip *sc, float loc[2], float *scale, float *angle);
void ED_clip_update_frame(const struct Main *mainp, int cfra);
int ED_clip_view_selection(struct SpaceClip *sc, struct ARegion *ar, int fit);
-void ED_clip_point_undistorted_pos(SpaceClip * sc, const float co[2], float r_co[2]);
+void ED_clip_point_undistorted_pos(SpaceClip *sc, const float co[2], float r_co[2]);
void ED_clip_point_stable_pos(const struct bContext *C, float x, float y, float *xr, float *yr);
void ED_clip_point_stable_pos__reverse(SpaceClip *sc, ARegion *ar, const float co[2], float r_co[2]);
void ED_clip_mouse_pos(const struct bContext *C, struct wmEvent *event, float co[2]);
+int ED_space_clip_check_show_trackedit(struct SpaceClip *sc);
+int ED_space_clip_check_show_maskedit(struct SpaceClip *sc);
+
+void ED_space_clip_get_mask_size(struct SpaceClip *sc, int *width, int *height);
+void ED_space_clip_get_mask_aspect(struct SpaceClip *sc, float *aspx, float *aspy);
+
+struct Mask *ED_space_clip_get_mask(struct SpaceClip *sc);
+void ED_space_clip_set_mask(struct bContext *C, struct SpaceClip *sc, struct Mask *mask);
+
+/* textures buffer */
int ED_space_clip_texture_buffer_supported(struct SpaceClip *sc);
int ED_space_clip_load_movieclip_buffer(struct SpaceClip *sc, struct ImBuf *ibuf);
void ED_space_clip_unload_movieclip_buffer(struct SpaceClip *sc);
void ED_space_clip_free_texture_buffer(struct SpaceClip *sc);
-int ED_space_clip_show_trackedit(struct SpaceClip *sc);
-int ED_space_clip_show_maskedit(struct SpaceClip *sc);
-void ED_space_clip_set_mask(struct bContext *C, struct SpaceClip *sc, struct Mask *mask);
-
-/* clip_ops.c */
+/* ** clip_ops.c ** */
void ED_operatormacros_clip(void);
-#endif /* ED_TEXT_H */
+#endif /* ED_CLIP_H */
Modified: trunk/blender/source/blender/editors/mask/mask_edit.c
===================================================================
--- trunk/blender/source/blender/editors/mask/mask_edit.c 2012-06-19 14:09:44 UTC (rev 48081)
+++ trunk/blender/source/blender/editors/mask/mask_edit.c 2012-06-19 14:26:29 UTC (rev 48082)
@@ -138,7 +138,7 @@
if (sa && sa->spacedata.first) {
if (sa->spacetype == SPACE_CLIP) {
SpaceClip *sc = sa->spacedata.first;
- ED_space_clip_mask_size(sc, width, height);
+ ED_space_clip_get_mask_size(sc, width, height);
return;
}
else if (sa->spacetype == SPACE_SEQ) {
@@ -159,7 +159,7 @@
SpaceClip *sc = CTX_wm_space_clip(C);
if (sc) {
- ED_space_clip_mask_aspect(sc, aspx, aspy);
+ ED_space_clip_get_mask_aspect(sc, aspx, aspy);
}
else {
/* possible other spaces from which mask editing is available */
@@ -177,9 +177,9 @@
int width, height;
float zoomx, zoomy, aspx, aspy;
- ED_space_clip_size(sc, &width, &height);
- ED_space_clip_zoom(sc, ar, &zoomx, &zoomy);
- ED_space_clip_aspect(sc, &aspx, &aspy);
+ ED_space_clip_get_clip_size(sc, &width, &height);
+ ED_space_clip_get_zoom(sc, ar, &zoomx, &zoomy);
+ ED_space_clip_get_clip_aspect(sc, &aspx, &aspy);
*scalex = ((float)width * aspx) * zoomx;
*scaley = ((float)height * aspy) * zoomy;
Modified: trunk/blender/source/blender/editors/mask/mask_select.c
===================================================================
--- trunk/blender/source/blender/editors/mask/mask_select.c 2012-06-19 14:09:44 UTC (rev 48081)
+++ trunk/blender/source/blender/editors/mask/mask_select.c 2012-06-19 14:26:29 UTC (rev 48082)
@@ -595,8 +595,8 @@
/* TODO - make generic! - this is SpaceClip only! */
/* compute ellipse and position in unified coordinates */
- ED_space_clip_size(sc, &width, &height);
- ED_space_clip_zoom(sc, ar, &zoomx, &zoomy);
+ ED_space_clip_get_clip_size(sc, &width, &height);
+ ED_space_clip_get_zoom(sc, ar, &zoomx, &zoomy);
width = height = MAX2(width, height);
ellipse[0] = width * zoomx / radius;
Modified: trunk/blender/source/blender/editors/screen/screen_ops.c
===================================================================
--- trunk/blender/source/blender/editors/screen/screen_ops.c 2012-06-19 14:09:44 UTC (rev 48081)
+++ trunk/blender/source/blender/editors/screen/screen_ops.c 2012-06-19 14:26:29 UTC (rev 48082)
@@ -460,7 +460,7 @@
{
SpaceClip *sc= CTX_wm_space_clip(C);
- return ED_space_clip_show_maskedit(sc);
+ return ED_space_clip_check_show_maskedit(sc);
}
/* *************************** action zone operator ************************** */
Modified: trunk/blender/source/blender/editors/space_clip/clip_dopesheet_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_clip/clip_dopesheet_draw.c 2012-06-19 14:09:44 UTC (rev 48081)
+++ trunk/blender/source/blender/editors/space_clip/clip_dopesheet_draw.c 2012-06-19 14:26:29 UTC (rev 48082)
@@ -146,7 +146,7 @@
void clip_draw_dopesheet_main(SpaceClip *sc, ARegion *ar, Scene *scene)
{
- MovieClip *clip = ED_space_clip(sc);
+ MovieClip *clip = ED_space_clip_get_clip(sc);
View2D *v2d = &ar->v2d;
/* frame range */
@@ -256,7 +256,7 @@
ScrArea *sa = CTX_wm_area(C);
SpaceClip *sc = CTX_wm_space_clip(C);
View2D *v2d = &ar->v2d;
- MovieClip *clip = ED_space_clip(sc);
+ MovieClip *clip = ED_space_clip_get_clip(sc);
MovieTracking *tracking;
MovieTrackingDopesheet *dopesheet;
MovieTrackingDopesheetChannel *channel;
Modified: trunk/blender/source/blender/editors/space_clip/clip_dopesheet_ops.c
===================================================================
--- trunk/blender/source/blender/editors/space_clip/clip_dopesheet_ops.c 2012-06-19 14:09:44 UTC (rev 48081)
+++ trunk/blender/source/blender/editors/space_clip/clip_dopesheet_ops.c 2012-06-19 14:26:29 UTC (rev 48082)
@@ -91,7 +91,7 @@
static int dopesheet_select_channel_exec(bContext *C, wmOperator *op)
{
SpaceClip *sc = CTX_wm_space_clip(C);
- MovieClip *clip = ED_space_clip(sc);
+ MovieClip *clip = ED_space_clip_get_clip(sc);
MovieTracking *tracking = &clip->tracking;
MovieTrackingObject *object = BKE_tracking_object_get_active(tracking);
MovieTrackingDopesheet *dopesheet = &tracking->dopesheet;
Modified: trunk/blender/source/blender/editors/space_clip/clip_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_clip/clip_draw.c 2012-06-19 14:09:44 UTC (rev 48081)
+++ trunk/blender/source/blender/editors/space_clip/clip_draw.c 2012-06-19 14:26:29 UTC (rev 48082)
@@ -226,7 +226,7 @@
static void draw_movieclip_notes(SpaceClip *sc, ARegion *ar)
{
- MovieClip *clip = ED_space_clip(sc);
+ MovieClip *clip = ED_space_clip_get_clip(sc);
MovieTracking *tracking = &clip->tracking;
char str[256] = {0};
int block = FALSE;
@@ -255,7 +255,7 @@
int width, int height, float zoomx, float zoomy)
{
int x, y;
- MovieClip *clip = ED_space_clip(sc);
+ MovieClip *clip = ED_space_clip_get_clip(sc);
/* find window pixel coordinates of origin */
UI_view2d_to_region_no_clip(&ar->v2d, 0.0f, 0.0f, &x, &y);
@@ -344,7 +344,7 @@
if (count == 0)
return;
- start_frame = framenr = ED_space_clip_clip_framenr(sc);
+ start_frame = framenr = ED_space_clip_get_clip_frame_number(sc);
marker = BKE_tracking_marker_get(track, framenr);
if (marker->framenr != framenr || marker->flag & MARKER_DISABLED)
@@ -924,7 +924,7 @@
if (marker->flag & MARKER_DISABLED)
strcpy(state, "disabled");
- else if (marker->framenr != ED_space_clip_clip_framenr(sc))
+ else if (marker->framenr != ED_space_clip_get_clip_frame_number(sc))
strcpy(state, "estimated");
else if (marker->flag & MARKER_TRACKED)
strcpy(state, "tracked");
@@ -972,7 +972,7 @@
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list