From 01cbfc6c3ce0b9ea02d5c2ed1ae35b6b21a0b293 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Wed, 21 Oct 2020 16:40:26 +0200 Subject: [PATCH] MeshTools: adapt compile() test to changes in Phong light falloff. Heh, I forgot to run the full test suite after the changes in 1eb1eec2713c349bdbafe13da67a699c1a1f9878 and then the CI accidentally had all rendering tests skipped due to missing plugins (which got fixed in the previous commit, d1ee0b7f7e48bb75ba34603a6fb8257818a2c882), so that didn't catch it either. Sigh. --- src/Magnum/MeshTools/Test/CompileGLTest.cpp | 6 +++--- .../Test/CompileTestFiles/phong-flat.tga | Bin 2998 -> 2998 bytes .../Test/CompileTestFiles/phong-smooth.tga | Bin 3012 -> 3008 bytes .../MeshTools/Test/CompileTestFiles/phong.tga | Bin 2998 -> 2998 bytes 4 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Magnum/MeshTools/Test/CompileGLTest.cpp b/src/Magnum/MeshTools/Test/CompileGLTest.cpp index de73c7e7a..a90d567be 100644 --- a/src/Magnum/MeshTools/Test/CompileGLTest.cpp +++ b/src/Magnum/MeshTools/Test/CompileGLTest.cpp @@ -307,7 +307,7 @@ CompileGLTest::CompileGLTest() { difference in normals; disable specular as that only causes unnecessary rounding errors across GPUs */ _phong.setLightPositions({{0.0f, 0.0f, -0.0f, 1.0f}}) - .setLightColors({0xffffff_rgbf*9.0f}) + .setLightColors({0xffffff_rgbf*5.0f}) .setSpecularColor(0x00000000_rgbaf); #ifndef MAGNUM_TARGET_GLES2 @@ -748,7 +748,7 @@ template void CompileGLTest::threeDimensions() { _framebuffer.read({{}, {32, 32}}, {PixelFormat::RGBA8Unorm}), Utility::Directory::join(COMPILEGLTEST_TEST_DIR, "phong.tga"), /* SwiftShader has some minor off-by-one precision differences */ - (DebugTools::CompareImageToFile{_manager, 0.5f, 0.0113f})); + (DebugTools::CompareImageToFile{_manager, 0.5f, 0.013f})); } /* Check generated flat / smooth normals with the phong shader. If smooth @@ -1088,7 +1088,7 @@ void CompileGLTest::packedAttributes() { _framebuffer.read({{}, {32, 32}}, {PixelFormat::RGBA8Unorm}), Utility::Directory::join(COMPILEGLTEST_TEST_DIR, "phong.tga"), /* SwiftShader has some minor off-by-one precision differences */ - (DebugTools::CompareImageToFile{_manager, 0.5f, 0.0113f})); + (DebugTools::CompareImageToFile{_manager, 0.5f, 0.013f})); /* Check colors */ _framebuffer.clear(GL::FramebufferClear::Color); diff --git a/src/Magnum/MeshTools/Test/CompileTestFiles/phong-flat.tga b/src/Magnum/MeshTools/Test/CompileTestFiles/phong-flat.tga index 1be253521ce7a43399b94677c7adbb3244cba8ce..bc3507a98c6b3df730e2f71f7cd659d032607973 100644 GIT binary patch literal 2998 zcmZveS#M2Y6oz{#u3So~(|OS1hL}oKC#}}3DDhtqL`aA+2sO|1Jj6Ui2tiCighX8V z56k4}lzWNJOI5`%#|5K%JVy((Lk(I4WNiTs zs41J1?z1p-N0*eDt#WNAE3Ex=rL`VTI`6ttZ7J*-u?x%w6UZ5P$OsNrbkV#kVUxm0 zlmO9juF^U$R9Tl;AzJG(38u1hu2oytaZ4XfD90uJtYpmx^ zjm^DRYrPL@6A0adHLW2y&(Ky1n`i2N<|DHv#V##kDbFYaJBJgixp!-<_kOMQJ*u;L zPwQ;{^LpzQe2?w{!?P}Q1nnZ@D^U_15HqmuW5g7H5Ypiu3+h>&EqGCH3t!gTqSp;J z?@68C>$xpxse#W~Xct@8P>t9T!3dTab3Y@du5;87=WvrPc#9$DJ4nDz@(hCK-t*91a6T1kOP-8n{5E1->0barsmOw85)?_PwG}*wAXok#Z>#={x8>iPtp9T{H0lsD#DyWVOq5t1e2-v< z2uzgJJ&7egc!{vE1akG?2{!O+TmmiDF1XtBn5kXnmm%_qNo@8lj3Zbsaf{`~qx=bf z%8*bB#*{`_SON(&Ezk-r(HbrKa52}gh9yf=nSojaivS4Wt3tx?9ib4cC{~CqVSxq` z!4Vz711ZE{guxQWBvdH`}lR$Jl1X_Z_hL{l_yadiy zh9I437$DVx4te2-3CDRxWRDW;g4jwjW1oeldtW2OOpzh6#0M{dgC*(xA5#ufj+=-r z!-MTEHm48Cj-k1(?c+xT!zIBMev!3 zrLkkC#fkxeJ<&l4p#0pGu+(B;vMe+2N`$%yQj9#&iV>Z|z}wL*6E7g}9@eaZ6h_&= zD4=)|!pFca1LrR;F(kgKV>)MbFvIS-m<9-9N6d&|3ZuAC4=7&ucX3>>$3B(QWp zRfck~foXvCWf>syFPY9Jz{oFR0xO_+sZHUM*Jh85M4(Ho#-}U{LVHOmz*sY5-hI9- N<@~jIkpC4v{sC(@%K!iX literal 2998 zcmZ9O*=vKKWQgb8n`bQGFC=jYDD*HH{;p__x@Cf)9eCbaZa5twWvK+SXZG z2h>V!rHDc)h)?|+w(GaN=j6*#yu^FH?6udh_xV~{rnjU&^%nh|cC1#b#pK6c{ySsg z!P&9sP-`syq&1d&UW=t))?(SwdMrO)j}<5DG5kYk3}5Mtp-UaH=KGFVeXc!LecK)@ zPq)R2Q*A+!J$!u3#|QKG&58y4XT`z;DtlNZKW&YrUsOu!R|dasi_{z^d{#5uN0V?srS3C~O7d$!&?z0SR!O?&JGvhI zrOU9e8@k+?nHf^;(H4*(Rp4NSP#p0{hWSnq=LK=G!{vsrcAC)|nCJ|~qt_cT^0S!! z)MY_=mex>#bLtgv2nZ{V(3?`g;02x_8YM@6?TWD*jQ}>671Obs4WAjZde#&+!RB>XDD?&BGE<#Gj^*H>+W>N`g`5)%c~7Uq%{QOoR-$g*C{ROEJbE_#-53P znWeg>43IE`)wFUW9Qqs zZh=-Zw4TLl$4oG&#zdfE^1gs&Uoy^Y8ahi+BC*5=FA)}&K<@f~o_~hDp{0hsR?KLZ zwmm>ZOk%SK*jNQDUwK975z;t?u}V>LiqL`wnignR z31n4h;ztbGR>aa9tQjq0TficOw~}CpM4Df=4=OO1X_yQxFA)}&uxGd!vXp3s&jJ%G z1XipV(gN1(SoiYS!y_2B4FcsQnV?Cxyv9p}#d9E8DXbP&3_IMbqdC6_%t|U?y(R>K zC@e+aFcJ!AM=Y^sh2XVfMtoq7u&@L&M@cm>&X=LC76fJi7qGtMbn_>%OK4alI9_7{ zks+}}4KIO%B{|4TGBMTgaLsVt6tHM-QDwg`Jg#pbxL2F3eea?M(bM;a61*=v;Mhj# z)@iN^E>W0rsdBky*!S;BetW>nDr^!PpEUs0Ggtu)GupsMuX`~>Skz+=n5AAFfUCT` zaKykc&bcgN3X+lt%DJz732g`|;mb^nP{1&1i`J>fix58YVpPE8cO)PaOAQg_oMr@; zXcnK%r8E4cHR1>R3?mU?1r+`*&}&}-$ID@cRChpf^OIIYLM#|Dt6r7~LhaE4gMe4S v;1};+umXyg+6=dspJupgUdfV}Fl)lVj(wR+YOI;D)P0JAUz?9nZt~+Dlm_GE diff --git a/src/Magnum/MeshTools/Test/CompileTestFiles/phong-smooth.tga b/src/Magnum/MeshTools/Test/CompileTestFiles/phong-smooth.tga index d13c884404d019dd4638cdb02ff9ebc33eedc172..76cb17fe30fc6fc4ce55c16bebb086f5345b3fb6 100644 GIT binary patch literal 3008 zcmZwJ=WkYZ6bEo#8rl+G5)?|yDzs&om?(nC9?B3AWQj=pL)0iQeBnskQQSN35qI1p zaVE~VjVn+ubLhf zxyX+T{Frjwg-6Hn7atQ#E*)F;+SZbmTY1|+th!?$R^K%ktM3_%HTUN4y9Z;{?E`gh z<*frPNKjdZatbEPTXOldIN_3M1$TZMZX&1?^OovWree!kcFlb=W8DLJJUlDbKQb%& zHayxoS$qG?!dHiS)V1Q4ffmJFq%f~+VS*aRn}QZBYIqHfa`pl}=%VPt#Wgi!X_K1s+TcCKGaYB0*OU&^l7;uy zyx9KU{5a$N;n?xva7^0yQR~D-#ca*OHa$N#Ha(x&7T1-p-GQ*!9I|?EGY;YN5f_*AqG=2VJz&X6x~+q1**a zg|ajsl^RJQ?Y5+eV!+UJ znn|L~h)&$8RB)R*f+?{~Yp9|LbN?@k;_P1+#ev@!$ARA#1^6~}I^cQlNriPZl{wNV z-3435=53Evn6gP2CP2)jESezC`D1Y${Oi~__-8^Vd;?8!X3H6=%IK6%NQD)(ZrBu` z5vC1ewI#DeR(_aic`zW){U?vV$Dot7lDHseN>#G{HcE-`O4B!Km{ea>V{1Lny!^80<|-h!V!>%ZN>==lHi0dwrK=I zI@o6SH~up6e_+|pevehGG8P@N%EY#zlQotg#Z279PN%hFm9eyrn2PIvz3mllA$MEo zgG(Af2%?gVBTOW|y{CR5t5Iyl=>dur1zy6vqkZ!WSB&TOGf9ixuX1)cGvpe_;F8j)!x zI4s>WN`=B`HDXKQT#vCva3^f9K}`gMn;>h_WDRGq7c|z!WzGU3%1vLhBNU!pA!))i zEOdX(sj;rLxGkp(*T&SQoG#nAs13Vl%Xhln>`EN(BfS&F6kZmFC(Lp+w@`hlcWkY; z*fwr`GxZeT9M@Wy)P;*PxzlN-3nt06b#JrN8>G_1O1gT`maS+DiA}@vh>sYTIxulf zot0U96IW9y-_)@@I%;sumPHS`9J$l6(gzZH<8VDb-InI(R2woA#oD3@Hk(Nwm&FO& z+kB_NuvbYa9CN1G+F<$c^8wh2H^paSVUE#cDaR$*>l(PQoA1O_3%)wY;GSf9hhyYI t3zW~>Hryd+lcff=f=R*62vBw8G9WGIZ%cYk^|kC+80rK1u;s>o{0kSc{E7eo literal 3012 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