mirror of
https://github.com/overte-org/overte.git
synced 2025-08-09 10:07:58 +02:00
Resolving ambiguity between functions and inputs differently
This commit is contained in:
parent
4938e5ea84
commit
5d4cbfdacb
6 changed files with 49 additions and 51 deletions
|
@ -17,9 +17,9 @@ ControllerTest = function() {
|
||||||
this.mapping.from(standard.RB).pulse(0.10).scale(15.0).to(actions.StepYaw);
|
this.mapping.from(standard.RB).pulse(0.10).scale(15.0).to(actions.StepYaw);
|
||||||
}
|
}
|
||||||
|
|
||||||
var testFunctionSource = false;
|
var testFunctionSource = true;
|
||||||
if (testFunctionSource) {
|
if (testFunctionSource) {
|
||||||
this.mapping.fromFunction(function(){
|
this.mapping.from(function(){
|
||||||
return Math.sin(Date.now() / 250);
|
return Math.sin(Date.now() / 250);
|
||||||
}).to(actions.Yaw);
|
}).to(actions.Yaw);
|
||||||
}
|
}
|
||||||
|
@ -27,22 +27,25 @@ ControllerTest = function() {
|
||||||
this.mapping.enable();
|
this.mapping.enable();
|
||||||
this.mappingEnabled = true;
|
this.mappingEnabled = true;
|
||||||
|
|
||||||
print("Actions");
|
var dumpInputs = false;
|
||||||
for (var prop in Controller.Actions) {
|
if (dumpInputs) {
|
||||||
print("\t" + prop);
|
print("Actions");
|
||||||
}
|
for (var prop in Controller.Actions) {
|
||||||
print("Standard");
|
print("\t" + prop);
|
||||||
for (var prop in Controller.Standard) {
|
|
||||||
print("\t" + prop);
|
|
||||||
}
|
|
||||||
print("Hardware");
|
|
||||||
for (var prop in Controller.Hardware) {
|
|
||||||
print("\t" + prop);
|
|
||||||
for (var prop2 in Controller.Hardware[prop]) {
|
|
||||||
print("\t\t" + prop2);
|
|
||||||
}
|
}
|
||||||
|
print("Standard");
|
||||||
|
for (var prop in Controller.Standard) {
|
||||||
|
print("\t" + prop);
|
||||||
|
}
|
||||||
|
print("Hardware");
|
||||||
|
for (var prop in Controller.Hardware) {
|
||||||
|
print("\t" + prop);
|
||||||
|
for (var prop2 in Controller.Hardware[prop]) {
|
||||||
|
print("\t\t" + prop2);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
print("Done");
|
||||||
}
|
}
|
||||||
print("Done");
|
|
||||||
|
|
||||||
var that = this;
|
var that = this;
|
||||||
Script.scriptEnding.connect(function() {
|
Script.scriptEnding.connect(function() {
|
||||||
|
|
|
@ -25,15 +25,15 @@ HifiControls.VrDialog {
|
||||||
|
|
||||||
function buildMapping() {
|
function buildMapping() {
|
||||||
testMapping = Controller.newMapping();
|
testMapping = Controller.newMapping();
|
||||||
testMapping.from(standard.RY).invert().to(actions.Pitch);
|
testMapping.fromQml(standard.RY).invert().toQml(actions.Pitch);
|
||||||
testMapping.fromQmlFunction(function(){
|
testMapping.fromQml(function(){
|
||||||
return Math.sin(Date.now() / 250);
|
return Math.sin(Date.now() / 250);
|
||||||
}).to(actions.Yaw);
|
}).toQml(actions.Yaw);
|
||||||
//testMapping.makeAxis(standard.LB, standard.RB).to(actions.Yaw);
|
//testMapping.makeAxis(standard.LB, standard.RB).to(actions.Yaw);
|
||||||
// Step yaw takes a number of degrees
|
// Step yaw takes a number of degrees
|
||||||
testMapping.from(standard.LB).pulse(0.10).invert().scale(40.0).to(actions.StepYaw);
|
testMapping.fromQml(standard.LB).pulse(0.10).invert().scale(40.0).toQml(actions.StepYaw);
|
||||||
testMapping.from(standard.RB).pulse(0.10).scale(15.0).to(actions.StepYaw);
|
testMapping.fromQml(standard.RB).pulse(0.10).scale(15.0).toQml(actions.StepYaw);
|
||||||
testMapping.from(standard.RX).scale(15.0).to(actions.StepYaw);
|
testMapping.fromQml(standard.RX).scale(15.0).toQml(actions.StepYaw);
|
||||||
}
|
}
|
||||||
|
|
||||||
function toggleMapping() {
|
function toggleMapping() {
|
||||||
|
@ -91,8 +91,9 @@ HifiControls.VrDialog {
|
||||||
Hydra { device: root.hydra; width: 180 }
|
Hydra { device: root.hydra; width: 180 }
|
||||||
}
|
}
|
||||||
|
|
||||||
Row {
|
Grid {
|
||||||
spacing: 8
|
columns: 6
|
||||||
|
spacing: 4
|
||||||
ScrollingGraph {
|
ScrollingGraph {
|
||||||
controlId: Controller.Actions.Yaw
|
controlId: Controller.Actions.Yaw
|
||||||
label: "Yaw"
|
label: "Yaw"
|
||||||
|
|
|
@ -20,19 +20,13 @@
|
||||||
|
|
||||||
using namespace controller;
|
using namespace controller;
|
||||||
|
|
||||||
QObject* MappingBuilderProxy::from(int input) {
|
QObject* MappingBuilderProxy::fromQml(const QJSValue& source) {
|
||||||
qCDebug(controllers) << "Creating new Route builder proxy from " << input;
|
|
||||||
auto sourceEndpoint = _parent.endpointFor(Input(input));
|
|
||||||
return from(sourceEndpoint);
|
|
||||||
}
|
|
||||||
|
|
||||||
QObject* MappingBuilderProxy::fromQmlFunction(const QJSValue& source) {
|
|
||||||
qCDebug(controllers) << "Creating new Route builder proxy from " << source.toString();
|
qCDebug(controllers) << "Creating new Route builder proxy from " << source.toString();
|
||||||
auto sourceEndpoint = _parent.endpointFor(source);
|
auto sourceEndpoint = _parent.endpointFor(source);
|
||||||
return from(sourceEndpoint);
|
return from(sourceEndpoint);
|
||||||
}
|
}
|
||||||
|
|
||||||
QObject* MappingBuilderProxy::fromFunction(const QScriptValue& source) {
|
QObject* MappingBuilderProxy::from(const QScriptValue& source) {
|
||||||
qCDebug(controllers) << "Creating new Route builder proxy from " << source.toString();
|
qCDebug(controllers) << "Creating new Route builder proxy from " << source.toString();
|
||||||
auto sourceEndpoint = _parent.endpointFor(source);
|
auto sourceEndpoint = _parent.endpointFor(source);
|
||||||
return from(sourceEndpoint);
|
return from(sourceEndpoint);
|
||||||
|
@ -49,9 +43,15 @@ QObject* MappingBuilderProxy::from(const Endpoint::Pointer& source) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
QObject* MappingBuilderProxy::makeAxis(int source1, int source2) {
|
QObject* MappingBuilderProxy::makeAxisQml(const QJSValue& source1, const QJSValue& source2) {
|
||||||
auto source1Endpoint = _parent.endpointFor(Input(source1));
|
auto source1Endpoint = _parent.endpointFor(source1);
|
||||||
auto source2Endpoint = _parent.endpointFor(Input(source2));
|
auto source2Endpoint = _parent.endpointFor(source2);
|
||||||
|
return from(_parent.compositeEndpointFor(source1Endpoint, source2Endpoint));
|
||||||
|
}
|
||||||
|
|
||||||
|
QObject* MappingBuilderProxy::makeAxis(const QScriptValue& source1, const QScriptValue& source2) {
|
||||||
|
auto source1Endpoint = _parent.endpointFor(source1);
|
||||||
|
auto source2Endpoint = _parent.endpointFor(source2);
|
||||||
return from(_parent.compositeEndpointFor(source1Endpoint, source2Endpoint));
|
return from(_parent.compositeEndpointFor(source1Endpoint, source2Endpoint));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -32,10 +32,11 @@ public:
|
||||||
MappingBuilderProxy(UserInputMapper& parent, Mapping::Pointer mapping)
|
MappingBuilderProxy(UserInputMapper& parent, Mapping::Pointer mapping)
|
||||||
: _parent(parent), _mapping(mapping) { }
|
: _parent(parent), _mapping(mapping) { }
|
||||||
|
|
||||||
Q_INVOKABLE QObject* from(int sourceInput);
|
Q_INVOKABLE QObject* fromQml(const QJSValue& source);
|
||||||
Q_INVOKABLE QObject* fromQmlFunction(const QJSValue& source);
|
Q_INVOKABLE QObject* makeAxisQml(const QJSValue& source1, const QJSValue& source2);
|
||||||
Q_INVOKABLE QObject* fromFunction(const QScriptValue& source);
|
|
||||||
Q_INVOKABLE QObject* makeAxis(int source1, const int source2);
|
Q_INVOKABLE QObject* from(const QScriptValue& source);
|
||||||
|
Q_INVOKABLE QObject* makeAxis(const QScriptValue& source1, const QScriptValue& source2);
|
||||||
|
|
||||||
Q_INVOKABLE QObject* enable(bool enable = true);
|
Q_INVOKABLE QObject* enable(bool enable = true);
|
||||||
Q_INVOKABLE QObject* disable() { return enable(false); }
|
Q_INVOKABLE QObject* disable() { return enable(false); }
|
||||||
|
|
|
@ -20,13 +20,7 @@
|
||||||
|
|
||||||
using namespace controller;
|
using namespace controller;
|
||||||
|
|
||||||
void RouteBuilderProxy::to(int destinationInput) {
|
void RouteBuilderProxy::toQml(const QJSValue& destination) {
|
||||||
qCDebug(controllers) << "Completing route " << destinationInput;
|
|
||||||
auto destinationEndpoint = _parent.endpointFor(Input(destinationInput));
|
|
||||||
return to(destinationEndpoint);
|
|
||||||
}
|
|
||||||
|
|
||||||
void RouteBuilderProxy::to(const QJSValue& destination) {
|
|
||||||
qCDebug(controllers) << "Completing route " << destination.toString();
|
qCDebug(controllers) << "Completing route " << destination.toString();
|
||||||
auto destinationEndpoint = _parent.endpointFor(destination);
|
auto destinationEndpoint = _parent.endpointFor(destination);
|
||||||
return to(destinationEndpoint);
|
return to(destinationEndpoint);
|
||||||
|
@ -45,7 +39,7 @@ void RouteBuilderProxy::to(const Endpoint::Pointer& destination) {
|
||||||
deleteLater();
|
deleteLater();
|
||||||
}
|
}
|
||||||
|
|
||||||
QObject* RouteBuilderProxy::filter(const QJSValue& expression) {
|
QObject* RouteBuilderProxy::filterQml(const QJSValue& expression) {
|
||||||
if (expression.isCallable()) {
|
if (expression.isCallable()) {
|
||||||
addFilter([=](float value) {
|
addFilter([=](float value) {
|
||||||
QJSValue originalExpression = expression;
|
QJSValue originalExpression = expression;
|
||||||
|
|
|
@ -31,11 +31,10 @@ class RouteBuilderProxy : public QObject {
|
||||||
RouteBuilderProxy(UserInputMapper& parent, Mapping::Pointer mapping, Route::Pointer route)
|
RouteBuilderProxy(UserInputMapper& parent, Mapping::Pointer mapping, Route::Pointer route)
|
||||||
: _parent(parent), _mapping(mapping), _route(route) { }
|
: _parent(parent), _mapping(mapping), _route(route) { }
|
||||||
|
|
||||||
Q_INVOKABLE void to(int destination);
|
Q_INVOKABLE void toQml(const QJSValue& destination);
|
||||||
Q_INVOKABLE void to(const QJSValue& destination);
|
Q_INVOKABLE QObject* filterQml(const QJSValue& expression);
|
||||||
Q_INVOKABLE void to(const QScriptValue& destination);
|
|
||||||
|
|
||||||
Q_INVOKABLE QObject* filter(const QJSValue& expression);
|
Q_INVOKABLE void to(const QScriptValue& destination);
|
||||||
Q_INVOKABLE QObject* filter(const QScriptValue& expression);
|
Q_INVOKABLE QObject* filter(const QScriptValue& expression);
|
||||||
Q_INVOKABLE QObject* clamp(float min, float max);
|
Q_INVOKABLE QObject* clamp(float min, float max);
|
||||||
Q_INVOKABLE QObject* pulse(float interval);
|
Q_INVOKABLE QObject* pulse(float interval);
|
||||||
|
|
Loading…
Reference in a new issue