kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

View3D Walk: Use scene gravity instead of hardcoded value (fix T40921)

Browse Source 
Differential Revision: https://developer.blender.org/D636
This commit is contained in:
Dalai Felinto 2014-07-07 12:46:25 -03:00
parent 92c8dd16df
commit 1aabbf8476
1 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
source/blender/editors/space_view3d/view3d_walk.c
View File

@ -60,10 +60,8 @@
#include "view3d_intern.h" /* own include */ #include "view3d_intern.h" /* own include */
#define EARTH_GRAVITY 9.80668f /* m/s2 */
/* prototypes */ /* prototypes */
static float getVelocityZeroTime(float velocity); static float getVelocityZeroTime(const float gravity, const float velocity);
/* 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 */
enum { enum {
@ -281,6 +279,7 @@ typedef struct WalkInfo {
/* gravity system */ /* gravity system */
eWalkGravityState gravity_state; eWalkGravityState gravity_state;
float gravity;
/* height to use in walk mode */ /* height to use in walk mode */
float view_height; float view_height;
@ -512,6 +511,13 @@ static bool initWalkInfo(bContext *C, WalkInfo *walk, wmOperator *op)
walk->gravity_state = WALK_GRAVITY_STATE_OFF; walk->gravity_state = WALK_GRAVITY_STATE_OFF;
if ((walk->scene->physics_settings.flag & PHYS_GLOBAL_GRAVITY)) {
walk->gravity = fabsf(walk->scene->physics_settings.gravity[2]);
}
else {
walk->gravity = 9.80668f; /* m/s2 */
}
walk->is_reversed = ((U.walk_navigation.flag & USER_WALK_MOUSE_REVERSE) != 0); walk->is_reversed = ((U.walk_navigation.flag & USER_WALK_MOUSE_REVERSE) != 0);
walk->active_directions = 0; walk->active_directions = 0;
@ -755,7 +761,7 @@ static void walkEvent(bContext *C, wmOperator *UNUSED(op), WalkInfo *walk, const
#define JUMP_SPEED_MIN 1.0f #define JUMP_SPEED_MIN 1.0f
#define JUMP_TIME_MAX 0.2f /* s */ #define JUMP_TIME_MAX 0.2f /* s */
#define JUMP_SPEED_MAX sqrtf(2.0f * EARTH_GRAVITY * walk->jump_height) #define JUMP_SPEED_MAX sqrtf(2.0f * walk->gravity * walk->jump_height)
case WALK_MODAL_JUMP_STOP: case WALK_MODAL_JUMP_STOP:
if (walk->gravity_state == WALK_GRAVITY_STATE_JUMP) { if (walk->gravity_state == WALK_GRAVITY_STATE_JUMP) {
@ -769,7 +775,7 @@ static void walkEvent(bContext *C, wmOperator *UNUSED(op), WalkInfo *walk, const
walk->speed_jump = JUMP_SPEED_MIN + t * (JUMP_SPEED_MAX - JUMP_SPEED_MIN) / JUMP_TIME_MAX; walk->speed_jump = JUMP_SPEED_MIN + t * (JUMP_SPEED_MAX - JUMP_SPEED_MIN) / JUMP_TIME_MAX;
/* when jumping, duration is how long it takes before we start going down */ /* when jumping, duration is how long it takes before we start going down */
walk->teleport.duration = getVelocityZeroTime(walk->speed_jump); walk->teleport.duration = getVelocityZeroTime(walk->gravity, walk->speed_jump);
/* no more increase of jump speed */ /* no more increase of jump speed */
walk->gravity_state = WALK_GRAVITY_STATE_ON; walk->gravity_state = WALK_GRAVITY_STATE_ON;
@ -793,7 +799,7 @@ static void walkEvent(bContext *C, wmOperator *UNUSED(op), WalkInfo *walk, const
copy_v2_v2(walk->teleport.direction, walk->dvec_prev); copy_v2_v2(walk->teleport.direction, walk->dvec_prev);
/* when jumping, duration is how long it takes before we start going down */ /* when jumping, duration is how long it takes before we start going down */
walk->teleport.duration = getVelocityZeroTime(walk->speed_jump); walk->teleport.duration = getVelocityZeroTime(walk->gravity, walk->speed_jump);
} }
break; break;
@ -853,14 +859,14 @@ static void walkMoveCamera(bContext *C, WalkInfo *walk,
ED_view3d_cameracontrol_update(walk->v3d_camera_control, true, C, do_rotate, do_translate); ED_view3d_cameracontrol_update(walk->v3d_camera_control, true, C, do_rotate, do_translate);
} }
static float getFreeFallDistance(const float time) static float getFreeFallDistance(const float gravity, const float time)
{ {
return EARTH_GRAVITY * (time * time) * 0.5f; return gravity * (time * time) * 0.5f;
} }
static float getVelocityZeroTime(float velocity) static float getVelocityZeroTime(const float gravity, const float velocity)
{ {
return velocity / EARTH_GRAVITY; return velocity / gravity;
} }
static int walkApply(bContext *C, WalkInfo *walk) static int walkApply(bContext *C, WalkInfo *walk)
@ -1130,7 +1136,7 @@ static int walkApply(bContext *C, WalkInfo *walk)
copy_v2_v2(dvec, walk->teleport.direction); copy_v2_v2(dvec, walk->teleport.direction);
z_cur = walk->rv3d->viewinv[3][2]; z_cur = walk->rv3d->viewinv[3][2];
z_new = walk->teleport.origin[2] - getFreeFallDistance(t) * walk->grid; z_new = walk->teleport.origin[2] - getFreeFallDistance(walk->gravity, t) * walk->grid;
/* jump */ /* jump */
z_new += t * walk->speed_jump * walk->grid; z_new += t * walk->speed_jump * walk->grid;
@ -1334,5 +1340,3 @@ void VIEW3D_OT_walk(wmOperatorType *ot)
/* flags */ /* flags */
ot->flag = OPTYPE_BLOCKING; ot->flag = OPTYPE_BLOCKING;
} }
#undef EARTH_GRAVITY