summaryrefslogtreecommitdiffhomepage
path: root/logic
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2018-05-23 00:58:41 +0200
committerStanislaw Halik <sthalik@misaki.pl>2018-05-23 00:58:41 +0200
commit1f19917924ecf102a4534ca7c9e0e2aa76cfd8c9 (patch)
treea1b09458dd85c891e3e0237d529d1c67d1547d48 /logic
parentc4e896c85279109cf9118e9087717e71d3ff97cc (diff)
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.
Diffstat (limited to 'logic')
-rw-r--r--logic/pipeline.cpp10
1 files 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);