Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 13:28:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #6168 from ZappoMan/fixScripts

Browse source 
fix AnyEndpoint support from JS
This commit is contained in:
Brad Davis 2015-10-23 16:16:51 -07:00
commit 548dcde335
1 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
libraries/controllers/src/controllers/UserInputMapper.cpp
View file

@ -217,10 +217,10 @@ public:
} }
virtual float value() override { virtual float value() override {
float result = 0; float result = 0.0f;
for (auto& child : _children) { for (auto& child : _children) {
float childResult = child->value(); float childResult = child->value();
if (childResult != 0.0f) { if (childResult != 0.0f && result == 0.0f) {
result = childResult; result = childResult;
} }
} }
@ -856,6 +856,21 @@ Endpoint::Pointer UserInputMapper::endpointFor(const QScriptValue& endpoint) {
return result; return result;
} }
if (endpoint.isArray()) {
int length = endpoint.property("length").toInteger();
Endpoint::List children;
for (int i = 0; i < length; i++) {
QScriptValue arrayItem = endpoint.property(i);
Endpoint::Pointer destination = endpointFor(arrayItem);
if (!destination) {
return Endpoint::Pointer();
}
children.push_back(destination);
}
return std::make_shared<AnyEndpoint>(children);
}
qWarning() << "Unsupported input type " << endpoint.toString(); qWarning() << "Unsupported input type " << endpoint.toString();
return Endpoint::Pointer(); return Endpoint::Pointer();
} }