mirrors/ClassiCube
1
0
Fork 0
mirror of https://github.com/ClassiCube/ClassiCube.git synced 2025-01-22 09:01:57 -05:00
Code Issues Projects Releases Packages Wiki Activity

Save a few instructions for chunk updating checks

Browse source
This commit is contained in:
UnknownShadow200 2024-06-07 13:17:09 +10:00
parent 0c8d8a04ad
commit c2be079943
2 changed files with 25 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/MapRenderer.c
View file

@ -54,8 +54,12 @@ static void ChunkInfo_Reset(struct ChunkInfo* chunk, int x, int y, int z) {
chunk->vb = 0; chunk->vb = 0;
#endif #endif
chunk->visible = true; chunk->empty = false; chunk->visible = true;
chunk->pendingDelete = false; chunk->allAir = false; chunk->empty = false;
chunk->dirty = false;
chunk->allAir = false;
chunk->noData = true;
chunk->drawXMin = false; chunk->drawXMax = false; chunk->drawZMin = false; chunk->drawXMin = false; chunk->drawXMax = false; chunk->drawZMin = false;
chunk->drawZMax = false; chunk->drawYMin = false; chunk->drawYMax = false; chunk->drawZMax = false; chunk->drawYMin = false; chunk->drawYMax = false;
@ -313,7 +317,9 @@ static void DeleteChunk(struct ChunkInfo* info) {
Gfx_DeleteVb(&info->vb); Gfx_DeleteVb(&info->vb);
#endif #endif
info->empty = false; info->allAir = false; info->empty = false;
info->allAir = false;
info->noData = true;
#ifdef OCCLUSION #ifdef OCCLUSION
info.OcclusionFlags = 0; info.OcclusionFlags = 0;
info.OccludedFlags = 0; info.OccludedFlags = 0;
@ -351,12 +357,12 @@ static void BuildChunk(struct ChunkInfo* info, int* chunkUpdates) {
Game.ChunkUpdates++; Game.ChunkUpdates++;
(*chunkUpdates)++; (*chunkUpdates)++;
info->pendingDelete = false;
Builder_MakeChunk(info); Builder_MakeChunk(info);
if (!info->normalParts && !info->translucentParts) { info->dirty = false;
info->empty = true; return; info->noData = !info->normalParts && !info->translucentParts;
} info->empty = info->noData;
if (info->empty) return;
if (info->normalParts) { if (info->normalParts) {
ptr = info->normalParts; ptr = info->normalParts;
@ -545,13 +551,13 @@ static int UpdateChunksAndVisibility(int* chunkUpdates) {
if (info->empty) continue; if (info->empty) continue;
distSqr = distances[i]; distSqr = distances[i];
noData = !info->normalParts && !info->translucentParts; noData = info->noData;
/* Auto unload chunks far away chunks */ /* Auto unload chunks far away chunks */
if (!noData && distSqr >= buildDistSqr + 32 * 16) { if (!noData && distSqr >= buildDistSqr + 32 * 16) {
DeleteChunk(info); continue; DeleteChunk(info); continue;
} }
noData |= info->pendingDelete; noData |= info->dirty;
if (noData && distSqr <= buildDistSqr && *chunkUpdates < chunksTarget) { if (noData && distSqr <= buildDistSqr && *chunkUpdates < chunksTarget) {
DeleteChunk(info); DeleteChunk(info);
@ -578,13 +584,13 @@ static int UpdateChunksStill(int* chunkUpdates) {
if (info->empty) continue; if (info->empty) continue;
distSqr = distances[i]; distSqr = distances[i];
noData = !info->normalParts && !info->translucentParts; noData = info->noData;
/* Auto unload chunks far away chunks */ /* Auto unload chunks far away chunks */
if (!noData && distSqr >= buildDistSqr + 32 * 16) { if (!noData && distSqr >= buildDistSqr + 32 * 16) {
DeleteChunk(info); continue; DeleteChunk(info); continue;
} }
noData |= info->pendingDelete; noData |= info->dirty;
if (noData && distSqr <= buildDistSqr && *chunkUpdates < chunksTarget) { if (noData && distSqr <= buildDistSqr && *chunkUpdates < chunksTarget) {
DeleteChunk(info); DeleteChunk(info);
@ -700,8 +706,8 @@ void MapRenderer_RefreshChunk(int cx, int cy, int cz) {
info = &mapChunks[World_ChunkPack(cx, cy, cz)]; info = &mapChunks[World_ChunkPack(cx, cy, cz)];
if (info->allAir) return; /* do not recreate chunks completely air */ if (info->allAir) return; /* do not recreate chunks completely air */
info->empty = false; info->empty = false;
info->pendingDelete = true; info->dirty = true;
} }
void MapRenderer_OnBlockChanged(int x, int y, int z, BlockID block) { void MapRenderer_OnBlockChanged(int x, int y, int z, BlockID block) {

11
src/MapRenderer.h
View file

@ -34,11 +34,12 @@ struct ChunkPartInfo {
struct ChunkInfo { struct ChunkInfo {
cc_uint16 centreX, centreY, centreZ; /* Centre coordinates of the chunk */ cc_uint16 centreX, centreY, centreZ; /* Centre coordinates of the chunk */
cc_uint8 visible : 1; /* Whether chunk is visible to the player */ cc_uint8 visible : 1; /* Whether chunk is visible to the player */
cc_uint8 empty : 1; /* Whether the chunk is empty of data */ cc_uint8 empty : 1; /* Whether the chunk is empty of data and is known to have no data */
cc_uint8 pendingDelete : 1; /* Whether chunk is pending deletion */ cc_uint8 dirty : 1; /* Whether chunk is pending being rebuilt */
cc_uint8 allAir : 1; /* Whether chunk is completely air */ cc_uint8 allAir : 1; /* Whether chunk is completely air */
cc_uint8 : 0; /* pad to next byte*/ cc_uint8 noData : 1; /* Whether the chunk is currently empty of data, but may have data if built */
cc_uint8 : 0; /* pad to next byte*/
cc_uint8 drawXMin : 1; cc_uint8 drawXMin : 1;
cc_uint8 drawXMax : 1; cc_uint8 drawXMax : 1;