Skip to content

instanced mesh children with overlays are invisible - #151

Open
Ikreb1 wants to merge 2 commits into
mainfrom
EF-21059-instanced-mesh-overlay-fix
Open

Ikreb1 wants to merge 2 commits into
mainfrom
EF-21059-instanced-mesh-overlay-fix

Conversation

@Ikreb1

@Ikreb1 Ikreb1 commented Nov 11, 2026

Copy link
Copy Markdown
Member

made to fix https://fenriscreations.atlassian.net/browse/EF-21059 which shows that the buildmode ships are invisible if they are using sharedInstancing

image

Copilot AI balanced review requested due to automatic review settings November 11, 2026 13:54
filipppavlov
filipppavlov previously approved these changes Nov 11, 2026

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🟢 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 returns true for 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

github-actions[bot]

This comment was marked as outdated.

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

@github-actions github-actions Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants