Minor fixes:

Fixed wrong copyright lines
Fixed retrieving a tex coord channel
Fixed various include issues

Setup project to work alongside RMC-Pro

.gitignore

@@ -1,3 +1,6 @@
+# Git files
+.git/
+
 # Visual Studio 2015 user specific files
 .vs/
 
@@ -49,7 +52,7 @@ SourceArt/**/*.png
 SourceArt/**/*.tga
 
 # Binary Files
-Binaries/*
+Binaries/**
 Plugins/*/Binaries/*
 
 # Builds
@@ -70,8 +73,26 @@ Build/*/**
 Saved/*
 
 # Compiled source files for the engine to use
-Intermediate/*
+Intermediate/**
 Plugins/*/Intermediate/*
 
 # Cache files for the editor to use
 DerivedDataCache/*
+
+# Mac crap
+.DS_Store
+
+# Un-Ignore All ThirdParty binary/libs etc.
+!ThirdParty/**
+
+# Ignore Export directory
+Export/**
+
+# Ignore VS Code files
+.vscode/**
+
+# Unignore .github folder
+!.github/**
+
+# Unignore .gitignore
+!.gitignore

Source/RuntimeMeshComponent/Private/Providers/RuntimeMeshProviderStatic.cpp

@@ -4,6 +4,7 @@
 #include "RuntimeMeshComponentPlugin.h"
 #include "RuntimeMeshModifier.h"
 
+
 #define RMC_LOG_VERBOSE(Format, ...) \
 	UE_LOG(RuntimeMeshLog2, Verbose, TEXT("[RMPS:%d Thread:%d]: " Format), GetUniqueID(), FPlatformTLS::GetCurrentThreadId(), __VA_ARGS__);
 
@@ -295,6 +296,8 @@ void URuntimeMeshProviderStatic::SetShouldSerializeMeshData(bool bIsSerialized)
 	StoreEditorGeneratedDataForGame = bIsSerialized;
 }
 
+
+
 void URuntimeMeshProviderStatic::Initialize()
 {
 	RMC_LOG_VERBOSE("Initializing...");
@@ -479,7 +482,6 @@ bool URuntimeMeshProviderStatic::GetCollisionMesh(FRuntimeMeshCollisionData& Col
 }
 
 
-
 void URuntimeMeshProviderStatic::ConfigureLODs(const TArray<FRuntimeMeshLODProperties>& LODSettings)
 {
 	check(LODSettings.Num() > 0 && LODSettings.Num() <= RUNTIMEMESH_MAXLODS);
@@ -634,6 +636,30 @@ void URuntimeMeshProviderStatic::Serialize(FArchive& Ar)
 					LoadedMaterialSlots = MaterialSlots;
 				}
 			}
+
+			if (Ar.CustomVer(FRuntimeMeshVersion::GUID) >= FRuntimeMeshVersion::AddedDistanceField)
+			{
+				if (Ar.IsSaving())
+				{
+					bool bHasDistanceField = false;
+					Ar << bHasDistanceField;
+					if (bHasDistanceField)
+					{
+						FRuntimeMeshDistanceFieldData NullDistanceField;
+						Ar << NullDistanceField;
+					}
+				}
+				else if (Ar.IsLoading())
+				{
+					bool bHasDistanceField;
+					Ar << bHasDistanceField;
+					if (bHasDistanceField)
+					{
+						FRuntimeMeshDistanceFieldData NullDistanceField;
+						Ar << NullDistanceField;
+					}
+				}
+			}
 		}
 	}
 }

Source/RuntimeMeshComponent/Private/RuntimeMesh.cpp

@@ -53,6 +53,7 @@ class FRuntimeMeshUpdateTask : public FNonAbandonableTask
 				PinnedRef->HandleUpdate();
 				//}
 			}
+
 		}
 	}
 
@@ -602,6 +603,8 @@ void URuntimeMesh::QueueForDelayedInitialize()
 }
 
 
+
+
 void URuntimeMesh::QueueForUpdate()
 {
 	FRuntimeMeshMisc::DoOnGameThread([MeshPtr = GetMeshReference()]()
@@ -899,6 +902,7 @@ void URuntimeMesh::HandleSingleSectionUpdate(const FRuntimeMeshProxyPtr& RenderP
 }
 
 
+
 URuntimeMeshComponentEngineSubsystem* URuntimeMesh::GetEngineSubsystem()
 {
 	URuntimeMeshComponentEngineSubsystem* RMCSubsystem = GEngine->GetEngineSubsystem<URuntimeMeshComponentEngineSubsystem>();
@@ -1163,6 +1167,7 @@ FRuntimeMeshProxyPtr URuntimeMesh::GetRenderProxy(ERHIFeatureLevel::Type InFeatu
 		}
 	}
 
+
 	return RenderProxy;
 }
 

Source/RuntimeMeshComponent/Private/RuntimeMeshBlueprintFunctions.cpp

@@ -210,10 +210,10 @@ void URuntimeMeshBlueprintFunctions::AppendTexCoords(FRuntimeMeshVertexTexCoordS
 	Stream.Append(InOther);
 }
 
-void URuntimeMeshBlueprintFunctions::GetTexCoord(FRuntimeMeshVertexTexCoordStream& Stream, FRuntimeMeshVertexTexCoordStream& OutStream, int32 Index, FVector2D& OutTexCoord)
+void URuntimeMeshBlueprintFunctions::GetTexCoord(FRuntimeMeshVertexTexCoordStream& Stream, FRuntimeMeshVertexTexCoordStream& OutStream, int32 Index, int32 ChannelId, FVector2D& OutTexCoord)
 {
 	OutStream = Stream;
-	OutTexCoord = Stream.GetTexCoord(Index);
+	OutTexCoord = Stream.GetTexCoord(Index, ChannelId);
 }
 
 void URuntimeMeshBlueprintFunctions::SetTexCoord(FRuntimeMeshVertexTexCoordStream& Stream, FRuntimeMeshVertexTexCoordStream& OutStream, int32 Index, FVector2D NewTexCoord, int32 ChannelId /*= 0*/)

Source/RuntimeMeshComponent/Private/RuntimeMeshComponent.cpp

@@ -98,8 +98,6 @@ void URuntimeMeshComponent::ForceProxyRecreate()
 }
 
 
-
-
 FBoxSphereBounds URuntimeMeshComponent::CalcBounds(const FTransform& LocalToWorld) const
 {
 	if (GetRuntimeMesh())

Source/RuntimeMeshComponent/Private/RuntimeMeshComponentEngineSubsystem.cpp

@@ -143,6 +143,7 @@ void URuntimeMeshComponentEngineSubsystem::Tick(float DeltaTime)
 					{
 						MeshRef->HandleUpdate();
 					}
+
 				}
 			}
 		}

Source/RuntimeMeshComponent/Private/RuntimeMeshComponentPlugin.cpp

@@ -4,6 +4,7 @@
 #include "Serialization/CustomVersion.h"
 #include "RuntimeMeshCore.h"
 
+
 // Register the custom version with core
 FCustomVersionRegistration GRegisterRuntimeMeshCustomVersion(FRuntimeMeshVersion::GUID, FRuntimeMeshVersion::LatestVersion, TEXT("RuntimeMesh"));
 
@@ -20,12 +21,10 @@ IMPLEMENT_MODULE(FRuntimeMeshComponentPlugin, RuntimeMeshComponent)
 
 void FRuntimeMeshComponentPlugin::StartupModule()
 {
-
 }
 
 void FRuntimeMeshComponentPlugin::ShutdownModule()
 {
-
 }
 
 DEFINE_LOG_CATEGORY(RuntimeMeshLog2);

Source/RuntimeMeshComponent/Private/RuntimeMeshComponentProxy.cpp

@@ -13,6 +13,7 @@
 #include "RayTracingDefinitions.h"
 #include "RayTracingInstance.h"
 
+
 DECLARE_CYCLE_STAT(TEXT("RuntimeMeshComponentSceneProxy - Create Mesh Batch"), STAT_RuntimeMeshComponentSceneProxy_CreateMeshBatch, STATGROUP_RuntimeMesh);
 DECLARE_CYCLE_STAT(TEXT("RuntimeMeshComponentSceneProxy - Get Dynamic Mesh Elements"), STAT_RuntimeMeshComponentSceneProxy_GetDynamicMeshElements, STATGROUP_RuntimeMesh);
 DECLARE_CYCLE_STAT(TEXT("RuntimeMeshComponentSceneProxy - Draw Static Mesh Elements"), STAT_RuntimeMeshComponentSceneProxy_DrawStaticMeshElements, STATGROUP_RuntimeMesh);
@@ -67,6 +68,8 @@ FRuntimeMeshComponentSceneProxy::FRuntimeMeshComponentSceneProxy(URuntimeMeshCom
 	// We always use local vertex factory, which gets its primitive data from GPUScene, so we can skip expensive primitive uniform buffer updates
 	bVFRequiresPrimitiveUniformBuffer = !UseGPUScene(GMaxRHIShaderPlatform, FeatureLevel);
 	bStaticElementsAlwaysUseProxyPrimitiveUniformBuffer = true;
+	bVerifyUsedMaterials = false;
+
 }
 
 FRuntimeMeshComponentSceneProxy::~FRuntimeMeshComponentSceneProxy()
@@ -119,14 +122,15 @@ void FRuntimeMeshComponentSceneProxy::CreateMeshBatch(FMeshBatch& MeshBatch, con
 	const bool bWantsAdjacencyInfo = !bForRayTracing && !bRenderWireframe && RequiresAdjacencyInformation(Material, Section.Buffers->VertexFactory.GetType(), GetScene().GetFeatureLevel());
 	check(!bWantsAdjacencyInfo || Section.bHasAdjacencyInfo);
 
+
 	// No support for stateless dithered LOD transitions for movable meshes
 	const bool bDitheredLODTransition = !IsMovable() && Material->IsDitheredLODTransition();
 
 
 	const FRuntimeMeshIndexBuffer* CurrentIndexBuffer =
 		(bWantsAdjacencyInfo ?
 			&Section.Buffers->AdjacencyIndexBuffer :
-			&Section.Buffers->IndexBuffer);
+		&Section.Buffers->IndexBuffer);
 
 	int32 NumIndicesPerTriangle = bWantsAdjacencyInfo ? 12 : 3;
 	int32 NumPrimitives = CurrentIndexBuffer->Num() / NumIndicesPerTriangle;
@@ -286,7 +290,6 @@ void FRuntimeMeshComponentSceneProxy::GetDynamicMeshElements(const TArray<const
 }
 
 
-
 // This function was exposed on 4.24, previously it existed but wasn't public
 #if ENGINE_MAJOR_VERSION <= 4 && ENGINE_MINOR_VERSION < 24
  static float ComputeBoundsScreenRadiusSquared(const FVector4& BoundsOrigin, const float SphereRadius, const FVector4& ViewOrigin, const FMatrix& ProjMatrix)

Source/RuntimeMeshComponent/Private/RuntimeMeshComponentProxy.h

@@ -68,6 +68,7 @@ class FRuntimeMeshComponentSceneProxy : public FPrimitiveSceneProxy
 
 	virtual void GetDynamicMeshElements(const TArray<const FSceneView*>& Views, const FSceneViewFamily& ViewFamily, uint32 VisibilityMap, FMeshElementCollector& Collector) const override;
 
+
 #if RHI_RAYTRACING
 	virtual bool IsRayTracingRelevant() const { return true; }
 	virtual bool IsRayTracingStaticRelevant() const { return false; }

Source/RuntimeMeshComponent/Private/RuntimeMeshComponentSettings.cpp

@@ -1,4 +1,4 @@
-// Fill out your copyright notice in the Description page of Project Settings.
+// Copyright 2016-2020 Chris Conway (Koderz). All Rights Reserved.
 
 
 #include "RuntimeMeshComponentSettings.h"

Source/RuntimeMeshComponent/Private/RuntimeMeshProvider.cpp

@@ -158,6 +158,7 @@ void URuntimeMeshProvider::MarkCollisionDirty()
 	}
 }
 
+
 void URuntimeMeshProvider::SetupMaterialSlot(int32 MaterialSlot, FName SlotName, UMaterialInterface* InMaterial)
 {
 	FReadScopeLock Lock(TargetLock);
@@ -365,6 +366,7 @@ void URuntimeMeshProviderPassthrough::CollisionUpdateCompleted()
 	}
 }
 
+
 bool URuntimeMeshProviderPassthrough::IsThreadSafe()
 {
 	FReadScopeLock Lock(ChildLock);

Source/RuntimeMeshComponent/Private/RuntimeMeshProxy.cpp

@@ -5,6 +5,7 @@
 #include "RuntimeMeshComponentPlugin.h"
 #include "RuntimeMesh.h"
 
+
 DECLARE_CYCLE_STAT(TEXT("RuntimeMeshProxy - Initialize LDOs - RenderThread"), STAT_RuntimeMeshProxy_InitializeLODs_RT, STATGROUP_RuntimeMesh);
 DECLARE_CYCLE_STAT(TEXT("RuntimeMeshProxy - Clear LOD - RenderThread"), STAT_RuntimeMeshProxy_ClearLOD_RT, STATGROUP_RuntimeMesh);
 DECLARE_CYCLE_STAT(TEXT("RuntimeMeshProxy - Create/Update Section - RenderThread"), STAT_RuntimeMeshProxy_CreateUpdateSection_RT, STATGROUP_RuntimeMesh);
@@ -86,7 +87,6 @@ void FRuntimeMeshProxy::FlushPendingUpdates()
 
 
 
-
 void FRuntimeMeshProxy::ResetProxy_GameThread()
 {
 	RMC_LOG_VERBOSE("ResetProxy_GameThread");
@@ -197,6 +197,7 @@ void FRuntimeMeshProxy::ResetProxy_RenderThread()
 	CurrentForcedLOD = INDEX_NONE;
 
 	LODs.Empty();
+
 }
 
 void FRuntimeMeshProxy::InitializeLODs_RenderThread(const TArray<FRuntimeMeshLODProperties>& InProperties)
@@ -449,6 +450,8 @@ void FRuntimeMeshProxy::RemoveSection_RenderThread(int32 LODIndex, int32 Section
 	}
 }
 
