[Bf-blender-cvs] [4ff1181] wiggly-widgets: Cleanup: Naming, consistent API call order
Julian Eisel
noreply at git.blender.org
Tue Sep 15 01:12:11 CEST 2015
Commit: 4ff1181f7c183bdf067ea7fe6ffe5ac99b03e1ff
Author: Julian Eisel
Date: Tue Sep 15 01:09:32 2015 +0200
Branches: wiggly-widgets
https://developer.blender.org/rB4ff1181f7c183bdf067ea7fe6ffe5ac99b03e1ff
Cleanup: Naming, consistent API call order
===================================================================
M source/blender/editors/object/object_lamp.c
M source/blender/editors/space_graph/graph_edit.c
M source/blender/editors/space_node/space_node.c
M source/blender/editors/space_sequencer/sequencer_view.c
M source/blender/editors/space_view3d/space_view3d.c
M source/blender/editors/transform/transform_manipulator.c
M source/blender/windowmanager/WM_api.h
M source/blender/windowmanager/intern/wm_generic_widgets.c
M source/blender/windowmanager/intern/wm_widgets.c
===================================================================
diff --git a/source/blender/editors/object/object_lamp.c b/source/blender/editors/object/object_lamp.c
index 2dd97c1..cb0e578 100644
--- a/source/blender/editors/object/object_lamp.c
+++ b/source/blender/editors/object/object_lamp.c
@@ -216,8 +216,6 @@ int WIDGETGROUP_lamp_poll(const struct bContext *C, struct wmWidgetGroupType *UN
void WIDGETGROUP_lamp_create(const struct bContext *C, struct wmWidgetGroup *wgroup)
{
- float color_lamp[4] = {0.5f, 0.5f, 1.0f, 1.0f};
- float color_hi_lamp[4] = {0.8f, 0.8f, 0.45f, 1.0f};
Object *ob = CTX_data_active_object(C);
Lamp *la = ob->data;
wmWidget *widget;
@@ -225,14 +223,18 @@ void WIDGETGROUP_lamp_create(const struct bContext *C, struct wmWidgetGroup *wgr
float dir[3];
const char *propname = "spot_size";
+ const float color[4] = {0.5f, 0.5f, 1.0f, 1.0f};
+ const float color_hi[4] = {0.8f, 0.8f, 0.45f, 1.0f};
+
+
+ negate_v3_v3(dir, ob->obmat[2]);
+
widget = WIDGET_arrow_new(wgroup, propname, WIDGET_ARROW_STYLE_INVERTED);
- WM_widget_set_colors(widget, color_lamp, color_hi_lamp);
-
RNA_pointer_create(&la->id, &RNA_Lamp, la, &ptr);
- WM_widget_set_origin(widget, ob->obmat[3]);
WIDGET_arrow_set_range_fac(widget, 4.0f);
- WM_widget_property(widget, ARROW_SLOT_OFFSET_WORLD_SPACE, &ptr, propname);
- negate_v3_v3(dir, ob->obmat[2]);
WIDGET_arrow_set_direction(widget, dir);
+ WM_widget_set_origin(widget, ob->obmat[3]);
+ WM_widget_set_colors(widget, color, color_hi);
+ WM_widget_set_property(widget, ARROW_SLOT_OFFSET_WORLD_SPACE, &ptr, propname);
}
diff --git a/source/blender/editors/space_graph/graph_edit.c b/source/blender/editors/space_graph/graph_edit.c
index 300657a..19fcbd6 100644
--- a/source/blender/editors/space_graph/graph_edit.c
+++ b/source/blender/editors/space_graph/graph_edit.c
@@ -2525,8 +2525,8 @@ static void widgetgroup_backdrop_create(const struct bContext *C, struct wmWidge
wgroup, "backdrop_cage",
WIDGET_RECT_TRANSFORM_STYLE_SCALE_UNIFORM | WIDGET_RECT_TRANSFORM_STYLE_TRANSLATE,
width, height);
- WM_widget_property(cage, RECT_TRANSFORM_SLOT_OFFSET, op->ptr, "offset");
- WM_widget_property(cage, RECT_TRANSFORM_SLOT_SCALE, op->ptr, "scale");
+ WM_widget_set_property(cage, RECT_TRANSFORM_SLOT_OFFSET, op->ptr, "offset");
+ WM_widget_set_property(cage, RECT_TRANSFORM_SLOT_SCALE, op->ptr, "scale");
origin[0] = BLI_rcti_size_x(&ar->winrct) / 2.0f;
origin[1] = BLI_rcti_size_y(&ar->winrct) / 2.0f;
diff --git a/source/blender/editors/space_node/space_node.c b/source/blender/editors/space_node/space_node.c
index 2c26b78..29e513f 100644
--- a/source/blender/editors/space_node/space_node.c
+++ b/source/blender/editors/space_node/space_node.c
@@ -877,8 +877,8 @@ static void WIDGETGROUP_node_transform_create(const struct bContext *C, struct w
RNA_pointer_create(snode->id, &RNA_SpaceNodeEditor, snode, &nodeptr);
WM_widget_set_origin(cage, origin);
- WM_widget_property(cage, RECT_TRANSFORM_SLOT_OFFSET, &nodeptr, "backdrop_offset");
- WM_widget_property(cage, RECT_TRANSFORM_SLOT_SCALE, &nodeptr, "backdrop_zoom");
+ WM_widget_set_property(cage, RECT_TRANSFORM_SLOT_OFFSET, &nodeptr, "backdrop_offset");
+ WM_widget_set_property(cage, RECT_TRANSFORM_SLOT_SCALE, &nodeptr, "backdrop_zoom");
}
BKE_image_release_ibuf(ima, ibuf, lock);
}
diff --git a/source/blender/editors/space_sequencer/sequencer_view.c b/source/blender/editors/space_sequencer/sequencer_view.c
index a6fc537..ebe0a38 100644
--- a/source/blender/editors/space_sequencer/sequencer_view.c
+++ b/source/blender/editors/space_sequencer/sequencer_view.c
@@ -279,8 +279,8 @@ static void widgetgroup_overdrop_create(const struct bContext *C, struct wmWidge
wgroup, "overdrop_cage",
WIDGET_RECT_TRANSFORM_STYLE_SCALE_UNIFORM | WIDGET_RECT_TRANSFORM_STYLE_TRANSLATE,
sizex, sizey);
- WM_widget_property(cage, RECT_TRANSFORM_SLOT_OFFSET, op->ptr, "offset");
- WM_widget_property(cage, RECT_TRANSFORM_SLOT_SCALE, op->ptr, "scale");
+ WM_widget_set_property(cage, RECT_TRANSFORM_SLOT_OFFSET, op->ptr, "offset");
+ WM_widget_set_property(cage, RECT_TRANSFORM_SLOT_SCALE, op->ptr, "scale");
origin[0] = BLI_rcti_size_x(&ar->winrct)/2.0f;
origin[1] = BLI_rcti_size_y(&ar->winrct)/2.0f;
@@ -444,7 +444,7 @@ static void widgetgroup_image_transform_create(const struct bContext *C, struct
wgroup, "image_cage",
WIDGET_RECT_TRANSFORM_STYLE_SCALE_UNIFORM | WIDGET_RECT_TRANSFORM_STYLE_TRANSLATE,
viewrect[0] * scale[0], viewrect[1] * scale[1]);
- WM_widget_property(cage, RECT_TRANSFORM_SLOT_SCALE, op->ptr, "scale");
+ WM_widget_set_property(cage, RECT_TRANSFORM_SLOT_SCALE, op->ptr, "scale");
origin[0] = -(v2d->cur.xmin * scale[0]);
origin[1] = -(v2d->cur.ymin * scale[1]);
diff --git a/source/blender/editors/space_view3d/space_view3d.c b/source/blender/editors/space_view3d/space_view3d.c
index 364651f..a592f59 100644
--- a/source/blender/editors/space_view3d/space_view3d.c
+++ b/source/blender/editors/space_view3d/space_view3d.c
@@ -750,28 +750,24 @@ static void WIDGETGROUP_camera_create(const struct bContext *C, struct wmWidgetG
/* dof distance */
if (ca->flag & CAM_SHOWLIMITS) {
- float color_camera[4] = {1.0f, 0.3f, 0.0f, 1.0f};
- float color_hi_camera[4] = {1.0f, 0.3f, 0.0f, 1.0f};
+ const float color[4] = {1.0f, 0.3f, 0.0f, 1.0f};
+ const float color_hi[4] = {1.0f, 0.3f, 0.0f, 1.0f};
const char *propname = "dof_distance";
widget = WIDGET_arrow_new(wgroup, propname, WIDGET_ARROW_STYLE_CROSS);
+ WIDGET_arrow_set_direction(widget, dir);
+ WIDGET_arrow_set_up_vector(widget, ob->obmat[1]);
WM_widget_set_flag(widget, WM_WIDGET_DRAW_HOVER, true);
WM_widget_set_flag(widget, WM_WIDGET_SCALE_3D, false);
- WM_widget_set_colors(widget, color_camera, color_hi_camera);
-
+ WM_widget_set_colors(widget, color, color_hi);
WM_widget_set_origin(widget, ob->obmat[3]);
- WM_widget_property(widget, ARROW_SLOT_OFFSET_WORLD_SPACE, &cameraptr, propname);
- WIDGET_arrow_set_direction(widget, dir);
- WIDGET_arrow_set_up_vector(widget, ob->obmat[1]);
+ WM_widget_set_property(widget, ARROW_SLOT_OFFSET_WORLD_SPACE, &cameraptr, propname);
WM_widget_set_scale(widget, ca->drawsize);
}
/* focal length
* - logic/calculations are similar to BKE_camera_view_frame_ex, better keep in sync */
if (focallen_widget) {
- const float color_camera[4] = {1.0f, 1.0, 0.27f, 0.5f};
- const float color_hi_camera[4] = {1.0f, 1.0, 0.27f, 1.0f};
-
const bool is_ortho = (ca->type == CAM_ORTHO);
const float scale_fac = ca->drawsize;
const float half_sensor = 0.5f * ((ca->sensor_fit == CAMERA_SENSOR_FIT_VERT) ? ca->sensor_y : ca->sensor_x);
@@ -780,6 +776,9 @@ static void WIDGETGROUP_camera_create(const struct bContext *C, struct wmWidgetG
(scale_fac / ((scale[0] + scale[1] + scale[2]) / 3.0f));
const char *propname = is_ortho ? "ortho_scale" : "lens";
+ const float color[4] = {1.0f, 1.0, 0.27f, 0.5f};
+ const float color_hi[4] = {1.0f, 1.0, 0.27f, 1.0f};
+
PropertyRNA *prop;
float offset[3];
float min, max, range;
@@ -802,15 +801,15 @@ static void WIDGETGROUP_camera_create(const struct bContext *C, struct wmWidgetG
widget = WIDGET_arrow_new(wgroup, propname, (WIDGET_ARROW_STYLE_CONE | WIDGET_ARROW_STYLE_CONSTRAINED));
WIDGET_arrow_set_range_fac(widget, is_ortho ? (scale_fac * range) : (drawsize * range / half_sensor));
- WM_widget_property(widget, ARROW_SLOT_OFFSET_WORLD_SPACE, &cameraptr, propname);
+ WIDGET_arrow_set_direction(widget, dir);
+ WIDGET_arrow_set_up_vector(widget, ob->obmat[1]);
+ WM_widget_set_property(widget, ARROW_SLOT_OFFSET_WORLD_SPACE, &cameraptr, propname);
WM_widget_set_origin(widget, ob->obmat[3]);
WM_widget_set_offset(widget, offset);
WM_widget_set_scale(widget, drawsize);
WM_widget_set_flag(widget, WM_WIDGET_SCALE_3D, false);
- WM_widget_set_colors(widget, color_camera, color_hi_camera);
+ WM_widget_set_colors(widget, color, color_hi);
- WIDGET_arrow_set_direction(widget, dir);
- WIDGET_arrow_set_up_vector(widget, ob->obmat[1]);
}
}
@@ -830,9 +829,11 @@ static void WIDGETGROUP_forcefield_create(const struct bContext *C, struct wmWid
const float size = (ob->type == OB_EMPTY) ? ob->empty_drawsize : 1.0f;
const float ofs[3] = {0.0f, -size, 0.0f};
+
const float col[4] = {0.8f, 0.8f, 0.45f, 0.5f};
const float col_hi[4] = {0.8f, 0.8f, 0.45f, 1.0f};
+
/* only wind effector for now */
if (pd->forcefield == PFIELD_WIND) {
widget = WIDGET_arrow_new(wgroup, "field_strength", WIDGET_ARROW_STYLE_CONSTRAINED);
@@ -845,7 +846,7 @@ static void WIDGETGROUP_forcefield_create(const struct bContext *C, struct wmWid
WM_widget_set_origin(widget, ob->obmat[3]);
WM_widget_set_offset(widget, ofs);
WM_widget_set_flag(widget, WM_WIDGET_SCALE_3D, false);
- WM_widget_property(widget, ARROW_SLOT_OFFSET_WORLD_SPACE, &ptr, "strength");
+ WM_widget_set_property(widget, ARROW_SLOT_OFFSET_WORLD_SPACE, &ptr, "strength");
}
}
@@ -884,7 +885,7 @@ static void WIDGETGROUP_shapekey_draw(const struct bContext *C, struct wmWidgetG
WIDGET_arrow_set_color(widget, color_shape);
RNA_pointer_create(&key->id, &RNA_ShapeKey, kb, &shapeptr);
WM_widget_set_origin(widget, ob->obmat[3]);
- WM_widget_property(widget, ARROW_SLOT_OFFSET_WORLD_SPACE, &shapeptr, "value");
+ WM_widget_set_property(widget, ARROW_SLOT_OFFSET_WORLD_SPACE, &shapeptr, "value");
negate_v3_v3(dir, ob->obmat[2]);
WIDGET_arrow_set_direction(widget, dir);
}
@@ -914,7 +915,6 @@ static int WIDGETGROUP_armature_facemap_poll(const struct bContext *C, struct wm
static void WIDGETGROUP_armature_facemap_create(const struct bContext *C, struct wmWidgetGroup *wgroup)
{
- float color_shape[4] = {1.0f, 0.3f, 0.0f, 1.0f};
Object *ob = CTX_data_active_object(C);
wmWidget *widget;
Object *armature;
@@ -924,7 +924,10 @@ static void WIDGETGROUP_armature_facemap_create(const struct bContext *C, struct
VirtualModifierData virtualModifierData;
int index = 0;
bFaceMap *fmap = ob->fmaps.first;
-
+
+ const float color_shape[4] = {1.0f, 0.3f, 0.0f, 1.0f};
+
+
md = modifiers_
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list