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

voxel mode actions group cannot be exclusive

Browse source
This commit is contained in:
Stephen Birarda 2013-08-15 12:48:48 -07:00
parent 4903122432
commit 0e4d54d5b0
3 changed files with 19 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/Application.cpp
View file

@ -1796,7 +1796,7 @@ void Application::update(float deltaTime) {
}
_mouseVoxel.s = 0.0f;
if (!Menu::getInstance()->isVoxelModeActionChecked() &&
if (Menu::getInstance()->isVoxelModeActionChecked() &&
(fabs(_myAvatar.getVelocity().x) +
fabs(_myAvatar.getVelocity().y) +
fabs(_myAvatar.getVelocity().z)) / 3 < MAX_AVATAR_EDIT_VELOCITY) {

17
interface/src/Menu.cpp
View file

@ -183,6 +183,7 @@ Menu::Menu() :
QMenu* voxelMenu = addMenu("Voxels");
_voxelModeActionsGroup = new QActionGroup(this);
_voxelModeActionsGroup->setExclusive(false);
QAction* addVoxelMode = addCheckableActionToQMenuAndActionHash(voxelMenu, MenuOption::VoxelAddMode, Qt::Key_V);
_voxelModeActionsGroup->addAction(addVoxelMode);
@ -199,6 +200,11 @@ Menu::Menu() :
QAction* getColorMode = addCheckableActionToQMenuAndActionHash(voxelMenu, MenuOption::VoxelGetColorMode, Qt::Key_G);
_voxelModeActionsGroup->addAction(getColorMode);
// connect each of the voxel mode actions to the updateVoxelModeActionsSlot
foreach (QAction* action, _voxelModeActionsGroup->actions()) {
connect(action, SIGNAL(triggered()), this, SLOT(updateVoxelModeActions()));
}
QAction* voxelPaintColor = addActionToQMenuAndActionHash(voxelMenu,
MenuOption::VoxelPaintColor,
Qt::META | Qt::Key_C,
@ -677,6 +683,15 @@ void Menu::cycleFrustumRenderMode() {
updateFrustumRenderModeAction();
}
void Menu::updateVoxelModeActions() {
// only the sender can be checked
foreach (QAction* action, _voxelModeActionsGroup->actions()) {
if (action->isChecked() && action != sender()) {
action->setChecked(false);
}
}
}
void Menu::chooseVoxelPaintColor() {
Application* appInstance = Application::getInstance();
QAction* paintColor = _actionHash.value(MenuOption::VoxelPaintColor);
@ -690,7 +705,7 @@ void Menu::chooseVoxelPaintColor() {
}
// restore the main window's active state
// _window->activateWindow();
appInstance->getWindow()->activateWindow();
}
void Menu::updateFrustumRenderModeAction() {

2
interface/src/Menu.h
View file

@ -65,8 +65,10 @@ private slots:
void bandwidthDetailsClosed();
void voxelStatsDetailsClosed();
void cycleFrustumRenderMode();
void updateVoxelModeActions();
void chooseVoxelPaintColor();
private:
static Menu* _instance;