Skip to content
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.

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

Ifdef several collision changes from vanilla + improved debug free move #794

Open
wants to merge 26 commits into
base: develop/2.4.0
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 24 commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
26e0daf
Add COLLISION_IMPROVEMENTS define, implement ROUNDED_WALL_CORNERS and…
Arceveti Feb 15, 2024
02f524b
Add SLOPE_FIX define and remove add_ceil_margin
Arceveti Feb 22, 2024
21d3c14
Avoid calculating FIND_FLOOR_BUFFER twice
Arceveti Feb 22, 2024
96f19dc
Make find_ceil consistent with find_floor
Arceveti Feb 22, 2024
b001875
Improved debug free move
Arceveti Feb 23, 2024
d9ac2bf
Implement EXPOSED_CEILINGS_FIX and DISABLE_CEILING_BONKS defines
Arceveti Feb 23, 2024
b247c4d
Improve SLOPE_FIX ifdefs + small optimization
Arceveti Feb 23, 2024
abfe05b
Improve define descriptions
Arceveti Feb 23, 2024
93dceb1
Fix Mario getting stuck squished if entering debug free move
Arceveti Feb 23, 2024
182c4fd
Improve collision define comments
Arceveti Feb 23, 2024
3d677ec
Revert removal of 78 unit buffer for ceiling checks
Arceveti Feb 23, 2024
068f9a5
Rename 'EXPOSED_CEILINGS_FIX' to 'FIX_EXPOSED_CEILINGS'
Arceveti Feb 23, 2024
d670157
Revert reverting ceiling buffer
Arceveti Feb 23, 2024
6a3e2f6
Move 'DISABLE_CEILING_BONKS' to config_movement.h
Arceveti Feb 23, 2024
ac663c4
Implement SIMULTANEOUS_WALL_COLLISIONS (maybe)
Arceveti Feb 23, 2024
032316a
Fix SIMULTANEOUS_WALL_COLLISIONS ifdef
Arceveti Feb 23, 2024
eb3a4bf
Remove SIMULTANEOUS_WALL_COLLISIONS
Arceveti Feb 23, 2024
751854d
bounds check comments
Arceveti Feb 27, 2024
d1ad8b3
Add FIX_FALSE_LEDGE_GRABS define (not implemented yet)
Arceveti Feb 27, 2024
2565dc7
Improve check ordering
Arceveti Feb 27, 2024
2239f1c
Rename 'SLOPE_FIX' to 'FIX_SURFACE_CUCKING'
Arceveti Mar 2, 2024
0dbd237
Remove FIX_SURFACE_CUCKING define + variable renames
Arceveti Mar 3, 2024
9717468
Move defines into config_movement.h
Arceveti Mar 3, 2024
ed921b2
Merge branch 'develop/2.3.0' of https://github.com/HackerN64/HackerSM…
Arceveti Apr 29, 2024
da74568
Cleaner 'FIX_EXPOSED_CEILINGS' ifdef
Arceveti Apr 29, 2024
57a648e
Formatting changes :)
Arceveti May 1, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 17 additions & 1 deletion include/config/config_movement.h
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,11 @@
*/
#define DONT_LEDGE_GRAB_STEEP_SLOPES

/**
* Disables bonking on sloped ceilings by separating the handling of ceiling interactions and wall interactions.
*/
#define DISABLE_CEILING_BONKS

/**
* Buffers an A input if you jump off a slope during the landing lag
*/
Expand All @@ -128,7 +133,7 @@
*/
// #define WATER_PLUNGE_UPWARP

/**
/**
* This bug allows mario to move when initiating a dialog,
* just as long as mario doesn't enter an action that can
* be interrupted with text
Expand All @@ -141,3 +146,14 @@
*/
#define MARIO_INERTIA_UPWARD
// #define MARIO_INERTIA_LATERAL

/**
* Improves the handling of convex wall corners by rounding wall collision at triangle edges to close the seams.
* Also properly handles simultaneous collisions with multiple walls (eg. concave wall corners or narrow tunnels).
*/
#define ROUNDED_WALL_CORNERS
/**
Copy link
Collaborator

Choose a reason for hiding this comment

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

Missing newline

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Fixed

* Fixes an issue where entering an area above a ceiling without an intermediate floor would count as hitting a ceiling.
* NOTE: This may allow Mario to clip through the wall on the deck of the the rocking JRB ship.
*/
#define FIX_EXPOSED_CEILINGS
Copy link
Collaborator

Choose a reason for hiding this comment

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

Wouldn't it make more sense to throw these into config_collision.h? Argument could be made for ceiling bonks too but that one's debatable.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Moved those two

1 change: 1 addition & 0 deletions include/surface_terrains.h
Original file line number Diff line number Diff line change
Expand Up @@ -257,6 +257,7 @@ enum SurfaceFlags {
SURFACE_FLAGS_NONE = (0 << 0), // 0x0000
SURFACE_FLAG_DYNAMIC = (1 << 0), // 0x0001
SURFACE_FLAG_NO_CAM_COLLISION = (1 << 1), // 0x0002
SURFACE_FLAG_X_PROJECTION = (1 << 3), // 0x0008
Copy link
Collaborator

Choose a reason for hiding this comment

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

Why skip a number?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

That's how it was in vanilla, this just restores it. Should it be changed to (1 << 2)?

Copy link
Collaborator

Choose a reason for hiding this comment

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

Yeah it just makes more sense

};

// These are effectively unique "surface" types like those defined higher
Expand Down
Loading