Skip to content

Fixed Blueprint Mesh Builder Multiple UVs #289

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 4 commits into
base: master
Choose a base branch
from
Open

Fixed Blueprint Mesh Builder Multiple UVs #289

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d08bcdb
Fixed Blueprint Mesh Builder Multiple UVs
laykun Oct 30, 2024
0d20b64
Fixed Binormals not working with Blueprint Local Builder
laykun Nov 4, 2024
2547622
Fixed 5.5 ray tracing enabled caused check to fail
laykun Nov 15, 2024
51fbb7d
Fixed packaging/cooking compilation error
laykun Dec 5, 2024
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
18 changes: 9 additions & 9 deletions Source/RealtimeMeshComponent/Private/Mesh/RealtimeMeshBlueprintMeshBuilder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -650,17 +650,17 @@ URealtimeMeshLocalBuilder* URealtimeMeshLocalBuilder::Initialize(ERealtimeMeshSi

if (WantedTexCoordChannels > 1)
{
UV1Builder = MakeUnique<RealtimeMesh::TRealtimeMeshStreamBuilder<FVector2d, void>>(Stream, 1);
UV1Builder = MakeUnique<RealtimeMesh::TRealtimeMeshStridedStreamBuilder<FVector2d, void>>(Stream, 1);
}

if (WantedTexCoordChannels > 2)
{
UV2Builder = MakeUnique<RealtimeMesh::TRealtimeMeshStreamBuilder<FVector2d, void>>(Stream, 2);
UV2Builder = MakeUnique<RealtimeMesh::TRealtimeMeshStridedStreamBuilder<FVector2d, void>>(Stream, 2);
}

if (WantedTexCoordChannels > 3)
{
UV3Builder = MakeUnique<RealtimeMesh::TRealtimeMeshStreamBuilder<FVector2d, void>>(Stream, 3);
UV3Builder = MakeUnique<RealtimeMesh::TRealtimeMeshStridedStreamBuilder<FVector2d, void>>(Stream, 3);
}
}

Expand Down Expand Up @@ -781,17 +781,17 @@ URealtimeMeshLocalBuilder* URealtimeMeshLocalBuilder::EnableTexCoords(int32 NumC

if (NumChannels > 1)
{
UV1Builder = MakeUnique<RealtimeMesh::TRealtimeMeshStreamBuilder<FVector2d, void>>(Stream, 1);
UV1Builder = MakeUnique<RealtimeMesh::TRealtimeMeshStridedStreamBuilder<FVector2d, void>>(Stream, 1);
}

if (NumChannels > 2)
{
UV2Builder = MakeUnique<RealtimeMesh::TRealtimeMeshStreamBuilder<FVector2d, void>>(Stream, 2);
UV2Builder = MakeUnique<RealtimeMesh::TRealtimeMeshStridedStreamBuilder<FVector2d, void>>(Stream, 2);
}

if (NumChannels > 3)
{
UV3Builder = MakeUnique<RealtimeMesh::TRealtimeMeshStreamBuilder<FVector2d, void>>(Stream, 3);
UV3Builder = MakeUnique<RealtimeMesh::TRealtimeMeshStridedStreamBuilder<FVector2d, void>>(Stream, 3);
}
}
return this;
Expand Down Expand Up @@ -941,15 +941,15 @@ int32 URealtimeMeshLocalBuilder::AddVertex(URealtimeMeshLocalBuilder*& Builder,

if (UV1Builder.IsValid())
{
UV1Builder->SetElement(Vertex.GetIndex(), 1, InVertex.UV1);
UV1Builder->SetElement(Vertex.GetIndex(), 0, InVertex.UV1);
}
if (UV2Builder.IsValid())
{
UV2Builder->SetElement(Vertex.GetIndex(), 2, InVertex.UV2);
UV2Builder->SetElement(Vertex.GetIndex(), 0, InVertex.UV2);
}
if (UV3Builder.IsValid())
{
UV3Builder->SetElement(Vertex.GetIndex(), 3, InVertex.UV3);
UV3Builder->SetElement(Vertex.GetIndex(), 0, InVertex.UV3);
}
}

Expand Down
2 changes: 2 additions & 0 deletions Source/RealtimeMeshComponent/Private/RenderProxy/RealtimeMeshProxy.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@ namespace RealtimeMesh
, ActiveStaticLODMask(false, REALTIME_MESH_MAX_LODS)
, ActiveDynamicLODMask(false, REALTIME_MESH_MAX_LODS)
, ReferencingHandle(MakeShared<uint8>(0xFF))
#if UE_ENABLE_DEBUG_DRAWING
, CollisionTraceFlag(CTF_UseSimpleAndComplex)
#endif
{
}

