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

move swatch reset to Menu

Browse source
This commit is contained in:
Stephen Birarda 2013-08-15 15:52:47 -07:00
parent 0ec2b761e9
commit 4a13f3b75a
4 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/src/Application.cpp
View file

@ -1128,10 +1128,6 @@ void Application::increaseVoxelSize() {
_mouseVoxelScale *= 2; _mouseVoxelScale *= 2;
} }
void Application::resetSwatchColors() {
_swatch.reset();
}
const int MAXIMUM_EDIT_VOXEL_MESSAGE_SIZE = 1500; const int MAXIMUM_EDIT_VOXEL_MESSAGE_SIZE = 1500;
struct SendVoxelsOperationArgs { struct SendVoxelsOperationArgs {
unsigned char* newBaseOctCode; unsigned char* newBaseOctCode;

1
interface/src/Application.h
View file

@ -135,7 +135,6 @@ public:
public slots: public slots:
void sendAvatarFaceVideoMessage(int frameCount, const QByteArray& data); void sendAvatarFaceVideoMessage(int frameCount, const QByteArray& data);
void resetSwatchColors();
void exportVoxels(); void exportVoxels();
void importVoxels(); void importVoxels();
void importVoxelsToClipboard(); void importVoxelsToClipboard();

8
interface/src/Menu.cpp
View file

@ -227,7 +227,7 @@ Menu::Menu() :
QKeySequence::ZoomIn, QKeySequence::ZoomIn,
appInstance, appInstance,
SLOT(increaseVoxelSize())); SLOT(increaseVoxelSize()));
addActionToQMenuAndActionHash(voxelMenu, MenuOption::ResetSwatchColors, 0, appInstance, SLOT(resetSwatchColors())); addActionToQMenuAndActionHash(voxelMenu, MenuOption::ResetSwatchColors, 0, this, SLOT(resetSwatchColors()));
addCheckableActionToQMenuAndActionHash(voxelMenu, MenuOption::DestructiveAddVoxel); addCheckableActionToQMenuAndActionHash(voxelMenu, MenuOption::DestructiveAddVoxel);
@ -743,12 +743,16 @@ void Menu::chooseVoxelPaintColor() {
// restore the main window's active state // restore the main window's active state
appInstance->getWindow()->activateWindow(); appInstance->getWindow()->activateWindow();
} }g
void Menu::runTests() { void Menu::runTests() {
runTimingTests(); runTimingTests();
} }
void Menu::resetSwatchColors() {
Application::getInstance()->getSwatch()->reset();
}
void Menu::updateFrustumRenderModeAction() { void Menu::updateFrustumRenderModeAction() {
QAction* frustumRenderModeAction = _actionHash.value(MenuOption::FrustumRenderMode); QAction* frustumRenderModeAction = _actionHash.value(MenuOption::FrustumRenderMode);
switch (_frustumDrawMode) { switch (_frustumDrawMode) {

1
interface/src/Menu.h
View file

@ -67,6 +67,7 @@ private slots:
void updateVoxelModeActions(); void updateVoxelModeActions();
void chooseVoxelPaintColor(); void chooseVoxelPaintColor();
void runTests(); void runTests();
void resetSwatchColors();
private: private:
static Menu* _instance; static Menu* _instance;