Free Camera #337

MelonSpeedruns · 2022-05-15T16:42:56Z

Has a toggle in the experimental im-gui menu. C-Buttons need to be changed from the right stick to other buttons manually in the shipofharkinian.ini file. Here's what I use with a Pro Controller:

btn_cright=10
btn_cleft=3
btn_cdown=2
btn_cup=8
btn_r=517
btn_l=9
btn_dright=14
btn_dleft=13
btn_ddown=12
btn_dup=11
btn_start=6
btn_z=516
btn_b=1
btn_a=0
btn_stickright=512
btn_stickleft=-512
btn_stickdown=513
btn_stickup=-513
sdl_controller_axis_leftx_threshold=16.000000
sdl_controller_axis_lefty_threshold=16.000000
sdl_controller_axis_rightx_threshold=16384
sdl_controller_axis_righty_threshold=16384
sdl_controller_axis_triggerleft_threshold=7680
sdl_controller_axis_triggerright_threshold=7680

Fetch latest

vaguerant · 2022-05-16T05:31:41Z

Think I've found an issue here. If you're in free camera mode and start climbing a ladder, vine, etc., re-centering the camera with Z doesn't work. You're stuck in free camera mode until you reach a platform.

Pure guesswork: in the base game, the camera gets locked behind you when you're climbing, so I suspect it's this camera lock that's preventing the player from escaping free camera mode.

EDIT: Not an issue, but options to invert the axes would be welcome.

EDIT2: An option to default back to the original camera when entering a new map might be warranted? I can see people wanting it both ways. I think the HD remakes on Wii U reset the camera on each map change but that shouldn't be only behavior.

MelonSpeedruns · 2022-05-16T14:12:07Z

Think I've found an issue here. If you're in free camera mode and start climbing a ladder, vine, etc., re-centering the camera with Z doesn't work. You're stuck in free camera mode until you reach a platform.

Pure guesswork: in the base game, the camera gets locked behind you when you're climbing, so I suspect it's this camera lock that's preventing the player from escaping free camera mode.

EDIT: Not an issue, but options to invert the axes would be welcome.

EDIT2: An option to default back to the original camera when entering a new map might be warranted? I can see people wanting it both ways. I think the HD remakes on Wii U reset the camera on each map change but that shouldn't be only behavior.

Good ideas! Will implement those and fix the ladder bug

# Conflicts: # libultraship/libultraship/Controller.cpp # libultraship/libultraship/Controller.h # libultraship/libultraship/Lib/Fast3D/U64/PR/ultra64/controller.h # libultraship/libultraship/UltraController.h

t0mtee · 2022-05-30T15:33:50Z

Trying it out right now. It works well, apart from the camera clipping through the floor when it pans down. Also noticed that the 'ladder' glitch also happens when charging up for a spin attack

outerwinnie · 2022-05-30T16:34:19Z

Doing an entire playthrough with this, and the only problem that i have found is the camera clipping through the floor and wall. Especially on the water temple:

Fix compilation issues

dcvz

Looks great! Only big issue is that we seem to have removed some of the dg strings again. Otherwise just some small nitpicks. Great work here! ✨

libultraship/libultraship/UltraController.h

soh/soh/Enhancements/debugger/debugSaveEditor.cpp

soh/src/code/padmgr.c

libultraship/libultraship/Controller.cpp

libultraship/libultraship/Lib/Fast3D/U64/PR/ultra64/controller.h

soh/src/code/z_camera.c

soh/src/overlays/gamestates/ovl_file_choose/z_file_choose.c

libultraship/libultraship/ImGuiImpl.cpp

libultraship/libultraship/SDLController.cpp

dcvz

LGTM 🚀 🏆

briaguya0

couple small comments, but nothing that makes me think we shouldn't

briaguya0 · 2022-07-12T21:46:00Z

libultraship/libultraship/SDLController.cpp

+        Conf[ConfSection][STR(BTN_CRIGHT)] = std::to_string(SDL_CONTROLLER_BUTTON_RIGHTSHOULDER);
+        Conf[ConfSection][STR(BTN_CLEFT)] = std::to_string(SDL_CONTROLLER_BUTTON_Y);
+        Conf[ConfSection][STR(BTN_CDOWN)] = std::to_string(SDL_CONTROLLER_BUTTON_X);
+        Conf[ConfSection][STR(BTN_CUP)] = std::to_string(SDL_CONTROLLER_BUTTON_RIGHTSTICK);


i like this

briaguya0 · 2022-07-12T21:48:20Z

soh/src/code/z_camera.c

+    Normal1* norm1 = (Normal1*)camera->paramData;
+
+    f32 playerHeight = Player_GetHeight(camera->player);
+    f32 sp94;


it's not clear what sp94 means, since it's a local var only used in here, it'd be nice to have a more descriptive name

soh/src/code/z_camera.c

