Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions Source/HoudiniEngine/HoudiniEngine.Build.cs
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ private void LogInformation(string info)

private string GetHFSPath()
{
string HoudiniVersion = "21.0.679";
string HoudiniVersion = "21.0.671"; // TRENT_MOD (4/8/26): Original version is "21.0.679". Modified for what I have locally.
bool bIsRelease = true;
string HFSPath = "";
string RegistryPath = "HKEY_LOCAL_MACHINE\\SOFTWARE\\Side Effects Software";
Expand Down Expand Up @@ -254,7 +254,7 @@ private string GetHFSPath()
}

string Info = string.Format("Houdini Engine : Houdini {0} could not be found. Houdini Engine will not be available in this build.", HoudiniVersion);
LogInformation(Info);
LogError(Info);

return "";
}
Expand Down
6 changes: 3 additions & 3 deletions Source/HoudiniEngine/Private/HoudiniAnimationTranslator.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -595,13 +595,13 @@ bool FHoudiniAnimationTranslator::CreateAnimationFromMotionClip(UHoudiniOutput*
TSharedPtr<FJsonObject> JsonObject;
if (GetFbxCustomAttributes(GeoId, MeshPartId, RootBoneIndex, JsonObject))
{
TArray<FString> Keys;
TArray<UE::FSharedString> Keys;
JsonObject->Values.GetKeys(Keys);
for (const FString& Key : Keys)
for (const UE::FSharedString& Key : Keys)
{
if (double Value; JsonObject->TryGetNumberField(Key, Value))
{
TArray<FRichCurveKey>& CurveData = FbxCustomAttributes.FindOrAdd(Key);
TArray<FRichCurveKey>& CurveData = FbxCustomAttributes.FindOrAdd(*Key);
CurveData.Add(FRichCurveKey(FrameTime, static_cast<float>(Value)));
}
}
Expand Down
8 changes: 3 additions & 5 deletions Source/HoudiniEngine/Private/HoudiniEngineUtils.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -8522,7 +8522,7 @@ FString FHoudiniEngineUtils::RSTOrderToString(HAPI_RSTOrder RstOrder)

FString FHoudiniEngineUtils::HapiTransformToString(HAPI_Transform Transform)
{
FStringBuilderBase Output;
TStringBuilderBase<TCHAR> Output;
Output.Appendf(TEXT("P: %f, %f, %f "), Transform.position[0], Transform.position[1], Transform.position[2]);
Output.Appendf(TEXT("Q: %f, %f, %f, %f "), Transform.rotationQuaternion[0], Transform.rotationQuaternion[1],
Transform.rotationQuaternion[2], Transform.rotationQuaternion[3]);
Expand All @@ -8544,9 +8544,7 @@ FString FHoudiniEngineUtils::DumpNode(HAPI_NodeId NodeId)
if(Result != HAPI_RESULT_SUCCESS)
return FString::Printf(TEXT("Failed to get node info: %s\n"), *FHoudiniEngineUtils::GetErrorDescription());

FStringBuilderBase Output;


TStringBuilderBase<TCHAR> Output;
Output.Appendf(TEXT("Node ID: %d\n"), NodeId);
Output.Appendf(TEXT(" Name: %s\n"), *FHoudiniEngineString(NodeInfo.nameSH).ToFString());
Output.Appendf(TEXT(" Type: %s\n"), *NodeTypeToString(NodeInfo.type));
Expand Down Expand Up @@ -8582,7 +8580,7 @@ FString FHoudiniEngineUtils::DumpAttribute(HAPI_NodeId NodeId, HAPI_PartId PartI
return FString::Printf(TEXT("Failed to get attribute info: %s\n"), *FHoudiniEngineUtils::GetErrorDescription());
}

FStringBuilderBase Output;
TStringBuilderBase<TCHAR> Output;
Output.Appendf(TEXT(" Storage: %s\n"), *StorageTypeToString(AttributeInfo.storage));
Output.Appendf(TEXT(" Type: %s\n"), *AttributeTypeToString(AttributeInfo.typeInfo));
Output.Appendf(TEXT(" Tuple Size: %d\n"), AttributeInfo.tupleSize);
Expand Down
2 changes: 1 addition & 1 deletion Source/HoudiniEngine/Private/HoudiniInstanceTranslator.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1927,7 +1927,7 @@ FHoudiniInstanceTranslator::GetPerInstanceCustomData(
Accessor.GetAttributeData(HAPI_ATTROWNER_POINT, Values);
if (Values.IsEmpty())
{
HOUDINI_LOG_ERROR(TEXT("Could found attribute "), *CurrentAttr);
HOUDINI_LOG_ERROR(TEXT("Could not find attribute: %s"), *CurrentAttr);
return;
}

Expand Down
2 changes: 1 addition & 1 deletion Source/HoudiniEngine/Private/HoudiniOutputTranslator.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
#include "Components/HierarchicalInstancedStaticMeshComponent.h"
#include "Editor.h"
#include "EditorSupportDelegates.h"
#include "Engine/UserDefinedStruct.h"
#include "StructUtils/UserDefinedStruct.h"
#include "Engine/WorldComposition.h"
#include "FileHelpers.h"
#include "HAL/PlatformFileManager.h"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ bool FHoudiniEditorTestLandscapeDataLayers::RunTest(const FString& Parameters)
auto& BakedOutput = BakedOutputs[0];
HOUDINI_TEST_EQUAL_ON_FAIL(BakedOutput.BakedOutputObjects.Num(), 1, return true);
#if ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION >= 7
auto& BakedObject = BakedOutput.BakedOutputObjects.begin().ElementIt->Value.Value;;
auto& BakedObject = BakedOutput.BakedOutputObjects.begin()->Value;
#else
auto& BakedObject = BakedOutput.BakedOutputObjects.begin().Value();
#endif
Expand Down Expand Up @@ -262,7 +262,7 @@ IMPLEMENT_SIMPLE_HOUDINI_AUTOMATION_TEST(FHoudiniEditorTestInstancesDataLayers,

HOUDINI_TEST_EQUAL_ON_FAIL(BakedOutput.BakedOutputObjects.Num(), 2, return true);
#if ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION >= 7
auto& BakedObject0 = ObjIt.ElementIt->Value.Value;
auto& BakedObject0 = ObjIt->Value;
#else
auto& BakedObject0 = ObjIt.Value();
#endif
Expand All @@ -280,7 +280,7 @@ IMPLEMENT_SIMPLE_HOUDINI_AUTOMATION_TEST(FHoudiniEditorTestInstancesDataLayers,
++ObjIt;

#if ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION >= 7
auto& BakedObject1 = ObjIt.ElementIt->Value.Value;
auto& BakedObject1 = ObjIt->Value;
#else
auto& BakedObject1 = ObjIt.Value();
#endif
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ bool FHoudiniEditorTestLandscapeHLOD::RunTest(const FString& Parameters)
HOUDINI_TEST_EQUAL_ON_FAIL(BakedOutput.BakedOutputObjects.Num(), 1, return true);

#if ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION >= 7
auto& BakedObject = BakedOutput.BakedOutputObjects.begin().ElementIt->Value.Value;
auto& BakedObject = BakedOutput.BakedOutputObjects.begin()->Value;
#else
auto& BakedObject = BakedOutput.BakedOutputObjects.begin().Value();
#endif
Expand Down Expand Up @@ -144,7 +144,7 @@ IMPLEMENT_SIMPLE_HOUDINI_AUTOMATION_TEST(FHoudiniEditorTestInstancesHLOD, "Houdi
HOUDINI_TEST_EQUAL_ON_FAIL(BakedOutput.BakedOutputObjects.Num(), 2, return true);

#if ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION >= 7
auto& BakedObject0 = ObjIt.ElementIt->Value.Value;
auto& BakedObject0 = ObjIt->Value;
#else
auto& BakedObject0 = ObjIt.Value();
#endif
Expand All @@ -159,7 +159,7 @@ IMPLEMENT_SIMPLE_HOUDINI_AUTOMATION_TEST(FHoudiniEditorTestInstancesHLOD, "Houdi
// Check second output instancer has HLODLayer.
++ObjIt;
#if ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION >= 7
auto& BakedObject1 = ObjIt.ElementIt->Value.Value;
auto& BakedObject1 = ObjIt->Value;
#else
auto& BakedObject1 = ObjIt.Value();
#endif
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ bool FHoudiniEditorTestSkeletalMeshElectra::RunTest(const FString& Parameters)
auto & BakedOutput = BakedOutputs[0];
HOUDINI_TEST_EQUAL_ON_FAIL(BakedOutput.BakedOutputObjects.Num(), 1, return true);
#if ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION >= 7
auto& BakedObject = BakedOutput.BakedOutputObjects.begin().ElementIt->Value.Value;
auto& BakedObject = BakedOutput.BakedOutputObjects.begin()->Value;
#else
auto& BakedObject = BakedOutput.BakedOutputObjects.begin().Value();
#endif
Expand Down Expand Up @@ -206,7 +206,7 @@ bool FHoudiniEditorTestSkeletalMeshElectraDefaultPhysicsAsset::RunTest(const FSt
auto& BakedOutput = BakedOutputs[0];
HOUDINI_TEST_EQUAL_ON_FAIL(BakedOutput.BakedOutputObjects.Num(), 1, return true);
#if ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION >= 7
auto& BakedObject = BakedOutput.BakedOutputObjects.begin().ElementIt->Value.Value;
auto& BakedObject = BakedOutput.BakedOutputObjects.begin()->Value;
#else
auto& BakedObject = BakedOutput.BakedOutputObjects.begin().Value();
#endif
Expand Down Expand Up @@ -312,7 +312,7 @@ bool FHoudiniEditorTestSkeletalMeshElectraCustomPhysicsAsset::RunTest(const FStr
HOUDINI_TEST_EQUAL_ON_FAIL(BakedOutput.BakedOutputObjects.Num(), 1, return true);

#if ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION >= 7
auto& BakedObject = BakedOutput.BakedOutputObjects.begin().ElementIt->Value.Value;
auto& BakedObject = BakedOutput.BakedOutputObjects.begin()->Value;
#else
auto& BakedObject = BakedOutput.BakedOutputObjects.begin().Value();
#endif
Expand Down Expand Up @@ -492,7 +492,7 @@ bool FHoudiniEditorTestSkeletalMeshElectraExistingPhysicsAsset::RunTest(const FS
HOUDINI_TEST_EQUAL_ON_FAIL(BakedOutput.BakedOutputObjects.Num(), 1, return true);

#if ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION >= 7
auto& BakedObject = BakedOutput.BakedOutputObjects.begin().ElementIt->Value.Value;
auto& BakedObject = BakedOutput.BakedOutputObjects.begin()->Value;
#else
auto& BakedObject = BakedOutput.BakedOutputObjects.begin().Value();
#endif
Expand Down Expand Up @@ -600,7 +600,7 @@ bool FHoudiniEditorTestSkeletalMeshElectraExistingSkeleton::RunTest(const FStrin
auto& BakedOutput = BakedOutputs[0];
HOUDINI_TEST_EQUAL_ON_FAIL(BakedOutput.BakedOutputObjects.Num(), 1, return true);
#if ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION >= 7
auto& BakedObject = BakedOutput.BakedOutputObjects.begin().ElementIt->Value.Value;
auto& BakedObject = BakedOutput.BakedOutputObjects.begin()->Value;
#else
auto& BakedObject = BakedOutput.BakedOutputObjects.begin().Value();
#endif
Expand Down