diff --git a/Unreal/CarlaUE4/Plugins/CarlaTools/Content/OnroadMapGenerator/UW_HoudiniBuildingImporter.uasset b/Unreal/CarlaUE4/Plugins/CarlaTools/Content/OnroadMapGenerator/UW_HoudiniBuildingImporter.uasset index fbf48f5db..3348f8d44 100644 Binary files a/Unreal/CarlaUE4/Plugins/CarlaTools/Content/OnroadMapGenerator/UW_HoudiniBuildingImporter.uasset and b/Unreal/CarlaUE4/Plugins/CarlaTools/Content/OnroadMapGenerator/UW_HoudiniBuildingImporter.uasset differ diff --git a/Unreal/CarlaUE4/Plugins/CarlaTools/Source/CarlaTools/CarlaTools.Build.cs b/Unreal/CarlaUE4/Plugins/CarlaTools/Source/CarlaTools/CarlaTools.Build.cs index 5f1dc68d2..a5181554a 100644 --- a/Unreal/CarlaUE4/Plugins/CarlaTools/Source/CarlaTools/CarlaTools.Build.cs +++ b/Unreal/CarlaUE4/Plugins/CarlaTools/Source/CarlaTools/CarlaTools.Build.cs @@ -6,7 +6,6 @@ using UnrealBuildTool; public class CarlaTools : ModuleRules { - bool UsingHoudini = true; bool bUsingOmniverseConnector = false; private bool IsWindows(ReadOnlyTargetRules Target) { @@ -97,16 +96,6 @@ public class CarlaTools : ModuleRules // ... add private dependencies that you statically link with here ... } ); - if(UsingHoudini) - { - PrivateDependencyModuleNames.AddRange( - new string[] - { - "HoudiniEngine", - "HoudiniEngineEditor", - "HoudiniEngineRuntime" - }); - } if(bUsingOmniverseConnector) { PrivateDependencyModuleNames.AddRange( diff --git a/Unreal/CarlaUE4/Plugins/CarlaTools/Source/CarlaTools/Private/HoudiniImportNodeWrapper.cpp b/Unreal/CarlaUE4/Plugins/CarlaTools/Source/CarlaTools/Private/HoudiniImportNodeWrapper.cpp index 015ffe56d..d2d57a4ee 100644 --- a/Unreal/CarlaUE4/Plugins/CarlaTools/Source/CarlaTools/Private/HoudiniImportNodeWrapper.cpp +++ b/Unreal/CarlaUE4/Plugins/CarlaTools/Source/CarlaTools/Private/HoudiniImportNodeWrapper.cpp @@ -5,7 +5,6 @@ // For a copy, see . #include "HoudiniImportNodeWrapper.h" -#include "HoudiniAsset.h" UHoudiniImportNodeWrapper::UHoudiniImportNodeWrapper(const FObjectInitializer& ObjectInitializer) { @@ -24,44 +23,15 @@ UHoudiniImportNodeWrapper* UHoudiniImportNodeWrapper::ImportBuildings( int ClusterSize, int CurrentCluster, bool bUseCOM) { - UE_LOG(LogCarlaTools, Log, TEXT("Start building import")); - UHoudiniAsset* InHoudiniAsset = Cast(InHoudiniObject); - if (!InHoudiniAsset) - { - UE_LOG(LogCarlaTools, Error, TEXT("Houdini asset not valid")); - return nullptr; - } - UHoudiniImportNodeWrapper* WrapperNode = NewObject(); - - TMap InParameters = - { {"userMapName", FHoudiniParameterTuple(MapName)}, - {"osmPath", FHoudiniParameterTuple(OSMFilePath)}, - {"clusterSize", FHoudiniParameterTuple(ClusterSize)}, - {"displayedCluster", FHoudiniParameterTuple(CurrentCluster)}, - {"startCooking", FHoudiniParameterTuple(true)}, - {"lat", FHoudiniParameterTuple(Latitude)}, - {"lon", FHoudiniParameterTuple(Longitude)}, - {"centOfMass", FHoudiniParameterTuple(bUseCOM)}}; - - WrapperNode->HDANode = - UHoudiniPublicAPIProcessHDANode::ProcessHDA( - InHoudiniAsset, InInstantiateAt, InParameters, {}, {}, - InWorldContextObject, nullptr, - true, true, "", EHoudiniEngineBakeOption::ToActor, - true); - WrapperNode->HDANode->Completed.AddDynamic(WrapperNode, &UHoudiniImportNodeWrapper::HandleCompleted); - WrapperNode->HDANode->Failed.AddDynamic(WrapperNode, &UHoudiniImportNodeWrapper::HandleFailed); - UE_LOG(LogCarlaTools, Log, TEXT("HDA node created")); - return WrapperNode; + UE_LOG(LogCarlaTools, Error, TEXT("Houdini asset not valid")); + return nullptr; } void UHoudiniImportNodeWrapper::Activate() { - HDANode->Activate(); } void UHoudiniImportNodeWrapper::HandleCompleted( - UHoudiniPublicAPIAssetWrapper* , bool bCookSuccess, bool bBakeSuccess) { UE_LOG(LogCarlaTools, Log, TEXT("Generation Finished")); @@ -73,7 +43,6 @@ void UHoudiniImportNodeWrapper::HandleCompleted( } void UHoudiniImportNodeWrapper::HandleFailed( - UHoudiniPublicAPIAssetWrapper* , bool bCookSuccess, bool bBakeSuccess) { UE_LOG(LogCarlaTools, Log, TEXT("Generation failed")); diff --git a/Unreal/CarlaUE4/Plugins/CarlaTools/Source/CarlaTools/Public/HoudiniImportNodeWrapper.h b/Unreal/CarlaUE4/Plugins/CarlaTools/Source/CarlaTools/Public/HoudiniImportNodeWrapper.h index 02b6e74e3..b8ccc5248 100644 --- a/Unreal/CarlaUE4/Plugins/CarlaTools/Source/CarlaTools/Public/HoudiniImportNodeWrapper.h +++ b/Unreal/CarlaUE4/Plugins/CarlaTools/Source/CarlaTools/Public/HoudiniImportNodeWrapper.h @@ -8,9 +8,6 @@ #include "CoreMinimal.h" #include "Kismet/BlueprintAsyncActionBase.h" - -#include "HoudiniPublicAPIProcessHDANode.h" - #include "HoudiniImportNodeWrapper.generated.h" // Delegate type for output pins on the node. @@ -49,17 +46,13 @@ protected: UFUNCTION() void HandleCompleted( - UHoudiniPublicAPIAssetWrapper* AssetWrapper, bool bCookSuccess, bool bBakeSuccess); UFUNCTION() void HandleFailed( - UHoudiniPublicAPIAssetWrapper* AssetWrapper, bool bCookSuccess, bool bBakeSuccess); -private: - UHoudiniPublicAPIProcessHDANode* HDANode; }; diff --git a/Util/BuildTools/BuildCarlaUE4.bat b/Util/BuildTools/BuildCarlaUE4.bat index cb61ed5d2..cce890090 100644 --- a/Util/BuildTools/BuildCarlaUE4.bat +++ b/Util/BuildTools/BuildCarlaUE4.bat @@ -129,18 +129,6 @@ if %REMOVE_INTERMEDIATE% == true ( ) ) -rem Download Houdini Plugin - -set HOUDINI_PLUGIN_REPO=https://github.com/sideeffects/HoudiniEngineForUnreal.git -set HOUDINI_PLUGIN_PATH=Plugins/HoudiniEngine -set HOUDINI_PLUGIN_COMMIT=55b6a16cdf274389687fce3019b33e3b6e92a914 -set HOUDINI_PATCH=${CARLA_UTIL_FOLDER}/Patches/houdini_patch.txt -if not exist "%HOUDINI_PLUGIN_PATH%" ( - call git clone %HOUDINI_PLUGIN_REPO% %HOUDINI_PLUGIN_PATH% - cd %HOUDINI_PLUGIN_PATH% - call git checkout %HOUDINI_PLUGIN_COMMIT% - cd ../.. -) rem Build Carla Editor rem diff --git a/Util/BuildTools/BuildCarlaUE4.sh b/Util/BuildTools/BuildCarlaUE4.sh index 3100fc7ed..19f204447 100755 --- a/Util/BuildTools/BuildCarlaUE4.sh +++ b/Util/BuildTools/BuildCarlaUE4.sh @@ -19,7 +19,6 @@ USE_UNITY=true USE_ROS2=false EDITOR_FLAGS="" -USE_HOUDINI=false GDB= RHI="-vulkan" @@ -71,9 +70,6 @@ while [[ $# -gt 0 ]]; do --no-unity ) USE_UNITY=false shift ;; - --with-houdini ) - USE_HOUDINI=true; - shift ;; -h | --help ) echo "$DOC_STRING" echo "$USAGE_STRING" @@ -136,22 +132,6 @@ if ${REMOVE_INTERMEDIATE} ; then fi -# ============================================================================== -# -- Download Houdini Plugin for Unreal Engine --------------------------------- -# ============================================================================== - -HOUDINI_PLUGIN_REPO=https://github.com/sideeffects/HoudiniEngineForUnreal.git -HOUDINI_PLUGIN_PATH=Plugins/HoudiniEngine -HOUDINI_PLUGIN_COMMIT=55b6a16cdf274389687fce3019b33e3b6e92a914 -HOUDINI_PATCH=${CARLA_UTIL_FOLDER}/Patches/houdini_patch.txt -if [[ ! -d ${HOUDINI_PLUGIN_PATH} ]] ; then - git clone ${HOUDINI_PLUGIN_REPO} ${HOUDINI_PLUGIN_PATH} - pushd ${HOUDINI_PLUGIN_PATH} >/dev/null - git checkout ${HOUDINI_PLUGIN_COMMIT} - git apply ${HOUDINI_PATCH} - popd >/dev/null -fi - # ============================================================================== # -- Build CarlaUE4 ------------------------------------------------------------ # ============================================================================== diff --git a/Util/Patches/houdini_patch.txt b/Util/Patches/houdini_patch.txt deleted file mode 100644 index ddc164d65..000000000 --- a/Util/Patches/houdini_patch.txt +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/Source/HoudiniEngineEditor/Private/HoudiniEngineDetails.cpp b/Source/HoudiniEngineEditor/Private/HoudiniEngineDetails.cpp -index 36c9bf5cd..d9d6dbfdb 100755 ---- a/Source/HoudiniEngineEditor/Private/HoudiniEngineDetails.cpp -+++ b/Source/HoudiniEngineEditor/Private/HoudiniEngineDetails.cpp -@@ -1131,8 +1131,8 @@ FHoudiniEngineDetails::CreateAssetOptionsWidgets( - - auto IsCheckedParameterChangedLambda = [MainHAC]() - { -- if (!IsValidWeakPointer(MainHAC)) -- return ECheckBoxState::Unchecked; -+ if (!IsValidWeakPointer(MainHAC)) -+ return ECheckBoxState::Unchecked; - - return MainHAC->bCookOnParameterChange ? ECheckBoxState::Checked : ECheckBoxState::Unchecked; - };