Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-10 04:12:46 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

make sure CompositeEndpoints properly report readability more axis based keyboard inputs

Browse source
This commit is contained in:
Brad Hefta-Gaub 2015-10-29 22:37:12 -07:00
parent 8a03383adc
commit 70f3156328
3 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
interface/resources/controllers/keyboardMouse.json
View file

@ -19,7 +19,6 @@
["Keyboard.D", "Keyboard.Right", "Keyboard.TouchpadRight"] ["Keyboard.D", "Keyboard.Right", "Keyboard.TouchpadRight"]
] ]
}, },
"when": [ "Application.InHMD", "Application.ComfortMode" ], "when": [ "Application.InHMD", "Application.ComfortMode" ],
"to": "Actions.StepYaw", "to": "Actions.StepYaw",
"filters": "filters":
@ -29,10 +28,18 @@
] ]
}, },
{ "from": ["Keyboard.A", "Keyboard.Left", "Keyboard.TouchpadLeft"], "to": "Actions.YAW_LEFT" }, { "from": { "makeAxis" : [
{ "from": ["Keyboard.D", "Keyboard.Right", "Keyboard.TouchpadRight"], "to": "Actions.YAW_RIGHT" }, ["Keyboard.A", "Keyboard.Left", "Keyboard.TouchpadLeft"],
{ "from": "Keyboard.MouseMoveLeft", "when": "Keyboard.RightMouseClick", "to": "Actions.YAW_LEFT" }, ["Keyboard.D", "Keyboard.Right", "Keyboard.TouchpadRight"]
{ "from": "Keyboard.MouseMoveRight", "when": "Keyboard.RightMouseClick", "to": "Actions.YAW_RIGHT" }, ]
},
"to": "Actions.Yaw"
},
{ "from": { "makeAxis" : ["Keyboard.MouseMoveLeft", "Keyboard.MouseMoveRight"] },
"when": "Keyboard.RightMouseClick",
"to": "Actions.Yaw",
},
{ "from": "Keyboard.A", "when": "Keyboard.Shift", "to": "Actions.LATERAL_LEFT" }, { "from": "Keyboard.A", "when": "Keyboard.Shift", "to": "Actions.LATERAL_LEFT" },
{ "from": "Keyboard.D", "when": "Keyboard.Shift", "to": "Actions.LATERAL_RIGHT" }, { "from": "Keyboard.D", "when": "Keyboard.Shift", "to": "Actions.LATERAL_RIGHT" },

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

@ -20,6 +20,10 @@ CompositeEndpoint::CompositeEndpoint(Endpoint::Pointer first, Endpoint::Pointer
} }
} }
bool CompositeEndpoint::readable() const {
return first->readable() && second->readable();
}
float CompositeEndpoint::value() { float CompositeEndpoint::value() {
float result = first->value() * -1.0f + second->value(); float result = first->value() * -1.0f + second->value();
return result; return result;

2
libraries/controllers/src/controllers/impl/endpoints/CompositeEndpoint.h
View file

@ -19,6 +19,8 @@ namespace controller {
virtual float value() override; virtual float value() override;
virtual void apply(float newValue, const Pointer& source) override; virtual void apply(float newValue, const Pointer& source) override;
virtual bool readable() const override;
}; };
} }