From 7b462c5da1146d69fec6fb998205f1899cae1106 Mon Sep 17 00:00:00 2001 From: kmkolasinski Date: Sun, 17 May 2015 18:59:02 +0200 Subject: [PATCH] small update --- Sources/CommonObjects.h | 4 +- Sources/content.qrc | 1 + Sources/mainwindow.cpp | 7 ++ Sources/mainwindow.h | 1 + Sources/mainwindow.ui | 58 +++++++++----- Sources/resources/showGrunge.png | Bin 0 -> 7437 bytes Sources/resources/showGrunge.svg | 129 +++++++++++++++++++++++++++++++ 7 files changed, 177 insertions(+), 23 deletions(-) create mode 100644 Sources/resources/showGrunge.png create mode 100644 Sources/resources/showGrunge.svg 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 0000000000000000000000000000000000000000..a53cb9410d17d77ded80517d6729b987016d8877 GIT binary patch literal 7437 zcmZvB1yoc)+y8=eN=k!(q;x8cG>eop!qVN{Al49%=3#UUhBCsAs!7L1Og#cRZ-9ZpQU#v4i>m-#hv#kzt1%cp`-JNKVoIEOU6Wd!=LlGN=Nphc?lbt>U0fErvs4B?4 z@Soeu4|t*LcYA>nqm3wH!g!YsQPM(VVM^qQ#&adm{b=m>ZfL`y%yCF)vg{wZCjHsl zRkw=U^*=%D-gDaX1@cWrJ_w(39gY-AMH_5wYi%4S(r+JeRG9*9-Kn#J?iqW+doFI+ zFESPu4t7E_4{n0H&AA>v>?L4kmLQ8=Kxam0BOyV9$AzmZ2!CD?xPEz$2|qk#fti_m zgs>+VVit)hw6i}FX zHnQ5LCcW7oKZKtlbmYKMt=|vhFKTIdu(-JRb>|Em5C}UvyZDnQa;&6s9OUv$_hp&W zW!d0z;NW^gnM^Cjo8P~DN}`3E9f?)f&;U0uGpl*b!;`OVW|k5YgVoaA-HicR=?&I0 zFqoDtv%d@u?S!&Ta+2dk#l%o@k|%f@7#N^)p`FO^=ZxE$+1MbCza!Lz)YR3rO-y!d zMRN-|DSQ;D{=xC507=Mqwur$2Msma)0n8v=z*xTE?6YqUSbF=8$Qdbb!^E`2qPu^SK z7owt~yrm0eoYClOV8{4)c>1?H=Km7hTwOyQm@v`Nf`fy9ZERr6$jGR$X0ZRd(WfTB zYHV&U>F#D|aYMzZAzt;u{5fT1{#~C$fdLJI>&?YCW1>gP|N@Wb=lajjWFDPJm5{{;k2Zxir zdiCl)4Go^Txw#hkz+WFPaXSB?p#J%JS`QD854E+*s;am(=AWd~9<8CLUH{#wrNzU? zU!ATpYH(Zbi#C@L^U&;REEe}WSUQ_;a+(gZv9UQoOCvZXey5zO1cegx_4UP!DH5w{ zLA5peVp0EYFF3fkl zx;;t_yFS?8-`|3m^5jc~Ui*I@8nQb6jTEg*;oCVj584wM%X>oh=FJ=Nuv^I=j!lTL z^w*i0p{KW32SdT9-;_~9pFh7}mVuvQK%0M{P+zXj=iR31pLkkV&N?^SKT>2SSs%}h z{rXj_13P0P0Sg87epu*+X0EOWWJxmB5eVgQRtx!f6WvYtsSbA4D@T3Xta^7|n@CUhxZ!fz_%`e^9i z;?z`g46d4;on4h_8|l%}5zzznZpUkCM#j`P+y=(Sco|bu`Zj86BNKoB{yj@UFJlQ; zZE9+&UIg7vouB*SQn8J7b#>KQ^kYHa3SzQo=$1Vnz-A1FA)mQ}9d3QHKF;ab6d2Fa z>eGSU(A5><4Ejpw@H-Hs+{VJhTwe4;MR#;aC{-*hE*{0oT%$!qL?ms1eK=dHk*mMZ z;pZldb|UtnvNEv+jDxVcx;h=2={cB0ZP@Hg-D=9K)DAA0eC8=1Kk^THfsL`+?7H}O z2!uMACW^bopKtTpXrFI!3k#2>rRXXe9#(m5_z|Y?8O}%M*L`z79~Tz~dpc0v-v0L; zy@YR-*juP1`no!s#MQ-txq+5ePj-m1k`gl~XS^&DV&~~8*w^3x_W4nJ;MsQOJ#3;G z7eVV(5Vz*to%@H&{YhFe(b3D*ElbQ8L`A=UTZ62@Z@UvqL_gX6mecLeLV0A!Rs_$5t+6^dK>`ylLJP_Vfpm| z3xn?FS>VzG^I#IgM-*!n5?ogwz09X zmY&`jt8Rg~2QvsrtTxlzzQ_H=&ti*o${`TlQfTihO#GNrzdx6k4~2!vA3b`+N9W|~ z`drd$eXODd6?$bd^U-dx6t)e9SZ6h4UyVpi#0Sa8?t!eRurQO13?m^SA*BUf)!(Zt zZC%~SoE#dENI1yx6qJ5>N1P#>+4@TJNO{=wsv$pW4a$c zy4DBd|J56bZSUq5tA>zwapBot?6~N&J3T*NnQL<5;N*;uFYc)}X)z0*q4D(akOTQ; zBJasbpFp*KZgy^NhvQObfM`RG=)H#8+El;8UvkDyTU%QWZ><YnSU+I#kSYIIZ*MQ(8CF6G$MBlx-QPlX6LhC)j8mR#saA`doAzvO>DgIX zb`1oJ`mp2Y1(K>xJbgnmJXlj=Ev;hn^SiqF`fm`<_TPBYQ zmUN+;ECmBa&%S^xeu+x0#> zJnR{H!!6*uJM-{L`YklZZz;e|R=k>!Eo)Q}K;~XuLPEl45bn8#8o7pJVgIgBLYq|x zSteO~dybuHU2W|MuZ@XsgI+Z?HHO{6PfTCFjJ*yD2@Xzs{n}cWKO)v9%9}WD*7-b8 zSic`-dB^?q^(kEx1Kr*EcNA&P&d$XB_UYb<7`3_=>lFn*2I&TbS)#7`R3>8dt*b0;o|t%(pmZAoUFSz2)cUJ zq|4KOxw7qT$CjEJ-dlG}I2RwEf%M!${8cA+F24o3(*w_=6~)BLvpL7MzM`U{2lZCX zrcVyt@e+9@01%vvj*c273mG+KBM^wjBSdN{v6E{^eF+eU5oZu573*ND6hngwfH_l-Tn_Lqnw@iXbLM?~y^+p63k<`z~1E zmLjcJ%3pAanY@}sp;C{JJrg%DFfe*DkB^Qb;BdHxB~;z2Sf_kpChv`GGW{-;Ht>U7g66 zsI}&CCb5%dbgJj9GlX_Tt6N#IO!oz=F(X?a&xHnj5Oz1xip ztb2^=sc<$;@?a??yj-e}a(d+hOfb3lStQcB+SJt4`7cb8r&K;6ovl=WdU%z9o4>Gt zrmhsLF5ts>E^1d1YGrA$TDgqPW&)pmn(x}<1@e6H_r7cb^+e=pV;$zY>`4~HFt^$B zMWU){8-;N8_%^aVH#2$QqxV`f}kff3B|Xc;4aZDWHzAdS-b1 z$+(ku^9S`v)33ByyTaBTuugUg=%iadi6(JzaT!J;>t^Jy8%s(`44pV_+limikIqGN zw}@m%wv{{Ue^Fs2tum~$)FOt$U`)2-IRkU}kWztkq;*I?$rv+)?|LOAg-D;YNc)`< zA(dToQ&X?KaJ?M`RUoqPLGGv^fGTfa-|zH}1^gC$h-IwOfZdro0HOcr!b6`j&3v8Y z!S@z?3yrLpr&Ci!d`J6YQIXmhlRemnL~>4#j_!yX8vo7dFY)0Yu@;;oEsQW`h*68& zdQe+lZUN@5igid|DgsfLhO~Z~P!dzfjh$^kURhlY#tC$a4D3q5$4A6z2NUgMhg1^i zwD0_TKRR?yTo<83STStL@ww4v(aOiy_fA-`Xk$g90sL$Xu&}qc?{&wVtkU8TY&G4- z_pk+I$m+qG7Pq*#zwCvPsi`D$ud}oBdmiiMBY&gGQVn(NM3c&ojsl9z>EBSOLeYuf z&@fu3_|dhMvuSh2ulaQ%$u^pnG?7R+`%YedezLO}{tjjwv<`3a{Lxe=mb#n3n5_^{ zE5j+Y0=awWYH;M|)?lLfBZNjzQgSjPSx7=c!e}&(GocR<<;Rp*(?5O`)zqX=Fzw3y z{P`0^LrF59m6a8Kj70W&cz8Gg5RP+~&~^>6>bJ#0JbX8XfWSp=Q`9#PSoc>5E(W!k z7Cg!V$%xOzQUHz0Zal{ay9d8E$aSd`X{;!5czDxb%G;7%TqqqfR{ST+ci5F56D=MwM^?KHRf1LGI(@1N2mg7${mZY%-wJKqcmDXTT%)}f=*npMVvZ88jevlFDhlFz#N6|!fDQV@jsgmD zawajcX|Bw~hc!V;Q_h$CR0OTTmx8+Ay%r}YPf~cO>hw%tVV0IFitVf)%F1Fr?C_nC z0|S`c1~rYXqPB8!Xh3TV{4O4ZZ3|W#8S1=v@%aT+l`0f^O%d+E8sShN;-nu_Tg&G{ z>b=~DIYrwK^m``n%LHnn?5yyr>S{$tM=o8-^Y5yf9v%Yq4GpoM7eDEIbQ2bQo(O=+ zW?*ozzTk9*2C7AFW7=r1%}b@Wym`Lg+zhDX`qCWCQ<1n96+dpw}6ej=G5mt z-rU@jeg2$iuMU@t%^IxKknPm>DcGx_RqCwAMj2NF56oF1{_A>4X0^(I4N&r#Im4aE za4`H&#>Ge|DP#KjJd+Pq?qi9W1IYmDmizm0f&d%a?nGwJHhLcdzvwFmIALrM~3VON< zhM1U`zrTOa^VzK|ol! zaO+ozn zGbXLt=~bXCtGa9Gc(?cVn!FE$Ei5eNAMl!H+Y<9GF!W-?_HSMNhHIV&1_s{B`*i~1 z545XY)5ZKZ8-6PHUp;7p%?m($*oGV<*{^1H!@b4%(RvmayVxH+S|f<;lAYjK{fPaRr4n>}%>ySjO%z?|+e-|W%`%)zAOB@GP?6%7sg^sZm22>r_R zoE%4wE{!_Fg-)0G<_2C~USFB&WgOc1>_?5JU3+mk{yAR=X;0%g6h9S;DCOVr;h}v*@?Spy zH4q5cB6qCrVmw=*pE-{v84D=o;ju9~{rUIaetxTej#j}m3;;dGBTr32QWpZ$dl1mr zd+xO({wd<(Kw5?XF9mh6*MeFZPG^}Pvu(&i{Hd&{z&qLaqHJ&f;pHy;kJ^5pwLHke zp&({Tl?lx))xh9b^*do8Twv0M}=yCzf#0{#c`AC>m~>toc`c6N7WA6_&%oK2&?Emtge{6l%U91y<1RS=jFGsd#B+o%w6n%aHY>b`8y z?8?jnlP(r?bDl|Kqf8v_IrL2mcL+KQ3J6$povmM+b^_Bm+hC^| z?B(UPA{&lQJbk|%U@>s12zayb-$H?pkrGeFZn@Cv@ofE=5bK_?iHWv>K`dBWP`Bt( z8$u{?y|KLkKI~Y0T-+ZbQN!fq@XLf44ne`=`LwjOqz1b$T&WCFG-djg*q9uL?j)5U z_#}mhx7XLPfO_x`2#|YB`HYpc7hqekG$UY-xUGP!DZL{BSD;xo_xEG;E2EX(Md(-3 zJ9iG_yjNgG8n=5pOk7`{Ofvci5se;KEaS03vN6#kEP%=4fJ7p<3~J5v7{uL~YD!CO zzlKW}if?&8)z_yky(h@T#N-6>$P;aC?XA>ISL&&=(0=MM_HZ3?o9riEw#L@h)_8MhoUblMc({_|~ge&GKLBXr(2JO1Pf z{crV!1jt8#iatWQw%NGNGz#dpNDt>@CONY6z z7)jojy4UwX`yBzmVu!mE0s~b5;3$p&0~qIx8YVcJjBlV*)zdqLRl>W!e`A1(RGb1c zaGr25(1Coo1MHz8Y@PB(7>JOqFB(zs!AI!pqY)#^?gTpJ!Wvv}N(mc@*D8ahK~*gL zx9m!qiR}MbGy89a?*G-yKsoJy*VBZrKfmbR$C8DF@9N51Yv3L(i2h1de8kH7wTaLk za*ZLYyicD_u?F&j4LMul7N)G~J}n9UN_P^s-8D8dbH?@k|5oV~?rr|N=UFIbEk;e6 R0ScE8RmJBDHS(}m{{!#LQ_uha literal 0 HcmV?d00001 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 +