From 5e9efdc0e159fb0997e2eeba203ead74a4eb25af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Konstantin=20K=C3=BChlem?= <konstantin@koeln.de> Date: Thu, 26 Sep 2024 17:23:03 +0200 Subject: [PATCH] Thesis dependend adjustments --- .../MetaHuman/metahuman_base_skel.uasset | 4 +- Source/CharacterPlugin/Private/VHMovement.cpp | 4 +- .../Private/VHOculusLipSync.cpp | 62 +++++++++---------- 3 files changed, 35 insertions(+), 35 deletions(-) diff --git a/Content/Characters/MetaHuman/metahuman_base_skel.uasset b/Content/Characters/MetaHuman/metahuman_base_skel.uasset index e2ec5b98..da31641a 100644 --- a/Content/Characters/MetaHuman/metahuman_base_skel.uasset +++ b/Content/Characters/MetaHuman/metahuman_base_skel.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d25f480b32f9b9d8a7548fd537664a41bbb06b64c0cd9b9e2e190492478b81de -size 525594 +oid sha256:81be8da154338a67724bd2811b6247f151516779e11542deb80130d481ba07bf +size 4561713 diff --git a/Source/CharacterPlugin/Private/VHMovement.cpp b/Source/CharacterPlugin/Private/VHMovement.cpp index 61d92c38..1fb2b3d9 100644 --- a/Source/CharacterPlugin/Private/VHMovement.cpp +++ b/Source/CharacterPlugin/Private/VHMovement.cpp @@ -236,7 +236,7 @@ void UVHMovement::MoveToWaypoint() } // if we are at the last waypoint and it defines destroying agent, do so - if (CurrentWaypointIterator == Waypoints.Num() && Waypoints[CurrentWaypointIterator - 1]->GetLastWaypointCommand() == EOnWaypointReach::Destroy) + if (Waypoints.Num() != 0 && CurrentWaypointIterator == Waypoints.Num() && Waypoints[CurrentWaypointIterator - 1]->GetLastWaypointCommand() == EOnWaypointReach::Destroy) { VirtualHumanAIController->DestroyAgent(); } @@ -310,7 +310,7 @@ void UVHMovement::MoveToWaypoint(FVector TargetLocation, float Speed) } Cast<UCharacterMovementComponent>(AVirtualHumanPawn->GetMovementComponent())->MaxWalkSpeed = Speed; - CurrentRequestID = VirtualHumanAIController->MoveToLocation(TargetLocation, false); + CurrentRequestID = VirtualHumanAIController->MoveToLocation(TargetLocation, false, true, true, false, false); } void UVHMovement::ChildMoveToWaypoint() diff --git a/Source/CharacterPlugin/Private/VHOculusLipSync.cpp b/Source/CharacterPlugin/Private/VHOculusLipSync.cpp index 3c98235f..28e8fbe3 100644 --- a/Source/CharacterPlugin/Private/VHOculusLipSync.cpp +++ b/Source/CharacterPlugin/Private/VHOculusLipSync.cpp @@ -17,7 +17,7 @@ bool UVHOculusLipSync::InternalLoadFile(FString LocalFilename) { - if(Mapping == nullptr) + if (Mapping == nullptr) { VH_ERROR("[UVHOculusLipSync::InternalLoadFile] Mapping is not specified!\n"); return false; @@ -25,52 +25,52 @@ bool UVHOculusLipSync::InternalLoadFile(FString LocalFilename) { TArray<FName> BlendshapeNames = Mapping->GetCurveFNames(); TArray<TArray<float>> BlendshapeValues; - for(FName PoseName : Mapping->GetPoseFNames()) + for (FName PoseName : Mapping->GetPoseFNames()) { BlendshapeValues.Add(Mapping->GetCurveValues(Mapping->GetPoseIndexByName(PoseName))); } - - //Load visemes.txt - FString FileAsString; - FString Filename = FPaths::Combine(FPaths::ProjectContentDir(), LocalFilename); - IPlatformFile &File = FPlatformFileManager::Get().GetPlatformFile(); - if (File.FileExists(*Filename)) { - - FFileHelper::LoadFileToString(FileAsString, *Filename); - } - TArray<FString> Lines; - FileAsString.ParseIntoArrayLines(Lines, true); + + //Load visemes.txt + FString FileAsString; + FString Filename = FPaths::Combine(FPaths::ProjectContentDir(), LocalFilename); + IPlatformFile& File = FPlatformFileManager::Get().GetPlatformFile(); + if (File.FileExists(*Filename)) { + + FFileHelper::LoadFileToString(FileAsString, *Filename); + } + TArray<FString> Lines; + FileAsString.ParseIntoArrayLines(Lines, true); AnimationData.BlendshapeNames.Empty(); AnimationData.TimeSteps.Empty(); - for(FName Name : BlendshapeNames) + for (FName Name : BlendshapeNames) { AnimationData.BlendshapeNames.Add(Name.ToString()); } - + int FrameNumber = 0; - for (FString Line : Lines) { + for (FString Line : Lines) { - if (Line.StartsWith("#Framerate")) { - TArray<FString> Entries; - Line.ParseIntoArrayWS(Entries); - if (Entries.Num() == 2) - Framerate = FCString::Atof(*Entries[1]); - } + if (Line.StartsWith("#Framerate")) { + TArray<FString> Entries; + Line.ParseIntoArrayWS(Entries); + if (Entries.Num() == 2) + Framerate = FCString::Atof(*Entries[1]); + } - if (Line.StartsWith("#")) - continue; + if (Line.StartsWith("#")) + continue; FFrameData FrameData; FrameData.Timestamp = FrameNumber / Framerate; - TArray<FString> Entries; - Line.ParseIntoArrayWS(Entries); - TArray<float> VisemeActivations; - for (FString Entry : Entries) { + TArray<FString> Entries; + Line.ParseIntoArrayWS(Entries); + TArray<float> VisemeActivations; + for (FString Entry : Entries) { VisemeActivations.Add(FCString::Atof(*Entry)); - } + } TArray<float> Activations; Activations.Init(0.0f, BlendshapeNames.Num()); @@ -85,6 +85,6 @@ bool UVHOculusLipSync::InternalLoadFile(FString LocalFilename) { } AnimationData.TimeSteps.Add(FrameData); ++FrameNumber; - } - return true; + } + return true; } -- GitLab