yyc12345/stb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update stb_voxel_render.h

Browse Source
This commit is contained in:
guitarfreak 2016-10-08 04:10:23 +02:00 committed by GitHub
parent 1a31473db8
commit 5fcd181fae
1 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
stb_voxel_render.h
View File

@ -3010,18 +3010,6 @@ static void stbvox_make_mesh_for_block_with_geo(stbvox_mesh_maker *mm, stbvox_po
nrot[5] = (mm->input.selector[v_off - 1] >> 4) & 3; nrot[5] = (mm->input.selector[v_off - 1] >> 4) & 3;
} }
#endif #endif
} else if (mm->input.block_selector) {
#ifndef STBVOX_CONFIG_ROTATION_IN_LIGHTING
if (mm->input.packed_compact == NULL) {
rot = (mm->input.block_selector[bt ] >> 4) & 3;
nrot[0] = (mm->input.block_selector[nbt[0]] >> 4) & 3;
nrot[1] = (mm->input.block_selector[nbt[1]] >> 4) & 3;
nrot[2] = (mm->input.block_selector[nbt[2]] >> 4) & 3;
nrot[3] = (mm->input.block_selector[nbt[3]] >> 4) & 3;
nrot[4] = (mm->input.block_selector[nbt[4]] >> 4) & 3;
nrot[5] = (mm->input.block_selector[nbt[5]] >> 4) & 3;
}
#endif
} else { } else {
#ifndef STBVOX_CONFIG_ROTATION_IN_LIGHTING #ifndef STBVOX_CONFIG_ROTATION_IN_LIGHTING
if (mm->input.packed_compact == NULL) { if (mm->input.packed_compact == NULL) {
@ -3346,7 +3334,7 @@ static void stbvox_make_mesh_for_block_with_geo(stbvox_mesh_maker *mm, stbvox_po
rotate.overlay = (val >> 2) & 3; rotate.overlay = (val >> 2) & 3;
//rotate.tex2 = (val >> 4) & 3; //rotate.tex2 = (val >> 4) & 3;
rotate.ecolor = (val >> 6) & 3; rotate.ecolor = (val >> 6) & 3;
} else if (mm->input.selector || mm->input.block_selector) { } else if (mm->input.selector) {
rotate.block = rotate.overlay = rotate.ecolor = simple_rot; rotate.block = rotate.overlay = rotate.ecolor = simple_rot;
} }
@ -3388,7 +3376,7 @@ static void stbvox_make_mesh_for_block_with_geo(stbvox_mesh_maker *mm, stbvox_po
rot.overlay = (val >> 2) & 3; rot.overlay = (val >> 2) & 3;
//rot.tex2 = (val >> 4) & 3; //rot.tex2 = (val >> 4) & 3;
rot.ecolor = (val >> 6) & 3; rot.ecolor = (val >> 6) & 3;
} else if (mm->input.selector || mm->input.block_selector) { } else if (mm->input.selector) {
rot.block = rot.overlay = rot.ecolor = simple_rot; rot.block = rot.overlay = rot.ecolor = simple_rot;
} }
rot.facerot = 0; rot.facerot = 0;