Revision: 18262
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18262
Author: ton
Date: 2009-01-02 15:11:18 +0100 (Fri, 02 Jan 2009)
Log Message:
-----------
2.5
- Lasso select back (CTRL+LMB), object centers only,
and for editmesh. See template in wm_operators.c
- Circle select for editmode back. Currently it still
uses Ckey, and is only a temporary mode, not persistant.
Persistant circle select can be added later with
tweak gesture keymap? We'll see. :) The old circle
select was actually annoying that it was so sticky.
Modified Paths:
--------------
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_intern.h
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_ops.c
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_select.c
branches/blender2.5/blender/source/blender/windowmanager/WM_api.h
branches/blender2.5/blender/source/blender/windowmanager/WM_types.h
branches/blender2.5/blender/source/blender/windowmanager/intern/wm_gesture.c
branches/blender2.5/blender/source/blender/windowmanager/intern/wm_operators.c
branches/blender2.5/blender/source/blender/windowmanager/wm.h
Modified:
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_intern.h
===================================================================
---
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_intern.h
2009-01-02 13:47:33 UTC (rev 18261)
+++
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_intern.h
2009-01-02 14:11:18 UTC (rev 18262)
@@ -112,6 +112,7 @@
void VIEW3D_OT_select_extend(struct wmOperatorType *ot);
void VIEW3D_OT_circle_select(struct wmOperatorType *ot);
void VIEW3D_OT_borderselect(struct wmOperatorType *ot);
+void VIEW3D_OT_lasso_select(struct wmOperatorType *ot);
/* view3d_view.c */
void VIEW3D_OT_smoothview(struct wmOperatorType *ot);
Modified:
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_ops.c
===================================================================
---
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_ops.c
2009-01-02 13:47:33 UTC (rev 18261)
+++
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_ops.c
2009-01-02 14:11:18 UTC (rev 18262)
@@ -76,6 +76,7 @@
WM_operatortype_append(VIEW3D_OT_smoothview);
WM_operatortype_append(VIEW3D_OT_render_border);
WM_operatortype_append(VIEW3D_OT_cursor3d);
+ WM_operatortype_append(VIEW3D_OT_lasso_select);
transform_operatortypes();
}
@@ -123,6 +124,8 @@
WM_keymap_add_item(keymap, "VIEW3D_OT_select", SELECTMOUSE, KM_PRESS,
0, 0);
RNA_enum_set(WM_keymap_add_item(keymap, "VIEW3D_OT_select",
SELECTMOUSE, KM_PRESS, KM_SHIFT, 0)->ptr, "type", 1);
WM_keymap_add_item(keymap, "VIEW3D_OT_borderselect", BKEY, KM_PRESS, 0,
0);
+ WM_keymap_add_item(keymap, "VIEW3D_OT_lasso_select", LEFTMOUSE,
KM_PRESS, KM_CTRL, 0);
+ RNA_enum_set(WM_keymap_add_item(keymap, "VIEW3D_OT_lasso_select",
LEFTMOUSE, KM_PRESS, KM_SHIFT|KM_CTRL, 0)->ptr, "type", 1);
WM_keymap_add_item(keymap, "VIEW3D_OT_circle_select", CKEY, KM_PRESS,
0, 0);
WM_keymap_add_item(keymap, "VIEW3D_OT_clipping", BKEY, KM_PRESS,
KM_ALT, 0);
Modified:
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_select.c
===================================================================
---
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_select.c
2009-01-02 13:47:33 UTC (rev 18261)
+++
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_select.c
2009-01-02 14:11:18 UTC (rev 18262)
@@ -88,6 +88,17 @@
#include "view3d_intern.h" // own include
+
+static void view3d_set_viewcontext(bContext *C, ViewContext *vc)
+{
+ memset(vc, 0, sizeof(ViewContext));
+ vc->ar= CTX_wm_region(C);
+ vc->scene= CTX_data_scene(C);
+ vc->v3d= (View3D *)CTX_wm_space_data(C);
+ vc->obact= CTX_data_active_object(C);
+ vc->obedit= CTX_data_edit_object(C);
+}
+
/* ********************** view3d_select: selection manipulations
********************* */
/* XXX to solve *************** */
@@ -390,6 +401,9 @@
lasso_select_boundbox(&rect, mcords, moves);
+ /* set editmesh */
+ vc->em= ((Mesh *)vc->obedit->data)->edit_mesh;
+
data.vc= *vc;
data.rect = ▭
data.mcords = mcords;
@@ -516,6 +530,7 @@
{
struct { short (*mcords)[2]; short moves; short select; } data;
+ /* set vc->editnurb */
data.mcords = mcords;
data.moves = moves;
data.select = select;
@@ -535,6 +550,7 @@
{
struct { short (*mcords)[2]; short moves; short select; } data;
+ /* set editdata in vc */
data.mcords = mcords;
data.moves = moves;
data.select = select;
@@ -548,6 +564,8 @@
float vec[3];
short sco1[2], sco2[2], didpoint;
+ /* set editdata in vc */
+
for (ebone=G.edbo.first; ebone; ebone=ebone->next) {
VECCOPY(vec, ebone->head);
@@ -654,6 +672,65 @@
}
+static EnumPropertyItem lasso_select_types[] = {
+ {0, "SELECT", "Select", ""},
+ {1, "DESELECT", "Deselect", ""},
+ {0, NULL, NULL, NULL}
+};
+
+
+/* lasso operator gives properties, but since old code works
+ with short array we convert */
+static int view3d_lasso_select_exec(bContext *C, wmOperator *op)
+{
+ ViewContext vc;
+ int select, i= 0;
+ short mcords[1024][2];
+
+ RNA_BEGIN(op->ptr, itemptr, "path") {
+ float loc[2];
+
+ RNA_float_get_array(&itemptr, "loc", loc);
+ mcords[i][0]= (short)loc[0];
+ mcords[i][1]= (short)loc[1];
+ i++;
+ if(i>=1024) break;
+ }
+ RNA_END;
+
+ /* setup view context for argument to callbacks */
+ view3d_set_viewcontext(C, &vc);
+
+ select= RNA_enum_is_equal(op->ptr, "type", "SELECT");
+ view3d_lasso_select(&vc, mcords, i, select);
+
+ return OPERATOR_FINISHED;
+}
+
+void VIEW3D_OT_lasso_select(wmOperatorType *ot)
+{
+ PropertyRNA *prop;
+
+ ot->name= "Lasso Select";
+ ot->idname= "VIEW3D_OT_lasso_select";
+
+ ot->invoke= WM_gesture_lasso_invoke;
+ ot->modal= WM_gesture_lasso_modal;
+ ot->exec= view3d_lasso_select_exec;
+
+ ot->poll= WM_operator_winactive;
+
+ prop= RNA_def_property(ot->srna, "path", PROP_COLLECTION, PROP_NONE);
+ RNA_def_property_struct_runtime(prop, &RNA_OperatorMousePath);
+
+ prop = RNA_def_property(ot->srna, "type", PROP_ENUM, PROP_NONE);
+ RNA_def_property_enum_items(prop, lasso_select_types);
+
+}
+
+
+/* ************************************************* */
+
#if 0
/* smart function to sample a rect spiralling outside, nice for backbuf
selection */
static unsigned int samplerect(unsigned int *buf, int size, unsigned int
dontdo)
@@ -849,11 +926,7 @@
short hits;
/* setup view context for argument to callbacks */
- memset(&vc, 0, sizeof(ViewContext));
- vc.ar= ar;
- vc.scene= scene;
- vc.v3d= v3d;
- vc.obact= OBACT;
+ view3d_set_viewcontext(C, &vc);
/* always start list from basact in wire mode */
startbase= FIRSTBASE;
@@ -1213,7 +1286,6 @@
ViewContext vc;
Scene *scene= CTX_data_scene(C);
ScrArea *sa= CTX_wm_area(C);
- ARegion *ar= CTX_wm_region(C);
View3D *v3d= sa->spacedata.first;
rcti rect;
Base *base;
@@ -1225,12 +1297,7 @@
view3d_operator_needs_opengl(C);
/* setup view context for argument to callbacks */
- memset(&vc, 0, sizeof(ViewContext));
- vc.ar= ar;
- vc.scene= scene;
- vc.v3d= v3d;
- vc.obact= OBACT;
- vc.obedit= G.obedit;
+ view3d_set_viewcontext(C, &vc);
val= RNA_int_get(op->ptr, "event_type");
rect.xmin= RNA_int_get(op->ptr, "xmin");
@@ -1496,18 +1563,9 @@
}
-/* ------------------------------------------------------------------------- */
+/* -------------------- circle select
--------------------------------------------- */
-/** The following functions are quick & dirty callback functions called
- * on the Circle select function (press B twice in Editmode)
- * They were torn out of the circle_select to make the latter more reusable
- * The callback version of circle_select (called circle_selectCB) was moved
- * to edit.c because of it's (wanted) generality.
-
- XXX These callback functions are still dirty, because they call
globals...
- */
-
-static void mesh_selectionCB__doSelectVert(void *userData, EditVert *eve, int
x, int y, int index)
+static void mesh_circle_doSelectVert(void *userData, EditVert *eve, int x, int
y, int index)
{
struct { short select, mval[2]; float radius; } *data = userData;
int mx = x - data->mval[0], my = y - data->mval[1];
@@ -1517,7 +1575,7 @@
eve->f = data->select?(eve->f|1):(eve->f&~1);
}
}
-static void mesh_selectionCB__doSelectEdge(void *userData, EditEdge *eed, int
x0, int y0, int x1, int y1, int index)
+static void mesh_circle_doSelectEdge(void *userData, EditEdge *eed, int x0,
int y0, int x1, int y1, int index)
{
struct { short select, mval[2]; float radius; } *data = userData;
@@ -1525,7 +1583,7 @@
EM_select_edge(eed, data->select);
}
}
-static void mesh_selectionCB__doSelectFace(void *userData, EditFace *efa, int
x, int y, int index)
+static void mesh_circle_doSelectFace(void *userData, EditFace *efa, int x, int
y, int index)
{
struct { short select, mval[2]; float radius; } *data = userData;
int mx = x - data->mval[0], my = y - data->mval[1];
@@ -1537,12 +1595,11 @@
}
}
-static void mesh_selectionCB(ViewContext *vc, int selecting, Object *editobj,
short *mval, float rad)
+static void mesh_circle_select(ViewContext *vc, int selecting, short *mval,
float rad)
{
- struct { short select, mval[2]; float radius; } data;
int bbsel;
-
- if(!G.obedit && (FACESEL_PAINT_TEST)) {
+
+ if(vc->obedit==NULL && (FACESEL_PAINT_TEST)) {
Object *ob= vc->obact;
Mesh *me = ob?ob->data:NULL;
@@ -1555,47 +1612,49 @@
// XXX object_tface_flags_changed(OBACT, 0);
}
-
- return;
}
+ else {
+ struct { short select, mval[2]; float radius; } data;
+
+ bbsel= EM_init_backbuf_circle(vc, mval[0], mval[1],
(short)(rad+1.0));
+ vc->em= ((Mesh *)vc->obedit->data)->edit_mesh;
- bbsel= EM_init_backbuf_circle(vc, mval[0], mval[1], (short)(rad+1.0));
-
- data.select = (selecting==LEFTMOUSE);
- data.mval[0] = mval[0];
- data.mval[1] = mval[1];
- data.radius = rad;
+ data.select = selecting;
+ data.mval[0] = mval[0];
+ data.mval[1] = mval[1];
+ data.radius = rad;
- if(vc->scene->selectmode & SCE_SELECT_VERTEX) {
- if(bbsel) {
- EM_backbuf_checkAndSelectVerts(vc->em,
selecting==LEFTMOUSE);
- } else {
- mesh_foreachScreenVert(vc,
mesh_selectionCB__doSelectVert, &data, 1);
+ if(vc->scene->selectmode & SCE_SELECT_VERTEX) {
+ if(bbsel) {
+ EM_backbuf_checkAndSelectVerts(vc->em,
selecting==LEFTMOUSE);
+ } else {
+ mesh_foreachScreenVert(vc,
mesh_circle_doSelectVert, &data, 1);
+ }
}
- }
- if(vc->scene->selectmode & SCE_SELECT_EDGE) {
- if (bbsel) {
- EM_backbuf_checkAndSelectEdges(vc->em,
selecting==LEFTMOUSE);
- } else {
- mesh_foreachScreenEdge(vc,
mesh_selectionCB__doSelectEdge, &data, 0);
+ if(vc->scene->selectmode & SCE_SELECT_EDGE) {
+ if (bbsel) {
+ EM_backbuf_checkAndSelectEdges(vc->em,
selecting==LEFTMOUSE);
+ } else {
+ mesh_foreachScreenEdge(vc,
mesh_circle_doSelectEdge, &data, 0);
+ }
}
- }
-
- if(vc->scene->selectmode & SCE_SELECT_FACE) {
- if(bbsel) {
- EM_backbuf_checkAndSelectFaces(vc->em,
selecting==LEFTMOUSE);
- } else {
- mesh_foreachScreenFace(vc,
mesh_selectionCB__doSelectFace, &data);
+
+ if(vc->scene->selectmode & SCE_SELECT_FACE) {
+ if(bbsel) {
+ EM_backbuf_checkAndSelectFaces(vc->em,
selecting==LEFTMOUSE);
+ } else {
+ mesh_foreachScreenFace(vc,
mesh_circle_doSelectFace, &data);
+ }
}
+
+ EM_free_backbuf();
+ EM_selectmode_flush(vc->em);
}
-
- EM_free_backbuf();
- EM_selectmode_flush(vc->em);
}
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
