Skip to content

Reonucam and camera collision defines #778

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Open
Reonu wants to merge 36 commits into
base: develop/3.0.0
Choose a base branch
from
Open

Reonucam and camera collision defines #778

Reonu wants to merge 36 commits into from

Conversation

@Reonu
Copy link
Contributor

@Reonu Reonu commented Apr 2, 2024 •
edited
Loading

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.

@Reonu Reonu added the do not merge Do not merge (yet) label Apr 2, 2024
@Reonu Reonu added this to the 3.0 milestone Apr 2, 2024
@Reonu Reonu self-assigned this Apr 2, 2024
@Reonu Reonu marked this pull request as ready for review April 17, 2024 20:26
@Reonu Reonu requested a review from gheskett as a code owner April 17, 2024 20:26
@Reonu Reonu changed the title [DO NOT MERGE] reonucam Reonucam and camera collision defines Apr 17, 2024
@Reonu Reonu added enhancement New feature or request monkaS monkaS and removed do not merge Do not merge (yet) labels Apr 17, 2024
arthurtilly
arthurtilly reviewed Apr 17, 2024
View reviewed changes
arthurtilly
arthurtilly reviewed Apr 17, 2024
View reviewed changes
arthurtilly
arthurtilly reviewed Apr 17, 2024
View reviewed changes
src/game/camera.c
Vec3f pos;
s16 oldAreaYaw = sAreaYaw;

#ifdef REONUCAM
Copy link
Collaborator

@arthurtilly arthurtilly Apr 17, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

Copy link
Contributor Author

@Reonu Reonu Apr 17, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

makes sense, will look into it tomorrow

Copy link
Collaborator

@arthurtilly arthurtilly Jun 1, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

still havent done this smh

Copy link
Contributor Author

@Reonu Reonu Feb 13, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this ok now @arthurtilly

arthurtilly
arthurtilly reviewed Apr 17, 2024
View reviewed changes
arthurtilly
arthurtilly reviewed Apr 17, 2024
View reviewed changes
arthurtilly
arthurtilly reviewed Apr 17, 2024
View reviewed changes
arthurtilly
arthurtilly reviewed Apr 17, 2024
View reviewed changes
gheskett
gheskett requested changes Apr 18, 2024
View reviewed changes
Copy link
Collaborator

@gheskett gheskett left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

@Reonu
Copy link
Contributor Author

Reonu commented Apr 18, 2024

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
gheskett requested changes Apr 20, 2024
View reviewed changes
Copy link
Collaborator

@gheskett gheskett left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

gheskett
gheskett requested changes Apr 20, 2024
View reviewed changes
@arthurtilly
Copy link
Collaborator

arthurtilly commented Jan 30, 2025

Bro NEEDS to finish reonucam!

@mountainflaw
Copy link
Contributor

mountainflaw commented Jan 30, 2025

http://reonu.cam/

@arthurtilly
Copy link
Collaborator

arthurtilly commented Feb 5, 2025

Can you believe it guys? Reonucam, just a year away!

@Reonu
Copy link
Contributor Author

Reonu commented Feb 5, 2025

I'll finish this when the chaos comp is over, sorry

@arthurtilly
Copy link
Collaborator

arthurtilly commented Feb 5, 2025

Beonu

@gheskett
Copy link
Collaborator

gheskett commented Feb 5, 2025

🅱️eonu

@Reonu Reonu force-pushed the develop/3.0.0-reonucam branch from 5a43423 to 725596d Compare February 13, 2025 15:02
@Reonu
Copy link
Contributor Author

Reonu commented Feb 13, 2025

Should be ok to re-review now @arthurtilly @gheskett

gheskett
gheskett requested changes Feb 14, 2025
View reviewed changes
Copy link
Collaborator

@gheskett gheskett left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Got some more for you :)

include/config/config_camera.h
*/
// #define PUPPYCAM
#define PARALLEL_LAKITU_CAM
/**
Copy link
Collaborator

@gheskett gheskett Feb 14, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wants a newline.

include/config/config_safeguards.h
Comment on lines +145 to +148
#ifdef USE_COURSE_DEFAULT_MODE
#undef USE_COURSE_DEFAULT_MODE
#define USE_COURSE_DEFAULT_MODE
#endif
Copy link
Collaborator

@gheskett gheskett Feb 14, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this doing what you think it's doing? This code seems completely useless lol.

I assume what you meant to do was force camera default mode to always be on, in which case just get rid of the ifdef/endif lines completely. Same goes for the 4 lines after this, only that ifdef is actually not broken this time so it matters a bit less lol.

include/config/config_camera.h
#define PARALLEL_LAKITU_CAM
/**
* 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)
Copy link
Collaborator

@gheskett gheskett Feb 14, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"An explanation OF the features..."

src/game/camera.c
eight_dir_collision_handler(c);
#endif
set_camera_height(c, pos[1]);
#endif
Copy link
Collaborator

@gheskett gheskett Feb 14, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: inconsistent indentation (also add a comment clarifying it's a REONUCAM endif)

@Reonu
Copy link
Contributor Author

Reonu commented Mar 4, 2025

Please direct all future bullying to @arthurtilly until further notice since he is now in charge of fixing the collision code

@arthurtilly
Copy link
Collaborator

arthurtilly commented Mar 4, 2025

Reminder that reonu has had review feedback on the vertical rooms PR since July 2022 and has not touched it

@Reonu
Copy link
Contributor Author

Reonu commented Mar 4, 2025

Lies and deceit

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@gheskett gheskett gheskett requested changes

@arthurtilly arthurtilly Awaiting requested review from arthurtilly arthurtilly is a code owner

Requested changes must be addressed to merge this pull request.

Assignees

@Reonu Reonu

@arthurtilly arthurtilly

Labels

enhancement New feature or request monkaS monkaS

Projects

3.0 (Major Feature Update)
Status: In progress

Milestone

3.0

Development

Successfully merging this pull request may close these issues.

4 participants

@Reonu @arthurtilly @mountainflaw @gheskett