summaryrefslogtreecommitdiffhomepage
path: root/opentrack/tracker.cpp
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2015-08-18 08:51:28 +0200
committerStanislaw Halik <sthalik@misaki.pl>2015-08-18 08:51:28 +0200
commitcfed344344b996aea1e6388031dc20b1d15a25f3 (patch)
treea881b7454f55e0d4b5e75ab8863f33532b27f493 /opentrack/tracker.cpp
parente6eb0bb0bc3f766953affe28cda7f8afbaab0985 (diff)
simple-mat: replace initializer_list with variadic ctor
Gives us type safety rather than argument count mismatch. Also there's no more narrowing conversion issue. Replace usages. Explicitly delete initializer_list ctor.
Diffstat (limited to 'opentrack/tracker.cpp')
-rwxr-xr-xopentrack/tracker.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/opentrack/tracker.cpp b/opentrack/tracker.cpp
index 22a8933c..403e87c5 100755
--- a/opentrack/tracker.cpp
+++ b/opentrack/tracker.cpp
@@ -52,7 +52,7 @@ double Tracker::map(double pos, Mapping& axis)
void Tracker::t_compensate(const rmat& rmat, const double* xyz, double* output, bool rz)
{
// TY is really yaw axis. need swapping accordingly.
- dmat<3, 1> tvec({ xyz[2], -xyz[0], -xyz[1] });
+ dmat<3, 1> tvec( xyz[2], -xyz[0], -xyz[1] );
const dmat<3, 1> ret = rmat * tvec;
if (!rz)
output[2] = ret(0);
@@ -107,7 +107,7 @@ void Tracker::logic()
};
const rmat cam = rmat::euler_to_rmat(off);
rmat r = rmat::euler_to_rmat(&value[Yaw]);
- dmat<3, 1> t { value(0), value(1), value(2) };
+ dmat<3, 1> t(value(0), value(1), value(2));
r = cam * r;