mirror of
https://github.com/overte-org/overte.git
synced 2025-08-06 18:50:00 +02:00
Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll
This commit is contained in:
commit
3d75a793cc
2 changed files with 20 additions and 66 deletions
|
@ -3805,68 +3805,6 @@ void Application::keyPressEvent(QKeyEvent* event) {
|
||||||
Menu::getInstance()->triggerOption(MenuOption::Chat);
|
Menu::getInstance()->triggerOption(MenuOption::Chat);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
#if 0
|
|
||||||
case Qt::Key_I:
|
|
||||||
if (isShifted) {
|
|
||||||
_myCamera.setEyeOffsetOrientation(glm::normalize(
|
|
||||||
glm::quat(glm::vec3(0.002f, 0, 0)) * _myCamera.getEyeOffsetOrientation()));
|
|
||||||
} else {
|
|
||||||
_myCamera.setEyeOffsetPosition(_myCamera.getEyeOffsetPosition() + glm::vec3(0, 0.001, 0));
|
|
||||||
}
|
|
||||||
updateProjectionMatrix();
|
|
||||||
break;
|
|
||||||
|
|
||||||
case Qt::Key_K:
|
|
||||||
if (isShifted) {
|
|
||||||
_myCamera.setEyeOffsetOrientation(glm::normalize(
|
|
||||||
glm::quat(glm::vec3(-0.002f, 0, 0)) * _myCamera.getEyeOffsetOrientation()));
|
|
||||||
} else {
|
|
||||||
_myCamera.setEyeOffsetPosition(_myCamera.getEyeOffsetPosition() + glm::vec3(0, -0.001, 0));
|
|
||||||
}
|
|
||||||
updateProjectionMatrix();
|
|
||||||
break;
|
|
||||||
|
|
||||||
case Qt::Key_J:
|
|
||||||
if (isShifted) {
|
|
||||||
QMutexLocker viewLocker(&_viewMutex);
|
|
||||||
_viewFrustum.setFocalLength(_viewFrustum.getFocalLength() - 0.1f);
|
|
||||||
} else {
|
|
||||||
_myCamera.setEyeOffsetPosition(_myCamera.getEyeOffsetPosition() + glm::vec3(-0.001, 0, 0));
|
|
||||||
}
|
|
||||||
updateProjectionMatrix();
|
|
||||||
break;
|
|
||||||
|
|
||||||
case Qt::Key_M:
|
|
||||||
if (isShifted) {
|
|
||||||
QMutexLocker viewLocker(&_viewMutex);
|
|
||||||
_viewFrustum.setFocalLength(_viewFrustum.getFocalLength() + 0.1f);
|
|
||||||
} else {
|
|
||||||
_myCamera.setEyeOffsetPosition(_myCamera.getEyeOffsetPosition() + glm::vec3(0.001, 0, 0));
|
|
||||||
}
|
|
||||||
updateProjectionMatrix();
|
|
||||||
break;
|
|
||||||
|
|
||||||
case Qt::Key_U:
|
|
||||||
if (isShifted) {
|
|
||||||
_myCamera.setEyeOffsetOrientation(glm::normalize(
|
|
||||||
glm::quat(glm::vec3(0, 0, -0.002f)) * _myCamera.getEyeOffsetOrientation()));
|
|
||||||
} else {
|
|
||||||
_myCamera.setEyeOffsetPosition(_myCamera.getEyeOffsetPosition() + glm::vec3(0, 0, -0.001));
|
|
||||||
}
|
|
||||||
updateProjectionMatrix();
|
|
||||||
break;
|
|
||||||
|
|
||||||
case Qt::Key_Y:
|
|
||||||
if (isShifted) {
|
|
||||||
_myCamera.setEyeOffsetOrientation(glm::normalize(
|
|
||||||
glm::quat(glm::vec3(0, 0, 0.002f)) * _myCamera.getEyeOffsetOrientation()));
|
|
||||||
} else {
|
|
||||||
_myCamera.setEyeOffsetPosition(_myCamera.getEyeOffsetPosition() + glm::vec3(0, 0, 0.001));
|
|
||||||
}
|
|
||||||
updateProjectionMatrix();
|
|
||||||
break;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
case Qt::Key_Slash:
|
case Qt::Key_Slash:
|
||||||
Menu::getInstance()->triggerOption(MenuOption::Stats);
|
Menu::getInstance()->triggerOption(MenuOption::Stats);
|
||||||
break;
|
break;
|
||||||
|
|
|
@ -103,16 +103,32 @@ Menu::Menu() {
|
||||||
editMenu->addSeparator();
|
editMenu->addSeparator();
|
||||||
|
|
||||||
// Edit > Cut
|
// Edit > Cut
|
||||||
addActionToQMenuAndActionHash(editMenu, "Cut", Qt::CTRL | Qt::Key_X);
|
auto cutAction = addActionToQMenuAndActionHash(editMenu, "Cut", QKeySequence::Cut);
|
||||||
|
connect(cutAction, &QAction::triggered, [] {
|
||||||
|
QKeyEvent* keyEvent = new QKeyEvent(QEvent::KeyPress, Qt::Key_X, Qt::ControlModifier);
|
||||||
|
QCoreApplication::postEvent(QCoreApplication::instance(), keyEvent);
|
||||||
|
});
|
||||||
|
|
||||||
// Edit > Copy
|
// Edit > Copy
|
||||||
addActionToQMenuAndActionHash(editMenu, "Copy", Qt::CTRL | Qt::Key_C);
|
auto copyAction = addActionToQMenuAndActionHash(editMenu, "Copy", QKeySequence::Copy);
|
||||||
|
connect(copyAction, &QAction::triggered, [] {
|
||||||
|
QKeyEvent* keyEvent = new QKeyEvent(QEvent::KeyPress, Qt::Key_C, Qt::ControlModifier);
|
||||||
|
QCoreApplication::postEvent(QCoreApplication::instance(), keyEvent);
|
||||||
|
});
|
||||||
|
|
||||||
// Edit > Paste
|
// Edit > Paste
|
||||||
addActionToQMenuAndActionHash(editMenu, "Paste", Qt::CTRL | Qt::Key_V);
|
auto pasteAction = addActionToQMenuAndActionHash(editMenu, "Paste", QKeySequence::Paste);
|
||||||
|
connect(pasteAction, &QAction::triggered, [] {
|
||||||
|
QKeyEvent* keyEvent = new QKeyEvent(QEvent::KeyPress, Qt::Key_V, Qt::ControlModifier);
|
||||||
|
QCoreApplication::postEvent(QCoreApplication::instance(), keyEvent);
|
||||||
|
});
|
||||||
|
|
||||||
// Edit > Delete
|
// Edit > Delete
|
||||||
addActionToQMenuAndActionHash(editMenu, "Delete", Qt::Key_Delete);
|
auto deleteAction =addActionToQMenuAndActionHash(editMenu, "Delete", QKeySequence::Delete);
|
||||||
|
connect(deleteAction, &QAction::triggered, [] {
|
||||||
|
QKeyEvent* keyEvent = new QKeyEvent(QEvent::KeyPress, Qt::Key_Delete, Qt::ControlModifier);
|
||||||
|
QCoreApplication::postEvent(QCoreApplication::instance(), keyEvent);
|
||||||
|
});
|
||||||
|
|
||||||
editMenu->addSeparator();
|
editMenu->addSeparator();
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue