- Added missing includes

- Fixed issues that could cause parameters/inputs to not be properly set
  after rebuilding/recooking/on first cook after load.
- Added new setting, "UsePresetsForParameters" that disables setting parameters
  in bulk with presets - this is to be used for troubleshooting only.

Author: dpernuit

Source/HoudiniEngine/Private/HoudiniEngineManager.cpp

@@ -831,13 +831,23 @@ FHoudiniEngineManager::ProcessComponent(UHoudiniAssetComponent* HAC)
 			if (!bIsNodeSyncComponent && HAC->AssetId != INDEX_NONE)
 			{
 				// Make sure no parameters are changed before getting the preset
-				FHoudiniParameterTranslator::UploadChangedParameters(HAC);
-
-				if (!FHoudiniEngineUtils::GetAssetPreset(HAC->AssetId, HAC->ParameterPresetBuffer))
+				bool bCleanParamPreset = false;
+				if (FHoudiniParameterTranslator::UploadChangedParameters(HAC))
 				{
-					HOUDINI_LOG_WARNING(TEXT("Failed to get the asset's parameter preset, rebuilt asset may have lost its parameters."));
-					HAC->ParameterPresetBuffer.Empty();
+					if (!FHoudiniEngineUtils::GetAssetPreset(HAC->AssetId, HAC->ParameterPresetBuffer))
+					{
+						HOUDINI_LOG_WARNING(TEXT("Failed to get the asset's parameter preset, rebuilt asset may have lost its parameters."));
+						bCleanParamPreset = true;
+					}
 				}
+				else
+				{
+					bCleanParamPreset = true;
+				}
+
+				// If we failed to update params or get the preset buffer, dont use it
+				if(bCleanParamPreset)
+					HAC->ParameterPresetBuffer.Empty();
 
 				// Do not delete nodes for NodeSync components!
 				StartTaskAssetRebuild(HAC->AssetId, HAC->HapiGUID);
@@ -1266,15 +1276,7 @@ FHoudiniEngineManager::PreCook(UHoudiniAssetComponent* HAC)
 			TRACE_CPUPROFILER_EVENT_SCOPE(FHoudiniEngineManager::PreCook-SetPreset);
 
 			// If we have stored parameter preset - restore them
-			HAPI_Result Res = FHoudiniApi::SetPreset(
-				FHoudiniEngine::Get().GetSession(), 
-				HAC->AssetId,
-				HAPI_PRESETTYPE_BINARY,
-				"hapi",
-				(char *)(HAC->ParameterPresetBuffer.GetData()),
-				HAC->ParameterPresetBuffer.Num());
-
-			if (Res == HAPI_RESULT_SUCCESS)
+			if(FHoudiniEngineUtils::SetAssetPreset(HAC->GetAssetId(), HAC->ParameterPresetBuffer))
 				bPresetSuccess = true;
 		}
 

Source/HoudiniEngine/Private/HoudiniEngineUtils.cpp

@@ -1978,15 +1978,15 @@ FHoudiniEngineUtils::IsValidNodeId(HAPI_NodeId NodeId)
 */
 
 bool
