Skip to content

Simplified getting the asset state as string, removed unused helpers #156

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 1 commit into
base: Houdini18.5-4.26
Choose a base branch
from
Open

Simplified getting the asset state as string, removed unused helpers #156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion Source/HoudiniEngineRuntime/Private/HoudiniAssetComponent.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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; };
Expand Down
19 changes: 0 additions & 19 deletions Source/HoudiniEngineRuntime/Private/HoudiniEngineRuntimeUtils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,25 +161,6 @@ struct HOUDINIENGINERUNTIME_API FHoudiniEngineRuntimeUtils
// The function returns the number of objects that were deleted.
static int32 SafeDeleteObjects(TArray<UObject*>& InObjectsToDelete, TArray<UObject*>* 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<typename T>
static FString EnumToString(const FString& EnumName, const T Value)
{
UEnum* Enum = FindObject<UEnum>(ANY_PACKAGE, *EnumName);
return *(Enum ? Enum->GetNameStringByValue(static_cast<uint8>(Value)) : "null");
}

template<typename T>
static FString EnumToString(const T Value)
{
return UEnum::GetValueAsString(Value);
}

// -------------------------------------------------
// Blueprint utilities
// -------------------------------------------------
Expand Down