[src] Fix release/debug config switch to link against the corresponding SOFA dll and libs + small improvments in VisualMesh (#34)

* [src] Fix release/debug config switch to link against the corresponding SOFA dll and libs

* [src] Fix simulation pace to call step every dt

* small improvment for SofaVIsualMesh

Author: epernod

Source/SofaUE5/Private/SofaContext.cpp

@@ -233,24 +233,26 @@ void ASofaContext::PostEditChangeProperty(FPropertyChangedEvent & PropertyChange
 }
 #endif
 
-
+double nextime = 0.0;
+int cptStep = 0;
 // Called every frame
 void ASofaContext::Tick( float DeltaTime )
 {   
     if (m_status != -1 && m_sofaAPI)
     {
-        // Step SOFA simulation on each UE tick
-        m_sofaAPI->step();
-        
-        //double stime = m_sofaAPI->getTime();
-        
-        //if (m_isMsgHandlerActivated == true)
-        //    catchSofaMessages();
-        
-        //UE_LOG(LogTemp, Warning, TEXT("## ASofaContext: Tick: %f %f"), value, stime);
+        float value = this->GetGameTimeSinceCreation();
+		if (value >= nextime)
+		{
+            cptStep++;
+			nextime = value + Dt;
+			//UE_LOG(SUnreal_log, Log, TEXT("## ASofaContext: Tick %d: %f"), cptStep, value);
+
+            // Step SOFA simulation on each UE tick
+            m_sofaAPI->step();
+		}
+              
+        //UE_LOG(LogTemp, Warning, TEXT("## ASofaContext: Tick: %f"), value);
     }
-    float value = this->GetGameTimeSinceCreation();
-    UE_LOG(LogTemp, Warning, TEXT("## ASofaContext: Tick: %f"), value);
 
     Super::Tick(DeltaTime);
 }
@@ -366,7 +368,8 @@ void ASofaContext::loadDefaultPlugin()
 
     bool debugMode = false;
 
-#if (UE_BUILD_DEBUG || UE_BUILD_DEVELOPMENT) && !UE_BUILD_SHIPPING
+
+#if UE_DEBUGGAME
     debugMode = true;
 #endif
 

Source/SofaUE5/Private/SofaUE5.cpp

@@ -42,10 +42,11 @@ void FSofaUE5Module::StartupModule()
 	FString BaseDir = IPluginManager::Get().FindPlugin("SofaUE5")->GetBaseDir();
 
 	bool debugMode = false;
-
-#if (UE_BUILD_DEBUG || UE_BUILD_DEVELOPMENT) && !UE_BUILD_SHIPPING
+	
+#if UE_DEBUGGAME
 	debugMode = true;
 #endif
+	UE_LOG(LogTemp, Warning, TEXT("FSofaUE5Module::StartupModule debug = %d"), debugMode);
 
 	// Add on the relative location of the third party dll and load it
 	FString LibraryPath;
@@ -98,6 +99,7 @@ void FSofaUE5Module::StartupModule()
 		FMessageDialog::Open(EAppMsgType::Ok, LOCTEXT("ThirdPartyLibraryError", "Failed to load SofaVerseAPI GetDllHandle error"));
 	}
 
+	UE_LOG(LogTemp, Warning, TEXT("LibraryPath = %s"), *LibraryPath);
 	UE_LOG(LogTemp, Warning, TEXT("_ITERATOR_DEBUG_LEVEL = %d"), _ITERATOR_DEBUG_LEVEL);
 }
 

Source/SofaUE5/Private/SofaVisualMesh.cpp

@@ -24,6 +24,7 @@
 #include "SofaVisualMesh.h"
 #include "SofaUE5.h"
 #include "SofaUE5Library/SofaAdvancePhysicsAPI.h"
+#include "KismetProceduralMeshLibrary.h"
 
 // Sets default values
 ASofaVisualMesh::ASofaVisualMesh()
@@ -170,8 +171,12 @@ void ASofaVisualMesh::createMesh()
     TArray<int32> Triangles;
     TArray<FVector> normals;
     TArray<FVector2D> UV0;
-    TArray<FProcMeshTangent> tangents;
-    TArray<FLinearColor> vertexColors;
+    //TArray<FProcMeshTangent> tangents;
+    //TArray<FLinearColor> vertexColors;
+
+    vertices.Reserve(nbrV);
+    normals.Reserve(nbrV);
+    UV0.Reserve(nbrV);
 
     for (int i = 0; i < nbrV; i++)
     {
@@ -182,9 +187,6 @@ void ASofaVisualMesh::createMesh()
             normals.Add(FVector(-sofaNormals[i * 3], -sofaNormals[i * 3 + 1], -sofaNormals[i * 3 + 2]));
         else
             normals.Add(FVector(sofaNormals[i * 3], sofaNormals[i * 3 + 1], sofaNormals[i * 3 + 2]));
-
-        tangents.Add(FProcMeshTangent(0, 1, 0));
-        vertexColors.Add(FLinearColor(0.75, 0.75, 0.75, 1.0));
     }
 
     // Add triangles
@@ -206,14 +208,24 @@ void ASofaVisualMesh::createMesh()
         Triangles.Add(sofaQuads[i * 4 + 2]);
         Triangles.Add(sofaQuads[i * 4 + 3]);
     }
+
+
+    // Generate tangents for correct lighting
+    TArray<FVector> CalcNormals;
+    TArray<FProcMeshTangent> CalcTangents;
+    UKismetProceduralMeshLibrary::CalculateTangentsForMesh(vertices, Triangles, UV0, CalcNormals, CalcTangents);
+
+    mesh->CreateMeshSection_LinearColor(0, vertices, Triangles, CalcNormals, UV0, {}, CalcTangents, true);
+
+    mesh->SetCastShadow(true);
+    mesh->bCastDynamicShadow = true;
+    mesh->bAffectDistanceFieldLighting = true;
 
     delete[] sofaVertices;
     delete[] sofaNormals;
     delete[] sofaTexCoords;
     delete[] sofaTriangles;
     delete[] sofaQuads;
-    
-    mesh->CreateMeshSection_LinearColor(0, vertices, Triangles, normals, UV0, vertexColors, tangents, true);
 
     // Enable collision data
     //mesh->ContainsPhysicsTriMeshData(true);

Source/ThirdParty/SofaUE5Library/SofaUE5Library.Build.cs

@@ -26,12 +26,15 @@ public SofaUE5Library(ReadOnlyTargetRules Target) : base(Target)
                 SofaBinPath = Path.Combine("$(PluginDir)/Binaries/ThirdParty/SofaUE5Library/Win64/", "Debug", SofaBinName);
 
                 PublicDefinitions.Add("WITH_SOFA_DEBUG=1");
+                PublicDefinitions.Add("UE_DEBUGGAME=1");
             }
             else
             {
                 SofaLibPath = Path.Combine(ModuleDirectory, "x64", "Release", "SofaVerseAPI.lib");
                 SofaBinName = "SofaVerseAPI.dll";
                 SofaBinPath = Path.Combine("$(PluginDir)/Binaries/ThirdParty/SofaUE5Library/Win64/", "Release", SofaBinName);
+
+                PublicDefinitions.Add("UE_DEBUGGAME=0");
             }
 
             // Add the import library