From c2f313b23e2e23dc7ce0ef60fbcb54c6cd75c901 Mon Sep 17 00:00:00 2001 From: Patrick Nossol <patrick.nossol@vr.rwth-aachen.de> Date: Wed, 19 Oct 2022 13:27:07 +0200 Subject: [PATCH] Sorted MoCap settings --- Source/MoCapPlugin/Public/MCController.h | 50 +++++++++++++----------- 1 file changed, 27 insertions(+), 23 deletions(-) diff --git a/Source/MoCapPlugin/Public/MCController.h b/Source/MoCapPlugin/Public/MCController.h index 0e245aa..940b91b 100644 --- a/Source/MoCapPlugin/Public/MCController.h +++ b/Source/MoCapPlugin/Public/MCController.h @@ -126,6 +126,8 @@ protected: int CurRecordingInSession = 0; + FAdditionalOffsets LastAddOffsets; + public: @@ -143,45 +145,47 @@ public: UPROPERTY(EditAnywhere, meta = (DisplayName = "Finger Tracking Method", Category = "MotionCapture")) ESkeletalSummaryDataType FingerTrackingMethod = ESkeletalSummaryDataType::VR_SummaryType_FromAnimation; - UPROPERTY(EditAnywhere, meta = (DisplayName = "Frames per Second", Category = "MotionCapture")) - int FramesPerSecond = 60; - - UPROPERTY(EditAnywhere, meta = (DisplayName = "Pawn", Category = "MotionCapture")) + /*------------MAP PROPERTIES-------------*/ + + UPROPERTY(EditAnywhere, meta = (DisplayName = "Pawn", Category = "MotionCapture Map")) AMCPawn* Pawn; - UPROPERTY(EditAnywhere, meta = (DisplayName = "Spectator Cam", Category = "MotionCapture")) + UPROPERTY(EditAnywhere, meta = (DisplayName = "Spectator Cam", Category = "MotionCapture Map")) ASceneCapture2D* SpectatorCam; - UPROPERTY(EditAnywhere, meta = (DisplayName = "Gesture Hold Scale Excess Time", Category = "MotionCapture")) - float GestureHoldExcessTime = 0.f; + UPROPERTY(EditAnywhere, meta = (DisplayName = "Left Foot Plane", Category = "MotionCapture Map")) + AActor* LeftFootPlane; - UPROPERTY(EditAnywhere, meta = (DisplayName = "Nr of Leg Smoothing Iterations", Category = "MotionCapture")) - int LegSmoothTimes = 5; + UPROPERTY(EditAnywhere, meta = (DisplayName = "Right Foot Plane", Category = "MotionCapture Map")) + AActor* RightFootPlane; - UPROPERTY(EditAnywhere, meta = (DisplayName = "Leg Smoothing Neighbor Window", Category = "MotionCapture")) - int LegSmoothWindow = 3; + /*------------ANIM PROPERTIES-------------*/ - UPROPERTY(EditAnywhere, meta = (DisplayName = "Left Foot Plane", Category = "MotionCapture")) - AActor* LeftFootPlane; + UPROPERTY(EditAnywhere, meta = (DisplayName = "Frames per Second", Category = "MotionCapture Anim")) + int FramesPerSecond = 60; - UPROPERTY(EditAnywhere, meta = (DisplayName = "Right Foot Plane", Category = "MotionCapture")) - AActor* RightFootPlane; + UPROPERTY(EditAnywhere, meta = (DisplayName = "Gesture Hold Scale Excess Time", Category = "MotionCapture Anim")) + float GestureHoldExcessTime = 0.f; - UPROPERTY(EditAnywhere, meta = (DisplayName = "Edit Offsets Mode", Category = "MotionCapture")) - bool EditOffsetMode = false; + UPROPERTY(EditAnywhere, meta = (DisplayName = "Nr of Leg Smoothing Iterations", Category = "MotionCapture Anim")) + int LegSmoothTimes = 5; - UPROPERTY(EditAnywhere, meta = (DisplayName = "Lock Feet To Green Foot Indicators", Category = "MotionCapture")) + UPROPERTY(EditAnywhere, meta = (DisplayName = "Leg Smoothing Neighbor Window", Category = "MotionCapture Anim")) + int LegSmoothWindow = 3; + + UPROPERTY(EditAnywhere, meta = (DisplayName = "Lock Feet To Green Foot Indicators", Category = "MotionCapture Anim")) bool LockFeet = true; - UPROPERTY(EditAnywhere, meta = (DisplayName = "Use the captured hand position", Category = "MotionCapture")) + UPROPERTY(EditAnywhere, meta = (DisplayName = "Use the captured hand position", Category = "MotionCapture Anim")) bool UseHandPosition = true; - UPROPERTY(EditAnywhere, meta = (DisplayName = "Limit the hand rotation (can cause rotational jumping)", Category = "MotionCapture")) + UPROPERTY(EditAnywhere, meta = (DisplayName = "Limit the hand rotation (can cause rotational jumping)", Category = "MotionCapture Anim")) bool LimitHandRotation = false; - UPROPERTY(EditAnywhere, meta = (DisplayName = "Additional Post Processing Offsets", Category = "MotionCapture")) - FAdditionalOffsets AdditionalOffsets; + //UPROPERTY(EditAnywhere, meta = (DisplayName = "Edit Offsets Mode", Category = "MotionCapture Anim")) + bool EditOffsetMode = false; - FAdditionalOffsets LastAddOffsets; + UPROPERTY(EditAnywhere, meta = (DisplayName = "Additional Post Processing Offsets", Category = "MotionCapture Anim")) + FAdditionalOffsets AdditionalOffsets; }; -- GitLab