From f2dda8721f46ff1812586f23d20d41f8e416295d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Malte=20K=C3=B6gel?= <koegel@vr.rwth-aachen.de>
Date: Mon, 11 Sep 2023 12:27:17 +0200
Subject: [PATCH] WIP removed unnecessary changes, added some debugging calls
---
.../Private/GazeTracking/SFGazeTracker.cpp | 12 +++---------
.../Public/GazeTracking/SFGazeTracker.h | 10 ----------
2 files changed, 3 insertions(+), 19 deletions(-)
diff --git a/Source/StudyFrameworkPlugin/Private/GazeTracking/SFGazeTracker.cpp b/Source/StudyFrameworkPlugin/Private/GazeTracking/SFGazeTracker.cpp
index aaffdf5..702d7e8 100644
--- a/Source/StudyFrameworkPlugin/Private/GazeTracking/SFGazeTracker.cpp
+++ b/Source/StudyFrameworkPlugin/Private/GazeTracking/SFGazeTracker.cpp
@@ -29,13 +29,14 @@ bool USFGazeTracker::Tick(float DeltaTime)
ViveSR::anipal::Eye::EyeData_v2 TempEyeData;
AsyncTask(ENamedThreads::AnyThread, [TempEyeDataAddr = &TempEyeData, SranipalEyeData = MoveTemp(SranipalEyeData), bIsAsyncEyeTrackingTaskRunning = MoveTemp(bIsAsyncEyeTrackingTaskRunning), bDataLogged = MoveTemp(bDataLogged)]()
{
- ViveSR::anipal::Eye::GetEyeData_v2(TempEyeDataAddr);
+ int Result = ViveSR::anipal::Eye::GetEyeData_v2(TempEyeDataAddr);
- AsyncTask(ENamedThreads::GameThread, [TempEyeDataAddr =TempEyeDataAddr, SranipalEyeData, bIsAsyncEyeTrackingTaskRunning, bDataLogged]() mutable
+ AsyncTask(ENamedThreads::GameThread, [TempEyeDataAddr =TempEyeDataAddr, SranipalEyeData, bIsAsyncEyeTrackingTaskRunning, bDataLogged, Result]() mutable
{
SranipalEyeData = *TempEyeDataAddr;
bDataLogged = false;
bIsAsyncEyeTrackingTaskRunning = false;
+ UE_LOG(LogTemp, Warning, TEXT("Tried to get EyeData, Result: %d"), Result);
});
});
@@ -249,13 +250,6 @@ float USFGazeTracker::GetPupilDiameter()
return 0.0f;
}
-void USFGazeTracker::OnEyeTrackingDataReceived(ViveSR::anipal::Eye::EyeData_v2 EyeData)
-{
- bIsAsyncEyeTrackingTaskRunning = false;
- SranipalEyeData = EyeData;
- bDataLogged = false;
-}
-
FGazeRay USFGazeTracker::GetSranipalGazeRayFromData()
{
FGazeRay GazeRay;
diff --git a/Source/StudyFrameworkPlugin/Public/GazeTracking/SFGazeTracker.h b/Source/StudyFrameworkPlugin/Public/GazeTracking/SFGazeTracker.h
index 9f7e393..b6cebcf 100644
--- a/Source/StudyFrameworkPlugin/Public/GazeTracking/SFGazeTracker.h
+++ b/Source/StudyFrameworkPlugin/Public/GazeTracking/SFGazeTracker.h
@@ -9,11 +9,6 @@
#include "SFGazeTracker.generated.h"
-#ifdef WITH_SRANIPAL
-//Use this to broadcast the data from async thread to game thread for logging
-//DECLARE_DYNAMIC_DELEGATE_OneParam(FOnEyeTrackingDataReceived, const ViveSR::anipal::Eye::EyeData_v2, EyeData);
-#endif
-
UENUM()
enum class EGazeTrackerMode : uint8
{
@@ -80,11 +75,6 @@ public:
UPROPERTY(BlueprintReadWrite)
bool bDebugRenderRayTraces = false;
-
-#ifdef WITH_SRANIPAL
- //FOnEyeTrackingDataReceived& OnEyeTrackingDataReceived;
- void OnEyeTrackingDataReceived(ViveSR::anipal::Eye::EyeData_v2 EyeData);
-#endif
private:
FGazeRay GetSranipalGazeRayFromData();
--
GitLab