summaryrefslogtreecommitdiffhomepage
path: root/logic
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2017-05-16 10:51:48 +0200
committerStanislaw Halik <sthalik@misaki.pl>2017-05-16 10:51:48 +0200
commitd7e1d8165a4d8c7bb559cb00b79f9567d0c4ab6e (patch)
tree6e492124b6901b5bd79649dae37b1991c896bcf2 /logic
parenta9ddb1242181032c549bcac7341e38cb2ee0bb73 (diff)
logic: remove height in "dynamic neck"
It doesn't help any. Leave the depth only.
Diffstat (limited to 'logic')
-rw-r--r--logic/main-settings.cpp1
-rw-r--r--logic/main-settings.hpp2
-rw-r--r--logic/tracker.cpp8
3 files changed, 5 insertions, 6 deletions
diff --git a/logic/main-settings.cpp b/logic/main-settings.cpp
index 64bd0010..a847c920 100644
--- a/logic/main-settings.cpp
+++ b/logic/main-settings.cpp
@@ -23,7 +23,6 @@ main_settings::main_settings() :
camera_roll(b, "camera-roll", 0),
center_at_startup(b, "center-at-startup", true),
center_method(b, "centering-method", 1),
- neck_y(b, "neck-height", 0),
neck_z(b, "neck-depth", 0),
neck_enable(b, "neck-enable", false),
key_start_tracking1(b, "start-tracking"),
diff --git a/logic/main-settings.hpp b/logic/main-settings.hpp
index 6e6f698f..6f7c2c82 100644
--- a/logic/main-settings.hpp
+++ b/logic/main-settings.hpp
@@ -79,7 +79,7 @@ struct OTR_LOGIC_EXPORT main_settings final
value<int> camera_yaw, camera_pitch, camera_roll;
value<bool> center_at_startup;
value<int> center_method;
- value<int> neck_y, neck_z;
+ value<int> neck_z;
value<bool> neck_enable;
key_opts key_start_tracking1, key_start_tracking2;
key_opts key_stop_tracking1, key_stop_tracking2;
diff --git a/logic/tracker.cpp b/logic/tracker.cpp
index 48a50d80..1002932f 100644
--- a/logic/tracker.cpp
+++ b/logic/tracker.cpp
@@ -284,18 +284,18 @@ void Tracker::logic()
if (s.neck_enable)
{
- double ny = s.neck_y, nz = -s.neck_z;
+ double nz = -s.neck_z;
- if (ny != 0 || nz != 0)
+ if (nz != 0)
{
const rmat R = euler_to_rmat(
euler_t(value(Yaw) * d2r,
value(Pitch) * d2r,
value(Roll) * d2r));
- euler_t xyz(0, ny, nz);
+ euler_t xyz(0, 0, nz);
t_compensate(R, xyz, xyz, false, false, false);
neck(TX) = xyz(TX);
- neck(TY) = xyz(TY) - ny;
+ neck(TY) = xyz(TY);
neck(TZ) = xyz(TZ) - nz;
}
}