From 1a31473db826af86ddf8ce8a2cf224fe9a43d406 Mon Sep 17 00:00:00 2001 From: guitarfreak Date: Sat, 8 Oct 2016 01:59:11 +0200 Subject: [PATCH 1/3] Added block_selector --- stb_voxel_render.h | 32 +++++++++++++++++++++++++++----- 1 file changed, 27 insertions(+), 5 deletions(-) diff --git a/stb_voxel_render.h b/stb_voxel_render.h index c49aa40..17c8fbc 100644 --- a/stb_voxel_render.h +++ b/stb_voxel_render.h @@ -2902,7 +2902,9 @@ static void stbvox_make_mesh_for_block(stbvox_mesh_maker *mm, stbvox_pos pos, in if (mm->input.selector) mesh = mm->input.selector[v_off]; - + else if (mm->input.block_selector) + mesh = mm->input.block_selector[mm->input.blocktype[v_off]]; + // check if we're going off the end if (mm->output_cur[mesh][0] + mm->output_size[mesh][0]*6 > mm->output_end[mesh][0]) { mm->full = 1; @@ -3008,6 +3010,18 @@ 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) { @@ -3111,7 +3125,9 @@ static void stbvox_make_mesh_for_block_with_geo(stbvox_mesh_maker *mm, stbvox_po mesh = mm->default_mesh; if (mm->input.selector) mesh = mm->input.selector[v_off]; - + else if (mm->input.block_selector) + mesh = mm->input.block_selector[bt]; + if (geo <= STBVOX_GEOM_ceil_slope_north_is_bottom) { // this is the simple case, we can just use regular block gen with special vmesh calculated with vheight stbvox_mesh_vertex basevert; @@ -3132,7 +3148,9 @@ static void stbvox_make_mesh_for_block_with_geo(stbvox_mesh_maker *mm, stbvox_po basevert = stbvox_vertex_encode(pos.x, pos.y, pos.z << STBVOX_CONFIG_PRECISION_Z, 0,0); if (mm->input.selector) { mesh = mm->input.selector[v_off]; - } + } else if (mm->input.block_selector) + mesh = mm->input.block_selector[bt]; + // check if we're going off the end if (mm->output_cur[mesh][0] + mm->output_size[mesh][0]*6 > mm->output_end[mesh][0]) { @@ -3328,7 +3346,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) { + } else if (mm->input.selector || mm->input.block_selector) { rotate.block = rotate.overlay = rotate.ecolor = simple_rot; } @@ -3352,6 +3370,10 @@ static void stbvox_make_mesh_for_block_with_geo(stbvox_mesh_maker *mm, stbvox_po mesh = mm->input.selector[v_off]; simple_rot = mesh >> 4; mesh &= 15; + } else if (mm->input.block_selector) { + mesh = mm->input.block_selector[bt]; + simple_rot = mesh >> 4; + mesh &= 15; } // check if we're going off the end @@ -3366,7 +3388,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) { + } else if (mm->input.selector || mm->input.block_selector) { rot.block = rot.overlay = rot.ecolor = simple_rot; } rot.facerot = 0; From 5fcd181fae6d5e318bf897473a2ee5a9e2259a51 Mon Sep 17 00:00:00 2001 From: guitarfreak Date: Sat, 8 Oct 2016 04:10:23 +0200 Subject: [PATCH 2/3] Update stb_voxel_render.h --- stb_voxel_render.h | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/stb_voxel_render.h b/stb_voxel_render.h index 17c8fbc..46a4726 100644 --- a/stb_voxel_render.h +++ b/stb_voxel_render.h @@ -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; From 6a29bcf2a1c00b100558d6b0366fa64f4c0929c7 Mon Sep 17 00:00:00 2001 From: guitarfreak Date: Sat, 8 Oct 2016 04:23:52 +0200 Subject: [PATCH 3/3] Update stb_voxel_render.h --- stb_voxel_render.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/stb_voxel_render.h b/stb_voxel_render.h index 46a4726..32d581c 100644 --- a/stb_voxel_render.h +++ b/stb_voxel_render.h @@ -3358,10 +3358,9 @@ static void stbvox_make_mesh_for_block_with_geo(stbvox_mesh_maker *mm, stbvox_po mesh = mm->input.selector[v_off]; simple_rot = mesh >> 4; mesh &= 15; - } else if (mm->input.block_selector) { + } + if (mm->input.block_selector) { mesh = mm->input.block_selector[bt]; - simple_rot = mesh >> 4; - mesh &= 15; } // check if we're going off the end