Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-14 11:46:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

add makeAxis support to JSON parsing

Browse source
This commit is contained in:
Brad Hefta-Gaub 2015-10-29 17:33:30 -07:00
parent b070306c2c
commit b56c49a182
2 changed files with 44 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -747,7 +747,15 @@ Endpoint::Pointer UserInputMapper::parseEndpoint(const QJsonValue& value) {
if (value.isString()) {
auto input = findDeviceInput(value.toString());
result = endpointFor(input);
} else if (value.isArray()) {
return parseAny(value);
} else if (value.isObject()) {
auto axisEndpoint = parseAxis(value);
if (axisEndpoint) {
return axisEndpoint;
}
// if we have other types of endpoints that are objects, follow the axisEndpoint example, and place them here
// Endpoint is defined as an object, we expect a js function then
return Endpoint::Pointer();
}
@ -881,7 +889,28 @@ Endpoint::Pointer UserInputMapper::parseDestination(const QJsonValue& value) {
return parseEndpoint(value);
}
Endpoint::Pointer UserInputMapper::parseSource(const QJsonValue& value) {
Endpoint::Pointer UserInputMapper::parseAxis(const QJsonValue& value) {
if (value.isObject()) {
auto object = value.toObject();
if (object.contains("makeAxis")) {
auto axisValue = object.value("makeAxis");
if (axisValue.isArray()) {
auto axisArray = axisValue.toArray();
static const int AXIS_ARRAY_SIZE = 2; // axis can only have 2 children
if (axisArray.size() == AXIS_ARRAY_SIZE) {
Endpoint::Pointer first = parseEndpoint(axisArray.first());
Endpoint::Pointer second = parseEndpoint(axisArray.last());
if (first && second) {
return std::make_shared<CompositeEndpoint>(first, second);
}
}
}
}
}
return Endpoint::Pointer();
}
Endpoint::Pointer UserInputMapper::parseAny(const QJsonValue& value) {
if (value.isArray()) {
Endpoint::List children;
for (auto arrayItem : value.toArray()) {
@ -893,7 +922,19 @@ Endpoint::Pointer UserInputMapper::parseSource(const QJsonValue& value) {
}
return std::make_shared<AnyEndpoint>(children);
}
return Endpoint::Pointer();
}
Endpoint::Pointer UserInputMapper::parseSource(const QJsonValue& value) {
if (value.isObject()) {
auto axisEndpoint = parseAxis(value);
if (axisEndpoint) {
return axisEndpoint;
}
// if we have other types of endpoints that are objects, follow the axisEndpoint example, and place them here
} else if (value.isArray()) {
return parseAny(value);
}
return parseEndpoint(value);
}

2
libraries/controllers/src/controllers/UserInputMapper.h
View file

@ -159,6 +159,8 @@ namespace controller {
RoutePointer parseRoute(const QJsonValue& value);
EndpointPointer parseDestination(const QJsonValue& value);
EndpointPointer parseSource(const QJsonValue& value);
EndpointPointer parseAxis(const QJsonValue& value);
EndpointPointer parseAny(const QJsonValue& value);
EndpointPointer parseEndpoint(const QJsonValue& value);
ConditionalPointer parseConditional(const QJsonValue& value);