mirrors/monado
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/monado/monado.git synced 2025-01-01 12:46:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

a/math: Resolve warnings.

Browse source
This commit is contained in:
Ryan Pavlik 2022-07-13 12:20:49 -05:00
parent f703355761
commit 88389ae0ca
2 changed files with 12 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/xrt/auxiliary/math/m_relation_history.cpp
View file

@ -132,8 +132,8 @@ m_relation_history_get(struct m_relation_history *rh, uint64_t at_timestamp_ns,
// We precede *it and follow *(it - 1) (which we know exists because we already handled
// the it = begin() case)
auto predecessor = *(it - 1);
auto successor = *it;
const auto &predecessor = *(it - 1);
const auto &successor = *it;
// Do the thing.
int64_t diff_before = static_cast<int64_t>(at_timestamp_ns) - predecessor.timestamp;
@ -187,7 +187,7 @@ m_relation_history_estimate_motion(struct m_relation_history *rh,
return false;
};
float dt = time_ns_to_s(timestamp - last_time_ns);
float dt = (float)time_ns_to_s(timestamp - last_time_ns);
// Used to find out what values are valid in both the old relation and the new relation
enum xrt_space_relation_flags tmp_flags =
@ -245,7 +245,7 @@ void
m_relation_history_clear(struct m_relation_history *rh)
{
std::unique_lock<os::Mutex> lock(rh->mutex);
rh->impl = {};
rh->impl.clear();
}
void

20
src/xrt/auxiliary/math/m_space.h
View file

@ -36,18 +36,14 @@ m_pose_is_identity(struct xrt_pose *pose)
{
struct xrt_pose p = *pose;
if ((p.position.x == 0.0f || p.position.x == -0.0f) && // x
(p.position.y == 0.0f || p.position.y == -0.0f) && // y
(p.position.z == 0.0f || p.position.z == -0.0f) && // z
(p.orientation.x == 0.0f || p.orientation.x == -0.0f) && // x
(p.orientation.y == 0.0f || p.orientation.y == -0.0f) && // y
(p.orientation.z == 0.0f || p.orientation.z == -0.0f) && // z
(p.orientation.w == 1.0f || p.orientation.w == -1.0f) // w
) {
return true;
}
return false;
return ((p.position.x == 0.0f || p.position.x == -0.0f) && // x
(p.position.y == 0.0f || p.position.y == -0.0f) && // y
(p.position.z == 0.0f || p.position.z == -0.0f) && // z
(p.orientation.x == 0.0f || p.orientation.x == -0.0f) && // x
(p.orientation.y == 0.0f || p.orientation.y == -0.0f) && // y
(p.orientation.z == 0.0f || p.orientation.z == -0.0f) && // z
(p.orientation.w == 1.0f || p.orientation.w == -1.0f) // w
);
}