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

Fix shortcuts : done

Browse source
This commit is contained in:
atlante45 2013-08-02 16:36:53 -07:00
parent eb2a1ecedd
commit 1b4cdc003d
1 changed files with 35 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

69
interface/src/Application.cpp
View file

@ -571,6 +571,7 @@ void Application::keyPressEvent(QKeyEvent* event) {
_myAvatar.getHand().setRaveGloveEffectsMode((QKeyEvent*)event); _myAvatar.getHand().setRaveGloveEffectsMode((QKeyEvent*)event);
} }
bool alt = event->modifiers().testFlag(Qt::AltModifier);
bool meta = event->modifiers().testFlag(Qt::MetaModifier); bool meta = event->modifiers().testFlag(Qt::MetaModifier);
bool shifted = event->modifiers().testFlag(Qt::ShiftModifier); bool shifted = event->modifiers().testFlag(Qt::ShiftModifier);
switch (event->key()) { switch (event->key()) {
@ -646,8 +647,7 @@ void Application::keyPressEvent(QKeyEvent* event) {
case Qt::Key_C: case Qt::Key_C:
if (shifted) { if (shifted) {
_occlusionCulling->toggle(); _occlusionCulling->trigger();
disableOcclusionCulling(_occlusionCulling->isChecked());
} else if (meta) { } else if (meta) {
chooseVoxelPaintColor(); chooseVoxelPaintColor();
} else { } else {
@ -674,16 +674,15 @@ void Application::keyPressEvent(QKeyEvent* event) {
case Qt::Key_G: case Qt::Key_G:
if (shifted) { if (shifted) {
_gravityUse->toggle(); _gravityUse->trigger();
} else { } else {
_eyedropperMode->toggle(); _eyedropperMode->trigger();
updateVoxelModeActions();
} }
break; break;
case Qt::Key_A: case Qt::Key_A:
if (shifted) { if (shifted) {
_renderAtmosphereOn->toggle(); _renderAtmosphereOn->trigger();
} else { } else {
_myAvatar.setDriveKeys(ROT_LEFT, 1); _myAvatar.setDriveKeys(ROT_LEFT, 1);
} }
@ -776,59 +775,48 @@ void Application::keyPressEvent(QKeyEvent* event) {
} }
resizeGL(_glWidget->width(), _glWidget->height()); resizeGL(_glWidget->width(), _glWidget->height());
break; break;
case Qt::Key_H:
_noise->toggle();
setNoise(_noise->isChecked());
break;
case Qt::Key_N: case Qt::Key_N:
_lookingInMirror->toggle(); _noise->trigger();
setRenderMirrored(_lookingInMirror->isChecked()); break;
case Qt::Key_H:
_lookingInMirror->trigger();
break; break;
case Qt::Key_F: case Qt::Key_F:
if (shifted) { if (shifted) {
_frustumOn->toggle(); _frustumOn->trigger();
} else { } else {
_fullScreenMode->toggle(); _fullScreenMode->trigger();
setFullscreen(_fullScreenMode->isChecked());
} }
break; break;
case Qt::Key_V: case Qt::Key_V:
if (shifted) { if (shifted) {
_renderVoxels->toggle(); _renderVoxels->trigger();
setRenderVoxels(_renderVoxels->isChecked());
} else { } else {
_addVoxelMode->toggle(); _addVoxelMode->trigger();
updateVoxelModeActions();
} }
break; break;
case Qt::Key_P: case Qt::Key_P:
_manualFirstPerson->toggle(); _manualFirstPerson->trigger();
setRenderFirstPerson(_manualFirstPerson->isChecked());
break; break;
case Qt::Key_R: case Qt::Key_R:
if (shifted) { if (shifted) {
_frustumRenderModeAction->toggle(); _frustumRenderModeAction->trigger();
cycleFrustumRenderMode();
} else { } else {
_deleteVoxelMode->toggle(); _deleteVoxelMode->trigger();
updateVoxelModeActions();
} }
break; break;
case Qt::Key_B: case Qt::Key_B:
_colorVoxelMode->toggle(); _colorVoxelMode->trigger();
updateVoxelModeActions();
break; break;
case Qt::Key_O: case Qt::Key_O:
if (shifted) { if (shifted) {
_viewFrustumFromOffset->toggle(); _viewFrustumFromOffset->trigger();
setFrustumOffset(_viewFrustumFromOffset->isChecked());
} else { } else {
_selectVoxelMode->toggle(); _selectVoxelMode->trigger();
updateVoxelModeActions();
} }
break; break;
case Qt::Key_Slash: case Qt::Key_Slash:
_renderStatsOn->toggle(); _renderStatsOn->trigger();
break; break;
case Qt::Key_Backspace: case Qt::Key_Backspace:
case Qt::Key_Delete: case Qt::Key_Delete:
@ -836,6 +824,17 @@ void Application::keyPressEvent(QKeyEvent* event) {
deleteVoxelUnderCursor(); deleteVoxelUnderCursor();
} }
break; break;
case Qt::Key_Plus:
if (alt) {
increaseAvatarSize();
}
break;
case Qt::Key_Minus:
if (alt) {
decreaseAvatarSize();
}
break;
case Qt::Key_1: case Qt::Key_1:
case Qt::Key_2: case Qt::Key_2:
case Qt::Key_3: case Qt::Key_3:
@ -1866,10 +1865,12 @@ void Application::initMenu() {
_window->setMenuBar(menuBar); _window->setMenuBar(menuBar);
QMenu* fileMenu = menuBar->addMenu("File"); QMenu* fileMenu = menuBar->addMenu("File");
fileMenu->addAction("Quit", this, SLOT(quit()), Qt::CTRL | Qt::Key_Q); QAction* quitAction = fileMenu->addAction("Quit", this, SLOT(quit()), Qt::CTRL | Qt::Key_Q);
quitAction->setMenuRole(QAction::QuitRole);
QMenu* editMenu = menuBar->addMenu("Edit"); QMenu* editMenu = menuBar->addMenu("Edit");
editMenu->addAction("Preferences...", this, SLOT(editPreferences())); QAction* preferencesAction = editMenu->addAction("Preferences...", this, SLOT(editPreferences()), Qt::CTRL | Qt::Key_Comma);
preferencesAction->setMenuRole(QAction::PreferencesRole);
QMenu* pairMenu = menuBar->addMenu("Pair"); QMenu* pairMenu = menuBar->addMenu("Pair");
pairMenu->addAction("Pair", this, SLOT(pair())); pairMenu->addAction("Pair", this, SLOT(pair()));