Revision: 44779
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44779
Author: campbellbarton
Date: 2012-03-10 04:19:25 +0000 (Sat, 10 Mar 2012)
Log Message:
-----------
change fly mode behavior to address issue raised in [#30508] - there being no
way to pause.
now when reversing direction immediately - fly mode translation will pause
until pressed again.
Modified Paths:
--------------
trunk/blender/source/blender/editors/space_view3d/view3d_fly.c
Modified: trunk/blender/source/blender/editors/space_view3d/view3d_fly.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_fly.c
2012-03-10 03:25:16 UTC (rev 44778)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_fly.c
2012-03-10 04:19:25 UTC (rev 44779)
@@ -582,35 +582,68 @@
/* implement WASD keys */
case FLY_MODAL_DIR_FORWARD:
- if (fly->speed < 0.0f) fly->speed= -fly->speed;
/* flip speed rather than stopping, game like motion */
- else if (fly->axis==2) fly->speed += fly->grid;
/* increase like mousewheel if were already
-
* moving in that difection*/
- fly->axis= 2;
+ if (fly->axis == 2 && fly->speed < 0.0f) { /*
reverse direction stops, tap again to continue */
+ fly->axis = -1;
+ }
+ else {
+ if (fly->speed < 0.0f) fly->speed=
-fly->speed; /* flip speed rather than stopping, game like motion */
+ else if (fly->axis==2) fly->speed +=
fly->grid; /* increase like mousewheel if were already
+
* moving in that difection*/
+ fly->axis= 2;
+ }
break;
case FLY_MODAL_DIR_BACKWARD:
- if (fly->speed > 0.0f) fly->speed= -fly->speed;
- else if (fly->axis==2) fly->speed -= fly->grid;
- fly->axis= 2;
+ if (fly->axis == 2 && fly->speed > 0.0f) { /*
reverse direction stops, tap again to continue */
+ fly->axis = -1;
+ }
+ else {
+ if (fly->speed > 0.0f) fly->speed=
-fly->speed;
+ else if (fly->axis==2) fly->speed -=
fly->grid;
+
+ fly->axis= 2;
+ }
break;
case FLY_MODAL_DIR_LEFT:
- if (fly->speed < 0.0f) fly->speed= -fly->speed;
- else if (fly->axis==0) fly->speed += fly->grid;
- fly->axis= 0;
+ if (fly->axis == 0 && fly->speed < 0.0f) { /*
reverse direction stops, tap again to continue */
+ fly->axis = -1;
+ }
+ else {
+ if (fly->speed < 0.0f) fly->speed=
-fly->speed;
+ else if (fly->axis==0) fly->speed +=
fly->grid;
+
+ fly->axis= 0;
+ }
break;
case FLY_MODAL_DIR_RIGHT:
- if (fly->speed > 0.0f) fly->speed= -fly->speed;
- else if (fly->axis==0) fly->speed -= fly->grid;
- fly->axis= 0;
+ if (fly->axis == 0 && fly->speed > 0.0f) { /*
reverse direction stops, tap again to continue */
+ fly->axis = -1;
+ }
+ else {
+ if (fly->speed > 0.0f) fly->speed=
-fly->speed;
+ else if (fly->axis==0) fly->speed -=
fly->grid;
+
+ fly->axis= 0;
+ }
break;
case FLY_MODAL_DIR_DOWN:
- if (fly->speed < 0.0f) fly->speed= -fly->speed;
- else if (fly->axis==1) fly->speed += fly->grid;
- fly->axis= 1;
+ if (fly->axis == 1 && fly->speed < 0.0f) { /*
reverse direction stops, tap again to continue */
+ fly->axis = -1;
+ }
+ else {
+ if (fly->speed < 0.0f) fly->speed=
-fly->speed;
+ else if (fly->axis==1) fly->speed +=
fly->grid;
+ fly->axis= 1;
+ }
break;
case FLY_MODAL_DIR_UP:
- if (fly->speed > 0.0f) fly->speed= -fly->speed;
- else if (fly->axis==1) fly->speed -= fly->grid;
- fly->axis= 1;
+ if (fly->axis == 1 && fly->speed > 0.0f) { /*
reverse direction stops, tap again to continue */
+ fly->axis = -1;
+ }
+ else {
+ if (fly->speed > 0.0f) fly->speed=
-fly->speed;
+ else if (fly->axis==1) fly->speed -=
fly->grid;
+ fly->axis= 1;
+ }
break;
case FLY_MODAL_AXIS_LOCK_X:
@@ -932,7 +965,10 @@
}
}
-
+ if (fly->axis == -1) {
+ /* pause */
+ zero_v3(dvec_tmp);
+ }
if (!fly->use_freelook) {
/* Normal operation */
/* define dvec, view direction vector */
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
