Skip to content

Commit 332a8eb

Browse files
committed
Fix damaged voxel z-fighting with greedy meshing enabled
1 parent 0bab22f commit 332a8eb

File tree

1 file changed

+15
-7
lines changed

1 file changed

+15
-7
lines changed

src/map.c

+15-7
Original file line numberDiff line numberDiff line change
@@ -131,9 +131,14 @@ static bool damaged_voxel_update(void* key, void* value, void* user) {
131131
void map_damaged_voxels_render() {
132132
matrix_identity(matrix_model);
133133
matrix_upload();
134-
// glEnable(GL_POLYGON_OFFSET_FILL);
135-
// glPolygonOffset(0.0F,-100.0F);
136-
glDepthFunc(GL_EQUAL);
134+
135+
if(settings.greedy_meshing) {
136+
glEnable(GL_POLYGON_OFFSET_FILL);
137+
glPolygonOffset(0.0F, -100.0F);
138+
} else {
139+
glDepthFunc(GL_EQUAL);
140+
}
141+
137142
glEnable(GL_BLEND);
138143
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
139144

@@ -142,11 +147,14 @@ void map_damaged_voxels_render() {
142147
ht_iterate_remove(&map_damaged_voxels, &map_damaged_tesselator, damaged_voxel_update);
143148

144149
tesselator_draw(&map_damaged_tesselator, 1);
145-
146-
glDepthFunc(GL_LEQUAL);
147150
glDisable(GL_BLEND);
148-
// glPolygonOffset(0.0F,0.0F);
149-
// glDisable(GL_POLYGON_OFFSET_FILL);
151+
152+
if(settings.greedy_meshing) {
153+
glPolygonOffset(0.0F, 0.0F);
154+
glDisable(GL_POLYGON_OFFSET_FILL);
155+
} else {
156+
glDepthFunc(GL_LEQUAL);
157+
}
150158
}
151159

152160
struct map_work_packet {

0 commit comments

Comments
 (0)