summaryrefslogtreecommitdiffhomepage
path: root/ftnoir_tracker_rift/ftnoir_tracker_rift.cpp
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2013-11-30 17:09:12 +0100
committerStanislaw Halik <sthalik@misaki.pl>2013-11-30 17:09:12 +0100
commit8b3838e6e744bd1dfff290bf56ee4543bc442526 (patch)
tree3a4d14a4498d326fbd45f37b9c95bd790f4ed7f9 /ftnoir_tracker_rift/ftnoir_tracker_rift.cpp
parent2435ad93423ee3ce3b262000854666adc5f51386 (diff)
Revert "Added positional tracking?!"
This reverts commit 8b3285917eeb228e9811df75568d927b763644cf. Requested-by: mm0zct
Diffstat (limited to 'ftnoir_tracker_rift/ftnoir_tracker_rift.cpp')
-rw-r--r--ftnoir_tracker_rift/ftnoir_tracker_rift.cpp22
1 files changed, 5 insertions, 17 deletions
diff --git a/ftnoir_tracker_rift/ftnoir_tracker_rift.cpp b/ftnoir_tracker_rift/ftnoir_tracker_rift.cpp
index 45c02cfb..dd78bf9f 100644
--- a/ftnoir_tracker_rift/ftnoir_tracker_rift.cpp
+++ b/ftnoir_tracker_rift/ftnoir_tracker_rift.cpp
@@ -88,23 +88,11 @@ bool Rift_Tracker::GiveHeadPoseData(double *data)
if(newHeadPose[Yaw]<-deadzone)newHeadPose[Yaw]+= constant_drift;
old_yaw=yaw;
}
-#if 1
-
- double dt = 0.015;
-
- OVR::Vector3f acc = pSFusion->GetAcceleration();
- old_x = old_x*persistence + vx*dt + 0.5*(acc.x*acc.x);
- vx = vx*persistence + acc.x*dt;
- newHeadPose[TX] = old_x;
-
- old_y = old_y*persistence + vy*dt + 0.5*(acc.y*acc.y);
- vy = vy*persistence + acc.y*dt;
- newHeadPose[TY] = old_y;
-
- old_z = old_z*persistence + vz*dt + 0.5*(acc.z*acc.z);
- vz = vz*persistence + acc.z*dt;
- newHeadPose[TZ] = old_z;
-
+#if 0
+ newHeadPose[TX] = acd.controllers[0].pos[0]/50.0f;
+ newHeadPose[TY] = acd.controllers[0].pos[1]/50.0f;
+ newHeadPose[TZ] = acd.controllers[0].pos[2]/50.0f;
+
if (bEnableX) {
data[TX] = newHeadPose[TX];
}