fix damage overlay for animated objects - #81
Merged
Conversation
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
There was a problem hiding this comment.
Cpp-linter Review
Used clang-format v21.1.8
Click here for the full clang-format patch
diff --git a/trinity/Eve/SpaceObject/Children/EveChildMesh.h b/trinity/Eve/SpaceObject/Children/EveChildMesh.h
index 954aa4b..023985f 100644
--- a/trinity/Eve/SpaceObject/Children/EveChildMesh.h
+++ b/trinity/Eve/SpaceObject/Children/EveChildMesh.h
@@ -208 +208 @@ public:
- void SetArmorDamageShaderEffect( Tr2Effect* effect );
+ void SetArmorDamageShaderEffect( Tr2Effect * effect );
Have any feedback or feature suggestions? Share it here.
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
….com/carbonengine/trinity into fix-damage-overlay-on-animated-child
CCPNobody
approved these changes
Sep 2, 2026
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.
https://fenriscreations.atlassian.net/browse/PLAT-11984
EveSpaceObject2 used to pass the effect of its impact overlay to the children. This caused children to get the wrong shader when the parent was static and the child animated, causing the damage impact to be displayed in bind pose rather than on the animated child.
This PR fixes the bug by selecting which effect to use in sof. This not only addresses the animation, but also varying race data bound to the effect. It also preserves the sharing of the effects (no idea if there is actually any performance benefit).