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

Add navigation actions and wire them up in the standard controller

Browse source
This commit is contained in:
Brad Davis 2015-12-30 17:14:40 -08:00
parent a834f28eca
commit 4c26627622
4 changed files with 82 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
interface/resources/controllers/standard.json
View file

@ -1,6 +1,15 @@
{
"name": "Standard to Action",
"channels": [
{ "from": "Standard.DU", "when": "Application.NavigationFocused", "to": "Actions.UiNavUp" },
{ "from": "Standard.DD", "when": "Application.NavigationFocused", "to": "Actions.UiNavDown" },
{ "from": "Standard.DL", "when": "Application.NavigationFocused", "to": "Actions.UiNavLeft" },
{ "from": "Standard.DR", "when": "Application.NavigationFocused", "to": "Actions.UiNavRight" },
{ "from": "Standard.A", "when": "Application.NavigationFocused", "to": "Actions.UiNavSelect" },
{ "from": "Standard.B", "when": "Application.NavigationFocused", "to": "Actions.UiNavBack" },
{ "from": "Standard.LB", "when": "Application.NavigationFocused", "to": "Actions.UiNavPreviousGroup" },
{ "from": "Standard.RB", "when": "Application.NavigationFocused", "to": "Actions.UiNavNextGroup" },
{ "from": "Standard.LY", "to": "Actions.TranslateZ" },
{ "from": "Standard.LX", "to": "Actions.TranslateX" },

55
interface/src/Application.cpp
View file

@ -11,6 +11,8 @@
#include "Application.h"
#include <gl/Config.h>
#include <glm/glm.hpp>
#include <glm/gtx/component_wise.hpp>
#include <glm/gtx/quaternion.hpp>
@ -34,6 +36,7 @@
#include <QtQml/QQmlContext>
#include <QtQml/QQmlEngine>
#include <QtQuick/QQuickWindow>
#include <QtWidgets/QActionGroup>
#include <QtWidgets/QDesktopWidget>
@ -684,6 +687,50 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer) :
// Setup the userInputMapper with the actions
auto userInputMapper = DependencyManager::get<UserInputMapper>();
connect(userInputMapper.data(), &UserInputMapper::actionEvent, [this](int action, float state) {
using namespace controller;
static auto offscreenUi = DependencyManager::get<OffscreenUi>();
if (offscreenUi->navigationFocused()) {
auto actionEnum = static_cast<Action>(action);
int key = Qt::Key_unknown;
switch (actionEnum) {
case Action::UI_NAV_UP:
key = Qt::Key_Up;
break;
case Action::UI_NAV_DOWN:
key = Qt::Key_Down;
break;
case Action::UI_NAV_LEFT:
key = Qt::Key_Left;
break;
case Action::UI_NAV_RIGHT:
key = Qt::Key_Right;
break;
case Action::UI_NAV_BACK:
key = Qt::Key_Escape;
break;
case Action::UI_NAV_SELECT:
key = Qt::Key_Return;
break;
case Action::UI_NAV_NEXT_GROUP:
key = Qt::Key_Tab;
break;
case Action::UI_NAV_PREVIOUS_GROUP:
key = Qt::Key_Backtab;
break;
}
if (key != Qt::Key_unknown) {
if (state) {
QKeyEvent event(QEvent::KeyPress, key, Qt::NoModifier);
sendEvent(offscreenUi->getWindow(), &event);
} else {
QKeyEvent event(QEvent::KeyRelease, key, Qt::NoModifier);
sendEvent(offscreenUi->getWindow(), &event);
}
return;
}
}
if (action == controller::toInt(controller::Action::RETICLE_CLICK)) {
auto globalPos = QCursor::pos();
auto localPos = _glWidget->mapFromGlobal(globalPos);
@ -754,6 +801,10 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer) :
_applicationStateDevice->addInputVariant(QString("Grounded"), controller::StateController::ReadLambda([]() -> float {
return (float)qApp->getMyAvatar()->getCharacterController()->onGround();
}));
_applicationStateDevice->addInputVariant(QString("NavigationFocused"), controller::StateController::ReadLambda([]() -> float {
static auto offscreenUi = DependencyManager::get<OffscreenUi>();
return offscreenUi->navigationFocused() ? 1.0 : 0.0;
}));
userInputMapper->registerDevice(_applicationStateDevice);
@ -1096,7 +1147,9 @@ void Application::initializeUi() {
offscreenUi->setBaseUrl(QUrl::fromLocalFile(PathUtils::resourcesPath() + "/qml/"));
offscreenUi->load("Root.qml");
offscreenUi->load("RootMenu.qml");
// FIXME either expose so that dialogs can set this themselves or
// do better detection in the offscreen UI of what has focus
offscreenUi->setNavigationFocused(false);
auto rootContext = offscreenUi->getRootContext();
auto engine = rootContext->engine();

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

@ -62,6 +62,15 @@ namespace controller {
makeButtonPair(Action::TOGGLE_MUTE, "ToggleMute"),
makeButtonPair(Action::CYCLE_CAMERA, "CycleCamera"),
makeButtonPair(Action::UI_NAV_UP, "UiNavUp"),
makeButtonPair(Action::UI_NAV_DOWN, "UiNavDown"),
makeButtonPair(Action::UI_NAV_LEFT, "UiNavLeft"),
makeButtonPair(Action::UI_NAV_RIGHT, "UiNavRight"),
makeButtonPair(Action::UI_NAV_SELECT, "UiNavSelect"),
makeButtonPair(Action::UI_NAV_BACK, "UiNavBack"),
makeButtonPair(Action::UI_NAV_NEXT_GROUP, "UiNavNextGroup"),
makeButtonPair(Action::UI_NAV_PREVIOUS_GROUP, "UiNavPreviousGroup"),
makeAxisPair(Action::RETICLE_CLICK, "ReticleClick"),
makeAxisPair(Action::RETICLE_X, "ReticleX"),
makeAxisPair(Action::RETICLE_Y, "ReticleY"),

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

@ -55,6 +55,15 @@ enum class Action {
SHIFT,
UI_NAV_UP,
UI_NAV_DOWN,
UI_NAV_LEFT,
UI_NAV_RIGHT,
UI_NAV_SELECT,
UI_NAV_BACK,
UI_NAV_NEXT_GROUP,
UI_NAV_PREVIOUS_GROUP,
// Pointer/Reticle control
RETICLE_CLICK,
RETICLE_X,
@ -90,6 +99,7 @@ enum class Action {
BOOM_IN,
BOOM_OUT,
NUM_ACTIONS,
};