merge master

urobosim · Jun 23, 2022 · 591ccf9 · 591ccf9
2 parents 9873415 + bbb6a5a
commit 591ccf9
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -1,6 +1,8 @@
 URoboVision
 =====
 
+### UE Version: **4.27**
+
 Plugin with a CameraActor that captures RGB-D data and sends it out over TCP.
 
 Usage

diff --git a/Source/URoboVision/Private/RGBDCamera.cpp b/Source/URoboVision/Private/RGBDCamera.cpp
@@ -9,7 +9,6 @@
 #else
 #include "ConstructorHelpers.h"
 #endif
-
 #include "EngineUtils.h"
 #include "StopTime.h"
 #include "Server.h"
@@ -485,7 +484,6 @@ void ARGBDCamera::ReadImage(UTextureRenderTarget2D *RenderTarget, TArray<FFloat1
 
 void ARGBDCamera::ReadColorImage(UTextureRenderTarget2D *RenderTarget, TArray<FColor> &ImageData) const
 {
-
 	int32 RT_Width = RenderTarget->SizeX, RT_Height = RenderTarget->SizeY;
 	FTextureRenderTargetResource* RenderTargetResource;
 	ImageData.AddZeroed(RT_Width * RT_Height);
@@ -618,13 +616,17 @@ bool ARGBDCamera::ColorObject(AActor *Actor, const FString &name)
 	{
 		return false;
 	}
-	TArray<UActorComponent*> SegmentationComponents = Actor->GetComponentsByClass(USegmentationComponent::StaticClass());
+	//TArray<UActorComponent*> SegmentationComponents = Actor->GetComponentsByClass(USegmentationComponent::StaticClass());
+	TArray<UActorComponent*> SegmentationComponents;
+	Actor->GetComponents(USegmentationComponent::StaticClass(), SegmentationComponents);
 	if (SegmentationComponents.Num() != 0)
 	{
 		return false;
 	}
 
-	TArray<UActorComponent*> MeshComponents = Actor->GetComponentsByClass(UMeshComponent::StaticClass());
+	//TArray<UActorComponent*> MeshComponents = Actor->GetComponentsByClass(UMeshComponent::StaticClass());
+	TArray<UActorComponent*> MeshComponents;
+	Actor->GetComponents(UMeshComponent::StaticClass(), MeshComponents);
 	for (UActorComponent* Component : MeshComponents)
 	{
 		UMeshComponent* MeshComponent = Cast<UMeshComponent>(Component);

diff --git a/Source/URoboVision/Private/SegmentationComponent.cpp b/Source/URoboVision/Private/SegmentationComponent.cpp
@@ -13,7 +13,6 @@
 #else
 #include "ConstructorHelpers.h"
 #endif
-
 #include "EngineUtils.h"
 #include "StopTime.h"
 #include "Server.h"
@@ -104,7 +103,7 @@ FPrimitiveSceneProxy* USegmentationComponent::CreateSceneProxy(USkeletalMeshComp
 	ERHIFeatureLevel::Type SceneFeatureLevel = GetWorld()->FeatureLevel;
 	FSkeletalMeshRenderData* SkelMeshRenderData = SkeletalMeshComponent->GetSkeletalMeshRenderData();
 	if (SkelMeshRenderData &&
-		SkelMeshRenderData->LODRenderData.IsValidIndex(SkeletalMeshComponent->PredictedLODLevel) &&
+		SkelMeshRenderData->LODRenderData.IsValidIndex(SkeletalMeshComponent->GetPredictedLODLevel()) &&
 		SkeletalMeshComponent->MeshObject) 
 	{
 		return new FSkeletalSegmentationSceneProxy(SkeletalMeshComponent, SkelMeshRenderData, ProxyMaterial);