Walk Navigation: Controls to adjust jump height interactively #109827

Andras-Borsanyi · 2023-07-07T16:44:44+02:00

Andras-Borsanyi commented

2023-07-07 16:44:44 +02:00

In Walk Navigation mode with gravity enabled, the jump height is often inappropriate for the scene that you are viewing and it is annoying to go into preferences and change it there every time. This is a small feature that lets you change the jump height in modal walk navigation as you go, i.e. if there are varying elevation changes across the scene.

Pressing '.' increases, ',' decreases the jump height (because these keys are the same for most layouts). The setting in preferences is still loaded as default when starting walk navigation.

In Walk Navigation mode with gravity enabled, the jump height is often inappropriate for the scene that you are viewing and it is annoying to go into preferences and change it there every time. This is a small feature that lets you change the jump height in modal walk navigation as you go, i.e. if there are varying elevation changes across the scene. Pressing '.' increases, ',' decreases the jump height (because these keys are the same for most layouts). The setting in preferences is still loaded as default when starting walk navigation.

Andras-Borsanyi added 1 commit 2023-07-07 16:44:54 +02:00

06186ba5e5 Walk Navigation: Controls to adjust jump height interactively

Pressing '.' increases, ',' decreases the jump height in modal walk navigation.
Before, you could only change the global height in the preferences, this change
allows you to do so interactively (the setting in preferences is still loaded as default
when starting walk navigation). This is useful when different parts of the scene
have varying elevation changes.

Iliya Katushenock added the

Module

Modeling

label 2023-07-07 17:10:31 +02:00

Pratik Borhade added

and removed

labels 2023-07-08 06:57:29 +02:00

Pratik Borhade requested changes 2023-07-10 12:54:41 +02:00

Pratik Borhade left a comment

Hi, thanks for working on this. Looks good so far. Small change requested:

@dfelinto , agree with this improvement? AFAIK you are the original author of walk/flg navigation :)

Hi, thanks for working on this. Looks good so far. Small change requested: @dfelinto , agree with this improvement? AFAIK you are the original author of walk/flg navigation :)

source/blender/editors/space_view3d/view3d_navigate_walk.c Outdated

						
				@ -898,0 +906,4 @@

				#define JUMP_HEIGHT_MIN 0.1f

				      case WALK_MODAL_INCREASE_JUMP:

				        walk->jump_height *= JUMP_HEIGHT_FACTOR;

Pratik Borhade commented

2023-07-10 12:50:30 +02:00

keep jump_height value within finite range.
Without upper bound, jump will be way too high.

keep `jump_height` value within finite range. Without upper bound, jump will be way too high.

Pratik Borhade commented

2023-07-11 12:44:39 +02:00

Hi, this file is now moved to c++: 093a4d63f3
So, merge the main branch into your working branch, refer wiki

Hi, this file is now moved to c++: 093a4d63f3bac26427028e7a7eecae8e2ab2960a So, merge the main branch into your working branch, [refer wiki](https://wiki.blender.org/wiki/Tools/Pull_Requests#Workflow:~:text=Update%20a%20Pull%20Request)

Andras-Borsanyi commented

2023-07-12 17:38:32 +02:00

As requested, I capped the jump height (to 10 units).
PS: That is a lot of commits, I hope I did it right.

As requested, I capped the jump height (to 10 units). PS: That is a lot of commits, I hope I did it right.

Pratik Borhade commented

2023-07-13 10:47:27 +02:00

Unfortunately, merge did not happen correctly :/
Which command you ran for updating the branch to main?
this is expected:

git checkout interactive-jump-height
git merge main

Unfortunately, merge did not happen correctly :/ Which command you ran for updating the branch to main? this is expected: ``` git checkout interactive-jump-height git merge main ```

Andras-Borsanyi commented

2023-07-15 19:54:00 +02:00

I had to tell git how to merge, I think what I ended up doing was rebasing to the latest version. It was honestly a bunch of convoluted steps I might not have understood entirely. I once had to resolve a conflict and I chose the later version (nullptr instead of NULL in line 175), was that the problem or was it the whole rebasing thing? I might need to go back and just try again.

Pratik Borhade commented

2023-07-17 11:50:57 +02:00

Guess rebasing does this, not entirely sure though.
If you're having trouble to revert these changes, feel free to ask in #blender-coders

Guess rebasing does this, not entirely sure though. If you're having trouble to revert these changes, feel free to ask in [#blender-coders](https://blender.chat/channel/blender-coders)

Andras-Borsanyi force-pushed interactive-jump-height from 0241990a3a to 80cca8de7e

2023-07-19 19:57:28 +02:00

Compare

Andras-Borsanyi commented

2023-07-19 20:30:20 +02:00

This time I did merge --no-rebase and I think it worked.

This time I did `merge --no-rebase` and I think it worked.

Pratik Borhade approved these changes 2023-07-21 13:07:37 +02:00

Pratik Borhade left a comment

Thanks. Looks correct now :D
@dfelinto wrote the walk navigation code so I'll defer the further review to him

Thanks. Looks correct now :D @dfelinto wrote the walk navigation code so I'll defer the further review to him

source/blender/editors/space_view3d/view3d_navigate_walk.cc Outdated

						
				@ -898,0 +908,4 @@

				      case WALK_MODAL_INCREASE_JUMP:

				        walk->jump_height *= JUMP_HEIGHT_FACTOR;

				        if (walk->jump_height > JUMP_HEIGHT_MAX) {

Pratik Borhade commented

2023-07-21 13:04:55 +02:00

guess we can use min_ff/max_ff instead of if conditions but fine with current code too :)

guess we can use `min_ff/max_ff` instead of `if` conditions but fine with current code too :)

