[src] Update SofaContext loading to split the node and component loading using gui button to track crash (#24)

Author: epernod

Source/SofaUE5/Private/SofaContext.cpp

@@ -240,7 +240,7 @@ void ASofaContext::createSofaContext()
         //TSharedRef<SofaAdvancePhysicsAPI> apiRef(new SofaAdvancePhysicsAPI());
         //m_data.m_sofaAPI = apiRef;
         m_sofaAPI = new SofaAdvancePhysicsAPI();
-        UE_LOG(SUnreal_log, Warning, TEXT("## ASofaDAGNode::loadComponents TEST 11"));
+        UE_LOG(SUnreal_log, Warning, TEXT("## ASofaDAGNode::loadComponents TEST 12"));
         // TODO restore that
         //m_sofaAPI->activateMessageHandler(m_isMsgHandlerActivated);
 
@@ -278,15 +278,11 @@ void ASofaContext::createSofaContext()
         return;
     }
 
-    // Load default plugins
-    FString pluginPaths = curPath + "Plugins/SofaUE5/Binaries/ThirdParty/SofaUE5Library/Win64";
-    const char* pluginPchar = TCHAR_TO_ANSI(*pluginPaths);
-    int resPlug = m_sofaAPI->loadDefaultPlugins(pluginPchar);
-    if (resPlug != 0) {
-        UE_LOG(SUnreal_log, Error, TEXT("## ASofaContext::createSofaContext: loadDefaultPlugin failed, returns: %d"), resPlug);
-    }
+    // Load default plugins at start before loading SOFA scene
+    loadDefaultPlugin();
 
 
+    // If file is already set will load directly the file
     if (!filePath.FilePath.IsEmpty()) {
         loadSofaScene();
 
@@ -317,8 +313,7 @@ void ASofaContext::loadSofaScene()
         UE_LOG(SUnreal_log, Log, TEXT("## ASofaContext::loadSofaScene: Scene loading with success: %s"), *my_filePath);
     }
 
-    //FPlatformProcess::Sleep(0.01f);
-
+ 
     // Pass default scene parameter
    // this->setDT(Dt);
    // this->setGravity(Gravity);
@@ -332,28 +327,18 @@ void ASofaContext::loadSofaScene()
     //m_status++;
 }
 
-void ASofaContext::mapSofaScene()
-{
-    if (m_status == -1) {
-        this->loadNodeGraph();
-    }
-    else
-    {
-        this->reconnectNodeGraph();
-
-    }
-    m_status++;
-}
-
-
 void ASofaContext::loadDefaultPlugin()
 {
     if (m_sofaAPI == nullptr)
         return;
 
-    //m_sofaAPI->loadPlugin("C:/projects/UnrealEngine/SOFA_test2/Plugins/SofaUE5/Binaries/ThirdParty/SofaUE5Library/Win64/Sofa.Component.dll");
-    //m_sofaAPI->loadPlugin("C:/projects/UnrealEngine/SOFA_test2/Plugins/SofaUE5/Binaries/ThirdParty/SofaUE5Library/Win64/Sofa.GL.Component.dll");
-    //m_sofaAPI->loadPlugin("C:/projects/UnrealEngine/SOFA_test2/Plugins/SofaUE5/Binaries/ThirdParty/SofaUE5Library/Win64/Sofa.GUI.Component.dll");
+    FString curPath = FPaths::ConvertRelativePathToFull(FPaths::ProjectDir());
+    FString pluginPaths = curPath + "Plugins/SofaUE5/Binaries/ThirdParty/SofaUE5Library/Win64";
+    const char* pluginPchar = TCHAR_TO_ANSI(*pluginPaths);
+    int resPlug = m_sofaAPI->loadDefaultPlugins(pluginPchar);
+    if (resPlug != 0) {
+        UE_LOG(SUnreal_log, Error, TEXT("## ASofaContext::createSofaContext: loadDefaultPlugin failed, returns: %d"), resPlug);
+    }
 
     //if (m_isMsgHandlerActivated == true)
     //    catchSofaMessages();
@@ -398,7 +383,7 @@ void ASofaContext::loadNodeGraph()
         FString fs_nodeDisplayName(nodeDisplayName.c_str());
 
         FActorSpawnParameters SpawnParams;
-        //SpawnParams.Name = MakeUniqueObjectName(World, ASofaDAGNode::StaticClass(), FName(*fs_nodeDisplayName));
+        SpawnParams.Name = MakeUniqueObjectName(World, ASofaDAGNode::StaticClass(), FName(*fs_nodeDisplayName));
         SpawnParams.Owner = this;
 
         ASofaDAGNode* dagNode = World->SpawnActorDeferred<ASofaDAGNode>(
@@ -411,9 +396,6 @@ void ASofaContext::loadNodeGraph()
 
         if (dagNode != nullptr)
         {                
-            //FAttachmentTransformRules att = FAttachmentTransformRules(EAttachmentRule::KeepRelative, true);
-            //dagNode->AttachToActor(this, FAttachmentTransformRules::KeepRelativeTransform);
-
             std::string parentNameId = "";
             int resParentNameId = m_sofaAPI->getDAGNodeParentAPIName_out(nodeUniqID, parentNameId);
             if (resParentNameId != 0)
@@ -446,8 +428,10 @@ void ASofaContext::loadNodeGraph()
 
         const FString& parentName = dagNode->getParentName();
         auto res = parentName.Compare("None");
-        if (res == 0)
+        if (res == 0) {
+            dagNode->AttachToActor(this, FAttachmentTransformRules::KeepRelativeTransform);
             continue;
+        }
 
         for (auto& WeakOther : m_dagNodes)
         {
@@ -461,6 +445,12 @@ void ASofaContext::loadNodeGraph()
         }
     }
 
+    m_status++;
+}
+
+
+void ASofaContext::loadSofaComponents()
+{
     UE_LOG(SUnreal_log, Warning, TEXT("## ASofaContext::loadNodeGraph: Load all components | nbr Nodes: %d"), m_dagNodes.Num());
     // Load Components Graph
     for (auto& WeakDagNode : m_dagNodes)
@@ -470,7 +460,6 @@ void ASofaContext::loadNodeGraph()
             dagNode->loadComponents(m_sofaAPI);
         }
     }
