From 293b7c12e151b49305b4d87137816aee387c4e1b Mon Sep 17 00:00:00 2001 From: Brad Hefta-Gaub Date: Sat, 17 Oct 2015 12:46:05 -0700 Subject: [PATCH] change join to makeAxis, fix some warnings --- .../controllers/src/controllers/impl/MappingBuilderProxy.cpp | 3 ++- .../controllers/src/controllers/impl/MappingBuilderProxy.h | 2 +- tests/controllers/qml/content.qml | 3 +-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libraries/controllers/src/controllers/impl/MappingBuilderProxy.cpp b/libraries/controllers/src/controllers/impl/MappingBuilderProxy.cpp index fe7a5c24af..c6031d45d2 100644 --- a/libraries/controllers/src/controllers/impl/MappingBuilderProxy.cpp +++ b/libraries/controllers/src/controllers/impl/MappingBuilderProxy.cpp @@ -39,7 +39,7 @@ QObject* MappingBuilderProxy::from(const Endpoint::Pointer& source) { return new RouteBuilderProxy(_parent, _mapping, route); } -QObject* MappingBuilderProxy::join(const QJSValue& source1, const QJSValue& source2) { +QObject* MappingBuilderProxy::makeAxis(const QJSValue& source1, const QJSValue& source2) { auto source1Endpoint = _parent.endpointFor(source1); auto source2Endpoint = _parent.endpointFor(source2); return from(_parent.compositeEndpointFor(source1Endpoint, source2Endpoint)); @@ -82,6 +82,7 @@ QObject* MappingBuilderProxy::from(const QJsonValue& json) { // Endpoint is defined as an object, we expect a js function then return nullptr; } + return nullptr; } QObject* MappingBuilderProxy::enable(bool enable) { diff --git a/libraries/controllers/src/controllers/impl/MappingBuilderProxy.h b/libraries/controllers/src/controllers/impl/MappingBuilderProxy.h index 9531d8bbea..a29f7ade39 100644 --- a/libraries/controllers/src/controllers/impl/MappingBuilderProxy.h +++ b/libraries/controllers/src/controllers/impl/MappingBuilderProxy.h @@ -33,7 +33,7 @@ public: Q_INVOKABLE QObject* from(const QJSValue& source); Q_INVOKABLE QObject* from(const QScriptValue& source); - Q_INVOKABLE QObject* join(const QJSValue& source1, const QJSValue& source2); + Q_INVOKABLE QObject* makeAxis(const QJSValue& source1, const QJSValue& source2); Q_INVOKABLE QObject* enable(bool enable = true); Q_INVOKABLE QObject* disable() { return enable(false); } diff --git a/tests/controllers/qml/content.qml b/tests/controllers/qml/content.qml index 4beda82df3..5d81ead2fd 100644 --- a/tests/controllers/qml/content.qml +++ b/tests/controllers/qml/content.qml @@ -83,8 +83,7 @@ Column { mapping.from(function() { return Math.sin(Date.now() / 250); }).to(standard.RX); // Constrainting a value to -1, 0, or 1, with a deadzone mapping.from(xbox.LY).deadZone(0.5).constrainToInteger().to(standard.LY); - // change join to makeAxis - mapping.join(standard.LB, standard.RB).to(actions.Yaw); + mapping.makeAxis(standard.LB, standard.RB).to(actions.Yaw); mapping.from(actions.Yaw).clamp(0, 1).invert().to(actions.YAW_RIGHT); mapping.from(actions.Yaw).clamp(-1, 0).to(actions.YAW_LEFT); // mapping.modifier(keyboard.Ctrl).scale(2.0)