Pratik Borhade requested review from Dalai Felinto 2023-07-21 13:07:55 +02:00

Dalai Felinto commented

2023-07-21 14:35:17 +02:00

Indeed better to use min/max functions.

Also, is the jump height being preserved across the session? (similar to how we preserve the speed)

Indeed better to use min/max functions. Also, is the jump height being preserved across the session? (similar to how we preserve the speed)

Andras-Borsanyi added 1 commit 2023-07-21 22:47:17 +02:00

1b9d6f00ca Walk Navigation: Preserve jump height across a session

Similar to walking speed, jump height will be preserved across a session.
Also fixed changing jump height mid-air and switched to using min/max functions
for capping jump height.

Andras-Borsanyi commented

2023-07-21 22:50:30 +02:00

I have made the requested changes and also fixed some problems with changing the jump height mid-air.

Pratik Borhade reviewed 2023-07-24 13:40:17 +02:00

Pratik Borhade left a comment

Thanks :)
just spotted one small change

Thanks :) just spotted one small change

source/blender/editors/space_view3d/view3d_navigate_walk.cc Outdated

						
				@ -528,0 +539,4 @@

				  }

				  walk->jump_height = 0.0f;

Pratik Borhade commented

2023-07-24 13:39:33 +02:00

Remove trailing whitespace: image

Remove trailing whitespace: [image](/attachments/1c533903-069f-4f41-983c-0d2ce95733d7)

Andras-Borsanyi added 1 commit 2023-07-26 21:26:15 +02:00

425aa36e02 Cleanup: Remove trailing whitespace

Andras-Borsanyi commented

2023-07-26 21:37:23 +02:00

Removed the whitespace :)

Pratik Borhade approved these changes 2023-07-27 10:55:04 +02:00

Pratik Borhade left a comment

Thanks :)

Dalai Felinto commented

2023-07-28 10:38:39 +02:00

@PratikPB2123 can you handle the commit + release notes? The code seems fine, so if you tested it, it is good to go.

Thanks @Andras-Borsanyi for the patch :)

@PratikPB2123 can you handle the commit + release notes? The code seems fine, so if you tested it, it is good to go. Thanks @Andras-Borsanyi for the patch :)

Dalai Felinto approved these changes 2023-07-28 10:38:54 +02:00

Pratik Borhade commented

2023-07-28 10:53:11 +02:00

can you handle the commit + release notes? The code seems fine, so if you tested it, it is good to go.

Sure. Will check once again before committing.

> can you handle the commit + release notes? The code seems fine, so if you tested it, it is good to go. Sure. Will check once again before committing.

Pratik Borhade referenced this issue from a commit

2023-07-28 13:43:44 +02:00

Walk Navigation: Controls to adjust jump height interactively

Pratik Borhade merged commit f418e4f648 into main

2023-07-28 13:43:45 +02:00

Pratik Borhade commented

2023-07-28 13:52:29 +02:00

Thanks, merged into master :D
Also added to release notes: https://wiki.blender.org/wiki/Reference/Release_Notes/4.0/User_Interface#General
(I hope release notes changes are correct)

Thanks, merged into master :D Also added to release notes: https://wiki.blender.org/wiki/Reference/Release_Notes/4.0/User_Interface#General (I hope release notes changes are correct)

William Leeson referenced this issue from a commit

2023-07-28 18:18:59 +02:00

Walk Navigation: Controls to adjust jump height interactively

Andras-Borsanyi deleted branch interactive-jump-height

2023-07-30 17:05:34 +02:00

Sign in to join this conversation.

No reviewers

No Label

Download

What's New

Blender Studio

Manual

Developers Blog

Documentation

Benchmark

Blender Conference

Development Fund

One-time Donations

Walk Navigation: Controls to adjust jump height interactively #109827