-
 }
 
 

Source/SofaUE5/Public/SofaContext.h

@@ -45,23 +45,13 @@ class SOFAUE5_API ASofaContext : public AActor
     // Called when the game starts or when spawned
     virtual void BeginPlay() override;
 
+    virtual void EndPlay(const EEndPlayReason::Type EndPlayReason) override;
+
 
 public:
     // Sets default values for this actor's properties
     ASofaContext();
 
-    virtual void EndPlay(const EEndPlayReason::Type EndPlayReason) override;
-
-    UFUNCTION(CallInEditor, Category = "Sofa")
-    void loadSofaScene();
-
-    UFUNCTION(CallInEditor, Category = "Sofa")
-    void mapSofaScene();
-
-#if WITH_EDITOR
-    virtual void PostEditChangeProperty(FPropertyChangedEvent& PropertyChangedEvent) override;
-#endif
-
     // Called every frame
     virtual void Tick( float DeltaSeconds ) override;
 
@@ -70,33 +60,46 @@ class SOFAUE5_API ASofaContext : public AActor
     void setGravity(FVector value);
 
 public:
-    UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Sofa Parameters")
-        FFilePath filePath;
+    UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Sofa")
+    FFilePath filePath;
+ 
+    UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Sofa")
+    float Dt;
+
+    UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Sofa")
+    FVector Gravity;
 
-    UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Sofa Parameters")
-        float Dt;
+    UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Sofa")
+    bool m_isMsgHandlerActivated = false;
 
-    UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Sofa Parameters")
-        FVector Gravity;
+    UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Sofa")
+    bool m_log = true;
 
-    UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Sofa Parameters")
-        bool m_isMsgHandlerActivated = false;
+    UFUNCTION(CallInEditor, Category = "Sofa")
+    void loadNodeGraph();
 
-    UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Sofa Parameters")
-        bool m_log = true;
+    UFUNCTION(CallInEditor, Category = "Sofa")
+    void loadSofaComponents();
 
-protected:
-    void catchSofaMessages();
+#if WITH_EDITOR
+    virtual void PostEditChangeProperty(FPropertyChangedEvent& PropertyChangedEvent) override;
+#endif
 
+protected:
     void createSofaContext();
 
+    // Internal method to load SOFA scene inside the SofaContext
+    void loadSofaScene();
 
+    // Method to internally load SOFA default plugin dll
     void loadDefaultPlugin();
 
-    void loadNodeGraph();
+    
     void reconnectNodeGraph();
     void clearNodeGraph();
 
+    void catchSofaMessages();
+
 private:
     int32 m_dllLoadStatus;
     FString m_apiName;