Skip to content

Commit

Permalink
small update
Browse files Browse the repository at this point in the history
  • Loading branch information
@kmkolasinski
kmkolasinski committed May 17, 2015
1 parent a40ac52 commit 7b462c5
Show file tree
Hide file tree
Showing 7 changed files with 177 additions and 23 deletions.
4 changes: 2 additions & 2 deletions Sources/CommonObjects.h
View file
Expand Up @@ -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;
Expand Down
1 change: 1 addition & 0 deletions Sources/content.qrc
View file
Expand Up @@ -62,5 +62,6 @@
<file>resources/lenscolor.png</file>
<file>resources/lensdirt.png</file>
<file>resources/lensstar.png</file>
<file>resources/showGrunge.png</file>
</qresource>
</RCC>
7 changes: 7 additions & 0 deletions Sources/mainwindow.cpp
View file
Expand Up @@ -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)));
Expand Down Expand Up @@ -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);
Expand Down
1 change: 1 addition & 0 deletions Sources/mainwindow.h
View file
Expand Up @@ -68,6 +68,7 @@ public slots:
void selectRoughnessTab();
void selectMetallicTab();
void selectMaterialsTab();
void selectGrungeTab();
void selectGeneralSettingsTab();
void selectUVsTab();
void fitImage();// resize 2D image
Expand Down
58 changes: 37 additions & 21 deletions Sources/mainwindow.ui
View file
Expand Up @@ -115,8 +115,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>100</width>
<height>30</height>
<width>376</width>
<height>646</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_4">
Expand Down Expand Up @@ -189,8 +189,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>100</width>
<height>30</height>
<width>376</width>
<height>646</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_5">
Expand Down Expand Up @@ -266,8 +266,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>100</width>
<height>30</height>
<width>376</width>
<height>646</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_9">
Expand Down Expand Up @@ -337,8 +337,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>100</width>
<height>30</height>
<width>376</width>
<height>646</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_6">
Expand Down Expand Up @@ -408,8 +408,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>100</width>
<height>30</height>
<width>376</width>
<height>646</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_12">
Expand Down Expand Up @@ -476,8 +476,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>100</width>
<height>30</height>
<width>376</width>
<height>646</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_25">
Expand Down Expand Up @@ -550,8 +550,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>100</width>
<height>30</height>
<width>376</width>
<height>646</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_27">
Expand Down Expand Up @@ -603,8 +603,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>98</width>
<height>28</height>
<width>367</width>
<height>644</height>
</rect>
</property>
<property name="sizePolicy">
Expand Down Expand Up @@ -650,8 +650,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>98</width>
<height>28</height>
<width>360</width>
<height>630</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_33">
Expand Down Expand Up @@ -736,7 +736,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>393</width>
<width>359</width>
<height>675</height>
</rect>
</property>
Expand Down Expand Up @@ -2060,8 +2060,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>264</width>
<height>471</height>
<width>376</width>
<height>646</height>
</rect>
</property>
<property name="sizePolicy">
Expand Down Expand Up @@ -4044,6 +4044,7 @@
<addaction name="actionShowRoughnessImage"/>
<addaction name="actionShowMetallicImage"/>
<addaction name="actionShowMaterialsImage"/>
<addaction name="actionShowGrungeTexture"/>
<addaction name="actionShowSettingsImage"/>
<addaction name="actionShowUVsTab"/>
<addaction name="actionFitToScreen"/>
Expand Down Expand Up @@ -4289,6 +4290,21 @@
<string>Alt+E</string>
</property>
</action>
<action name="actionShowGrungeTexture">
<property name="icon">
<iconset resource="content.qrc">
<normaloff>:/resources/showGrunge.png</normaloff>:/resources/showGrunge.png</iconset>
</property>
<property name="text">
<string>Show Grunge Map</string>
</property>
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Show grunge tab (G)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="shortcut">
<string>G</string>
</property>
</action>
</widget>
<resources>
<include location="content.qrc"/>
Expand Down
Binary file added Sources/resources/showGrunge.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
129 changes: 129 additions & 0 deletions Sources/resources/showGrunge.svg
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 7b462c5

Please sign in to comment.