Expand Down
2 changes: 1 addition & 1 deletion Source/RealtimeMeshComponent/Private/RenderProxy/RealtimeMeshSectionGroupProxy.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,7 @@ namespace RealtimeMesh
Segment.VertexBuffer = PositionStream->VertexBufferRHI;
Segment.VertexBufferOffset = 0;
Segment.MaxVertices = PositionStream->Num();
Segment.bEnabled = Section->GetDrawMask().IsAnySet(ERealtimeMeshDrawMask::DrawDynamic | ERealtimeMeshDrawMask::DrawStatic);
Segment.bEnabled = DrawMask.IsAnySet(ERealtimeMeshDrawMask::DrawDynamic | ERealtimeMeshDrawMask::DrawStatic);
if (Segment.bEnabled)
{
Segment.FirstPrimitive = Section->GetStreamRange().GetMinIndex() / 3;
Expand Down
2 changes: 1 addition & 1 deletion Source/RealtimeMeshComponent/Public/Interface/Core/RealtimeMeshBuilder.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1518,7 +1518,7 @@ namespace RealtimeMesh
void SetTangents(int32 VertIdx, const FVector3f& Normal, const FVector3f& Binormal, const FVector3f& Tangent)
{
checkf(HasTangents(), TEXT("Vertex tangents not enabled"));
Tangents->Set(VertIdx, TRealtimeMeshTangents<FVector4f>(Normal, Tangent, Tangent));
Tangents->Set(VertIdx, TRealtimeMeshTangents<FVector4f>(Normal, Binormal, Tangent));
}

void SetTexCoord(int32 VertIdx, int32 TexCoordIdx, const FVector2f& TexCoord)
Expand Down
12 changes: 6 additions & 6 deletions Source/RealtimeMeshComponent/Public/Mesh/RealtimeMeshBlueprintMeshBuilder.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,18 +247,18 @@ class REALTIMEMESHCOMPONENT_API URealtimeMeshLocalBuilder : public URealtimeMesh
GENERATED_BODY()
protected:
TUniquePtr<RealtimeMesh::TRealtimeMeshBuilderLocal<void, void, void, 1, void>> MeshBuilder;
TUniquePtr<RealtimeMesh::TRealtimeMeshStreamBuilder<FVector2D, void>> UV1Builder;
TUniquePtr<RealtimeMesh::TRealtimeMeshStreamBuilder<FVector2D, void>> UV2Builder;
TUniquePtr<RealtimeMesh::TRealtimeMeshStreamBuilder<FVector2D, void>> UV3Builder;
TUniquePtr<RealtimeMesh::TRealtimeMeshStridedStreamBuilder<FVector2D, void>> UV1Builder;
TUniquePtr<RealtimeMesh::TRealtimeMeshStridedStreamBuilder<FVector2D, void>> UV2Builder;
TUniquePtr<RealtimeMesh::TRealtimeMeshStridedStreamBuilder<FVector2D, void>> UV3Builder;
virtual void EnsureInitialized() override;
public:
URealtimeMeshLocalBuilder() = default;

void Initialize(TUniquePtr<RealtimeMesh::FRealtimeMeshStreamSet>&& InStreams,
TUniquePtr<RealtimeMesh::TRealtimeMeshBuilderLocal<void, void, void, 1, void>>&& InBuilder,
TUniquePtr<RealtimeMesh::TRealtimeMeshStreamBuilder<FVector2D, void>>&& InUV1Builder,
TUniquePtr<RealtimeMesh::TRealtimeMeshStreamBuilder<FVector2D, void>>&& InUV2Builder,
TUniquePtr<RealtimeMesh::TRealtimeMeshStreamBuilder<FVector2D, void>>&& InUV3Builder)
TUniquePtr<RealtimeMesh::TRealtimeMeshStridedStreamBuilder<FVector2D, void>>&& InUV1Builder,
TUniquePtr<RealtimeMesh::TRealtimeMeshStridedStreamBuilder<FVector2D, void>>&& InUV2Builder,
TUniquePtr<RealtimeMesh::TRealtimeMeshStridedStreamBuilder<FVector2D, void>>&& InUV3Builder)
{
Streams = MakeShared<RealtimeMesh::FRealtimeMeshStreamSet>(MoveTemp(*InStreams));
MeshBuilder = MoveTemp(InBuilder);
Expand Down