Skip to content
Snippets Groups Projects
Commit a67788c8 authored by Patrick Nossol's avatar Patrick Nossol
Browse files

reworked arms and removed unused things

parent 37682964
No related branches found
No related tags found
No related merge requests found
No preview for this file type
No preview for this file type
...@@ -155,74 +155,6 @@ void AMCController::SaveToAnimMode() { ...@@ -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() { void AMCController::InputNextFrame() {
bool stop = false; bool stop = false;
...@@ -571,8 +503,6 @@ void AMCController::SaveAnimation() { ...@@ -571,8 +503,6 @@ void AMCController::SaveAnimation() {
IsSavingToAnim = true; IsSavingToAnim = true;
AnimSaveState.WaitForAnimInstance = true; AnimSaveState.WaitForAnimInstance = true;
PreprocessRecording();
InputNextFrame(); InputNextFrame();
} }
......
...@@ -32,12 +32,6 @@ public: ...@@ -32,12 +32,6 @@ public:
UPROPERTY(BlueprintReadWrite) UPROPERTY(BlueprintReadWrite)
FSensorOffsets SensorOffsets; FSensorOffsets SensorOffsets;
UPROPERTY(BlueprintReadWrite)
FTransform MaxPelvisSpineLengthPelvis;
UPROPERTY(BlueprintReadWrite)
FTransform MaxPelvisSpineLengthSpine;
UPROPERTY(BlueprintReadWrite) UPROPERTY(BlueprintReadWrite)
FBodyProportionStruct Measurements; FBodyProportionStruct Measurements;
......
...@@ -79,7 +79,6 @@ protected: ...@@ -79,7 +79,6 @@ protected:
void RecordMode(); void RecordMode();
void SaveToAnimMode(); void SaveToAnimMode();
void PreprocessRecording();
void InputNextFrame(); void InputNextFrame();
void SaveAnimSnapshots(); void SaveAnimSnapshots();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment