Skip to content

Fix Unreal 5.4 Linux Compile Errors #293

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix Unreal 5.4 Linux Compile Errors #293

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Source/RealtimeMeshComponent/Private/RealtimeMeshSimple.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -768,11 +768,11 @@ namespace RealtimeMesh
if (const auto ThisShared = ThisWeak.Pin())
{
FRealtimeMeshAccessContext AccessContext(ThisShared.ToSharedRef());
FRealtimeMeshComplexGeometry ComplexGeometry;
Copy link
Author

Choose a reason for hiding this comment

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

Shadowed another variable of the same name

FRealtimeMeshComplexGeometry ComplexCollisionGeometry;

if (ThisShared->GenerateComplexCollision(AccessContext, ComplexGeometry))
if (ThisShared->GenerateComplexCollision(AccessContext, ComplexCollisionGeometry))
{
CollisionData->ComplexGeometry = MoveTemp(ComplexGeometry);
CollisionData->ComplexGeometry = MoveTemp(ComplexCollisionGeometry);
}

auto CollisionUpdateFuture = ThisShared->UpdateCollision(MoveTemp(*CollisionData), UpdateKey);
Expand Down
2 changes: 1 addition & 1 deletion Source/RealtimeMeshComponent/Public/RealtimeMeshSimple.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,7 +348,7 @@ namespace RealtimeMesh

virtual void ProcessEndOfFrameUpdates() override;

friend class URealtimeMeshSimple;
friend class ::URealtimeMeshSimple;
Copy link
Author

Choose a reason for hiding this comment

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

Explicit namespace is necessary to prevent this from being treated as a different type

Copy link
Author

Choose a reason for hiding this comment

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

Also fixed in https://github.com/TriAxis-Games/RealtimeMeshComponent/pull/292/files, but I think it's better to fix the friend declaration

};
}

Expand Down
2 changes: 1 addition & 1 deletion Source/RealtimeMeshComponent/Public/RenderProxy/RealtimeMeshGPUBuffer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ namespace RealtimeMesh
#endif
}

/*Batcher.QueueUpdateRequest(VertexBufferRHI, UpdateData->GetNumElements() > 0? UpdateData->GetBuffer() : nullptr);
Copy link
Author

Choose a reason for hiding this comment

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

Starting a block comment is not allowed in a block comment

Copy link
Author

Choose a reason for hiding this comment

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

Similar change in https://github.com/TriAxis-Games/RealtimeMeshComponent/pull/292/files

Batcher.QueueUpdateRequest(VertexBufferRHI, UpdateData->GetNumElements() > 0? UpdateData->GetBuffer() : nullptr);

#if RMC_ENGINE_BELOW_5_3
if (ShaderResourceViewRHI)
Expand Down
1 change: 1 addition & 0 deletions Source/RealtimeMeshEditor/Private/RealtimeMeshEditor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
#include "ComponentAssetBroker.h"
#include "EngineUtils.h"
#include "IAssetTools.h"
#include "Editor.h"
Copy link
Author

Choose a reason for hiding this comment

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

Missing include, as reported here: #286 (comment)

#include "ToolMenus.h"
#include "IPluginWardenModule.h"
#include "RealtimeMeshComponent.h"
Expand Down