Fix: Pose Height/Animation Fixes#1149
Open
tylerreese543-lab wants to merge 2 commits intosmartcmd:mainfrom
Open
Fix: Pose Height/Animation Fixes#1149tylerreese543-lab wants to merge 2 commits intosmartcmd:mainfrom
tylerreese543-lab wants to merge 2 commits intosmartcmd:mainfrom
Conversation
Fixed boat heights + small model item holding when on boats. Added boat height fix for small models.
3UR
suggested changes
Mar 13, 2026
Contributor
3UR
left a comment
3UR
left a comment
There was a problem hiding this comment.
There should really only be 3 lines changed for this everything else is unnecessary.
| _init(g,yOffset,texWidth,texHeight); | ||
| } | ||
|
|
||
| bool HumanoidModel::bitmaskEnabled(unsigned int uiBitmask, animbits bit) |
|
|
||
| } | ||
| else if(uiBitmaskOverrideAnim&(1<<eAnim_ArmsOutFront)) | ||
| else if(bitmaskEnabled(uiBitmaskOverrideAnim, eAnim_ArmsOutFront)) |
| // Does the skin have an override for anim? | ||
|
|
||
| if(uiBitmaskOverrideAnim&(1<<eAnim_ArmsDown)) | ||
| if(bitmaskEnabled(uiBitmaskOverrideAnim, eAnim_ArmsDown)) |
| arm1->zRot = 0.0f; | ||
| } | ||
| else if(uiBitmaskOverrideAnim&(1<<eAnim_SingleArms)) | ||
| else if(bitmaskEnabled(uiBitmaskOverrideAnim, eAnim_SingleArms)) |
| } | ||
| // 4J-PB - Weeping Angel - does't look good holding something in the arm that's up | ||
| else if((uiBitmaskOverrideAnim&(1<<eAnim_StatueOfLiberty)) && (holdingRightHand==0) && (attackTime==0.0f)) | ||
| else if(bitmaskEnabled(uiBitmaskOverrideAnim, eAnim_StatueOfLiberty) && (holdingRightHand==0) && (attackTime==0.0f)) |
| { | ||
| if(uiBitmaskOverrideAnim&(1<<eAnim_SmallModel) == 0) | ||
| //Fix this later | ||
| if(bitmaskEnabled(uiBitmaskOverrideAnim, eAnim_SmallModel) || bitmaskEnabled(uiBitmaskOverrideAnim, eAnim_SingleLegs)) |
Contributor
There was a problem hiding this comment.
This is wrong too, I will attach a screenshot of how the fix should actually be done for riding (This was decompiled and is the exact fix 4J studios did.)
| leg1->yRot = -HALF_PI * 0.2f; | ||
| } | ||
| else if(uiBitmaskOverrideAnim&(1<<eAnim_NoLegAnim)) | ||
| else if(bitmaskEnabled(uiBitmaskOverrideAnim, eAnim_NoLegAnim)) |
| leg1->yRot = 0.0f; | ||
| } | ||
| else if(uiBitmaskOverrideAnim&(1<<eAnim_SingleLegs)) | ||
| else if(bitmaskEnabled(uiBitmaskOverrideAnim, eAnim_SingleLegs)) |
| arm0->yRot += body->yRot * 2.0f; | ||
|
|
||
| if((uiBitmaskOverrideAnim&(1<<eAnim_StatueOfLiberty))&& (holdingRightHand==0) && (attackTime==0.0f)) | ||
| if(bitmaskEnabled(uiBitmaskOverrideAnim, eAnim_StatueOfLiberty) && (holdingRightHand==0) && (attackTime==0.0f)) |
| if (sneaking) | ||
| { | ||
| if(uiBitmaskOverrideAnim&(1<<eAnim_SmallModel)) | ||
| if(bitmaskEnabled(uiBitmaskOverrideAnim, eAnim_SmallModel)) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
Fixes the sneak height so the player doesn't float when they sneak. I might merge this with other fixes like boats in the future.
Fixes the boat height / animation for both large and small models.
Changes
Previous Behavior
Player floated when they crouched.
Player floated on boat, and legs were together.
Root Cause
Their height in the render script did not go down upon sneak.
Simply did not have the animation code proper.
New Behavior
Added that functionality.
Fixed the improper animation code. Sitting/Riding animations work properly, and small models are positioned correctly.
Fix Implementation
Replaced "yp" in PlayerRenderer::render, to go down upon sneak. I'm not entirely sure why it blocked sneaking in the first place.
Added a new bitmaskEnabled() function for getBitmaskOverride [localized, cleaned up, readability]
Re-worked boat riding
Added translation for item holding when small models are in a boat.
AI Use Disclosure
Related Issues