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

adding PushToTalk action

Browse source
This commit is contained in:
Wayne Chen 2019-03-07 12:36:56 -08:00
parent 5f48a6d104
commit 18b86d550d
4 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
interface/src/Application.cpp
View file

@ -1601,12 +1601,23 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
connect(userInputMapper.data(), &UserInputMapper::actionEvent, [this](int action, float state) {
using namespace controller;
auto tabletScriptingInterface = DependencyManager::get<TabletScriptingInterface>();
auto audioScriptingInterface = reinterpret_cast<scripting::Audio*>(DependencyManager::get<AudioScriptingInterface>().data());
{
auto actionEnum = static_cast<Action>(action);
int key = Qt::Key_unknown;
static int lastKey = Qt::Key_unknown;
bool navAxis = false;
switch (actionEnum) {
case Action::TOGGLE_PUSHTOTALK:
if (audioScriptingInterface->getPTT()) {
qDebug() << "State is " << state;
if (state > 0.0f) {
audioScriptingInterface->setPushingToTalk(false);
} else if (state < 0.0f) {
audioScriptingInterface->setPushingToTalk(true);
}
}
case Action::UI_NAV_VERTICAL:
navAxis = true;
if (state > 0.0f) {

4
libraries/controllers/src/controllers/Actions.cpp
View file

@ -180,6 +180,7 @@ namespace controller {
* third person, to full screen mirror, then back to first person and repeat.</td></tr>
* <tr><td><code>ContextMenu</code></td><td>number</td><td>number</td><td>Show / hide the tablet.</td></tr>
* <tr><td><code>ToggleMute</code></td><td>number</td><td>number</td><td>Toggle the microphone mute.</td></tr>
* <tr><td><code>TogglePushToTalk</code></td><td>number</td><td>number</td><td>Toggle push to talk.</td></tr>
* <tr><td><code>ToggleOverlay</code></td><td>number</td><td>number</td><td>Toggle the display of overlays.</td></tr>
* <tr><td><code>Sprint</code></td><td>number</td><td>number</td><td>Set avatar sprint mode.</td></tr>
* <tr><td><code>ReticleClick</code></td><td>number</td><td>number</td><td>Set mouse-pressed.</td></tr>
@ -245,6 +246,8 @@ namespace controller {
* <code>ContextMenu</code> instead.</td></tr>
* <tr><td><code>TOGGLE_MUTE</code></td><td>number</td><td>number</td><td><strong>Deprecated:</strong> Use
* <code>ToggleMute</code> instead.</td></tr>
* <tr><td><code>TOGGLE_PUSHTOTALK</code></td><td>number</td><td>number</td><td><strong>Deprecated:</strong> Use
* <code>TogglePushToTalk</code> instead.</td></tr>
* <tr><td><code>SPRINT</code></td><td>number</td><td>number</td><td><strong>Deprecated:</strong> Use
* <code>Sprint</code> instead.</td></tr>
* <tr><td><code>LONGITUDINAL_BACKWARD</code></td><td>number</td><td>number</td><td><strong>Deprecated:</strong> Use
@ -411,6 +414,7 @@ namespace controller {
makeButtonPair(Action::ACTION2, "SecondaryAction"),
makeButtonPair(Action::CONTEXT_MENU, "ContextMenu"),
makeButtonPair(Action::TOGGLE_MUTE, "ToggleMute"),
makeButtonPair(Action::TOGGLE_PUSHTOTALK, "TogglePushToTalk"),
makeButtonPair(Action::CYCLE_CAMERA, "CycleCamera"),
makeButtonPair(Action::TOGGLE_OVERLAY, "ToggleOverlay"),
makeButtonPair(Action::SPRINT, "Sprint"),

1
libraries/controllers/src/controllers/Actions.h
View file

@ -60,6 +60,7 @@ enum class Action {
CONTEXT_MENU,
TOGGLE_MUTE,
TOGGLE_PUSHTOTALK,
CYCLE_CAMERA,
TOGGLE_OVERLAY,

2
scripts/system/controllers/controllerModules/pushToTalk.js
View file

@ -72,4 +72,4 @@ Script.include("/~/system/libraries/controllers.js");
};
Script.scriptEnding.connect(cleanup);
}()); // END LOCAL_SCOPE
}()); // END LOCAL_SCOPE