Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-06 16:36:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/worklist/hifi into ssao

Browse source
This commit is contained in:
Andrzej Kapolka 2013-08-19 11:03:41 -07:00
commit 89b13417e5
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
interface/src/Menu.cpp
View file

@ -151,6 +151,12 @@ Menu::Menu() :
&appInstance->getAvatar()->getHead().getFace(), &appInstance->getAvatar()->getHead().getFace(),
SLOT(cycleRenderMode())); SLOT(cycleRenderMode()));
addActionToQMenuAndActionHash(renderMenu,
MenuOption::GlowMode,
0,
appInstance->getGlowEffect(),
SLOT(cycleRenderMode()));
addCheckableActionToQMenuAndActionHash(renderMenu, MenuOption::FrameTimer); addCheckableActionToQMenuAndActionHash(renderMenu, MenuOption::FrameTimer);
addCheckableActionToQMenuAndActionHash(renderMenu, MenuOption::LookAtVectors); addCheckableActionToQMenuAndActionHash(renderMenu, MenuOption::LookAtVectors);
addCheckableActionToQMenuAndActionHash(renderMenu, MenuOption::LookAtIndicator, 0, true); addCheckableActionToQMenuAndActionHash(renderMenu, MenuOption::LookAtIndicator, 0, true);
@ -776,4 +782,4 @@ void Menu::updateFrustumRenderModeAction() {
frustumRenderModeAction->setText("Render Mode - Keyhole"); frustumRenderModeAction->setText("Render Mode - Keyhole");
break; break;
} }
} }

1
interface/src/Menu.h
View file

@ -137,6 +137,7 @@ namespace MenuOption {
const QString FrameTimer = "Show Timer"; const QString FrameTimer = "Show Timer";
const QString FrustumRenderMode = "Render Mode"; const QString FrustumRenderMode = "Render Mode";
const QString Fullscreen = "Fullscreen"; const QString Fullscreen = "Fullscreen";
const QString GlowMode = "Cycle Glow Mode";
const QString ImportVoxels = "Import Voxels"; const QString ImportVoxels = "Import Voxels";
const QString ImportVoxelsClipboard = "Import Voxels to Clipboard"; const QString ImportVoxelsClipboard = "Import Voxels to Clipboard";
const QString IncreaseAvatarSize = "Increase Avatar Size"; const QString IncreaseAvatarSize = "Increase Avatar Size";