-FHoudiniEngineUtils::GetHoudiniAssetName(const HAPI_NodeId& AssetNodeId, FString& NameString)
+FHoudiniEngineUtils::GetHoudiniAssetName(HAPI_NodeId InNodeId, FString& NameString)
 {
 	TRACE_CPUPROFILER_EVENT_SCOPE(FHoudiniEngineUtils::GetHoudiniAssetName);
 
-	if (AssetNodeId < 0)
+	if (InNodeId < 0)
 		return false;
 
 	HAPI_AssetInfo AssetInfo;
-	if (FHoudiniApi::GetAssetInfo(FHoudiniEngine::Get().GetSession(), AssetNodeId, &AssetInfo) == HAPI_RESULT_SUCCESS)
+	if (FHoudiniApi::GetAssetInfo(FHoudiniEngine::Get().GetSession(), InNodeId, &AssetInfo) == HAPI_RESULT_SUCCESS)
 	{
 		FHoudiniEngineString HoudiniEngineString(AssetInfo.nameSH);
 		return HoudiniEngineString.ToFString(NameString);
@@ -1995,7 +1995,7 @@ FHoudiniEngineUtils::GetHoudiniAssetName(const HAPI_NodeId& AssetNodeId, FString
 	{
 		// If the node is not an asset, return the node name
 		HAPI_NodeInfo NodeInfo;
-		if (FHoudiniApi::GetNodeInfo(FHoudiniEngine::Get().GetSession(), AssetNodeId, &NodeInfo) == HAPI_RESULT_SUCCESS)
+		if (FHoudiniApi::GetNodeInfo(FHoudiniEngine::Get().GetSession(), InNodeId, &NodeInfo) == HAPI_RESULT_SUCCESS)
 		{
 			FHoudiniEngineString HoudiniEngineString(NodeInfo.nameSH);
 			return HoudiniEngineString.ToFString(NameString);
@@ -2006,20 +2006,26 @@ FHoudiniEngineUtils::GetHoudiniAssetName(const HAPI_NodeId& AssetNodeId, FString
 }
 
 bool
-FHoudiniEngineUtils::GetAssetPreset(const HAPI_NodeId& AssetNodeId, TArray<int8>& PresetBuffer)
+FHoudiniEngineUtils::GetAssetPreset(HAPI_NodeId InNodeId, TArray<int8>& PresetBuffer)
 {
 	TRACE_CPUPROFILER_EVENT_SCOPE(FHoudiniEngineUtils::GetAssetPreset);
 	PresetBuffer.Empty();
 
+	// See if param presets usage is disabled
+	const UHoudiniRuntimeSettings* HoudiniRuntimeSettings = GetDefault<UHoudiniRuntimeSettings>();
+	bool bEnabled = HoudiniRuntimeSettings ? HoudiniRuntimeSettings->bUsePresetsForParameters : true;
+	if (!bEnabled)
+		return false;
+
 	HAPI_NodeId NodeId;
 	HAPI_AssetInfo AssetInfo;
 	if (HAPI_RESULT_SUCCESS == FHoudiniApi::GetAssetInfo(
-		FHoudiniEngine::Get().GetSession(), AssetNodeId, &AssetInfo))
+		FHoudiniEngine::Get().GetSession(), InNodeId, &AssetInfo))
 	{
 		NodeId = AssetInfo.nodeId;
 	}
 	else
-		NodeId = AssetNodeId;
+		NodeId = InNodeId;
 
 	if (NodeId < 0)
 		return false;
@@ -2037,6 +2043,34 @@ FHoudiniEngineUtils::GetAssetPreset(const HAPI_NodeId& AssetNodeId, TArray<int8>
 	return true;
 }
 
+bool
+FHoudiniEngineUtils::SetAssetPreset(HAPI_NodeId InNodeId, const TArray<int8>& PresetBuffer)
+{
+	TRACE_CPUPROFILER_EVENT_SCOPE(FHoudiniEngineUtils::SetAssetPreset);
+	if (InNodeId < 0)
+		return false;
+
+	// See if param presets usage is disabled
+	const UHoudiniRuntimeSettings* HoudiniRuntimeSettings = GetDefault<UHoudiniRuntimeSettings>();
+	bool bEnabled = HoudiniRuntimeSettings ? HoudiniRuntimeSettings->bUsePresetsForParameters : true;
+	if (!bEnabled)
+		return false;
+
+	// If we have stored parameter preset - restore them
+	HAPI_Result Res = FHoudiniApi::SetPreset(
+		FHoudiniEngine::Get().GetSession(),
+		InNodeId,
+		HAPI_PRESETTYPE_BINARY,
+		"hapi",
+		(char*)(PresetBuffer.GetData()),
+		PresetBuffer.Num());
+
+	if (Res != HAPI_RESULT_SUCCESS)
+		return false;
+
+	return true;
+}
+
 bool
 FHoudiniEngineUtils::HapiGetAbsNodePath(const HAPI_NodeId& InNodeId, FString& OutPath)
 {
@@ -2096,7 +2130,7 @@ FHoudiniEngineUtils::HapiGetNodePath(const FHoudiniGeoPartObject& InHGPO, FStrin
 	FString NodePathTemp;
 	if (InHGPO.AssetId == InHGPO.GeoId)
 	{
-		HAPI_NodeId AssetNodeId = -1;
+		HAPI_NodeId NodeId = -1;
 
 		// This is a SOP asset, just return the asset name in this case
 		HAPI_AssetInfo AssetInfo;
@@ -2105,18 +2139,18 @@ FHoudiniEngineUtils::HapiGetNodePath(const FHoudiniGeoPartObject& InHGPO, FStrin
 			FHoudiniEngine::Get().GetSession(), InHGPO.AssetId, &AssetInfo))
 		{
 			// Get the asset info node id
-			AssetNodeId = AssetInfo.nodeId;
+			NodeId = AssetInfo.nodeId;
 		}
 		else
 		{
 			// Not an asset, just use the node id directly
-			AssetNodeId = InHGPO.AssetId;
+			NodeId = InHGPO.AssetId;
 		}
 
 		HAPI_NodeInfo AssetNodeInfo;
 		FHoudiniApi::NodeInfo_Init(&AssetNodeInfo);
 		if (HAPI_RESULT_SUCCESS == FHoudiniApi::GetNodeInfo(
-			FHoudiniEngine::Get().GetSession(), AssetNodeId, &AssetNodeInfo))
+			FHoudiniEngine::Get().GetSession(), NodeId, &AssetNodeInfo))
 		{
 			if (FHoudiniEngineString::ToFString(AssetNodeInfo.nameSH, NodePathTemp))
 			{

Source/HoudiniEngine/Private/HoudiniEngineUtils.h

@@ -423,10 +423,13 @@ struct HOUDINIENGINE_API FHoudiniEngineUtils
 			TArray<HAPI_StringHandle>& AssetNames, HAPI_StringHandle& OutPickedAssetName );
 
 		// Returns the name of a Houdini asset.
-		static bool GetHoudiniAssetName(const HAPI_NodeId& AssetNodeId, FString & NameString);
+		static bool GetHoudiniAssetName(HAPI_NodeId InNodeId, FString & NameString);
 
-		// Gets preset data for a given asset.
-		static bool GetAssetPreset(const HAPI_NodeId& AssetNodeId, TArray<int8>& PresetBuffer);
+		// Gets preset data for a given node.
+		static bool GetAssetPreset(HAPI_NodeId InNodeId, TArray<int8>& PresetBuffer);
+
+		// Sets preset data for a given node.
+		static bool SetAssetPreset(HAPI_NodeId InNodeId, const TArray<int8>& PresetBuffer);
 
 		// HAPI : Set asset transform.
 		static bool HapiSetAssetTransform(const HAPI_NodeId& AssetNodeId, const FTransform & Transform);

Source/HoudiniEngine/Private/HoudiniParameterTranslator.cpp

@@ -2628,14 +2628,14 @@ FHoudiniParameterTranslator::UploadChangedParameters( UHoudiniAssetComponent * H
 	if (HAC->IsA<UHoudiniNodeSyncComponent>())
 		return true;
 
+	bool bResult = true;
 	TMap<FString, UHoudiniParameter*> RampsToRevert;
 	// First upload all parameters, including the current child parameters/points of ramps, and then process
 	// the ramp parameters themselves (delete and insert operations of ramp points)
 	// This is so that the initial upload of parameter values use the correct parameter value/tuple array indices
 	// (which will change after potential insert/delete operations). Insert operations will upload their new
 	// parameter values after the insert.
 	TArray<UHoudiniParameter*> RampsToUpload;
-
 	for (int32 ParmIdx = 0; ParmIdx < HAC->GetNumParameters(); ParmIdx++)
 	{
 		TObjectPtr<UHoudiniParameter>& CurrentParm = HAC->Parameters[ParmIdx];
@@ -2678,10 +2678,12 @@ FHoudiniParameterTranslator::UploadChangedParameters( UHoudiniAssetComponent * H
 		{
 			// Keep this param marked as changed but prevent it from generating updates
 			CurrentParm->SetNeedsToTriggerUpdate(false);
+			bResult = false;
 		}
 	}
 
-	FHoudiniParameterTranslator::RevertRampParameters(RampsToRevert, HAC->GetAssetId());
+	if (!FHoudiniParameterTranslator::RevertRampParameters(RampsToRevert, HAC->GetAssetId()))
+		bResult = false;
 
 	for (UHoudiniParameter* const RampParam : RampsToUpload)
 	{
@@ -2690,9 +2692,11 @@ FHoudiniParameterTranslator::UploadChangedParameters( UHoudiniAssetComponent * H
 
 		if (UploadParameterValue(RampParam))
 			RampParam->MarkChanged(false);
+		else
+			bResult = false;
 	}
 
-	return true;
+	return bResult;
 }
 
 bool
@@ -2932,7 +2936,7 @@ FHoudiniParameterTranslator::UploadParameterValue(UHoudiniParameter* InParam)
 		default:
 		{
 			// TODO: implement other parameter types!
-			return false;
+			return true;
 		}
 		break;
 	}
@@ -3473,7 +3477,6 @@ bool
 FHoudiniParameterTranslator::RevertRampParameters(TMap<FString, UHoudiniParameter*> & InRampParams, const int32 & AssetId) 
 {
 	TRACE_CPUPROFILER_EVENT_SCOPE(FHoudiniParameterTranslator::RevertRampParameters);
-
 	if (InRampParams.Num() <= 0)
 		return true;
 

Source/HoudiniEngine/Private/SAssetSelectionWidget.cpp

@@ -26,11 +26,12 @@
 
 #include "SAssetSelectionWidget.h"
 
+#include "HoudiniEnginePrivatePCH.h"
 #include "HoudiniEngineString.h"
 
 #if WITH_EDITOR
 
-#include "../../Launch/Resources/Version.h"
+#include "Runtime/Launch/Resources/Version.h"
 
 #include "EditorStyleSet.h"
 #include "Internationalization/Internationalization.h"

Source/HoudiniEngineEditor/Private/SNewFilePathPicker.cpp

@@ -27,12 +27,14 @@
 #include "SNewFilePathPicker.h"
 
 #include "HoudiniApi.h"
+
 #include "DesktopPlatformModule.h"
-#include "Widgets/SBoxPanel.h"
 #include "Framework/Application/SlateApplication.h"
+#include "Runtime/Launch/Resources/Version.h"
 #include "Widgets/Images/SImage.h"
 #include "Widgets/Input/SEditableTextBox.h"
 #include "Widgets/Input/SButton.h"
+#include "Widgets/SBoxPanel.h"
 
 #define LOCTEXT_NAMESPACE "SNewFilePathPicker"
 

Source/HoudiniEngineRuntime/Private/HoudiniRuntimeSettings.cpp

@@ -83,6 +83,7 @@ UHoudiniRuntimeSettings::UHoudiniRuntimeSettings( const FObjectInitializer & Obj
 	bDisplaySlateCookingNotifications = true;
 	DefaultTemporaryCookFolder = HAPI_UNREAL_DEFAULT_TEMP_COOK_FOLDER;
 	DefaultBakeFolder = HAPI_UNREAL_DEFAULT_BAKE_FOLDER;
+	bUsePresetsForParameters = true;
 
 	// Instances
 	bEnableDeprecatedInstanceVariations = false;

Source/HoudiniEngineRuntime/Private/HoudiniRuntimeSettings.h

@@ -272,6 +272,10 @@ class HOUDINIENGINERUNTIME_API UHoudiniRuntimeSettings : public UObject
 		UPROPERTY(GlobalConfig, EditAnywhere, Category = Cooking)
 		FString DefaultBakeFolder;
 
+		// Whether Houdini Engine can store/set multiple parameters via presets
+		UPROPERTY(GlobalConfig, EditAnywhere, Category = Cooking)
+		bool bUsePresetsForParameters;
+
 		//-------------------------------------------------------------------------------------------------------------
 		// Deprecated instance settings.
 		//-------------------------------------------------------------------------------------------------------------