From a97ab85b332211c143e5225f79d8abeb8bafd542 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Tue, 23 Sep 2014 16:01:52 +0200 Subject: [PATCH] 32x32 tiles --- resources/entity/square.png | Bin 179 -> 734 bytes resources/tile/dirt.png | Bin 207 -> 1035 bytes src/view/MapView.cpp | 2 +- src/view/MapView.hpp | 2 +- 4 files changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/entity/square.png b/resources/entity/square.png index 97d7802d8ea4cab0c4452cd889d68058f0037a6f..a386db7a8323e9883021e4de6741064bf6a44483 100644 GIT binary patch delta 725 zcmV;`0xJEp0p0~6iBL{Q4GJ0x0000DNk~Le0001h0000W2m$~A098Qea*-hye*%z6 zL_t(&-tC%Qs^TyhhO7B0Db!2BDkv>=3+~3nxf|DT5Cm%rxon}KNmJ({;z*pCb26JSI)e7X%Q<|D1`r<#`^*@h}X-FgOyY)9G|NZJOreqGEzkf95dA?jO7mG!bB<8wWt>QS= zTHkIr7d|$v%jI%DpZ9(5MF7T_bN)O)yWMWP-MV1U=kw`wn$2c}5Uq7x*Uz82^Z%SU zj_33Fdc985G)>bi%Ql;h7xG=eVzF4S*Geg^wIdNBLcE0dX8Z#?IHa0S5O=n?`eUfA(7O4t#R~ zW8Wq|jd$Ri3xI$C5C8!IAOHdaKmY^;fB*;x7?sIn^38#7F2Fi~`-Z^Z1;2-YrfGs8 z@c4JS0fK<9rYMT@`RwsPsVE8%Fd}7Ho=zu^N2+C6f`AdJs%kcye|an_sH*Cp3Lu2| zG`(Yt2_cS0hmQfd3t)`-6<`4!`IOQq ziWp;I7#b6nfU2rY!HCDgve!mJNEn8Uu_%fh1w01iF5q}P20`GrwC}m`ulc_$P2`+g zyOitoTGzGT(n@QWE5$iS2q~rNy5^i;E*HnrM0g2>K!V^0DEppT%ld%Z00000NkvXX Hu0mjf*+NQ6 delta 165 zcmcb|x|vb2Gr-TCmrII^fq{Y7)59eQNIL+r00$G0)NFlMH&Ic%njzKG#WBR=_}i(5 zdzyw71|2JOM`FlT~V@I{`gZ*=~wG=XT8(Jy= PZD#Ov^>bP0l+XkKtQb6{ diff --git a/resources/tile/dirt.png b/resources/tile/dirt.png index e6f8b84110be12a50b5c3fcbf2bd9a3fbc80b382..59616664a9fff1ceb1a4c8638e65f2b6c08a6b66 100644 GIT binary patch delta 1028 zcmV+f1pE8X0gDJBiBL{Q4GJ0x0000DNk~Le0000W0000W2m$~A0Q?y3qmdyOe*?Wq zL_t(Y$DNkVlH4{7gc}V=v)-h9&x_>!-zlzjBoU1qNd3)>eFzU*Tna-11n@QO@4vp| z|Blbc{I#sVU*s`s1{vl#WMf5!$77P=Sh)@veynSs94i2RtZTd2$1$6YlGe4sAOj05 zw5Ex!LRCH;z=FF2K<2U1|MF_qe@}MzqM?8SfNAn+_HI#CPK!7r`?h~NhXZ|W-vPkK z6lVmPi9%T!ER4BULPpO_07{Lp0094N82}2o`;G*ha3HmBgRj=uBj};U6z;dnE+qhW zk2wIu?%FXKcRLR+g9Ko(+l?K`X|171QYJW1s45h)W!oA61{tK2K>&|=f9e;~nowW? zC6Xk&Lw(yb0st_C6CkbsXE6o+$eH%g0ASg+v6}L5Gn3H09}d;Miux}Fph^8pqN-#X zfi|6I^ixytVP_Ms_%V$Gwsq@mbWifydfAb@b*$7{dyU{kKpXe=?>@Pj zjlCiwrr4{ZMbO?WijNrfN#= zpVze&%Fc?15?A{^ey(|gT~@Z8ZbyvY<_V6qWVqdn!J47BMY(rQe~ha(Tw%v6yrQry z+clX>OBSD6_vq)(DF7JiS}fn^`D)K6lwbHoIAQpF#IN+=YiTGTh16y7rV#u!-&HUG zUt4SM^q?7JdW8R8KjL~tw@Jcw#{w8xJzKtJbESUf#>)=NvJo))p&z{Q{h+yncfK2J zR3{)qcwF_vXCF*0f1q&HkGS%^yEr<&KtdAsPo3|(eiSgsLo&0fDk6GIwyhod!B@V2 z#L<0x(#Y#1B6wG}?#+{aoT!-QX>|N1HA!kY+U+qt;hg?kKy}ILSd6z|2rUcO`Y^f5revO#oOl4l_fLiC>6HR-_ZEcby!6*X^5rhGTj(#;Mr6x2D{RoG_ z%wRx*#h&Mgcq96~eGbLEF%@qV?a&Xq7gK5^`HbM;yOj;LK=AP(bN4IXulhmK-Ag&m z?z6QL3RY&5T8~FxPx2G}J11V>qn+)QJIG5!M^32qc1ApkW10000ERLtqy<2jgAGW^fBv61QBk~}q0!UDF~s8Z)L=)x z1_hqkwgQjZ_xxn}|6j;y$BUCJ>8BfnBd;&hPTqa)@wNwVEF)L;CT-|ke8RrbR(*D% zGwT#z{|~kS2fS0h#)b4Pc&4|t*5FKw=_xkB##CkZ1ixR_r&C`_&XicxrjfEHM}D>9 urgw(BIv2-&pK<5NReJ^25Q)V_KN;%1+#c=cTk#X viewport = window->getViewport(); - float pixels = std::max(viewport.first/16.0f, viewport.second/12.0f); + float pixels = std::max(viewport.first/20.0f, viewport.second/15.0f); int tilePixels = getTileSize() * std::ceil(pixels / getTileSize()); float tilesW = viewport.first / tilePixels; diff --git a/src/view/MapView.hpp b/src/view/MapView.hpp index 373c714..98dfe56 100644 --- a/src/view/MapView.hpp +++ b/src/view/MapView.hpp @@ -45,7 +45,7 @@ private: std::map entityTextures; int getTileSize() { - return 16; + return 32; } public: