FIX - InitializeMujoco is now a wrapper to the real SceneInitialization

+ I don't want to commit 10 blueprints because we can't put empty map as default values in BP nodes
This commit is contained in:
Jb win 2025-04-30 16:45:32 +07:00 committed by Jean-Baptiste Briant (JB)
parent 2207cfbba0
commit 5ee0e40e6f
2 changed files with 23 additions and 7 deletions

View File

@ -115,7 +115,13 @@ void AMujocoVolumeActor::BindPostPhysicDelegate(UserClass* Object, void(UserClas
PostPhysicUpdateDelegate.BindUObject(Object, Func); PostPhysicUpdateDelegate.BindUObject(Object, Func);
} }
void AMujocoVolumeActor::InitializeMujoco(TMap<FString, FString> ContactExclusion)
void AMujocoVolumeActor::InitializeMujoco()
{
InitializeMujocoScene_WithContactExclusion(TMap<FString, FString>{});
}
void AMujocoVolumeActor::InitializeMujocoScene_WithContactExclusion(const TMap<FString, FString>& ContactExclusion)
{ {
if (!Options) if (!Options)
{ {
@ -170,6 +176,8 @@ void AMujocoVolumeActor::InitializeMujoco(TMap<FString, FString> ContactExclusio
return; return;
} }
// TODO Here we should check for mujoco dll if we are on windows and LOG an error if there is not + gently quit the game
std::array<char, 1024> ErrMsg{}; std::array<char, 1024> ErrMsg{};
MujocoModel = MakeMujocoModelPtr(mj_loadXML(TCHAR_TO_ANSI(*ExportFilename), nullptr, ErrMsg.data(), ErrMsg.size())); MujocoModel = MakeMujocoModelPtr(mj_loadXML(TCHAR_TO_ANSI(*ExportFilename), nullptr, ErrMsg.data(), ErrMsg.size()));
if (!MujocoModel) if (!MujocoModel)

View File

@ -33,15 +33,23 @@ class LUCKYMUJOCO_API AMujocoVolumeActor : public AActor
public: public:
AMujocoVolumeActor(); AMujocoVolumeActor();
UFUNCTION(BlueprintCallable, Category = "Mujoco")
/** /**
* Initialize the sim scene in headless mujoco * Initialize the sim scene in headless mujoco
*/
UFUNCTION(BlueprintCallable, Category = "Mujoco")
void InitializeMujoco();
/**
* Initialize the sim scene in headless mujoco with a list of contact exclusion
* @param ContactExclusion a list of pairs that should be patched in the xml file for contact exclusion (no friction, no collision) * @param ContactExclusion a list of pairs that should be patched in the xml file for contact exclusion (no friction, no collision)
* TODO Can't use a default empty map as parameter in blueprints? We shouldn't need to have 2 functions
* TODO ContactExclusion should be stored as a property of MujocoActor and not passed in the scene init * TODO ContactExclusion should be stored as a property of MujocoActor and not passed in the scene init
* TODO This require to cast the Actor in addition to the components list * TODO This require to cast the Actor in addition to the components list
*/ */
void InitializeMujoco(TMap<FString, FString> ContactExclusion); UFUNCTION(BlueprintCallable, Category = "Mujoco")
void InitializeMujocoScene_WithContactExclusion(const TMap<FString, FString>& ContactExclusion);
protected: protected:
virtual void BeginPlay() override; virtual void BeginPlay() override;