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

Import all Mario animations button. #182

Merged
merged 2 commits into from
Nov 27, 2022
Merged

Import all Mario animations button. #182

merged 2 commits into from
Nov 27, 2022

Conversation

Lilaa3
Copy link
Collaborator

@Lilaa3 Lilaa3 commented Nov 24, 2022

Added a button to import all of mario´s animations easily and with naming.

Commented out an uncessary print at readValueIndex that was slowing down animation import times by about 4 times on my machine.

Added a button to import all of mario´s animations easily and with naming.

Commented out an uncessary print at readValueIndex that was slowing down animation import times by about 4 times on my machine.

marioAnimations = [
# ( "animation name", "adress" ),
( "0 - Climb up ledge (right leg going up)", 5162640 ),
Copy link
Contributor

Choose a reason for hiding this comment

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

this file is formatted, so to keep things simple we should just keep it that way
I understand formatting breaks the column layout you have going on, so what about you swap the columns:

marioAnimations = [
    # (address, "animation name"),
    (5162640, "0 - Climb up ledge (right leg going up)"),
    (5165520, "1 - Thrown from painting"),
    (5165544, "2 - Blown by wind"),

(this is after formatting)

Copy link
Contributor

Choose a reason for hiding this comment

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

Also could you indicate which rom are these addresses for? unless all roms of sm64 are alike
(I'm a OoT enjoyer and there are many ROM versions from where I come 8) )

Copy link
Collaborator Author

@Lilaa3 Lilaa3 Nov 26, 2022

Choose a reason for hiding this comment

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

I used a script to generate the table so I can fix the formatting easily, the adresses should be consistent across versions I´m pretty sure? Either way you can´t import without an expended rom at the moment, and to get that you need to use the US version.

fast64_internal/sm64/sm64_anim.py Outdated Show resolved Hide resolved
Fixed formating, swapped segmentData reference for an empty dict as this data is not needed for importing Mario´s animations.
@Dragorn421 Dragorn421 added test please Ask that some other Fast64 dev tests the feature/... sm64 Has to do with the Super Mario 64 side labels Nov 26, 2022
Copy link
Contributor

@Dragorn421 Dragorn421 left a comment

Choose a reason for hiding this comment

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

can (has) any sm64 enjoyer test(ed) this? 😎

@Lilaa3
Copy link
Collaborator Author

Lilaa3 commented Nov 26, 2022

ive tested it, it works.
https://youtu.be/jlsOuw1uQts a test with a clean mario geo.
i also tested it on personal variations, it in fact works perfectly, i havent tested it on the ik rig but assuming it was made with animation importing in mind it will work.

@Dragorn421
Copy link
Contributor

Ideally testing is carried out by a different person from the person who made the feature, but since this is simple I'm okay with going ahead like this

I'll merge in a few days to give some time for feedback just in case

@Dragorn421 Dragorn421 added the merge soon Will be merged in a few days at most if nothing else comes up label Nov 26, 2022
@jesusyoshi54
Copy link
Collaborator

I have tested the latest commit and can confirm that it works

@Dragorn421 Dragorn421 merged commit f7032e2 into Fast-64:main Nov 27, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merge soon Will be merged in a few days at most if nothing else comes up sm64 Has to do with the Super Mario 64 side test please Ask that some other Fast64 dev tests the feature/...
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants