Removing HoudiniEngine plugin and main references (#7450)
* Removing Houdini plugin * Restore HoudiniEngine ignore from .gitignore --------- Co-authored-by: Blyron <53337103+Blyron@users.noreply.github.com>
This commit is contained in:
parent
e55a4ef1c0
commit
20a4a46182
Binary file not shown.
|
@ -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(
|
||||
|
|
|
@ -5,7 +5,6 @@
|
|||
// For a copy, see <https://opensource.org/licenses/MIT>.
|
||||
|
||||
#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<UHoudiniAsset>(InHoudiniObject);
|
||||
if (!InHoudiniAsset)
|
||||
{
|
||||
UE_LOG(LogCarlaTools, Error, TEXT("Houdini asset not valid"));
|
||||
return nullptr;
|
||||
}
|
||||
UHoudiniImportNodeWrapper* WrapperNode = NewObject<UHoudiniImportNodeWrapper>();
|
||||
|
||||
TMap<FName, FHoudiniParameterTuple> 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;
|
||||
}
|
||||
|
||||
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"));
|
||||
|
|
|
@ -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;
|
||||
|
||||
};
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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 ------------------------------------------------------------
|
||||
# ==============================================================================
|
||||
|
|
|
@ -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;
|
||||
};
|
Loading…
Reference in New Issue