AstralTransRocketries/ClassiCube
1
0
Fork 0
mirror of https://github.com/ClassiCube/ClassiCube.git synced 2025-09-17 03:25:14 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix client crashing when switching to a texture pack with less used 1D atlases. (Thanks MrGoober)

Browse Source
This commit is contained in:
UnknownShadow200 2016-04-20 16:04:12 +10:00
parent 02d861b275
commit 0920837bcb
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ClassicalSharp/Rendering/ChunkUpdater.cs
View File

@ -77,7 +77,7 @@ namespace ClassicalSharp.Renderers {
{ {
bool isBorder = x == 0 || z == 0 || x == (chunksX - 1) || z == (chunksZ - 1); bool isBorder = x == 0 || z == 0 || x == (chunksX - 1) || z == (chunksZ - 1);
if( isBorder && (y * 16) < clipLevel ) if( isBorder && (y * 16) < clipLevel )
DeleteChunk( renderer.unsortedChunks[index] ); DeleteChunk( renderer.unsortedChunks[index], true );
index++; index++;
} }
} }
@ -168,22 +168,22 @@ namespace ClassicalSharp.Renderers {
void ClearChunkCache() { void ClearChunkCache() {
if( renderer.chunks == null ) return; if( renderer.chunks == null ) return;
for( int i = 0; i < renderer.chunks.Length; i++ ) for( int i = 0; i < renderer.chunks.Length; i++ )
DeleteChunk( renderer.chunks[i] ); DeleteChunk( renderer.chunks[i], false );
renderer.totalUsed = new int[game.TerrainAtlas1D.TexIds.Length]; renderer.totalUsed = new int[game.TerrainAtlas1D.TexIds.Length];
} }
void DeleteChunk( ChunkInfo info ) { void DeleteChunk( ChunkInfo info, bool decUsed ) {
info.Empty = false; info.Empty = false;
#if OCCLUSION #if OCCLUSION
info.OcclusionFlags = 0; info.OcclusionFlags = 0;
info.OccludedFlags = 0; info.OccludedFlags = 0;
#endif #endif
DeleteData( ref info.NormalParts ); DeleteData( ref info.NormalParts, decUsed );
DeleteData( ref info.TranslucentParts ); DeleteData( ref info.TranslucentParts, decUsed );
} }
void DeleteData( ref ChunkPartInfo[] parts ) { void DeleteData( ref ChunkPartInfo[] parts, bool decUsed ) {
DecrementUsed( parts ); if( decUsed ) DecrementUsed( parts );
if( parts == null ) return; if( parts == null ) return;
for( int i = 0; i < parts.Length; i++ ) for( int i = 0; i < parts.Length; i++ )
@ -253,7 +253,7 @@ namespace ClassicalSharp.Renderers {
void ResetChunk( int cx, int cy, int cz ) { void ResetChunk( int cx, int cy, int cz ) {
if( cx < 0 || cy < 0 || cz < 0 || if( cx < 0 || cy < 0 || cz < 0 ||
cx >= chunksX || cy >= chunksY || cz >= chunksZ ) return; cx >= chunksX || cy >= chunksY || cz >= chunksZ ) return;
DeleteChunk( renderer.unsortedChunks[cx + chunksX * ( cy + cz * chunksY )] ); DeleteChunk( renderer.unsortedChunks[cx + chunksX * ( cy + cz * chunksY )], true );
} }
int chunksTarget = 4; int chunksTarget = 4;