diff --git a/Sources/CommonObjects.h b/Sources/CommonObjects.h index 91563af..3d877e7 100644 --- a/Sources/CommonObjects.h +++ b/Sources/CommonObjects.h @@ -30,9 +30,9 @@ //#define USE_OPENGL_330 #ifdef USE_OPENGL_330 -#define AWESOME_BUMP_VERSION "AwesomeBump Pi (2015) (openGL 330 release)" +#define AWESOME_BUMP_VERSION "AwesomeBump 4.0 Beta (2015) (openGL 330 release)" #else -#define AWESOME_BUMP_VERSION "AwesomeBump Pi (2015)" +#define AWESOME_BUMP_VERSION "AwesomeBump 4.0 Beta (2015)" #endif using namespace std; diff --git a/Sources/content.qrc b/Sources/content.qrc index 57d264d..c00fece 100644 --- a/Sources/content.qrc +++ b/Sources/content.qrc @@ -62,5 +62,6 @@ resources/lenscolor.png resources/lensdirt.png resources/lensstar.png + resources/showGrunge.png diff --git a/Sources/mainwindow.cpp b/Sources/mainwindow.cpp index 21f6367..574a8bb 100644 --- a/Sources/mainwindow.cpp +++ b/Sources/mainwindow.cpp @@ -346,6 +346,8 @@ MainWindow::MainWindow(QWidget *parent) : connect(ui->actionShowRoughnessImage ,SIGNAL(triggered()),this,SLOT(selectRoughnessTab())); connect(ui->actionShowMetallicImage ,SIGNAL(triggered()),this,SLOT(selectMetallicTab())); connect(ui->actionShowMaterialsImage ,SIGNAL(triggered()),this,SLOT(selectMaterialsTab())); + connect(ui->actionShowGrungeTexture ,SIGNAL(triggered()),this,SLOT(selectGrungeTab())); + connect(ui->checkBoxSaveDiffuse ,SIGNAL(toggled(bool)),this,SLOT(showHideTextureTypes(bool))); connect(ui->checkBoxSaveNormal ,SIGNAL(toggled(bool)),this,SLOT(showHideTextureTypes(bool))); @@ -686,6 +688,11 @@ void MainWindow::selectMaterialsTab(){ ui->tabWidget->setCurrentIndex(7); updateImage(7); } +void MainWindow::selectGrungeTab(){ + ui->tabWidget->setCurrentIndex(8); + updateImage(8); +} + void MainWindow::selectGeneralSettingsTab(){ ui->tabWidget->setCurrentIndex(TAB_SETTINGS); diff --git a/Sources/mainwindow.h b/Sources/mainwindow.h index 19f1f24..011b6da 100644 --- a/Sources/mainwindow.h +++ b/Sources/mainwindow.h @@ -68,6 +68,7 @@ public slots: void selectRoughnessTab(); void selectMetallicTab(); void selectMaterialsTab(); + void selectGrungeTab(); void selectGeneralSettingsTab(); void selectUVsTab(); void fitImage();// resize 2D image diff --git a/Sources/mainwindow.ui b/Sources/mainwindow.ui index ceddd73..d1d8df4 100644 --- a/Sources/mainwindow.ui +++ b/Sources/mainwindow.ui @@ -115,8 +115,8 @@ 0 0 - 100 - 30 + 376 + 646 @@ -189,8 +189,8 @@ 0 0 - 100 - 30 + 376 + 646 @@ -266,8 +266,8 @@ 0 0 - 100 - 30 + 376 + 646 @@ -337,8 +337,8 @@ 0 0 - 100 - 30 + 376 + 646 @@ -408,8 +408,8 @@ 0 0 - 100 - 30 + 376 + 646 @@ -476,8 +476,8 @@ 0 0 - 100 - 30 + 376 + 646 @@ -550,8 +550,8 @@ 0 0 - 100 - 30 + 376 + 646 @@ -603,8 +603,8 @@ 0 0 - 98 - 28 + 367 + 644 @@ -650,8 +650,8 @@ 0 0 - 98 - 28 + 360 + 630 @@ -736,7 +736,7 @@ 0 0 - 393 + 359 675 @@ -2060,8 +2060,8 @@ 0 0 - 264 - 471 + 376 + 646 @@ -4044,6 +4044,7 @@ + @@ -4289,6 +4290,21 @@ Alt+E + + + + :/resources/showGrunge.png:/resources/showGrunge.png + + + Show Grunge Map + + + <html><head/><body><p>Show grunge tab (G)</p></body></html> + + + G + + diff --git a/Sources/resources/showGrunge.png b/Sources/resources/showGrunge.png new file mode 100644 index 0000000..a53cb94 Binary files /dev/null and b/Sources/resources/showGrunge.png differ diff --git a/Sources/resources/showGrunge.svg b/Sources/resources/showGrunge.svg new file mode 100644 index 0000000..eaa08ae --- /dev/null +++ b/Sources/resources/showGrunge.svg @@ -0,0 +1,129 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + G +