* wip free cam * Almost done, needs collision still * Added free cam behind cvar * added WIP collision * Fixed & implemented "Manual mode" from WW & TP * Fixed camera not rotating when Link is moving * fixed initialized camera rotation * Fixed camera getting stuck + made it smoother * reduced deadzone * fixed epona camera height + added WW z-target free camera * Adjusted player camera height & fixed fov * Fixed camera roll * fixed fov when moving the camera while in z-target * Camera resets to Auto when going through doors or changing maps * Fixed building * touch * more touch work * Added WIP mouse support to the free cam * gui stuff * fixed building * fixed building error * ok fixed building for real this time * oops * Fix compilation issues * removed mouse stuff that magically appeared in this branch * smoothed out stick values & removed remains of mouse support * re-added manual camera when pressing Z * reduced minimum Y position of camera * Addressed dcsv's nitpicks * part 2 * oops Co-authored-by: David Chavez <[email protected]>

This reverts commit 0a24a07.

MelonSpeedruns added 16 commits March 27, 2022 16:15

wip free cam

3cc9b79

Almost done, needs collision still

c060329

Added free cam behind cvar

609dacf

added WIP collision

6278049

Merge branch 'free-cam' into develop

b69e059

Merge pull request #12 from HarbourMasters/develop

3cd66f1

Fetch latest

Fixed & implemented "Manual mode" from WW & TP

31d1c17

Fixed camera not rotating when Link is moving

15adf92

fixed initialized camera rotation

56e7c5c

Fixed camera getting stuck + made it smoother

b849a66

reduced deadzone

0a67b19

fixed epona camera height + added WW z-target free camera

6c8eb95

Adjusted player camera height & fixed fov

ce27458

Fixed camera roll

8c65ecd

Merge branch 'develop' into free-cam

b7a8016

fixed fov when moving the camera while in z-target

ac5d82e

Merge branch 'develop' into free-cam

15d69c5

MelonSpeedruns added 9 commits May 16, 2022 11:38

Camera resets to Auto when going through doors or changing maps

b45f7cc

Fixed building

1d39aaa

touch

12a7038

more touch work

381fd65

Merge branch 'touch' into free-cam

a91bd6a

# Conflicts: # libultraship/libultraship/Controller.cpp # libultraship/libultraship/Controller.h # libultraship/libultraship/Lib/Fast3D/U64/PR/ultra64/controller.h # libultraship/libultraship/UltraController.h

Added WIP mouse support to the free cam

9e48935

gui stuff

78994cb

Merge branch 'HarbourMasters:develop' into develop

895b84d

Merge branch 'HarbourMasters:develop' into develop

bcfddab

dcvz and others added 6 commits July 12, 2022 16:14

Fix compilation issues

83226df

Merge pull request #23 from dcvz/fix/free-camera

5e00c63

Fix compilation issues

removed mouse stuff that magically appeared in this branch

c4cd207

smoothed out stick values & removed remains of mouse support

f6ee51b

re-added manual camera when pressing Z

0bcd478

reduced minimum Y position of camera

d7413f2

dcvz reviewed Jul 12, 2022

View reviewed changes

MelonSpeedruns added 2 commits July 12, 2022 17:29

Addressed dcsv's nitpicks

8f7dd32

part 2

5e41bb5

dcvz reviewed Jul 12, 2022

View reviewed changes

libultraship/libultraship/SDLController.cpp Outdated Show resolved Hide resolved

oops

9cc7e11

dcvz approved these changes Jul 12, 2022

View reviewed changes

MelonSpeedruns requested review from Kenix3, briaguya0, louist103 and m4xw July 12, 2022 21:49

briaguya0 approved these changes Jul 12, 2022

View reviewed changes

Kenix3 approved these changes Jul 12, 2022

View reviewed changes

Kenix3 merged commit 66ec623 into HarbourMasters:develop Jul 12, 2022

MelonSpeedruns deleted the free-cam branch July 12, 2022 23:03

briaguya0 added a commit that referenced this pull request Jul 14, 2022

Revert "Free Camera (#337)"

db4ef99

This reverts commit 0a24a07.

KiritoDv added a commit to KiritoDv/Shipwright that referenced this pull request Jul 17, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Free Camera #337

Free Camera #337

Uh oh!

MelonSpeedruns commented May 15, 2022 •

edited

Loading

Uh oh!

vaguerant commented May 16, 2022 •

edited

Loading

Uh oh!

MelonSpeedruns commented May 16, 2022

Uh oh!

t0mtee commented May 30, 2022

Uh oh!

outerwinnie commented May 30, 2022

Uh oh!

dcvz left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

dcvz left a comment

Uh oh!

briaguya0 left a comment

Uh oh!

briaguya0 Jul 12, 2022

Uh oh!

briaguya0 Jul 12, 2022

Uh oh!

Uh oh!

Free Camera #337

Free Camera #337

Uh oh!

Conversation

MelonSpeedruns commented May 15, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

vaguerant commented May 16, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

MelonSpeedruns commented May 16, 2022

Uh oh!

t0mtee commented May 30, 2022

Uh oh!

outerwinnie commented May 30, 2022

Uh oh!

dcvz left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

dcvz left a comment

Choose a reason for hiding this comment

Uh oh!

briaguya0 left a comment

Choose a reason for hiding this comment

Uh oh!

briaguya0 Jul 12, 2022

Choose a reason for hiding this comment

Uh oh!

briaguya0 Jul 12, 2022

Choose a reason for hiding this comment

Uh oh!

Uh oh!

MelonSpeedruns commented May 15, 2022 •

edited

Loading

vaguerant commented May 16, 2022 •

edited

Loading