Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix [#28459] Fly mode problem: "Precision enable" not working in 2.59

Browse Source 
also added back freelook (from 2.4x) - so you can loop about without changing direction.
This commit is contained in:
Campbell Barton
2011-09-25 04:47:46 +00:00
parent f260a878e4
commit e3c9986b7c
1 changed files with 73 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

92
source/blender/editors/space_view3d/view3d_fly.c
View File

@@ -62,22 +62,27 @@
#include "view3d_intern.h" // own include #include "view3d_intern.h" // own include
/* NOTE: these defines are saved in keymap files, do not change values but just add new ones */ /* NOTE: these defines are saved in keymap files, do not change values but just add new ones */
#define FLY_MODAL_CANCEL 1 enum {
#define FLY_MODAL_CONFIRM 2 FLY_MODAL_CANCEL= 1,
#define FLY_MODAL_ACCELERATE 3 FLY_MODAL_CONFIRM,
#define FLY_MODAL_DECELERATE 4 FLY_MODAL_ACCELERATE,
#define FLY_MODAL_PAN_ENABLE 5 FLY_MODAL_DECELERATE,
#define FLY_MODAL_PAN_DISABLE 6 FLY_MODAL_PAN_ENABLE,
#define FLY_MODAL_DIR_FORWARD 7 FLY_MODAL_PAN_DISABLE,
#define FLY_MODAL_DIR_BACKWARD 8 FLY_MODAL_DIR_FORWARD,
#define FLY_MODAL_DIR_LEFT 9 FLY_MODAL_DIR_BACKWARD,
#define FLY_MODAL_DIR_RIGHT 10 FLY_MODAL_DIR_LEFT,
#define FLY_MODAL_DIR_UP 11 FLY_MODAL_DIR_RIGHT,
#define FLY_MODAL_DIR_DOWN 12 FLY_MODAL_DIR_UP,
#define FLY_MODAL_AXIS_LOCK_X 13 FLY_MODAL_DIR_DOWN,
#define FLY_MODAL_AXIS_LOCK_Z 14 FLY_MODAL_AXIS_LOCK_X,
#define FLY_MODAL_PRECISION_ENABLE 15 FLY_MODAL_AXIS_LOCK_Z,
#define FLY_MODAL_PRECISION_DISABLE 16 FLY_MODAL_PRECISION_ENABLE,
FLY_MODAL_PRECISION_DISABLE,
FLY_MODAL_FREELOOK_ENABLE,
FLY_MODAL_FREELOOK_DISABLE
};
/* called in transform_ops.c, on each regeneration of keymaps */ /* called in transform_ops.c, on each regeneration of keymaps */
void fly_modal_keymap(wmKeyConfig *keyconf) void fly_modal_keymap(wmKeyConfig *keyconf)
@@ -104,6 +109,9 @@ void fly_modal_keymap(wmKeyConfig *keyconf)
{FLY_MODAL_PRECISION_ENABLE, "PRECISION_ENABLE", 0, "Precision Enable", ""}, {FLY_MODAL_PRECISION_ENABLE, "PRECISION_ENABLE", 0, "Precision Enable", ""},
{FLY_MODAL_PRECISION_DISABLE, "PRECISION_DISABLE", 0, "Precision Disable", ""}, {FLY_MODAL_PRECISION_DISABLE, "PRECISION_DISABLE", 0, "Precision Disable", ""},
{FLY_MODAL_FREELOOK_ENABLE, "FREELOOK_ENABLE", 0, "Rotation Enable", ""},
{FLY_MODAL_FREELOOK_DISABLE, "FREELOOK_DISABLE", 0, "Rotation Disable", ""},
{0, NULL, 0, NULL, NULL}}; {0, NULL, 0, NULL, NULL}};
wmKeyMap *keymap= WM_modalkeymap_get(keyconf, "View3D Fly Modal"); wmKeyMap *keymap= WM_modalkeymap_get(keyconf, "View3D Fly Modal");
@@ -122,10 +130,10 @@ void fly_modal_keymap(wmKeyConfig *keyconf)
WM_modalkeymap_add_item(keymap, SPACEKEY, KM_PRESS, KM_ANY, 0, FLY_MODAL_CONFIRM); WM_modalkeymap_add_item(keymap, SPACEKEY, KM_PRESS, KM_ANY, 0, FLY_MODAL_CONFIRM);
WM_modalkeymap_add_item(keymap, PADENTER, KM_PRESS, KM_ANY, 0, FLY_MODAL_CONFIRM); WM_modalkeymap_add_item(keymap, PADENTER, KM_PRESS, KM_ANY, 0, FLY_MODAL_CONFIRM);
WM_modalkeymap_add_item(keymap, PADPLUSKEY, KM_PRESS, 0, 0, FLY_MODAL_ACCELERATE); WM_modalkeymap_add_item(keymap, PADPLUSKEY, KM_PRESS, KM_ANY, 0, FLY_MODAL_ACCELERATE);
WM_modalkeymap_add_item(keymap, PADMINUS, KM_PRESS, 0, 0, FLY_MODAL_DECELERATE); WM_modalkeymap_add_item(keymap, PADMINUS, KM_PRESS, KM_ANY, 0, FLY_MODAL_DECELERATE);
WM_modalkeymap_add_item(keymap, WHEELUPMOUSE, KM_PRESS, 0, 0, FLY_MODAL_ACCELERATE); WM_modalkeymap_add_item(keymap, WHEELUPMOUSE, KM_PRESS, KM_ANY, 0, FLY_MODAL_ACCELERATE);
WM_modalkeymap_add_item(keymap, WHEELDOWNMOUSE, KM_PRESS, 0, 0, FLY_MODAL_DECELERATE); WM_modalkeymap_add_item(keymap, WHEELDOWNMOUSE, KM_PRESS, KM_ANY, 0, FLY_MODAL_DECELERATE);
WM_modalkeymap_add_item(keymap, MIDDLEMOUSE, KM_PRESS, KM_ANY, 0, FLY_MODAL_PAN_ENABLE); WM_modalkeymap_add_item(keymap, MIDDLEMOUSE, KM_PRESS, KM_ANY, 0, FLY_MODAL_PAN_ENABLE);
WM_modalkeymap_add_item(keymap, MIDDLEMOUSE, KM_RELEASE, KM_ANY, 0, FLY_MODAL_PAN_DISABLE); /* XXX - Bug in the event system, middle mouse release doesnt work */ WM_modalkeymap_add_item(keymap, MIDDLEMOUSE, KM_RELEASE, KM_ANY, 0, FLY_MODAL_PAN_DISABLE); /* XXX - Bug in the event system, middle mouse release doesnt work */
@@ -144,6 +152,9 @@ void fly_modal_keymap(wmKeyConfig *keyconf)
WM_modalkeymap_add_item(keymap, LEFTSHIFTKEY, KM_PRESS, KM_ANY, 0, FLY_MODAL_PRECISION_ENABLE); WM_modalkeymap_add_item(keymap, LEFTSHIFTKEY, KM_PRESS, KM_ANY, 0, FLY_MODAL_PRECISION_ENABLE);
WM_modalkeymap_add_item(keymap, LEFTSHIFTKEY, KM_RELEASE, KM_ANY, 0, FLY_MODAL_PRECISION_DISABLE); WM_modalkeymap_add_item(keymap, LEFTSHIFTKEY, KM_RELEASE, KM_ANY, 0, FLY_MODAL_PRECISION_DISABLE);
WM_modalkeymap_add_item(keymap, LEFTCTRLKEY, KM_PRESS, KM_ANY, 0, FLY_MODAL_FREELOOK_ENABLE);
WM_modalkeymap_add_item(keymap, LEFTCTRLKEY, KM_RELEASE, KM_ANY, 0, FLY_MODAL_FREELOOK_DISABLE);
/* assign map to operators */ /* assign map to operators */
WM_modalkeymap_assign(keymap, "VIEW3D_OT_fly"); WM_modalkeymap_assign(keymap, "VIEW3D_OT_fly");
} }
@@ -158,8 +169,9 @@ typedef struct FlyInfo {
wmTimer *timer; /* needed for redraws */ wmTimer *timer; /* needed for redraws */
short state; short state;
short use_precision;
short redraw; short redraw;
unsigned char use_precision;
unsigned char use_freelook; /* if the user presses shift they can look about without movinf the direction there looking */
int mval[2]; /* latest 2D mouse values */ int mval[2]; /* latest 2D mouse values */
wmNDOFMotionData* ndof; /* latest 3D mouse values */ wmNDOFMotionData* ndof; /* latest 3D mouse values */
@@ -289,7 +301,8 @@ static int initFlyInfo (bContext *C, FlyInfo *fly, wmOperator *op, wmEvent *even
fly->xlock_momentum=0.0f; fly->xlock_momentum=0.0f;
fly->zlock_momentum=0.0f; fly->zlock_momentum=0.0f;
fly->grid= 1.0f; fly->grid= 1.0f;
fly->use_precision= 0; fly->use_precision= FALSE;
fly->use_freelook= FALSE;
#ifdef NDOF_FLY_DRAW_TOOMUCH #ifdef NDOF_FLY_DRAW_TOOMUCH
fly->redraw= 1; fly->redraw= 1;
@@ -516,10 +529,7 @@ static void flyEvent(FlyInfo *fly, wmEvent *event)
fly->speed= 0.0f; fly->speed= 0.0f;
} }
else { else {
if (event->shift) fly->speed += fly->grid*time_wheel * (fly->use_precision ? 0.1f : 1.0f);
fly->speed += fly->grid*time_wheel * 0.1f;
else
fly->speed += fly->grid*time_wheel;
} }
break; break;
} }
@@ -537,10 +547,7 @@ static void flyEvent(FlyInfo *fly, wmEvent *event)
fly->speed=0; fly->speed=0;
} }
else { else {
if (event->shift) fly->speed-= fly->grid*time_wheel * (fly->use_precision ? 0.1f : 1.0f);
fly->speed-= fly->grid*time_wheel * 0.1f;
else
fly->speed-= fly->grid*time_wheel;
} }
break; break;
} }
@@ -605,6 +612,13 @@ static void flyEvent(FlyInfo *fly, wmEvent *event)
case FLY_MODAL_PRECISION_DISABLE: case FLY_MODAL_PRECISION_DISABLE:
fly->use_precision= FALSE; fly->use_precision= FALSE;
break; break;
case FLY_MODAL_FREELOOK_ENABLE:
fly->use_freelook= TRUE;
break;
case FLY_MODAL_FREELOOK_DISABLE:
fly->use_freelook= FALSE;
break;
} }
} }
} }
@@ -704,8 +718,6 @@ static int flyApply(bContext *C, FlyInfo *fly)
// cent_orig[2], /* view center */ // cent_orig[2], /* view center */
//XXX- can avoid using // cent[2], /* view center modified */ //XXX- can avoid using // cent[2], /* view center modified */
xmargin, ymargin; /* x and y margin are define the safe area where the mouses movement wont rotate the view */ xmargin, ymargin; /* x and y margin are define the safe area where the mouses movement wont rotate the view */
unsigned char
apply_rotation= 1; /* if the user presses shift they can look about without movinf the direction there looking*/
#ifdef NDOF_FLY_DEBUG #ifdef NDOF_FLY_DEBUG
static unsigned int iteration = 1; static unsigned int iteration = 1;
@@ -888,7 +900,7 @@ static int flyApply(bContext *C, FlyInfo *fly)
} }
if (apply_rotation) { if (!fly->use_freelook) {
/* Normal operation */ /* Normal operation */
/* define dvec, view direction vector */ /* define dvec, view direction vector */
dvec_tmp[0]= dvec_tmp[1]= dvec_tmp[2]= 0.0f; dvec_tmp[0]= dvec_tmp[1]= dvec_tmp[2]= 0.0f;
@@ -896,10 +908,16 @@ static int flyApply(bContext *C, FlyInfo *fly)
dvec_tmp[fly->axis]= 1.0f; dvec_tmp[fly->axis]= 1.0f;
mul_m3_v3(mat, dvec_tmp); mul_m3_v3(mat, dvec_tmp);
}
else {
normalize_v3_v3(dvec_tmp, fly->dvec_prev);
if(fly->speed < 0.0f) {
negate_v3(dvec_tmp);
}
}
mul_v3_fl(dvec_tmp, fly->speed * time_redraw * 0.25f); mul_v3_fl(dvec_tmp, fly->speed * time_redraw * 0.25f);
} }
}
/* impose a directional lag */ /* impose a directional lag */
interp_v3_v3v3(dvec, dvec_tmp, fly->dvec_prev, (1.0f/(1.0f+(time_redraw*5.0f)))); interp_v3_v3v3(dvec, dvec_tmp, fly->dvec_prev, (1.0f/(1.0f+(time_redraw*5.0f))));
@@ -967,11 +985,9 @@ static int flyApply_ndof(bContext *C, FlyInfo *fly)
float speed = 10.f; /* blender units per second */ float speed = 10.f; /* blender units per second */
/* ^^ this is ok for default cube scene, but should scale with.. something */ /* ^^ this is ok for default cube scene, but should scale with.. something */
float trans[3] = { float trans[3] = {lateral_sensitivity * ndof->tvec[0],
lateral_sensitivity * ndof->tvec[0],
vertical_sensitivity * ndof->tvec[1], vertical_sensitivity * ndof->tvec[1],
forward_sensitivity * ndof->tvec[2] forward_sensitivity * ndof->tvec[2]};
};
if (fly->use_precision) if (fly->use_precision)
speed *= 0.2f; speed *= 0.2f;