griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Zoom to mouse pointer with mouse wheel works again.

Browse Source 
The point where it zooms to can now be specified as operator properties and will be used if zoom to pointer is on. (when not specified, it will use the x and y of the event)
This commit is contained in:
Martin Poirier
2009-10-16 00:23:40 +00:00
parent 6ffb79107c
commit 7016400278
1 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
source/blender/editors/space_view3d/view3d_edit.c
View File

@@ -926,6 +926,8 @@ static int viewzoom_exec(bContext *C, wmOperator *op)
View3D *v3d = CTX_wm_view3d(C);
RegionView3D *rv3d= CTX_wm_region_view3d(C);
int delta= RNA_int_get(op->ptr, "delta");
int mx = RNA_int_get(op->ptr, "mx");
int my = RNA_int_get(op->ptr, "my");
if(delta < 0) {
/* this min and max is also in viewmove() */
@@ -933,14 +935,18 @@ static int viewzoom_exec(bContext *C, wmOperator *op)
rv3d->camzoom-= 10;
if(rv3d->camzoom<-30) rv3d->camzoom= -30;
}
else if(rv3d->dist<10.0*v3d->far) rv3d->dist*=1.2f;
else if(rv3d->dist<10.0*v3d->far) {
view_zoom_mouseloc(CTX_wm_region(C), 1.2f, mx, my);
}
}
else {
if(rv3d->persp==V3D_CAMOB) {
rv3d->camzoom+= 10;
if(rv3d->camzoom>300) rv3d->camzoom= 300;
}
else if(rv3d->dist> 0.001*v3d->grid) rv3d->dist*=.83333f;
else if(rv3d->dist> 0.001*v3d->grid) {
view_zoom_mouseloc(CTX_wm_region(C), .83333f, mx, my);
}
}
if(rv3d->viewlock & RV3D_BOXVIEW)
@@ -955,6 +961,13 @@ static int viewzoom_exec(bContext *C, wmOperator *op)
static int viewzoom_invoke(bContext *C, wmOperator *op, wmEvent *event)
{
int delta= RNA_int_get(op->ptr, "delta");
/* if one or the other zoom position aren't set, set from event */
if (!RNA_property_is_set(op->ptr, "mx") || !RNA_property_is_set(op->ptr, "my"))
{
RNA_int_set(op->ptr, "mx", event->x);
RNA_int_set(op->ptr, "my", event->y);
}
if(delta) {
viewzoom_exec(C, op);
@@ -988,7 +1001,9 @@ void VIEW3D_OT_zoom(wmOperatorType *ot)
/* flags */
ot->flag= OPTYPE_BLOCKING|OPTYPE_GRAB_POINTER;
RNA_def_int(ot->srna, "delta", 0, INT_MIN, INT_MAX, "Delta", "", INT_MIN, INT_MAX);
RNA_def_int(ot->srna, "delta", 0, 0, INT_MAX, "Delta", "", 0, INT_MAX);
RNA_def_int(ot->srna, "mx", 0, 0, INT_MAX, "Zoom Position X", "", 0, INT_MAX);
RNA_def_int(ot->srna, "my", 0, 0, INT_MAX, "Zoom Position Y", "", 0, INT_MAX);
}
static int viewhome_exec(bContext *C, wmOperator *op) /* was view3d_home() in 2.4x */