From 26787fd116f2606317ab2704e02bd3dead4d9864 Mon Sep 17 00:00:00 2001 From: MarcEricMartel <74071476+MarcEricMartel@users.noreply.github.com> Date: Mon, 6 Dec 2021 10:58:40 -0500 Subject: [PATCH] Dernier commit? --- SQCSim2021/define.h | 2 ++ SQCSim2021/engine.cpp | 2 +- SQCSim2021/media/chunks/16325_16384.chunk | Bin 32768 -> 0 bytes SQCSim2021/media/chunks/16364_16379.chunk | 1 - SQCSim2021/media/chunks/16369_16385.chunk | 1 - SQCSim2021/media/chunks/16371_16383.chunk | 1 - SQCSim2021/media/chunks/16378_16383.chunk | Bin 32768 -> 0 bytes SQCSim2021/media/chunks/16381_16247.chunk | Bin 32768 -> 0 bytes SQCSim2021/media/chunks/16397_16373.chunk | Bin 32768 -> 0 bytes SQCSim2021/media/chunks/16398_16392.chunk | Bin 32768 -> 0 bytes SQCSim2021/media/chunks/16400_16392.chunk | Bin 32768 -> 0 bytes SQCSim2021/media/chunks/16505_16212.chunk | Bin 32768 -> 0 bytes SQCSim2021/world.cpp | 2 +- 13 files changed, 4 insertions(+), 5 deletions(-) delete mode 100644 SQCSim2021/media/chunks/16325_16384.chunk delete mode 100644 SQCSim2021/media/chunks/16364_16379.chunk delete mode 100644 SQCSim2021/media/chunks/16369_16385.chunk delete mode 100644 SQCSim2021/media/chunks/16371_16383.chunk delete mode 100644 SQCSim2021/media/chunks/16378_16383.chunk delete mode 100644 SQCSim2021/media/chunks/16381_16247.chunk delete mode 100644 SQCSim2021/media/chunks/16397_16373.chunk delete mode 100644 SQCSim2021/media/chunks/16398_16392.chunk delete mode 100644 SQCSim2021/media/chunks/16400_16392.chunk delete mode 100644 SQCSim2021/media/chunks/16505_16212.chunk diff --git a/SQCSim2021/define.h b/SQCSim2021/define.h index a1b29c5..fc1747e 100644 --- a/SQCSim2021/define.h +++ b/SQCSim2021/define.h @@ -26,6 +26,7 @@ #define FRAMES_DELETE_CHUNKS 4 #define VIEW_DISTANCE 128 +#define TEXTURE_SIZE 32 #endif #ifdef NDEBUG @@ -37,6 +38,7 @@ #define FRAMES_DELETE_CHUNKS 2 #define VIEW_DISTANCE 512 +#define TEXTURE_SIZE 512 #endif diff --git a/SQCSim2021/engine.cpp b/SQCSim2021/engine.cpp index 3387bc5..6668b9e 100644 --- a/SQCSim2021/engine.cpp +++ b/SQCSim2021/engine.cpp @@ -58,7 +58,7 @@ void Engine::LoadResource() { TextureAtlas::TextureIndex texGrassIndex = m_textureAtlas.AddTexture(TEXTURE_PATH "grass.png"); TextureAtlas::TextureIndex texMetalIndex = m_textureAtlas.AddTexture(TEXTURE_PATH "dirt.png"); - if (!m_textureAtlas.Generate(512, false)) { + if (!m_textureAtlas.Generate(TEXTURE_SIZE, false)) { std::cout << " Unable to generate texture atlas ..." << std::endl; abort(); } diff --git a/SQCSim2021/media/chunks/16325_16384.chunk b/SQCSim2021/media/chunks/16325_16384.chunk deleted file mode 100644 index 0137b36f97070d77e1d76800574ffc774ae8034f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 32768 zcmZP`1*0J_8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiSILVyVbkiCn} zXJ%qzLY5y+Y>;0;815$!2gSb-0k}LfC^S&R1Ec~;o|&0>XapC?-7pMxKa2zSKSBU3 z5Aix!5W+_YK=~jFSsug(D*`iM1l)X>zyQ!-S0V^#w88~IkqGBN+>6WwM=-Jg$Oq_r zu*ac-AbBuG=R*~N<-i0)0hkFU(D@JzU?~^@aUYBa_6mXnVxgv2umXs&M3WF(5y}bj z(G;NDNirW{HJF8FJQJpQs3M?HKotQSGfIqxz-S1JhQLS;0R|924ghpM69WSSLY|S4 zkrBaT0&y|;NCIGabUu=PCXfjze7bNzek28h!T_Qk_vv7b7%* zyaVz8LIgjH5u^cx;mW}Nhx15cKs`^A9!eEM;va4bhzs@;R0PBZVJMdY#0FsmAEX1u z1JR7g(jb8$j?uk?&L8658+HC@2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1J zhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kin zXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeD zjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mk zz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1Jh5#%C0J0=Z AZ~y=R diff --git a/SQCSim2021/media/chunks/16364_16379.chunk b/SQCSim2021/media/chunks/16364_16379.chunk deleted file mode 100644 index 507340d..0000000 --- a/SQCSim2021/media/chunks/16364_16379.chunk +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/SQCSim2021/media/chunks/16369_16385.chunk b/SQCSim2021/media/chunks/16369_16385.chunk deleted file mode 100644 index 1a5b1e4..0000000 --- a/SQCSim2021/media/chunks/16369_16385.chunk +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/SQCSim2021/media/chunks/16371_16383.chunk b/SQCSim2021/media/chunks/16371_16383.chunk deleted file mode 100644 index a197f63..0000000 --- a/SQCSim2021/media/chunks/16371_16383.chunk +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/SQCSim2021/media/chunks/16378_16383.chunk b/SQCSim2021/media/chunks/16378_16383.chunk deleted file mode 100644 index dd1dcbfd761fffacf9d1d6424adf0303892074fd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 32768 zcmZP`1*0J_8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8Umvs zFd71*Aut*OqaiRF0;3@?8UmvsFd71*Au!xRfPsMl)k~!EnbGtU`=EP#+_1`FWhgA^dk6XY|K8r~GDN5nVSZy*BdUJw(EaqvN2L6&ERga)#Ez|x5D zg(`rW2cp0VKny5G=Y#El%7H160x$zgP{;>q2e}VS!w8VkFgA$B#s@nLBnb~cCbU!6oMfdAZ#!R767xr1ego*AD9Po5tIYtLKGp9P;1~K z7<@DVbc5gt0bv4~4hBM6(2W2&8EzUhNYVMoc7W8Q@sX8d*pDJP${7uT(GVC7fzc2c z4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C z(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R z7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7 zfzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z N5Eu=C(GVa%1OVqaW+eas diff --git a/SQCSim2021/media/chunks/16381_16247.chunk b/SQCSim2021/media/chunks/16381_16247.chunk deleted file mode 100644 index 5e744b54265cdeda810747ac9bcbf11cc84e1fd3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 32768 zcmZP`1w$$Xn9y8HkdLN-35}0t+<x-l5I%%N=cC(4GM|YVY(KbV=5e6_oSOVrk36Ln1$-uzC2-b+;Gmy?_U}8eikHKd^lP8AHh-@U9 zeuDNP>m|TOv4?=#QR&eT7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c z4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C z(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R z7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7 zfzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z L5Eu=C;T8e_qn0$A diff --git a/SQCSim2021/media/chunks/16397_16373.chunk b/SQCSim2021/media/chunks/16397_16373.chunk deleted file mode 100644 index f88e52d2d5ce1ef43d5ee6ab9cb20c4ed3766a16..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 32768 zcmZP?1*0J_8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFf>Ad0nM3&_-M*OTm}@t#02Fs zLueQm!W(!J-92#kLY+pC4^>Byg8HAJx={tAAut*OqaiRF0;3@?8UmvsFd71*Aut*O zqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8Umvs zFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF z0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71* zAut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@? z8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFw8>$0OE%l A8vpK-RN0J7~BXe1p;4Xs*qj4dEq>_xpYhV}! zqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8Umvs zFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF z0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71* zAut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@? z8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*O gqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0yske01;yv761SM diff --git a/SQCSim2021/media/chunks/16505_16212.chunk b/SQCSim2021/media/chunks/16505_16212.chunk deleted file mode 100644 index a00f373cbd1f5ab2eee1c44c7f59b38ad29db655..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 32768 zcmZP?1*0J_8UmvsFd71*Aut*OqaiRF0;3@?LPLOsg@pyh>jd~{>Oowney};{d?t_p z*nFtDFg`XKBnHAvOkiywCKywj&oEGcaeyoyD0>IUyQ9{QhQMeDjE2By2#kinXb6mk zz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By z2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1J zhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kin zXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeD zjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mk Kz-S0i76JgVTp1Mr diff --git a/SQCSim2021/world.cpp b/SQCSim2021/world.cpp index 23c798e..473cd58 100644 --- a/SQCSim2021/world.cpp +++ b/SQCSim2021/world.cpp @@ -166,7 +166,7 @@ bool World::GenerateChunk(int chx, int chy, Perlin& perlin) { for (int x = 0; x < CHUNK_SIZE_X; ++x) // "Lacs" for (int z = 0; z < CHUNK_SIZE_Z; ++z) { - for (int y = 0; y < 12; ++y) { + for (int y = 0; y < 13; ++y) { if (chunk->GetBlock(x, y, z) == BTYPE_AIR) chunk->SetBlock(x, y, z, BTYPE_ICE, this); }