diff --git a/Source/StudyFrameworkPlugin/Private/GazeTracking/SFGazeTracker.cpp b/Source/StudyFrameworkPlugin/Private/GazeTracking/SFGazeTracker.cpp index aaffdf5e6eec47e0c95998846457aa2498d8eaf0..702d7e86fd9dda9699b3d65122bec235235be83b 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 9f7e393d55e8318ac6d6c44719cd9cb94136267e..b6cebcf660754837fd166b778236b3efc85fb0c5 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();