Reonucam and camera collision defines #778

Reonu · 2024-04-02T15:38:15Z

This PR adds Reonucam as a define, and additionally, adds a camera collision define for 8 direction camera that also affects Reonucam by extension (but you can toggle either separately)

Will update this in a sec listing all the features of reonucam

REONUCAM FEATURES

Pressing the cbuttons will rotate the camera by 45º as usual
Pressing R+Cbuttons will rotate it smoothly
- If you rotate it smoothly, and then rotate it 45º again, it will re-align itself to 45º automatically
- You can change the speed of the smooth rotation in the pause menu
Tap R once to center the camera behind Mario
Tap R twice to enter Mario cam (as in vanilla mario cam)
Compatible with camera collision
When in water or flying, you can press R at any time to swap between the vanilla swimming/flying cam, or Reonucam (default is vanilla)
You can press R+Cup in order to look down cliffs. The camera will continue being angled down until you let go of both R and C-up. So you can press R+C-up, then let go of C-up but keep holding R, and you'll have a top-down view until you let go of R.
Doesn't use a single button more than the vanilla camera. Perfect for hacks with lots of custom mechanics that might want L and the dpad to be free.

src/game/camera.c

arthurtilly · 2024-04-17T22:09:45Z

src/game/camera.c

@@ -1116,13 +1141,98 @@ s32 snap_to_45_degrees(s16 angle) {
    return angle;
 }

+#ifdef EIGHT_DIR_CAMERA_COLLISION
+void eight_dir_collision_handler(struct Camera *c) {


would like some lines of spacing between parts of the code in this function and the below function, its a little hard to read

mark it as resolved if you think it's ok now

arthurtilly · 2024-04-17T22:10:58Z

src/game/camera.c

 /**
 * A mode that only has 8 camera angles, 45 degrees apart
 */
 void mode_8_directions_camera(struct Camera *c) {
    Vec3f pos;
    s16 oldAreaYaw = sAreaYaw;
-
+#ifdef REONUCAM


for this function i think it might be better if reonucam_handler was expanded to include the other parts of this function and then it would be a replacement for this function rather than being full of ifdefs

makes sense, will look into it tomorrow

still havent done this smh

arthurtilly · 2024-04-17T22:11:18Z

src/game/camera.c

@@ -2882,14 +3003,23 @@ void update_camera(struct Camera *c) {
        // Only process R_TRIG if 'fixed' is not selected in the menu
        if (cam_select_alt_mode(CAM_SELECTION_NONE) == CAM_SELECTION_MARIO) {
            if (gPlayer1Controller->buttonPressed & R_TRIG) {
+#ifdef REONUCAM
+                if (set_cam_angle(0) == CAM_ANGLE_MARIO) {


this should be in the cam handler not here

unless thats not possible with how the cam angle stuff works idk

arthurtilly · 2024-04-17T22:12:25Z

src/game/camera.c

 }

 void play_sound_cbutton_down(void) {
+#ifndef REONUCAM


cleaner (both codewise and optimization wise) to ifdef this whole block and then if reonucam is defined instead do #define play_sound_cbutton_up()

arthurtilly · 2024-04-17T22:12:47Z

src/game/camera.c

@@ -4741,6 +4881,7 @@ void handle_c_button_movement(struct Camera *c) {
    }
 }

+


get this formatting change outta here!!!!!!

I think arceveti took over my pc

arthurtilly · 2024-04-17T22:14:00Z

src/game/camera.c

@@ -5210,7 +5351,11 @@ void set_camera_mode_8_directions(struct Camera *c) {
    if (c->mode != CAMERA_MODE_8_DIRECTIONS) {
        c->mode = CAMERA_MODE_8_DIRECTIONS;
        sStatusFlags &= ~CAM_FLAG_SMOOTH_MOVEMENT;
+#ifdef REONUCAM
+        s8DirModeBaseYaw = snap_to_45_degrees(s8DirModeBaseYaw);
+#else


this seems weird, how do you know what s8DirModeBaseYaw is here? that variable is not used outside of 8 direction camera afaik so i don't know if this has the effect you think it does

I think you're right and this is completely unnecessary

gheskett

Will review this properly tomorrow:tm:, but for now please remove reonucam from the enhancements folder

Reonu · 2024-04-18T08:56:34Z

Will review this properly tomorrow:tm:, but for now please remove reonucam from the enhancements folder

it's already not there in 3.0

gheskett

Sorry this is a lot of mostly nitpicks, but there's some important stuff in here too.

README.md

gheskett · 2024-04-20T01:31:26Z

include/config/config_camera.h

+
+// Enables Reonucam, a custom camera that aims to be a more feature-rich "aglabcam" that doesn't use a single button more than the vanilla camera. 
+// An explanation the features can be seen here: https://www.youtube.com/watch?v=TQNkznX9Z3k (please note that the analog feature shown at the end is no longer present)
+//#define REONUCAM


Nit: // #define REONUCAM (the space)

gheskett · 2024-04-20T01:36:58Z

include/config/config_safeguards.h

+    #ifndef USE_COURSE_DEFAULT_MODE
+    #define USE_COURSE_DEFAULT_MODE
+    #endif


Nit: #undef here instead

include/config/config_safeguards.h

src/game/ingame_menu.c

src/game/camera.c

gheskett · 2024-04-20T02:05:25Z

src/game/ingame_menu.c

+    } else if (gPlayer1Controller->buttonPressed & L_JPAD) {
+        gReonucamState.speed--;
+    }
+    gReonucamState.speed = (gReonucamState.speed + 5) % 5;


Can you extern cameraSpeeds, give it a hard size (5), and use ARRAY_COUNT here instead? Would make configuring camera speeds safer. Also rename it to gReonucamSpeeds or something less generic.

src/game/camera.c

gheskett · 2024-04-20T14:41:02Z

include/config/config_camera.h

@@ -58,7 +58,7 @@
 /**
 * Enables Puppy Camera 2, a rewritten camera that can be freely configured and modified.
 */
-// #define PUPPYCAM
+//#define PUPPYCAM


Probably should have been a bit more clear; the commented defines in the other files do use a space here. Space is also better because it's consistent with VSCode's commenting shortcut (Ctrl + /).

gheskett · 2024-04-20T14:42:04Z

include/config/config_camera.h

+// Enables Reonucam, a custom camera that aims to be a more feature-rich "aglabcam" that doesn't use a single button more than the vanilla camera. 
+// An explanation the features can be seen here: https://www.youtube.com/watch?v=TQNkznX9Z3k (please note that the analog feature shown at the end is no longer present)


Missed this last time, but this should use a block comment rather than line comments like the rest of the file.

reonucam initial commit

88dfc23

Reonu added the do not merge Do not merge (yet) label Apr 2, 2024

Reonu added this to the 3.0 milestone Apr 2, 2024

Reonu self-assigned this Apr 2, 2024

Reonu added 4 commits April 2, 2024 16:43

delete text_srings.h.in file

9caac98

removed oudated config info

ad5d751

cleaner printing code + multilang

bbd23d5

add camera collision

6ec51dc

Reonu marked this pull request as ready for review April 17, 2024 20:26

Reonu requested a review from gheskett as a code owner April 17, 2024 20:26

Reonu changed the title ~~[DO NOT MERGE] reonucam~~ Reonucam and camera collision defines Apr 17, 2024

Reonu added 2 commits April 17, 2024 21:45

add comment

52f8488

cast the ray from 300 units above mario

dfab25b

Reonu added enhancement New feature or request monkaS monkaS and removed do not merge Do not merge (yet) labels Apr 17, 2024

Reonu added 5 commits April 17, 2024 22:58

set default camera speed to medium

137af2c

add comment

367d2eb

clarify config_camera stuff

b6ca569

put safewuards in the right place

3cab72c

update french reonucam text

f842bc5

arthurtilly reviewed Apr 17, 2024

View reviewed changes

src/game/camera.c Outdated Show resolved Hide resolved

arthurtilly reviewed Apr 17, 2024

View reviewed changes

remove unnecesary define and fix flying

6593a03

Reonu added 2 commits April 17, 2024 23:48

fix spacing

5ae9364

add japanese text

455d013

gheskett requested changes Apr 18, 2024

View reviewed changes

Reonu added 3 commits April 18, 2024 09:57

remove formatting change

3d0b1e5

update readme

97c1e29

update readme again

cb7c949

gheskett requested changes Apr 20, 2024

View reviewed changes

Reonu added 4 commits April 20, 2024 11:08

Fix capitalization

78a9e66

fix space

d954465

remove unnecessary ifdefs

fcd9efd

address requested changes

5a43423

gheskett requested changes Apr 20, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Reonucam and camera collision defines #778

Reonucam and camera collision defines #778

Reonu commented Apr 2, 2024 •

edited

Loading

arthurtilly Apr 17, 2024

Reonu Apr 17, 2024

arthurtilly Apr 17, 2024

Reonu Apr 17, 2024

arthurtilly Jun 1, 2024

arthurtilly Apr 17, 2024

arthurtilly Apr 17, 2024

arthurtilly Apr 17, 2024

arthurtilly Apr 17, 2024

Reonu Apr 17, 2024

arthurtilly Apr 17, 2024

Reonu Apr 17, 2024

gheskett left a comment

Reonu commented Apr 18, 2024

gheskett left a comment

gheskett Apr 20, 2024

gheskett Apr 20, 2024

gheskett Apr 20, 2024

gheskett Apr 20, 2024

gheskett Apr 20, 2024

		@@ -4741,6 +4881,7 @@ void handle_c_button_movement(struct Camera *c) {
		}
		}

		// Enables Reonucam, a custom camera that aims to be a more feature-rich "aglabcam" that doesn't use a single button more than the vanilla camera.
		// An explanation the features can be seen here: https://www.youtube.com/watch?v=TQNkznX9Z3k (please note that the analog feature shown at the end is no longer present)

Reonucam and camera collision defines #778

Are you sure you want to change the base?

Reonucam and camera collision defines #778

Conversation

Reonu commented Apr 2, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

gheskett left a comment

Choose a reason for hiding this comment

Reonu commented Apr 18, 2024

gheskett left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Reonu commented Apr 2, 2024 •

edited

Loading