Implement AnimationNodeSub2 to AnimationTree and allow less or greater value in mathematical AnimationNode
#76616
+135
−60
Conversation
This file contains 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
TokageItLab
force-pushed
the
implement-anim-node-sub2
branch
from
e3290f9
to
5502bc9
Compare
TokageItLab
commented
Apr 30, 2023
| @@ -281,7 +281,7 @@ double AnimationNode::_blend_node(const StringName &p_subpath, const Vector<Stri | |||
| if (r_max) { | |||
| *r_max = 0; | |||
| for (int i = 0; i < blend_count; i++) { | |||
| *r_max = MAX(*r_max, blendw[i]); | |||
| *r_max = MAX(*r_max, Math::abs(blendw[i])); | |||
There was a problem hiding this comment.
Fixed a problem in which graph lines were not colored when blend values were negative, even though blending occurred. This r_max only affects the activity value and not the actual blend value.
TokageItLab
force-pushed
the
implement-anim-node-sub2
branch
4 times, most recently
from
69db072
to
8964743
Compare
TokageItLab
force-pushed
the
implement-anim-node-sub2
branch
from
8964743
to
3002d46
Compare
TokageItLab
changed the title
AnimationNodeSub2 to AnimationTreeAnimationNodeSub2 to AnimationTree and allow less or greater value in AnimationNodeAdd2/3
TokageItLab
force-pushed
the
implement-anim-node-sub2
branch
from
3002d46
to
8cb2536
Compare
|
I remembered that the extracted additive animations are useful for amplification and knockback by using outside the 0~1 range blending, so I allowed them in Add2/3. Godot.2023.05.25.-.15.36.24.02.mp4Also, for consistency, it is applied to Blend2/3 & Sub2. Their calculations are meaningful and can be used for quick blending with amplified or inverted animations like a video in #63369. |
TokageItLab
changed the title
AnimationNodeSub2 to AnimationTree and allow less or greater value in AnimationNodeAdd2/3AnimationNodeSub2 to AnimationTree and allow less or greater value in mathematical AnimationNode
TokageItLab
force-pushed
the
implement-anim-node-sub2
branch
3 times, most recently
from
d5c6c5d
to
9673291
Compare
MewPurPur
reviewed
May 26, 2023
TokageItLab
force-pushed
the
implement-anim-node-sub2
branch
7 times, most recently
from
2ed8c40
to
ead4886
Compare
TokageItLab
force-pushed
the
implement-anim-node-sub2
branch
from
ead4886
to
c9c8205
Compare
|
Fixed document tweak and rebased. |
fire
approved these changes
May 27, 2023
|
Thanks! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
If you want to use NodeAdd2 to blend animation, the difference from rest will be added unless the animation of the
inport is rest. Also see godotengine/godot-proposals#2700 and #76310 for more information.This can make the animation too exaggerated, so add a NodeSub2 to cancel the extra pose in advance and extract the delta animation. This improves the flexibility of NodeAdd2/Add3.
Test for calculation consistency. The following results are equivalent: