From 1f19917924ecf102a4534ca7c9e0e2aa76cfd8c9 Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Wed, 23 May 2018 00:58:41 +0200
Subject: logic/pipeline: fix disable_dof order
The actual order is (xyz, ypr). This was broken since
forever. This February's refactor merely preserved the
order of things.
---
logic/pipeline.cpp | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/logic/pipeline.cpp b/logic/pipeline.cpp
index 7626f2dd..105e672a 100644
--- a/logic/pipeline.cpp
+++ b/logic/pipeline.cpp
@@ -421,12 +421,12 @@ Pose pipeline::apply_reltrans(Pose value, vec6_bool disabled, bool centerp)
rel.on_center();
value = rel.apply_pipeline(s.reltrans_mode, value,
- { !!s.reltrans_disable_src_yaw,
- !!s.reltrans_disable_src_pitch,
- !!s.reltrans_disable_src_roll,
- !!s.reltrans_disable_tx,
+ { !!s.reltrans_disable_tx,
!!s.reltrans_disable_ty,
- !!s.reltrans_disable_tz },
+ !!s.reltrans_disable_tz,
+ !!s.reltrans_disable_src_yaw,
+ !!s.reltrans_disable_src_pitch,
+ !!s.reltrans_disable_src_roll, },
s.neck_enable,
s.neck_z);
--
cgit v1.2.3