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.

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

[3.x] Additive Animation Fix (and Sub2 node feature) #76310

Open
wants to merge 21 commits into
base: 3.x
Choose a base branch
from
Open

[3.x] Additive Animation Fix (and Sub2 node feature) #76310

wants to merge 21 commits into from
+163 −28

Commits on Jan 20, 2024

  1. Additive Animation Fix! 

    Adds the Add2 option: Add directly.
Default behaviour is current behaviour to preserve backwards compat.
New node Sub2 subtracts pose.
Doesnt change any existing nodes.

This is a messy commit and news some polish but is is a good
first draft.
Use blender NLA to test
what additive animations should
look like :-)
    @Riordan-DC
    Riordan-DC authored and Riordan-DC committed Jan 20, 2024
    Configuration menu
    Copy the full SHA
    693828c View commit details
    Browse the repository at this point in the history

  2. fixed file formatting and removed old comments.

    @Riordan-DC
    Riordan-DC committed Jan 20, 2024
    Configuration menu
    Copy the full SHA
    f080d8b View commit details
    Browse the repository at this point in the history

  3. changed code formatting again.

    @Riordan-DC
    Riordan-DC committed Jan 20, 2024
    Configuration menu
    Copy the full SHA
    4208073 View commit details
    Browse the repository at this point in the history

  4. editor to code format specs

    @Riordan-DC
    Riordan-DC committed Jan 20, 2024
    Configuration menu
    Copy the full SHA
    80bc684 View commit details
    Browse the repository at this point in the history

  5. Reworking in progress. Todo: testing.

    @Riordan-DC
    Riordan-DC authored and Riordan-DC committed Jan 20, 2024
    Configuration menu
    Copy the full SHA
    e0a77b2 View commit details
    Browse the repository at this point in the history

  6. Fixed issue with negative blend weights. 

    Tested with a blend tree with blend spaces as leaves instead
of animation nodes.
This means we have to pass use_blend
flag to animation state inside
_blend_node instead
of blend_input.
    @Riordan-DC
    Riordan-DC committed Jan 20, 2024
    Configuration menu
    Copy the full SHA
    adce1a3 View commit details
    Browse the repository at this point in the history

  7. Removed trailing whitespace from my comment.

    @Riordan-DC
    Riordan-DC committed Jan 20, 2024
    Configuration menu
    Copy the full SHA
    c342f6c View commit details
    Browse the repository at this point in the history

  8. Removed unneeded newline.

    @Riordan-DC
    Riordan-DC committed Jan 20, 2024
    Configuration menu
    Copy the full SHA
    a474403 View commit details
    Browse the repository at this point in the history

  9. Added / modified documentation

    @Riordan-DC
    Riordan-DC committed Jan 20, 2024
    Configuration menu
    Copy the full SHA
    4fac7e7 View commit details
    Browse the repository at this point in the history

  10. Fixed typo

    @Riordan-DC
    Riordan-DC committed Jan 20, 2024
    Configuration menu
    Copy the full SHA
    c23a91a View commit details
    Browse the repository at this point in the history

  11. Updating method binds

    @Riordan-DC
    Riordan-DC committed Jan 20, 2024
    Configuration menu
    Copy the full SHA
    9797dba View commit details
    Browse the repository at this point in the history

  12. Fixed typos. Thanks.

    @Riordan-DC
    Riordan-DC committed Jan 20, 2024
    Configuration menu
    Copy the full SHA
    1beedfe View commit details
    Browse the repository at this point in the history

  13. Update scene/animation/animation_blend_tree.cpp 

    Thanks!

Co-authored-by: A Thousand Ships <[email protected]>
    @Riordan-DC @AThousandShips
    Riordan-DC and AThousandShips committed Jan 20, 2024
    Configuration menu
    Copy the full SHA
    cb2dca3 View commit details
    Browse the repository at this point in the history

  14. Update scene/animation/animation_blend_tree.h 

    Thanks!

Co-authored-by: A Thousand Ships <[email protected]>
    @Riordan-DC @AThousandShips
    Riordan-DC and AThousandShips committed Jan 20, 2024
    Configuration menu
    Copy the full SHA
    1c6b820 View commit details
    Browse the repository at this point in the history

  15. Update scene/animation/animation_tree.cpp 

    Co-authored-by: A Thousand Ships <[email protected]>
    @Riordan-DC @AThousandShips
    Riordan-DC and AThousandShips authored Jan 20, 2024
    Configuration menu
    Copy the full SHA
    04b7de8 View commit details
    Browse the repository at this point in the history

  16. Update scene/animation/animation_blend_tree.h 

    Co-authored-by: A Thousand Ships <[email protected]>
    @Riordan-DC @AThousandShips
    Riordan-DC and AThousandShips authored Jan 20, 2024
    Configuration menu
    Copy the full SHA
    9ac2e21 View commit details
    Browse the repository at this point in the history

  17. Update scene/animation/animation_tree.cpp 

    Co-authored-by: A Thousand Ships <[email protected]>
    @Riordan-DC @AThousandShips
    Riordan-DC and AThousandShips authored Jan 20, 2024
    Configuration menu
    Copy the full SHA
    a050366 View commit details
    Browse the repository at this point in the history

  18. Update scene/animation/animation_tree.cpp 

    Co-authored-by: A Thousand Ships <[email protected]>
    @Riordan-DC @AThousandShips
    Riordan-DC and AThousandShips authored Jan 20, 2024
    Configuration menu
    Copy the full SHA
    9a141cd View commit details
    Browse the repository at this point in the history

  19. Update scene/animation/animation_tree.cpp 

    Co-authored-by: A Thousand Ships <[email protected]>
    @Riordan-DC @AThousandShips
    Riordan-DC and AThousandShips authored Jan 20, 2024
    Configuration menu
    Copy the full SHA
    a08805c View commit details
    Browse the repository at this point in the history

  20. Update doc/classes/AnimationNodeAdd2.xml 

    Co-authored-by: A Thousand Ships <[email protected]>
    @Riordan-DC @AThousandShips
    Riordan-DC and AThousandShips authored Jan 20, 2024
    Configuration menu
    Copy the full SHA
    6e88232 View commit details
    Browse the repository at this point in the history

  21. Simplified condition

    @Riordan-DC
    Riordan-DC committed Jan 20, 2024
    Configuration menu
    Copy the full SHA
    ae65ce4 View commit details
    Browse the repository at this point in the history