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 zcmeIv0Zzj(3KGzSXU1L0t5&UAV7cs0RjXF5FkL{ z-v})65Kz`0ZCrg>mJh@NwR7 zT3Z^iA4>V`Q~Pu4@2!u~w)@sXyGSW~kV`{cJRgXh3q7aWp0}p2=W*cZZ>#p_*ZC|F>xA|&A%$qA?{#>ypK!Cu%7r4cf73RE@{kQg{ z?ue(H3Vnah>HM0t;(bSs1LxeU z$IobAZ@2ar&-r|<49U^^z2A1(KGXJ=zRrbLn-S1P(yWTxNF~XSBu%EVts6Xdi(C$z3 zTF}*hJI8$GvajcSmF2FEbwdF>?2-&RG{vd02>>9_QEA{d=rf|KfecI#RcAk-LI?g|;E*cHtto z<)`;|n*sp>1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N z0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+ J009E`1s>-(W+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 zcmeIu(Ne=85Czbf{Qo}-RAkw-(oCIk)RUL?!Y&KvIDEfJU{9A_=2Wn!oR0hPnD4iz zg_5Ti+{>|`?w@j8_~sYqqvz?zk*?En?5X?l!nZssp3I*OAN3D&etw)?_iBHvY3GH7 zN9XshzTc1eBDXnVf0=7Rtk1b#GwiopkKE$@_qEAmzxULY{=facn#-K&yi?xO{;PR8 zZ@$j;w7T#06LkNZN@!UwxcVyvL7t{z*Ah?GQ4(MB)rvW8Z0Pyp@l_BYK!5-N z0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+ z009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBly VK!5-N0t5&UAV7cs0RjYi1U4+|84Umc diff --git a/SQCSim2021/media/chunks/16400_16392.chunk b/SQCSim2021/media/chunks/16400_16392.chunk deleted file mode 100644 index e49266cda27037d005cb30a16adb0fe9c82991fb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 32768 zcmeIuI}(5(3_w9;a{n{?!6+~~T3BwnM=}&!iXlLN009C72oNCfn?MXd4IN#_I?er- zP49Vi&9jfp&de_PkpB;znfEV!uIv4kx81C_eVc1{8AJBVuQh)?jF=1o0t5&UAV7cs z0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZ zfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&U VAV7cs0RjXF5FkK+009Dz0t*pi8WsQm 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 zcmeIu(GEZ`3pWG}Tr{|9Zqap(B|v}x0RjXF5FkK+009C72oNAZ zfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&U zAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C7 J2oQKDumZ7M85IBk 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); }