Skip to content

[#80] Fix for goron spin on wake up animation#1714

Merged
dcvz merged 1 commit intoHarbourMasters:developfrom
garrettjoecox:80-goron-spin-fix
Oct 10, 2022
Merged

[#80] Fix for goron spin on wake up animation#1714
dcvz merged 1 commit intoHarbourMasters:developfrom
garrettjoecox:80-goron-spin-fix

Conversation

@garrettjoecox
Copy link
Contributor

@garrettjoecox garrettjoecox commented Oct 9, 2022

Left a comment with explanation.

I personally would like this to have been fixed at a lower level but I went as deep as I could to find the interpolation method SkelAnime_InterpFrameTable and couldn't find any issues with it, or anything pointing to why this is inconsistent with hardware.

Also some-what similar to the attempted fix in #897 cc @leggettc18

@leggettc18
Copy link
Contributor

leggettc18 commented Oct 10, 2022 •
edited
Loading

Does this still allow the gorons to morph between their getting up and curling up animations smoothly if you walk away before they finish either animation? The first time I tried to fix this, I did a similar thing but it broke the transition between those animations. Yours is subtly different in a way that I think wouldn't cause the same issue but want to be sure we've checked for that.

@garrettjoecox
Copy link
Contributor Author

garrettjoecox commented Oct 10, 2022

Does this still allow the gorons to morph between their getting up and curling up animations smoothly if you walk away before they finish either animation? The first time I tried to fix this, I did a similar thing but it broke the transition between those animations. Yours is subtly different in a way that I think wouldn't cause the same issue but want to be sure we've checked for that.

Yes, the check for this->skelAnime.curFrame == 0.0f is the key point here, we only use the "fixed" animations (0/13) when an animation is not playing at all, meaning they are rolled up on the ground. If an animation is in progress it uses the original animations, which morph properly

aMannus
aMannus approved these changes Oct 10, 2022
View reviewed changes
Copy link
Contributor

@aMannus aMannus left a comment •
edited
Loading

Choose a reason for hiding this comment

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

Confirmed in-game this fixes it, including when gorons switch state mid-animation. Nice job!

@dcvz dcvz merged commit 14543d5 into HarbourMasters:develop Oct 10, 2022
@aMannus aMannus mentioned this pull request Oct 10, 2022
Closed
@briaguya0
Copy link
Contributor

briaguya0 commented Oct 11, 2022 •
edited
Loading

@Mergifyio backport develop-zhora

mergify bot pushed a commit that referenced this pull request Oct 11, 2022
@garrettjoecox @mergify
[#80] Fix for goron spin on wake up animation (#1714)
1f9c277 
(cherry picked from commit 14543d5)
@mergify mergify bot mentioned this pull request Oct 11, 2022
Merged
@mergify
Copy link
Contributor

mergify bot commented Oct 11, 2022

backport develop-zhora

✅ Backports have been created

Details

1 similar comment
@mergify
Copy link
Contributor

mergify bot commented Oct 11, 2022

backport develop-zhora

✅ Backports have been created

Details

dcvz pushed a commit that referenced this pull request Oct 11, 2022
@mergify
[#80] Fix for goron spin on wake up animation (#1714) (#1746)
83541f4
Kenix3 pushed a commit to Kenix3/Shipwright that referenced this pull request Oct 19, 2022
@garrettjoecox @Kenix3
[HarbourMasters#80] Fix for goron spin on wake up animation (HarbourM…
ccde658 
…asters#1714)
@garrettjoecox garrettjoecox deleted the 80-goron-spin-fix branch October 19, 2022 13:52
leggettc18 pushed a commit to leggettc18/Shipwright that referenced this pull request Oct 19, 2022
@garrettjoecox @leggettc18
[HarbourMasters#80] Fix for goron spin on wake up animation (HarbourM…
ecfbef8 
…asters#1714)
leggettc18 pushed a commit to leggettc18/Shipwright that referenced this pull request Oct 19, 2022
@garrettjoecox @leggettc18
[HarbourMasters#80] Fix for goron spin on wake up animation (HarbourM…
46a3a56 
…asters#1714)
th-2021 pushed a commit to th-2021/Shipwright-cmake that referenced this pull request Nov 28, 2022
@garrettjoecox @th-2021
[HarbourMasters#80] Fix for goron spin on wake up animation (HarbourM…
ae643d7 
…asters#1714)
th-2021 pushed a commit to th-2021/Shipwright-cmake that referenced this pull request Nov 28, 2022
@garrettjoecox @th-2021
[HarbourMasters#80] Fix for goron spin on wake up animation (HarbourM…
fe47a67 
…asters#1714)
th-2021 pushed a commit to th-2021/Shipwright-cmake that referenced this pull request Nov 28, 2022
@garrettjoecox @th-2021
[HarbourMasters#80] Fix for goron spin on wake up animation (HarbourM…
03b8087 
…asters#1714)
th-2021 pushed a commit to th-2021/Shipwright-cmake that referenced this pull request Nov 28, 2022
@garrettjoecox @th-2021
[HarbourMasters#80] Fix for goron spin on wake up animation (HarbourM…
afda474 
…asters#1714)
@Archez Archez mentioned this pull request May 8, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@aMannus aMannus aMannus approved these changes

+1 more reviewer

@dcvz dcvz dcvz approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

merge ready

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@garrettjoecox @leggettc18 @briaguya0 @dcvz @aMannus