+
+
 void FRuntimeMeshProxy::UpdateRenderState()
 {
 	bShouldRender = false;
@@ -547,9 +550,7 @@ void FRuntimeMeshProxy::ApplyMeshToSection(int32 LODIndex, int32 SectionId, FRun
 		FRuntimeMeshSectionProxyBuffers& Buffers = *Section.Buffers.Get();
 
 		Buffers.VertexFactory.ReleaseResource();
-#if RHI_RAYTRACING
 		Buffers.RayTracingGeometry.ReleaseResource();
-#endif
 	}
 
 	check(!Section.CanRender() || Section.Buffers->VertexFactory.IsInitialized());

Source/RuntimeMeshComponent/Private/RuntimeMeshProxy.h

@@ -15,6 +15,8 @@ class FRuntimeMeshProxy : public TSharedFromThis<FRuntimeMeshProxy, ESPMode::Thr
 {
 	TInlineLODArray<FRuntimeMeshLODData> LODs;
 
+
+
 	FThreadSafeBool IsQueuedForUpdate;
 	TQueue<TFunction<void()>, EQueueMode::Mpsc> PendingUpdates;
 
@@ -55,6 +57,7 @@ class FRuntimeMeshProxy : public TSharedFromThis<FRuntimeMeshProxy, ESPMode::Thr
 
 	float GetScreenSize(int32 LODIndex) const;
 
+
 	void QueueForUpdate();
 	void FlushPendingUpdates();
 
@@ -87,7 +90,6 @@ class FRuntimeMeshProxy : public TSharedFromThis<FRuntimeMeshProxy, ESPMode::Thr
 	void RemoveSection_RenderThread(int32 LODIndex, int32 SectionId);
 
 
-
 	void UpdateRenderState();
 
 	void ClearSection(FRuntimeMeshSectionProxy& Section);

Source/RuntimeMeshComponent/Private/RuntimeMeshSectionProxy.h

@@ -44,6 +44,7 @@ struct FRuntimeMeshSectionProxyBuffers : public TSharedFromThis<FRuntimeMeshSect
 	/** Index buffer for this section */
 	FRuntimeMeshIndexBuffer IndexBuffer;
 
+
 	/** Index buffer for this section */
 	FRuntimeMeshIndexBuffer AdjacencyIndexBuffer;
 
@@ -101,6 +102,7 @@ struct FRuntimeMeshSectionProxyBuffers : public TSharedFromThis<FRuntimeMeshSect
 
 		IndexBuffer.UpdateRHIFromExisting(UpdateData.TrianglesBuffer, UpdateData.Triangles.GetNumElements(), UpdateData.b32BitTriangles, Batcher);
 		AdjacencyIndexBuffer.UpdateRHIFromExisting(UpdateData.AdjacencyTrianglesBuffer, UpdateData.AdjacencyTriangles.GetNumElements(), UpdateData.b32BitAdjacencyTriangles, Batcher);
+
 	}
 
 	void UpdateRayTracingGeometry();

Source/RuntimeMeshComponent/Private/RuntimeMeshStaticMeshConverter.cpp

@@ -2,13 +2,15 @@
 
 
 #include "RuntimeMeshStaticMeshConverter.h"
+#include "RuntimeMeshComponentPlugin.h"
 #include "EngineGlobals.h"
 #include "Engine/StaticMesh.h"
 #include "PhysicsEngine/BodySetup.h"
 #include "RuntimeMeshRenderable.h"
 #include "RuntimeMeshComponent.h"
 #include "Providers/RuntimeMeshProviderStatic.h"
 
+
 #define RMC_LOG_VERBOSE(MeshId, Format, ...) \
 	UE_LOG(RuntimeMeshLog2, Verbose, TEXT("[SMC->RMC Mesh:%d Thread:%d]: " Format), MeshId, FPlatformTLS::GetCurrentThreadId(), __VA_ARGS__);
 
@@ -400,6 +402,7 @@ bool URuntimeMeshStaticMeshConverter::CopyStaticMeshToRuntimeMesh(UStaticMesh* S
 		StaticProvider->SetCollisionMesh(CollisionData);
 	}
 
+
 	return true;
 }
 

Source/RuntimeMeshComponent/Public/Providers/RuntimeMeshProviderStatic.h

@@ -39,6 +39,7 @@ class RUNTIMEMESHCOMPONENT_API URuntimeMeshProviderStatic : public URuntimeMeshP
 
 	TArray<FRuntimeMeshMaterialSlot> LoadedMaterialSlots;
 
+
 	UPROPERTY(VisibleAnywhere, Category = "RuntimeMesh|Providers|Static")
 	TArray<URuntimeMeshModifier*> CurrentMeshModifiers;
 public:
@@ -321,7 +322,6 @@ class RUNTIMEMESHCOMPONENT_API URuntimeMeshProviderStatic : public URuntimeMeshP
 	UFUNCTION(BlueprintCallable, Category = "RuntimeMesh|Providers|Static")
 	void SetShouldSerializeMeshData(bool bIsSerialized);
 
-
 public:
 
 	virtual void Initialize() override;
@@ -331,6 +331,7 @@ class RUNTIMEMESHCOMPONENT_API URuntimeMeshProviderStatic : public URuntimeMeshP
 	virtual bool HasCollisionMesh() override;
 	virtual bool GetCollisionMesh(FRuntimeMeshCollisionData& CollisionData) override;
 
+
 public:
 	virtual void ConfigureLODs(const TArray<FRuntimeMeshLODProperties>& LODSettings) override;
 	virtual void SetLODScreenSize(int32 LODIndex, float ScreenSize) override;