From 099b1cbdd7130d66dcb6c1369ca089537c43e47d Mon Sep 17 00:00:00 2001 From: zhenyan121 <3367366583@qq.com> Date: Sat, 18 Apr 2026 11:56:33 +0800 Subject: [PATCH] refactor: update log and leaf materials --- assets/texture/block/leaf/back.png | Bin 99 -> 398 bytes assets/texture/block/leaf/base.png | Bin 99 -> 398 bytes assets/texture/block/leaf/front.png | Bin 99 -> 398 bytes assets/texture/block/leaf/left.png | Bin 99 -> 398 bytes assets/texture/block/leaf/right.png | Bin 99 -> 398 bytes assets/texture/block/leaf/top.png | Bin 99 -> 398 bytes assets/texture/block/log/back.png | Bin 99 -> 259 bytes assets/texture/block/log/base.png | Bin 99 -> 215 bytes assets/texture/block/log/front.png | Bin 99 -> 259 bytes assets/texture/block/log/left.png | Bin 99 -> 259 bytes assets/texture/block/log/right.png | Bin 99 -> 259 bytes assets/texture/block/log/top.png | Bin 99 -> 215 bytes include/Cubed/gameplay/block.hpp | 30 ++++++++++++++++++++++++++-- include/Cubed/gameplay/chunk.hpp | 2 +- 14 files changed, 29 insertions(+), 3 deletions(-) diff --git a/assets/texture/block/leaf/back.png b/assets/texture/block/leaf/back.png index 16d842672f5599661a5fd0ab357814f30f8ac2f1..84bbfaa21acdde15e28e8e383dd69b1fc8c45889 100644 GIT binary patch delta 358 zcmV-s0h#_|jsuV|e*s8IL_t(IjdfGIjl(bueH0A1ca_c~L^IfBx&Rp>ULmzt@C{+W z-IekTx)I!|a_@>)2v1>*J5`iK@_j_fuzKBQMf(r{0OP5PGOS)x007|9zwZDbg?#1! zplqbg4nb_w}0U!fssT29w^+N)SY2>BPjJH|gtYMT=H-cgH$|fnGu$sCkG_ZZhr-WsU ze@dc1x93&uU?c)S#i6m&cz=04b_F0sGaH``6;fq_jV-#BNlyTv0suZGCz6Fkhxr>c zyO;=|%s6G7QOPLFdQW5fko*cnwZD#2$7Mel?@|DM0k$CpNI>1A1poj507*qoM6N<$ Ef)d-GXaE2J delta 57 zcmeBUPM%<3%pmLO;uvDln|$V0`iJ?AOb1*#p9M0z@k*E`7)UZO9GJ>fexCbi5Caf+ My85}Sb4q9e075MjF8}}l diff --git a/assets/texture/block/leaf/base.png b/assets/texture/block/leaf/base.png index 16d842672f5599661a5fd0ab357814f30f8ac2f1..84bbfaa21acdde15e28e8e383dd69b1fc8c45889 100644 GIT binary patch delta 358 zcmV-s0h#_|jsuV|e*s8IL_t(IjdfGIjl(bueH0A1ca_c~L^IfBx&Rp>ULmzt@C{+W z-IekTx)I!|a_@>)2v1>*J5`iK@_j_fuzKBQMf(r{0OP5PGOS)x007|9zwZDbg?#1! zplqbg4nb_w}0U!fssT29w^+N)SY2>BPjJH|gtYMT=H-cgH$|fnGu$sCkG_ZZhr-WsU ze@dc1x93&uU?c)S#i6m&cz=04b_F0sGaH``6;fq_jV-#BNlyTv0suZGCz6Fkhxr>c zyO;=|%s6G7QOPLFdQW5fko*cnwZD#2$7Mel?@|DM0k$CpNI>1A1poj507*qoM6N<$ Ef)d-GXaE2J delta 57 zcmeBUPM%<3%pmLO;uvDln|$V0`iJ?AOb1*#p9M0z@k*E`7)UZO9GJ>fexCbi5Caf+ My85}Sb4q9e075MjF8}}l diff --git a/assets/texture/block/leaf/front.png b/assets/texture/block/leaf/front.png index 16d842672f5599661a5fd0ab357814f30f8ac2f1..84bbfaa21acdde15e28e8e383dd69b1fc8c45889 100644 GIT binary patch delta 358 zcmV-s0h#_|jsuV|e*s8IL_t(IjdfGIjl(bueH0A1ca_c~L^IfBx&Rp>ULmzt@C{+W z-IekTx)I!|a_@>)2v1>*J5`iK@_j_fuzKBQMf(r{0OP5PGOS)x007|9zwZDbg?#1! zplqbg4nb_w}0U!fssT29w^+N)SY2>BPjJH|gtYMT=H-cgH$|fnGu$sCkG_ZZhr-WsU ze@dc1x93&uU?c)S#i6m&cz=04b_F0sGaH``6;fq_jV-#BNlyTv0suZGCz6Fkhxr>c zyO;=|%s6G7QOPLFdQW5fko*cnwZD#2$7Mel?@|DM0k$CpNI>1A1poj507*qoM6N<$ Ef)d-GXaE2J delta 57 zcmeBUPM%<3%pmLO;uvDln|$V0`iJ?AOb1*#p9M0z@k*E`7)UZO9GJ>fexCbi5Caf+ My85}Sb4q9e075MjF8}}l diff --git a/assets/texture/block/leaf/left.png b/assets/texture/block/leaf/left.png index 16d842672f5599661a5fd0ab357814f30f8ac2f1..84bbfaa21acdde15e28e8e383dd69b1fc8c45889 100644 GIT binary patch delta 358 zcmV-s0h#_|jsuV|e*s8IL_t(IjdfGIjl(bueH0A1ca_c~L^IfBx&Rp>ULmzt@C{+W z-IekTx)I!|a_@>)2v1>*J5`iK@_j_fuzKBQMf(r{0OP5PGOS)x007|9zwZDbg?#1! zplqbg4nb_w}0U!fssT29w^+N)SY2>BPjJH|gtYMT=H-cgH$|fnGu$sCkG_ZZhr-WsU ze@dc1x93&uU?c)S#i6m&cz=04b_F0sGaH``6;fq_jV-#BNlyTv0suZGCz6Fkhxr>c zyO;=|%s6G7QOPLFdQW5fko*cnwZD#2$7Mel?@|DM0k$CpNI>1A1poj507*qoM6N<$ Ef)d-GXaE2J delta 57 zcmeBUPM%<3%pmLO;uvDln|$V0`iJ?AOb1*#p9M0z@k*E`7)UZO9GJ>fexCbi5Caf+ My85}Sb4q9e075MjF8}}l diff --git a/assets/texture/block/leaf/right.png b/assets/texture/block/leaf/right.png index 16d842672f5599661a5fd0ab357814f30f8ac2f1..84bbfaa21acdde15e28e8e383dd69b1fc8c45889 100644 GIT binary patch delta 358 zcmV-s0h#_|jsuV|e*s8IL_t(IjdfGIjl(bueH0A1ca_c~L^IfBx&Rp>ULmzt@C{+W z-IekTx)I!|a_@>)2v1>*J5`iK@_j_fuzKBQMf(r{0OP5PGOS)x007|9zwZDbg?#1! zplqbg4nb_w}0U!fssT29w^+N)SY2>BPjJH|gtYMT=H-cgH$|fnGu$sCkG_ZZhr-WsU ze@dc1x93&uU?c)S#i6m&cz=04b_F0sGaH``6;fq_jV-#BNlyTv0suZGCz6Fkhxr>c zyO;=|%s6G7QOPLFdQW5fko*cnwZD#2$7Mel?@|DM0k$CpNI>1A1poj507*qoM6N<$ Ef)d-GXaE2J delta 57 zcmeBUPM%<3%pmLO;uvDln|$V0`iJ?AOb1*#p9M0z@k*E`7)UZO9GJ>fexCbi5Caf+ My85}Sb4q9e075MjF8}}l diff --git a/assets/texture/block/leaf/top.png b/assets/texture/block/leaf/top.png index 16d842672f5599661a5fd0ab357814f30f8ac2f1..84bbfaa21acdde15e28e8e383dd69b1fc8c45889 100644 GIT binary patch delta 358 zcmV-s0h#_|jsuV|e*s8IL_t(IjdfGIjl(bueH0A1ca_c~L^IfBx&Rp>ULmzt@C{+W z-IekTx)I!|a_@>)2v1>*J5`iK@_j_fuzKBQMf(r{0OP5PGOS)x007|9zwZDbg?#1! zplqbg4nb_w}0U!fssT29w^+N)SY2>BPjJH|gtYMT=H-cgH$|fnGu$sCkG_ZZhr-WsU ze@dc1x93&uU?c)S#i6m&cz=04b_F0sGaH``6;fq_jV-#BNlyTv0suZGCz6Fkhxr>c zyO;=|%s6G7QOPLFdQW5fko*cnwZD#2$7Mel?@|DM0k$CpNI>1A1poj507*qoM6N<$ Ef)d-GXaE2J delta 57 zcmeBUPM%<3%pmLO;uvDln|$V0`iJ?AOb1*#p9M0z@k*E`7)UZO9GJ>fexCbi5Caf+ My85}Sb4q9e075MjF8}}l diff --git a/assets/texture/block/log/back.png b/assets/texture/block/log/back.png index d05532c95b0399e331e740d29cc62b50b19c1f47..5356a05d7c4d59e4ae776a3f9907e59c05c0f58e 100644 GIT binary patch delta 217 zcmV;~04D!qg94B-f4xaWK~y-6l~XYe!Y~X>JtDEPA+gfm@CH7_>)bU`wyu@3hUu)U zYb<(86x%(Y&*}7ezlLfp5$5?(I2YXom*@SmOE5U+VFc6lX2G$oVXDVh!Y~C(>*1<6rdsW8?;!gZGT^%}S}$Ke T&FwyD00000NkvXXu0mjfqjFN}gb7BMS>ya{;!Nb5XlZo+tne1gg1|aZs L^>bP0l+XkKCMFVi diff --git a/assets/texture/block/log/base.png b/assets/texture/block/log/base.png index d05532c95b0399e331e740d29cc62b50b19c1f47..817809cf8363db57b600de0c1a7a572a0e87c61b 100644 GIT binary patch delta 173 zcmYek&N#uaexj#~V~9m>vd?CdKj$476A}{=5-v=6s^tCo>+$;vYzHisFw9u0bD}9K zipwQ)U)fv6IcJ;vg`^#}vm9n%V`FPO#gx8g)@}7SM+FXNF_<0Q!IOF@m4TU=*|~6+ zCJ5W9{@_($d+>z`B=-KymdKI;Vst0DX%?DF6Tf delta 56 zcmcc4m^{JINY>NEF~p)b*=MuKpYslk35#4luV7rv)+1#wgNK1(CKKcPGTF;~3_#%N L>gTe~DWM4fI8PGG diff --git a/assets/texture/block/log/front.png b/assets/texture/block/log/front.png index d05532c95b0399e331e740d29cc62b50b19c1f47..5356a05d7c4d59e4ae776a3f9907e59c05c0f58e 100644 GIT binary patch delta 217 zcmV;~04D!qg94B-f4xaWK~y-6l~XYe!Y~X>JtDEPA+gfm@CH7_>)bU`wyu@3hUu)U zYb<(86x%(Y&*}7ezlLfp5$5?(I2YXom*@SmOE5U+VFc6lX2G$oVXDVh!Y~C(>*1<6rdsW8?;!gZGT^%}S}$Ke T&FwyD00000NkvXXu0mjfqjFN}gb7BMS>ya{;!Nb5XlZo+tne1gg1|aZs L^>bP0l+XkKCMFVi diff --git a/assets/texture/block/log/left.png b/assets/texture/block/log/left.png index d05532c95b0399e331e740d29cc62b50b19c1f47..5356a05d7c4d59e4ae776a3f9907e59c05c0f58e 100644 GIT binary patch delta 217 zcmV;~04D!qg94B-f4xaWK~y-6l~XYe!Y~X>JtDEPA+gfm@CH7_>)bU`wyu@3hUu)U zYb<(86x%(Y&*}7ezlLfp5$5?(I2YXom*@SmOE5U+VFc6lX2G$oVXDVh!Y~C(>*1<6rdsW8?;!gZGT^%}S}$Ke T&FwyD00000NkvXXu0mjfqjFN}gb7BMS>ya{;!Nb5XlZo+tne1gg1|aZs L^>bP0l+XkKCMFVi diff --git a/assets/texture/block/log/right.png b/assets/texture/block/log/right.png index d05532c95b0399e331e740d29cc62b50b19c1f47..5356a05d7c4d59e4ae776a3f9907e59c05c0f58e 100644 GIT binary patch delta 217 zcmV;~04D!qg94B-f4xaWK~y-6l~XYe!Y~X>JtDEPA+gfm@CH7_>)bU`wyu@3hUu)U zYb<(86x%(Y&*}7ezlLfp5$5?(I2YXom*@SmOE5U+VFc6lX2G$oVXDVh!Y~C(>*1<6rdsW8?;!gZGT^%}S}$Ke T&FwyD00000NkvXXu0mjfqjFN}gb7BMS>ya{;!Nb5XlZo+tne1gg1|aZs L^>bP0l+XkKCMFVi diff --git a/assets/texture/block/log/top.png b/assets/texture/block/log/top.png index d05532c95b0399e331e740d29cc62b50b19c1f47..817809cf8363db57b600de0c1a7a572a0e87c61b 100644 GIT binary patch delta 173 zcmYek&N#uaexj#~V~9m>vd?CdKj$476A}{=5-v=6s^tCo>+$;vYzHisFw9u0bD}9K zipwQ)U)fv6IcJ;vg`^#}vm9n%V`FPO#gx8g)@}7SM+FXNF_<0Q!IOF@m4TU=*|~6+ zCJ5W9{@_($d+>z`B=-KymdKI;Vst0DX%?DF6Tf delta 56 zcmcc4m^{JINY>NEF~p)b*=MuKpYslk35#4luV7rv)+1#wgNK1(CKKcPGTF;~3_#%N L>gTe~DWM4fI8PGG diff --git a/include/Cubed/gameplay/block.hpp b/include/Cubed/gameplay/block.hpp index 9178a03..4d01c35 100644 --- a/include/Cubed/gameplay/block.hpp +++ b/include/Cubed/gameplay/block.hpp @@ -1,11 +1,12 @@ #pragma once #include #include +#include #include #include - - +#include +#include struct BlockTexture { std::string name; unsigned id; @@ -38,4 +39,29 @@ struct BlockRenderData { struct LookBlock { glm::ivec3 pos; glm::ivec3 normal; +}; + +constexpr std::array BLOCK_REISTER{ + "air", + "grass_block", + "dirt", + "stone", + "sand", + "log", + "leaf" +}; + +const std::array TRANSPARENT_MAP { + true, + false, + false, + false, + false, + false, + true +}; + +inline bool is_in_transparent_map(unsigned id) { + CUBED_ASSERT_MSG(id < MAX_BLOCK_NUM, "ID is invaild"); + return TRANSPARENT_MAP[id]; }; \ No newline at end of file diff --git a/include/Cubed/gameplay/chunk.hpp b/include/Cubed/gameplay/chunk.hpp index cbe2844..2b43331 100644 --- a/include/Cubed/gameplay/chunk.hpp +++ b/include/Cubed/gameplay/chunk.hpp @@ -49,7 +49,7 @@ public: static int get_index(int x, int y, int z); static int get_index(const glm::vec3& pos); void init_chunk(); - void gen_vertex_data(); + //void gen_vertex_data(); // 0 : (1, 0) // 1 : (-1, 0) // 2 : (0, 1)