diff --git a/Content/SaveSequenceAnimBP.uasset b/Content/SaveSequenceAnimBP.uasset index 042cad5a9e81c5a6f9954749df996b9901750c1e..ef9d83bcc65dc6074fee20abbed04b2f4d3d7c63 100644 --- a/Content/SaveSequenceAnimBP.uasset +++ b/Content/SaveSequenceAnimBP.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:80192145866aad375b507a92eed94f7c6940a98a3239fa5292043646e249dff3 -size 212348 +oid sha256:5de4bf55a201aed7ed8fc6a0c49455b41256b41f52e787ad1e3baa000fdeb2bf +size 204376 diff --git a/Content/SaveSequenceRig.uasset b/Content/SaveSequenceRig.uasset index 0d4c005d2d6f64bb37882c63353ce5b41c90376d..566ad715273ebb84a46ae52dd32698d4e28b52bc 100644 --- a/Content/SaveSequenceRig.uasset +++ b/Content/SaveSequenceRig.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d34967b4c8ac6cdb9440d7dd68310a56057cf96b90c07c567dd05d7539cdfa6f -size 4299196 +oid sha256:1024a63471871a8b6cea1ffab82d7b0307ddd41bafeb6dc78d33546297616fc2 +size 3954514 diff --git a/Source/MoCapPlugin/Private/MCController.cpp b/Source/MoCapPlugin/Private/MCController.cpp index ca6dddf212de98cfc1fe465c8a5b858e984ab448..25314bd9b9189eb03585ba301bc9861f4e4e08ab 100644 --- a/Source/MoCapPlugin/Private/MCController.cpp +++ b/Source/MoCapPlugin/Private/MCController.cpp @@ -155,74 +155,6 @@ void AMCController::SaveToAnimMode() { } -void AMCController::PreprocessRecording() { - - UMCAnimInstance* AI = AnimSaveState.Pawn->GetAnimInstance(); - - FTimespan LastStamp; - FTimespan NextFrame; - int CurrentMarker = 0; - float MaxPelvisSpineLength = -1.f; - - for (int i = 0; i < AnimSaveState.StringData.Num(); i++) { - - auto Entry = AnimSaveState.StringData[i]; - - FString TimeString, JsonString; - Entry.Split(" ", &TimeString, &JsonString); - FTimespan Timestamp = MCUtils::StringToTimespan(TimeString); - - if (Timestamp < LastStamp) { - Timestamp = Timestamp + FTimespan::FromHours(1); - } - - if (CurrentMarker > 0 && Timestamp > NextFrame) { - - float PelvisSpineLength = FMath::Abs(FVector::Dist(AI->SensorData.LowerBody.Pos, AI->SensorData.UpperBody.Pos)); - - if (PelvisSpineLength > MaxPelvisSpineLength) { - MaxPelvisSpineLength = PelvisSpineLength; - AI->MaxPelvisSpineLengthPelvis = FTransform(AI->SensorData.LowerBody.Rot, AI->SensorData.LowerBody.Pos); - AI->MaxPelvisSpineLengthSpine = FTransform(AI->SensorData.UpperBody.Rot, AI->SensorData.UpperBody.Pos); - } - - NextFrame = NextFrame + FTimespan::FromSeconds(AnimSaveState.SPF); - - } - - TSharedPtr<FJsonObject> TmpJson = MCUtils::StringToJson(JsonString); - - if (!TmpJson->HasField("Type")) { - continue; - } - - FString Type = TmpJson->GetStringField("Type"); - - if (Type == "Start") { - LastStamp = Timestamp; - NextFrame = Timestamp; - } - else if (Type == "Marker" || Type == "End") { - - LastStamp = Timestamp; - NextFrame = Timestamp; - - if (Type == "Marker") { - CurrentMarker++; - } - - } - else if (Type == "ViveData") { - AnimSaveState.Pawn->InputViveDataToAnimInstance(TmpJson); - } - else if (Type == "Offsets") { - AnimSaveState.Pawn->InputViveOffsetsToAnimInstance(TmpJson); - } - - } - -} - void AMCController::InputNextFrame() { bool stop = false; @@ -571,8 +503,6 @@ void AMCController::SaveAnimation() { IsSavingToAnim = true; AnimSaveState.WaitForAnimInstance = true; - PreprocessRecording(); - InputNextFrame(); } diff --git a/Source/MoCapPlugin/Public/MCAnimInstance.h b/Source/MoCapPlugin/Public/MCAnimInstance.h index df5b7dab1371f641a97243653605354c270835f1..6e3bac1c75f42b3d612faf5fa575d495576d29f4 100644 --- a/Source/MoCapPlugin/Public/MCAnimInstance.h +++ b/Source/MoCapPlugin/Public/MCAnimInstance.h @@ -32,12 +32,6 @@ public: UPROPERTY(BlueprintReadWrite) FSensorOffsets SensorOffsets; - UPROPERTY(BlueprintReadWrite) - FTransform MaxPelvisSpineLengthPelvis; - - UPROPERTY(BlueprintReadWrite) - FTransform MaxPelvisSpineLengthSpine; - UPROPERTY(BlueprintReadWrite) FBodyProportionStruct Measurements; diff --git a/Source/MoCapPlugin/Public/MCController.h b/Source/MoCapPlugin/Public/MCController.h index 158daac592bb3396d5670336d445196515340c24..63692fcac3a383caf93c5b46512ca80da25351da 100644 --- a/Source/MoCapPlugin/Public/MCController.h +++ b/Source/MoCapPlugin/Public/MCController.h @@ -79,7 +79,6 @@ protected: void RecordMode(); void SaveToAnimMode(); - void PreprocessRecording(); void InputNextFrame(); void SaveAnimSnapshots();