Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-09 16:52:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Misc fixes

Browse source
This commit is contained in:
David Rowe 2019-01-02 13:39:31 +13:00
parent f381361c82
commit d073dc22ac
3 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
libraries/controllers/src/controllers/impl/Endpoint.h
View file

@ -43,7 +43,6 @@ namespace controller {
virtual Pose peekPose() const { return Pose(); };
virtual Pose pose() { return peekPose(); }
virtual void apply(const Pose& value, const Pointer& source) {}
virtual bool isAxis() const { return _input.isAxis(); }
virtual bool isPose() const { return _input.isPose(); }
virtual bool writeable() const { return true; }
virtual bool readable() const { return true; }

2
libraries/controllers/src/controllers/impl/endpoints/AnyEndpoint.cpp
View file

@ -46,7 +46,7 @@ AxisValue AnyEndpoint::value() {
for (auto& child : _children) {
auto childValue = child->value();
if (std::abs(childValue.value) > std::abs(result.value)) {
result.value = childValue.value;
result = childValue;
}
}
return result;

8
libraries/controllers/src/controllers/impl/endpoints/CompositeEndpoint.cpp
View file

@ -25,13 +25,17 @@ bool CompositeEndpoint::readable() const {
}
AxisValue CompositeEndpoint::peek() const {
auto result = AxisValue(first->peek().value * -1.0f + second->peek().value, 0);
auto negative = first->peek();
auto positive = second->peek();
auto result = AxisValue(positive.value - negative.value, std::max(positive.timestamp, negative.timestamp));
return result;
}
// Fetching via value() must trigger any side effects of value() on the children
AxisValue CompositeEndpoint::value() {
auto result = AxisValue(first->value().value * -1.0f + second->value().value, 0);
auto negative = first->value();
auto positive = second->value();
auto result = AxisValue(positive.value - negative.value, std::max(positive.timestamp, negative.timestamp));
return result;
}