From b7bac23ad05520bae21a8721b852fe47bd48f814 Mon Sep 17 00:00:00 2001
From: Kamil Karwacki <kamil.karwacki@rwth-aachen.de>
Date: Sun, 22 Nov 2020 16:39:55 +0100
Subject: [PATCH] see diff for changes that were made
---
Source/MultiLine/Private/MultiLineActor.cpp | 8 ++++----
Source/MultiLine/Public/LineProps.h | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Source/MultiLine/Private/MultiLineActor.cpp b/Source/MultiLine/Private/MultiLineActor.cpp
index e15f13c..475fb96 100644
--- a/Source/MultiLine/Private/MultiLineActor.cpp
+++ b/Source/MultiLine/Private/MultiLineActor.cpp
@@ -22,7 +22,7 @@ AMultiLineActor::AMultiLineActor()
#pragma optimize( "", off )
void AMultiLineActor::CreateMesh(TArray<LineProps> & lines, bool has_collision_context)
{
- TArray<FLinearColor> vertex_colors;
+ TArray<FColor> vertex_colors;
FOccluderVertexArray vertices;
TArray<int32> triangles;
auto index_offset = 0;
@@ -50,7 +50,7 @@ void AMultiLineActor::CreateMesh(TArray<LineProps> & lines, bool has_collision_c
auto uv = TArray<FVector2D>();
auto tangents = TArray<FProcMeshTangent>();
FOccluderVertexArray normals;
- mesh_->CreateMeshSection_LinearColor(0, vertices, triangles, normals, uv, vertex_colors, tangents, false);
+ mesh_->CreateMeshSection(0, vertices, triangles, normals, uv, vertex_colors, tangents, false);
mesh_->ContainsPhysicsTriMeshData(false);
mesh_->SetMaterial(0, dynamic_cast<UMaterialInterface*>(material_));
@@ -58,7 +58,7 @@ void AMultiLineActor::CreateMesh(TArray<LineProps> & lines, bool has_collision_c
void AMultiLineActor::UpdateMesh(const TArray<LineProps> & lines)
{
- TArray<FLinearColor> vertex_colors;
+ TArray<FColor> vertex_colors;
FOccluderVertexArray vertices;
for (auto& line : lines) {
CreateVertices(line, vertices);
@@ -70,7 +70,7 @@ void AMultiLineActor::UpdateMesh(const TArray<LineProps> & lines)
auto uv = TArray<FVector2D>();
auto tangents = TArray<FProcMeshTangent>();
FOccluderVertexArray normals;
- mesh_->UpdateMeshSection_LinearColor(0, vertices, normals, uv, vertex_colors, tangents);
+ mesh_->UpdateMeshSection(0, vertices, normals, uv, vertex_colors, tangents);
}
diff --git a/Source/MultiLine/Public/LineProps.h b/Source/MultiLine/Public/LineProps.h
index a28150c..52e63d0 100644
--- a/Source/MultiLine/Public/LineProps.h
+++ b/Source/MultiLine/Public/LineProps.h
@@ -7,10 +7,10 @@
struct LineProps
{
LineProps(){}
- LineProps(TArray<FVector> & p, FLinearColor color, float w) : points(p), linear_color(color), width(w)
+ LineProps(TArray<FVector> & p, FColor color, float w) : points(p), linear_color(color), width(w)
{}
TArray<FVector> points;
- FLinearColor linear_color;
+ FColor linear_color;
float width;
};
--
GitLab