Repository navigation
Conversation
…up as invisible because IsAlwaysOn is false
filipppavlov
previously approved these changes
Nov 11, 2026
There was a problem hiding this comment.
🟢 Approval recommended
No active review issues are recorded for the instanced-mesh child traversal change.
No open issues 🎉
What changed in this PR
Addresses invisible ships using shared instancing in build mode by allowing instanced mesh overlays to participate in child traversal even when parent activation suppresses ordinary children.
Changes:
- Adds an
IsAlwaysOn()override that returnstruefor instanced mesh children, while preserving existing parent display and visibility gates.
| File | Description |
|---|---|
trinity/Eve/SpaceObject/Children/EveChildInstancedMeshes.h |
Declares the IsAlwaysOn() override. |
trinity/Eve/SpaceObject/Children/EveChildInstancedMeshes.cpp |
Implements the override to enable activation-independent child traversal. |
Review effort: Balanced
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
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/EveChildInstancedMeshes.h b/trinity/Eve/SpaceObject/Children/EveChildInstancedMeshes.h
--- a/trinity/Eve/SpaceObject/Children/EveChildInstancedMeshes.h
+++ b/trinity/Eve/SpaceObject/Children/EveChildInstancedMeshes.h
@@ -35,2 +35,2 @@ public:
- void GetRenderables( std::vector<ITr2Renderable*> & renderables ) override;
- bool GetBoundingSphere( Vector4 & sphere, BoundingSphereQuery query = EVE_BOUNDS_NORMAL ) const override;
+ void GetRenderables( std::vector<ITr2Renderable*>& renderables ) override;
+ bool GetBoundingSphere( Vector4& sphere, BoundingSphereQuery query = EVE_BOUNDS_NORMAL ) const override;
@@ -53,2 +53,2 @@ public:
- void GetShadowBatches( ITriRenderBatchAccumulator * batches, const Tr2PerObjectData* perObjectData, float shadowPixelSize ) override;
- Tr2PerObjectData* GetShadowPerObjectData( ITriRenderBatchAccumulator * accumulator ) override;
+ void GetShadowBatches( ITriRenderBatchAccumulator* batches, const Tr2PerObjectData* perObjectData, float shadowPixelSize ) override;
+ Tr2PerObjectData* GetShadowPerObjectData( ITriRenderBatchAccumulator* accumulator ) override;
@@ -60 +60 @@ public:
- void AddMeshesToManager( EveInstancedMeshManager & manager ) override;
+ void AddMeshesToManager( EveInstancedMeshManager& manager ) override;
@@ -65,2 +65,2 @@ public:
- void GetDebugOptions( Tr2DebugRendererOptions & options ) override;
- void RenderDebugInfo( ITr2DebugRenderer2 & renderer ) override;
+ void GetDebugOptions( Tr2DebugRendererOptions& options ) override;
+ void RenderDebugInfo( ITr2DebugRenderer2& renderer ) override;
@@ -70 +70 @@ public:
- void GetBatches( ITriRenderBatchAccumulator * batches, TriBatchType batchType, const Tr2PerObjectData* perObjectData, Tr2RenderReason reason = TR2RENDERREASON_NORMAL ) override;
+ void GetBatches( ITriRenderBatchAccumulator* batches, TriBatchType batchType, const Tr2PerObjectData* perObjectData, Tr2RenderReason reason = TR2RENDERREASON_NORMAL ) override;
@@ -73 +73 @@ public:
- Tr2PerObjectData* GetPerObjectData( ITriRenderBatchAccumulator * accumulator ) override;
+ Tr2PerObjectData* GetPerObjectData( ITriRenderBatchAccumulator* accumulator ) override;
@@ -191,2 +191,2 @@ private:
- void ReleaseCachedData( BlueAsyncRes * p ) override;
- void RebuildCachedData( BlueAsyncRes * p ) override;
+ void ReleaseCachedData( BlueAsyncRes* p ) override;
+ void RebuildCachedData( BlueAsyncRes* p ) override;
@@ -196 +196 @@ private:
- static void RebuildOverlayAreaBlocks( Mesh & mesh );
+ static void RebuildOverlayAreaBlocks( Mesh& mesh );
✨ Powered by cpp-linter -- ⭐ Star • ❤️ Sponsor • 💬 Feedback
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
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.
made to fix https://fenriscreations.atlassian.net/browse/EF-21059 which shows that the buildmode ships are invisible if they are using sharedInstancing