summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--FTNoIR_Tracker_PT/ftnoir_tracker_pt.cpp2
-rw-r--r--FTNoIR_Tracker_PT/ftnoir_tracker_pt.h4
-rw-r--r--facetracknoir/tracker.cpp4
-rw-r--r--ftnoir_tracker_aruco/ftnoir_tracker_aruco.cpp2
-rw-r--r--ftnoir_tracker_aruco/ftnoir_tracker_aruco.h2
-rw-r--r--ftnoir_tracker_base/ftnoir_tracker_base.h2
-rw-r--r--ftnoir_tracker_hatire/ftnoir_tracker_hat.cpp2
-rw-r--r--ftnoir_tracker_hatire/ftnoir_tracker_hat.h4
-rw-r--r--ftnoir_tracker_ht/ftnoir_tracker_ht.cpp2
-rw-r--r--ftnoir_tracker_ht/ftnoir_tracker_ht.h2
-rw-r--r--ftnoir_tracker_hydra/ftnoir_tracker_hydra.cpp2
-rw-r--r--ftnoir_tracker_hydra/ftnoir_tracker_hydra.h2
-rw-r--r--ftnoir_tracker_joystick/ftnoir_tracker_joystick.cpp2
-rw-r--r--ftnoir_tracker_joystick/ftnoir_tracker_joystick.h2
-rw-r--r--ftnoir_tracker_rift/ftnoir_tracker_rift.cpp2
-rw-r--r--ftnoir_tracker_rift/ftnoir_tracker_rift.h2
-rw-r--r--ftnoir_tracker_udp/ftnoir_tracker_udp.cpp2
-rw-r--r--ftnoir_tracker_udp/ftnoir_tracker_udp.h2
-rw-r--r--opentrack-api/trackers.cpp2
19 files changed, 22 insertions, 22 deletions
diff --git a/FTNoIR_Tracker_PT/ftnoir_tracker_pt.cpp b/FTNoIR_Tracker_PT/ftnoir_tracker_pt.cpp
index a6aaa29c..639053b7 100644
--- a/FTNoIR_Tracker_PT/ftnoir_tracker_pt.cpp
+++ b/FTNoIR_Tracker_PT/ftnoir_tracker_pt.cpp
@@ -233,7 +233,7 @@ void Tracker::StopTracker(bool exit)
#define THeadPoseData double
#endif
-void Tracker::GiveHeadPoseData(THeadPoseData *data)
+void Tracker::GetHeadPoseData(THeadPoseData *data)
{
{
QMutexLocker lock(&mutex);
diff --git a/FTNoIR_Tracker_PT/ftnoir_tracker_pt.h b/FTNoIR_Tracker_PT/ftnoir_tracker_pt.h
index 5c8d35d2..54edafb2 100644
--- a/FTNoIR_Tracker_PT/ftnoir_tracker_pt.h
+++ b/FTNoIR_Tracker_PT/ftnoir_tracker_pt.h
@@ -44,11 +44,11 @@ public:
virtual void Initialize(QFrame *videoframe);
#ifdef OPENTRACK_API
virtual void StartTracker(QFrame* parent_window);
- virtual void GiveHeadPoseData(double* data);
+ virtual void GetHeadPoseData(double* data);
#else
virtual void StartTracker(HWND parent_window);
virtual void StopTracker(bool exit);
- virtual bool GiveHeadPoseData(THeadPoseData *data);
+ virtual bool GetHeadPoseData(THeadPoseData *data);
#endif
virtual void refreshVideo();
diff --git a/facetracknoir/tracker.cpp b/facetracknoir/tracker.cpp
index fbf90a66..8f8ad356 100644
--- a/facetracknoir/tracker.cpp
+++ b/facetracknoir/tracker.cpp
@@ -108,11 +108,11 @@ void Tracker::run() {
break;
if (Libraries->pSecondTracker) {
- Libraries->pSecondTracker->GiveHeadPoseData(newpose);
+ Libraries->pSecondTracker->GetHeadPoseData(newpose);
}
if (Libraries->pTracker) {
- Libraries->pTracker->GiveHeadPoseData(newpose);
+ Libraries->pTracker->GetHeadPoseData(newpose);
}
{
diff --git a/ftnoir_tracker_aruco/ftnoir_tracker_aruco.cpp b/ftnoir_tracker_aruco/ftnoir_tracker_aruco.cpp
index 11916df5..6d06d4a8 100644
--- a/ftnoir_tracker_aruco/ftnoir_tracker_aruco.cpp
+++ b/ftnoir_tracker_aruco/ftnoir_tracker_aruco.cpp
@@ -375,7 +375,7 @@ void Tracker::run()
}
}
-void Tracker::GiveHeadPoseData(double *data)
+void Tracker::GetHeadPoseData(double *data)
{
QMutexLocker lck(&mtx);
diff --git a/ftnoir_tracker_aruco/ftnoir_tracker_aruco.h b/ftnoir_tracker_aruco/ftnoir_tracker_aruco.h
index 8a480d9f..be2ad3d7 100644
--- a/ftnoir_tracker_aruco/ftnoir_tracker_aruco.h
+++ b/ftnoir_tracker_aruco/ftnoir_tracker_aruco.h
@@ -26,7 +26,7 @@ public:
Tracker();
virtual ~Tracker();
void StartTracker(QFrame* frame);
- void GiveHeadPoseData(double *data);
+ void GetHeadPoseData(double *data);
bool enableTX, enableTY, enableTZ, enableRX, enableRY, enableRZ;
void run();
void load_settings();
diff --git a/ftnoir_tracker_base/ftnoir_tracker_base.h b/ftnoir_tracker_base/ftnoir_tracker_base.h
index e6e770ed..16f76cf3 100644
--- a/ftnoir_tracker_base/ftnoir_tracker_base.h
+++ b/ftnoir_tracker_base/ftnoir_tracker_base.h
@@ -43,7 +43,7 @@ struct ITracker
{
virtual ~ITracker() = 0;
virtual void StartTracker( QFrame* frame ) = 0;
- virtual void GiveHeadPoseData(double *data) = 0;
+ virtual void GetHeadPoseData(double *data) = 0;
virtual int preferredHz() { return 66; }
};
diff --git a/ftnoir_tracker_hatire/ftnoir_tracker_hat.cpp b/ftnoir_tracker_hatire/ftnoir_tracker_hat.cpp
index bcef6753..f902b207 100644
--- a/ftnoir_tracker_hatire/ftnoir_tracker_hat.cpp
+++ b/ftnoir_tracker_hatire/ftnoir_tracker_hat.cpp
@@ -323,7 +323,7 @@ void FTNoIR_Tracker::StartTracker(QFrame*)
#define THeadPoseData double
#endif
-void FTNoIR_Tracker::GiveHeadPoseData(THeadPoseData *data)
+void FTNoIR_Tracker::GetHeadPoseData(THeadPoseData *data)
{
QMutexLocker lck(&mutex);
while (dataRead.length()>=30) {
diff --git a/ftnoir_tracker_hatire/ftnoir_tracker_hat.h b/ftnoir_tracker_hatire/ftnoir_tracker_hat.h
index 04c5fb61..ec1125b9 100644
--- a/ftnoir_tracker_hatire/ftnoir_tracker_hat.h
+++ b/ftnoir_tracker_hatire/ftnoir_tracker_hat.h
@@ -29,12 +29,12 @@ public:
#ifdef OPENTRACK_API
virtual void StartTracker(QFrame*);
- virtual void GiveHeadPoseData(double* data);
+ virtual void GetHeadPoseData(double* data);
#else
void Initialize( QFrame *videoframe );
virtual void StartTracker(HWND parent_window);
virtual void StopTracker(bool exit);
- virtual bool GiveHeadPoseData(THeadPoseData *data);
+ virtual bool GetHeadPoseData(THeadPoseData *data);
#endif
void applysettings(const TrackerSettings& settings);
void notifyCenter();
diff --git a/ftnoir_tracker_ht/ftnoir_tracker_ht.cpp b/ftnoir_tracker_ht/ftnoir_tracker_ht.cpp
index c3c12005..00dd9919 100644
--- a/ftnoir_tracker_ht/ftnoir_tracker_ht.cpp
+++ b/ftnoir_tracker_ht/ftnoir_tracker_ht.cpp
@@ -186,7 +186,7 @@ void Tracker::StartTracker(QFrame* videoframe)
#endif
}
-void Tracker::GiveHeadPoseData(double *data)
+void Tracker::GetHeadPoseData(double *data)
{
lck_shm.lock();
shm->timer = 0;
diff --git a/ftnoir_tracker_ht/ftnoir_tracker_ht.h b/ftnoir_tracker_ht/ftnoir_tracker_ht.h
index 475d5a6c..404dbf6e 100644
--- a/ftnoir_tracker_ht/ftnoir_tracker_ht.h
+++ b/ftnoir_tracker_ht/ftnoir_tracker_ht.h
@@ -23,7 +23,7 @@ public:
Tracker();
virtual ~Tracker();
void StartTracker(QFrame* frame);
- void GiveHeadPoseData(double *data);
+ void GetHeadPoseData(double *data);
bool enableTX, enableTY, enableTZ, enableRX, enableRY, enableRZ;
ht_shm_t* shm;
private:
diff --git a/ftnoir_tracker_hydra/ftnoir_tracker_hydra.cpp b/ftnoir_tracker_hydra/ftnoir_tracker_hydra.cpp
index 11a3e0fb..31e3f319 100644
--- a/ftnoir_tracker_hydra/ftnoir_tracker_hydra.cpp
+++ b/ftnoir_tracker_hydra/ftnoir_tracker_hydra.cpp
@@ -66,7 +66,7 @@ void Hydra_Tracker::StartTracker(QFrame*)
}
-void Hydra_Tracker::GiveHeadPoseData(double *data)
+void Hydra_Tracker::GetHeadPoseData(double *data)
{
sixenseSetActiveBase(0);
diff --git a/ftnoir_tracker_hydra/ftnoir_tracker_hydra.h b/ftnoir_tracker_hydra/ftnoir_tracker_hydra.h
index 6e40b710..240f0687 100644
--- a/ftnoir_tracker_hydra/ftnoir_tracker_hydra.h
+++ b/ftnoir_tracker_hydra/ftnoir_tracker_hydra.h
@@ -12,7 +12,7 @@ public:
~Hydra_Tracker();
void StartTracker(QFrame *) virt_override;
- void GiveHeadPoseData(double *data) virt_override;
+ void GetHeadPoseData(double *data) virt_override;
void loadSettings();
volatile bool should_quit;
protected:
diff --git a/ftnoir_tracker_joystick/ftnoir_tracker_joystick.cpp b/ftnoir_tracker_joystick/ftnoir_tracker_joystick.cpp
index 8f5ac162..5be6b3db 100644
--- a/ftnoir_tracker_joystick/ftnoir_tracker_joystick.cpp
+++ b/ftnoir_tracker_joystick/ftnoir_tracker_joystick.cpp
@@ -175,7 +175,7 @@ fail:
qDebug() << "joy init failure";
}
-void FTNoIR_Tracker::GiveHeadPoseData(double *data)
+void FTNoIR_Tracker::GetHeadPoseData(double *data)
{
QMutexLocker foo(&mtx);
DIJOYSTATE js = {0};
diff --git a/ftnoir_tracker_joystick/ftnoir_tracker_joystick.h b/ftnoir_tracker_joystick/ftnoir_tracker_joystick.h
index 809d8c73..9c856d85 100644
--- a/ftnoir_tracker_joystick/ftnoir_tracker_joystick.h
+++ b/ftnoir_tracker_joystick/ftnoir_tracker_joystick.h
@@ -42,7 +42,7 @@ public:
~FTNoIR_Tracker();
void StartTracker(QFrame *frame);
- void GiveHeadPoseData(double *data);
+ void GetHeadPoseData(double *data);
void loadSettings();
LPDIRECTINPUT8 g_pDI;
LPDIRECTINPUTDEVICE8 g_pJoystick;
diff --git a/ftnoir_tracker_rift/ftnoir_tracker_rift.cpp b/ftnoir_tracker_rift/ftnoir_tracker_rift.cpp
index c3b313ca..da44ea0c 100644
--- a/ftnoir_tracker_rift/ftnoir_tracker_rift.cpp
+++ b/ftnoir_tracker_rift/ftnoir_tracker_rift.cpp
@@ -68,7 +68,7 @@ void Rift_Tracker::StartTracker(QFrame*)
}
-void Rift_Tracker::GiveHeadPoseData(double *data)
+void Rift_Tracker::GetHeadPoseData(double *data)
{
if (pSFusion != NULL && pSensor != NULL) {
Quatf hmdOrient = pSFusion->GetOrientation();
diff --git a/ftnoir_tracker_rift/ftnoir_tracker_rift.h b/ftnoir_tracker_rift/ftnoir_tracker_rift.h
index 33e6f5cd..3920c6ad 100644
--- a/ftnoir_tracker_rift/ftnoir_tracker_rift.h
+++ b/ftnoir_tracker_rift/ftnoir_tracker_rift.h
@@ -15,7 +15,7 @@ public:
virtual ~Rift_Tracker() virt_override;
void StartTracker(QFrame *) virt_override;
- void GiveHeadPoseData(double *data) virt_override;
+ void GetHeadPoseData(double *data) virt_override;
void loadSettings();
virtual int preferredHz() virt_override { return 250; }
volatile bool should_quit;
diff --git a/ftnoir_tracker_udp/ftnoir_tracker_udp.cpp b/ftnoir_tracker_udp/ftnoir_tracker_udp.cpp
index d58341a6..e70bfdc7 100644
--- a/ftnoir_tracker_udp/ftnoir_tracker_udp.cpp
+++ b/ftnoir_tracker_udp/ftnoir_tracker_udp.cpp
@@ -110,7 +110,7 @@ void FTNoIR_Tracker::StartTracker(QFrame*)
return;
}
-void FTNoIR_Tracker::GiveHeadPoseData(double *data)
+void FTNoIR_Tracker::GetHeadPoseData(double *data)
{
mutex.lock();
if (bEnableX) {
diff --git a/ftnoir_tracker_udp/ftnoir_tracker_udp.h b/ftnoir_tracker_udp/ftnoir_tracker_udp.h
index 7b6c5328..c7e9decf 100644
--- a/ftnoir_tracker_udp/ftnoir_tracker_udp.h
+++ b/ftnoir_tracker_udp/ftnoir_tracker_udp.h
@@ -16,7 +16,7 @@ public:
~FTNoIR_Tracker();
void StartTracker(QFrame *);
- void GiveHeadPoseData(double *data);
+ void GetHeadPoseData(double *data);
void loadSettings();
volatile bool should_quit;
protected:
diff --git a/opentrack-api/trackers.cpp b/opentrack-api/trackers.cpp
index 937f7084..5027ec1d 100644
--- a/opentrack-api/trackers.cpp
+++ b/opentrack-api/trackers.cpp
@@ -31,7 +31,7 @@ void OPENTRACK_EXPORT opentrack_tracker_start(opentrack self, opentrack_tracker
void OPENTRACK_EXPORT opentrack_tracker_tick(opentrack_tracker tracker, double* headpose)
{
- tracker->GiveHeadPoseData(headpose);
+ tracker->GetHeadPoseData(headpose);
QApplication::processEvents(0, 5);
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-10 19:17:17 +0000