LogalDeveloper/Minecraft-Overviewer
Archived
0
Fork 0
Code Activity

Convert case switch to block_class_is_subset

Browse Source
This commit is contained in:
Wunkolo
2019-03-17 17:57:18 -07:00
parent ee9a3411ba
commit 5ff6a6400e
3 changed files with 68 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
overviewer_core/src/block_class.c
View File

@@ -22,7 +22,7 @@
#include <immintrin.h>
#endif
bool block_class_is_subset(
extern inline bool block_class_is_subset(
mc_block_t block,
const mc_block_t block_class[],
size_t block_class_len

2
overviewer_core/src/block_class.h
View File

@@ -26,7 +26,7 @@
bool block_class_is_subset(
mc_block_t block,
const mc_block_t block_class[],
size_t block_class_len
size_t block_class_len
);
extern const mc_block_t block_class_stair[];

37
overviewer_core/src/primitives/base.c
View File

@@ -125,23 +125,25 @@ base_draw(void *data, RenderState *state, PyObject *src, PyObject *mask, PyObjec
/* grass needs a special facemask */
facemask = self->grass_texture;
}
switch (state->block) {
case block_grass:
case block_tallgrass:
case block_pumpkin_stem:
case block_melon_stem:
case block_vine:
case block_waterlily:
case block_double_plant:
if(block_class_is_subset(state->block,(mc_block_t[]){
block_grass,
block_tallgrass,
block_pumpkin_stem,
block_melon_stem,
block_vine,
block_waterlily,
block_double_plant
},7)) {
color_table = self->grasscolor;
break;
case block_flowing_water:
case block_water:
}
else if(block_class_is_subset(state->block,(mc_block_t[]){
block_flowing_water,block_water
},2)) {
color_table = self->watercolor;
break;
case block_leaves:
case block_leaves2:
}
else if(block_class_is_subset(state->block,(mc_block_t[]){
block_leaves,block_leaves2
},2)) {
color_table = self->foliagecolor;
if (state->block_data == 2)
{
@@ -149,10 +151,7 @@ base_draw(void *data, RenderState *state, PyObject *src, PyObject *mask, PyObjec
birch foliage color is flipped XY-ways */
flip_xy = 1;
}
break;
default:
break;
};
}
if (color_table) {
unsigned char biome;