|
|
|
@ -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; |
|
|
|
|
} |
|
|
|
|
#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 { |
|
|
|
|
#ifndef STBVOX_CONFIG_ROTATION_IN_LIGHTING |
|
|
|
|
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.tex2 = (val >> 4) & 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; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
@ -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.tex2 = (val >> 4) & 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.facerot = 0; |
|
|
|
|