From 62ba7a06a1b4bdd6bcb3a84e935961fc85e632d2 Mon Sep 17 00:00:00 2001 From: Paul Greveson Date: Thu, 8 Jul 2021 14:48:47 +0200 Subject: [PATCH] Simplified getting the asset state as string, removed unused helpers EnumToString was failing to compile on Linux, and is surplus to requirements now --- .../Private/HoudiniAssetComponent.h | 2 +- .../Private/HoudiniEngineRuntimeUtils.h | 19 ------------------- 2 files changed, 1 insertion(+), 20 deletions(-) diff --git a/Source/HoudiniEngineRuntime/Private/HoudiniAssetComponent.h b/Source/HoudiniEngineRuntime/Private/HoudiniAssetComponent.h index 7f394099..860412c7 100644 --- a/Source/HoudiniEngineRuntime/Private/HoudiniAssetComponent.h +++ b/Source/HoudiniEngineRuntime/Private/HoudiniAssetComponent.h @@ -167,7 +167,7 @@ class HOUDINIENGINERUNTIME_API UHoudiniAssetComponent : public UPrimitiveCompone UHoudiniAsset * GetHoudiniAsset() const; int32 GetAssetId() const { return AssetId; }; EHoudiniAssetState GetAssetState() const { return AssetState; }; - FString GetAssetStateAsString() const { return FHoudiniEngineRuntimeUtils::EnumToString(TEXT("EHoudiniAssetState"), GetAssetState()); }; + FString GetAssetStateAsString() const { return UEnum::GetValueAsString(GetAssetState()); }; EHoudiniAssetStateResult GetAssetStateResult() const { return AssetStateResult; }; FGuid GetHapiGUID() const { return HapiGUID; }; FString GetHapiAssetName() const { return HapiAssetName; }; diff --git a/Source/HoudiniEngineRuntime/Private/HoudiniEngineRuntimeUtils.h b/Source/HoudiniEngineRuntime/Private/HoudiniEngineRuntimeUtils.h index ffa4c106..6615688d 100644 --- a/Source/HoudiniEngineRuntime/Private/HoudiniEngineRuntimeUtils.h +++ b/Source/HoudiniEngineRuntime/Private/HoudiniEngineRuntimeUtils.h @@ -161,25 +161,6 @@ struct HOUDINIENGINERUNTIME_API FHoudiniEngineRuntimeUtils // The function returns the number of objects that were deleted. static int32 SafeDeleteObjects(TArray& InObjectsToDelete, TArray* OutObjectsNotDeleted=nullptr); - // ------------------------------------------------- - // Type utilities - // ------------------------------------------------- - - // Taken from here: https://answers.unrealengine.com/questions/330496/conversion-of-enum-to-string.html - // Return the string representation of an enum value. - template - static FString EnumToString(const FString& EnumName, const T Value) - { - UEnum* Enum = FindObject(ANY_PACKAGE, *EnumName); - return *(Enum ? Enum->GetNameStringByValue(static_cast(Value)) : "null"); - } - - template - static FString EnumToString(const T Value) - { - return UEnum::GetValueAsString(Value); - } - // ------------------------------------------------- // Blueprint utilities // -------------------------------------------------