mirror of
https://github.com/JulianGro/overte.git
synced 2025-07-17 18:57:23 +02:00
adding PushToTalk action
This commit is contained in:
parent
9d59e68d45
commit
b83e9f70e6
4 changed files with 18 additions and 2 deletions
|
@ -1601,12 +1601,23 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
|
||||||
connect(userInputMapper.data(), &UserInputMapper::actionEvent, [this](int action, float state) {
|
connect(userInputMapper.data(), &UserInputMapper::actionEvent, [this](int action, float state) {
|
||||||
using namespace controller;
|
using namespace controller;
|
||||||
auto tabletScriptingInterface = DependencyManager::get<TabletScriptingInterface>();
|
auto tabletScriptingInterface = DependencyManager::get<TabletScriptingInterface>();
|
||||||
|
auto audioScriptingInterface = reinterpret_cast<scripting::Audio*>(DependencyManager::get<AudioScriptingInterface>().data());
|
||||||
{
|
{
|
||||||
auto actionEnum = static_cast<Action>(action);
|
auto actionEnum = static_cast<Action>(action);
|
||||||
int key = Qt::Key_unknown;
|
int key = Qt::Key_unknown;
|
||||||
static int lastKey = Qt::Key_unknown;
|
static int lastKey = Qt::Key_unknown;
|
||||||
bool navAxis = false;
|
bool navAxis = false;
|
||||||
switch (actionEnum) {
|
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:
|
case Action::UI_NAV_VERTICAL:
|
||||||
navAxis = true;
|
navAxis = true;
|
||||||
if (state > 0.0f) {
|
if (state > 0.0f) {
|
||||||
|
|
|
@ -180,6 +180,7 @@ namespace controller {
|
||||||
* third person, to full screen mirror, then back to first person and repeat.</td></tr>
|
* 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>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>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>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>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>
|
* <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>
|
* <code>ContextMenu</code> instead.</td></tr>
|
||||||
* <tr><td><code>TOGGLE_MUTE</code></td><td>number</td><td>number</td><td><strong>Deprecated:</strong> Use
|
* <tr><td><code>TOGGLE_MUTE</code></td><td>number</td><td>number</td><td><strong>Deprecated:</strong> Use
|
||||||
* <code>ToggleMute</code> instead.</td></tr>
|
* <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
|
* <tr><td><code>SPRINT</code></td><td>number</td><td>number</td><td><strong>Deprecated:</strong> Use
|
||||||
* <code>Sprint</code> instead.</td></tr>
|
* <code>Sprint</code> instead.</td></tr>
|
||||||
* <tr><td><code>LONGITUDINAL_BACKWARD</code></td><td>number</td><td>number</td><td><strong>Deprecated:</strong> Use
|
* <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::ACTION2, "SecondaryAction"),
|
||||||
makeButtonPair(Action::CONTEXT_MENU, "ContextMenu"),
|
makeButtonPair(Action::CONTEXT_MENU, "ContextMenu"),
|
||||||
makeButtonPair(Action::TOGGLE_MUTE, "ToggleMute"),
|
makeButtonPair(Action::TOGGLE_MUTE, "ToggleMute"),
|
||||||
|
makeButtonPair(Action::TOGGLE_PUSHTOTALK, "TogglePushToTalk"),
|
||||||
makeButtonPair(Action::CYCLE_CAMERA, "CycleCamera"),
|
makeButtonPair(Action::CYCLE_CAMERA, "CycleCamera"),
|
||||||
makeButtonPair(Action::TOGGLE_OVERLAY, "ToggleOverlay"),
|
makeButtonPair(Action::TOGGLE_OVERLAY, "ToggleOverlay"),
|
||||||
makeButtonPair(Action::SPRINT, "Sprint"),
|
makeButtonPair(Action::SPRINT, "Sprint"),
|
||||||
|
|
|
@ -60,6 +60,7 @@ enum class Action {
|
||||||
|
|
||||||
CONTEXT_MENU,
|
CONTEXT_MENU,
|
||||||
TOGGLE_MUTE,
|
TOGGLE_MUTE,
|
||||||
|
TOGGLE_PUSHTOTALK,
|
||||||
CYCLE_CAMERA,
|
CYCLE_CAMERA,
|
||||||
TOGGLE_OVERLAY,
|
TOGGLE_OVERLAY,
|
||||||
|
|
||||||
|
|
|
@ -35,7 +35,7 @@ Script.include("/~/system/libraries/controllers.js");
|
||||||
};
|
};
|
||||||
|
|
||||||
this.isReady = function (controllerData, deltaTime) {
|
this.isReady = function (controllerData, deltaTime) {
|
||||||
if (HMD.active() && Audio.pushToTalk && this.shouldTalk(controllerData)) {
|
if (HMD.active && Audio.pushToTalk && this.shouldTalk(controllerData)) {
|
||||||
Audio.pushingToTalk = true;
|
Audio.pushingToTalk = true;
|
||||||
returnMakeRunningValues(true, [], []);
|
returnMakeRunningValues(true, [], []);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue