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

Prefer stale to deleted chunks

Browse source
This commit is contained in:
UnknownShadow200 2017-02-19 11:10:24 +11:00
parent 612e9f1a6d
commit 3fad8450b7
2 changed files with 23 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
ClassicalSharp/Rendering/ChunkUpdater.cs
View file

@ -259,7 +259,7 @@ namespace ClassicalSharp.Renderers {
ResetNeighbour(x, y, z + 1, block, cx, cy, cz + 1, minCy, maxCy);
}
bool Needs(BlockID block, BlockID other) {
bool Needs(BlockID block, BlockID other) {
return info.Draw[block] != DrawType.Opaque || info.Draw[other] != DrawType.Gas;
}
@ -303,17 +303,20 @@ namespace ClassicalSharp.Renderers {
void ResetChunk(int cx, int cy, int cz) {
if (cx < 0 || cy < 0 || cz < 0 ||
cx >= chunksX || cy >= chunksY || cz >= chunksZ) return;
DeleteChunk(renderer.unsortedChunks[cx + chunksX * (cy + cz * chunksY)], true);
cx >= chunksX || cy >= chunksY || cz >= chunksZ) return;
ChunkInfo info = renderer.unsortedChunks[cx + chunksX * (cy + cz * chunksY)];
info.Empty = false;
info.PendingDelete = true;
}
int chunksTarget = 4;
int chunksTarget = 12;
const double targetTime = (1.0 / 30) + 0.01;
public void UpdateChunks(double delta) {
int chunkUpdates = 0;
chunksTarget += delta < targetTime ? 1 : -1; // build more chunks if 30 FPS or over, otherwise slowdown.
Utils.Clamp(ref chunksTarget, 4, 16);
Utils.Clamp(ref chunksTarget, 4, 20);
LocalPlayer p = game.LocalPlayer;
Vector3 cameraPos = game.CurrentCameraPos;
@ -346,8 +349,10 @@ namespace ClassicalSharp.Renderers {
if (!noData && distSqr >= userDistSqr + 32 * 16) {
DeleteChunk(info, true); continue;
}
noData |= info.PendingDelete;
if (noData && distSqr <= viewDistSqr && chunkUpdates < chunksTarget) {
DeleteChunk(info, true);
BuildChunk(info, ref chunkUpdates);
}
info.Visible = distSqr <= viewDistSqr &&
@ -372,15 +377,16 @@ namespace ClassicalSharp.Renderers {
if (!noData && distSqr >= userDistSqr + 32 * 16) {
DeleteChunk(info, true); continue;
}
noData |= info.PendingDelete;
if (noData) {
if (distSqr <= userDistSqr && chunkUpdates < chunksTarget) {
BuildChunk(info, ref chunkUpdates);
// only need to update the visibility of chunks in range.
info.Visible = distSqr <= viewDistSqr &&
game.Culling.SphereInFrustum(info.CentreX, info.CentreY, info.CentreZ, 14); // 14 ~ sqrt(3 * 8^2)
if (info.Visible && !info.Empty) { render[j] = info; j++; }
}
if (noData && distSqr <= userDistSqr && chunkUpdates < chunksTarget) {
DeleteChunk(info, true);
BuildChunk(info, ref chunkUpdates);
// only need to update the visibility of chunks in range.
info.Visible = distSqr <= viewDistSqr &&
game.Culling.SphereInFrustum(info.CentreX, info.CentreY, info.CentreZ, 14); // 14 ~ sqrt(3 * 8^2)
if (info.Visible && !info.Empty) { render[j] = info; j++; }
} else if (info.Visible) {
render[j] = info; j++;
}

11
ClassicalSharp/Rendering/MapRenderer.cs
View file

@ -12,7 +12,8 @@ namespace ClassicalSharp.Renderers {
public class ChunkInfo {
public ushort CentreX, CentreY, CentreZ;
public bool Visible = true, Empty = false;
public bool Visible, Empty, PendingDelete;
public bool DrawLeft, DrawRight, DrawFront, DrawBack, DrawBottom, DrawTop;
#if OCCLUSION
public bool Visited = false, Occluded = false;
@ -22,18 +23,14 @@ namespace ClassicalSharp.Renderers {
public ChunkPartInfo[] NormalParts;
public ChunkPartInfo[] TranslucentParts;
public ChunkInfo(int x, int y, int z) {
CentreX = (ushort)(x + 8);
CentreY = (ushort)(y + 8);
CentreZ = (ushort)(z + 8);
}
public ChunkInfo(int x, int y, int z) { Reset(x, y, z); }
public void Reset(int x, int y, int z) {
CentreX = (ushort)(x + 8);
CentreY = (ushort)(y + 8);
CentreZ = (ushort)(z + 8);
Visible = true; Empty = false;
Visible = true; Empty = false; PendingDelete = false;
DrawLeft = false; DrawRight = false; DrawFront = false;
DrawBack = false; DrawBottom = false; DrawTop = false;
}