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

Quick fix for commit 8956cc5abdd346b6f3f71549abe37ff3f3a63689

Browse Source
This commit is contained in:
UnknownShadow200 2016-04-20 11:40:07 +10:00
parent 3b5f676a7a
commit 02d861b275
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ClassicalSharp/Rendering/ChunkUpdater.cs
View File

@ -13,7 +13,6 @@ namespace ClassicalSharp.Renderers {
Game game; Game game;
IGraphicsApi api; IGraphicsApi api;
int _1DUsed = 1;
ChunkMeshBuilder builder; ChunkMeshBuilder builder;
BlockInfo info; BlockInfo info;
@ -26,14 +25,15 @@ namespace ClassicalSharp.Renderers {
public ChunkUpdater( Game game, MapRenderer renderer ) { public ChunkUpdater( Game game, MapRenderer renderer ) {
this.game = game; this.game = game;
this.renderer = renderer; this.renderer = renderer;
_1DUsed = game.TerrainAtlas1D.CalcMaxUsedRow( game.TerrainAtlas, game.BlockInfo ); info = game.BlockInfo;
renderer._1DUsed = game.TerrainAtlas1D.CalcMaxUsedRow( game.TerrainAtlas, info );
renderer.totalUsed = new int[game.TerrainAtlas1D.TexIds.Length]; renderer.totalUsed = new int[game.TerrainAtlas1D.TexIds.Length];
RecalcBooleans( true ); RecalcBooleans( true );
builder = new ChunkMeshBuilder( game ); builder = new ChunkMeshBuilder( game );
api = game.Graphics; api = game.Graphics;
elementsPerBitmap = game.TerrainAtlas1D.elementsPerBitmap; elementsPerBitmap = game.TerrainAtlas1D.elementsPerBitmap;
info = game.BlockInfo;
game.Events.TerrainAtlasChanged += TerrainAtlasChanged; game.Events.TerrainAtlasChanged += TerrainAtlasChanged;
game.WorldEvents.OnNewMap += OnNewMap; game.WorldEvents.OnNewMap += OnNewMap;
@ -95,14 +95,14 @@ namespace ClassicalSharp.Renderers {
void TerrainAtlasChanged( object sender, EventArgs e ) { void TerrainAtlasChanged( object sender, EventArgs e ) {
bool refreshRequired = elementsPerBitmap != game.TerrainAtlas1D.elementsPerBitmap; bool refreshRequired = elementsPerBitmap != game.TerrainAtlas1D.elementsPerBitmap;
elementsPerBitmap = game.TerrainAtlas1D.elementsPerBitmap; elementsPerBitmap = game.TerrainAtlas1D.elementsPerBitmap;
_1DUsed = game.TerrainAtlas1D.CalcMaxUsedRow( game.TerrainAtlas, game.BlockInfo ); renderer._1DUsed = game.TerrainAtlas1D.CalcMaxUsedRow( game.TerrainAtlas, info );
if( refreshRequired ) Refresh(); if( refreshRequired ) Refresh();
RecalcBooleans( true ); RecalcBooleans( true );
} }
void BlockDefinitionChanged( object sender, EventArgs e ) { void BlockDefinitionChanged( object sender, EventArgs e ) {
_1DUsed = game.TerrainAtlas1D.CalcMaxUsedRow( game.TerrainAtlas, game.BlockInfo ); renderer._1DUsed = game.TerrainAtlas1D.CalcMaxUsedRow( game.TerrainAtlas, info );
RecalcBooleans( true ); RecalcBooleans( true );
Refresh(); Refresh();
} }
@ -130,14 +130,15 @@ namespace ClassicalSharp.Renderers {
} }
internal void RecalcBooleans( bool sizeChanged ) { internal void RecalcBooleans( bool sizeChanged ) {
int used = renderer._1DUsed;
if( sizeChanged ) { if( sizeChanged ) {
renderer.usedTranslucent = new bool[_1DUsed]; renderer.usedTranslucent = new bool[used];
renderer.usedNormal = new bool[_1DUsed]; renderer.usedNormal = new bool[used];
renderer.pendingTranslucent = new bool[_1DUsed]; renderer.pendingTranslucent = new bool[used];
renderer.pendingNormal = new bool[_1DUsed]; renderer.pendingNormal = new bool[used];
} }
for( int i = 0; i < _1DUsed; i++ ) { for( int i = 0; i < used; i++ ) {
renderer.pendingTranslucent[i] = true; renderer.pendingTranslucent[i] = true;
renderer.usedTranslucent[i] = false; renderer.usedTranslucent[i] = false;
renderer.pendingNormal[i] = true; renderer.pendingNormal[i] = true;

2
ClassicalSharp/Rendering/MapRenderer.cs
View File

@ -31,8 +31,8 @@ namespace ClassicalSharp.Renderers {
Game game; Game game;
IGraphicsApi api; IGraphicsApi api;
int _1DUsed = 1;
internal int _1DUsed = 1;
internal ChunkInfo[] chunks, unsortedChunks; internal ChunkInfo[] chunks, unsortedChunks;
internal bool[] usedTranslucent, usedNormal; internal bool[] usedTranslucent, usedNormal;
internal bool[] pendingTranslucent, pendingNormal; internal bool[] pendingTranslucent, pendingNormal;