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

Less hardcoding.

Browse Source
This commit is contained in:
UnknownShadow200 2015-04-26 08:26:31 +10:00
parent a559613198
commit 08b7bdb854
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
GraphicsAPI/OpenGLApi.cs
View File

@ -369,9 +369,6 @@ namespace ClassicalSharp.GraphicsAPI {
public override void DeleteIndexedVb( IndexedVbInfo id ) { public override void DeleteIndexedVb( IndexedVbInfo id ) {
if( id.Vb <= 0 && id.Ib <= 0 ) return; if( id.Vb <= 0 && id.Ib <= 0 ) return;
#if TRACK_RESOURCES
vbs.Remove( id );
#endif
if( !useVbos ) { if( !useVbos ) {
GL.DeleteLists( id.Vb, 1 ); GL.DeleteLists( id.Vb, 1 );
return; return;

27
MeshBuilders/ChunkMeshBuilder.cs
View File

@ -11,6 +11,9 @@ namespace ClassicalSharp {
protected Map map; protected Map map;
public Game Window; public Game Window;
public IGraphicsApi Graphics; public IGraphicsApi Graphics;
const int chunkSize = 16, extChunkSize = 18;
const int chunkSize2 = 16 * 16, extChunkSize2 = 18 * 18;
const int chunkSize3 = 16 * 16 * 16, extChunkSize3 = 18 * 18 * 18;
public ChunkMeshBuilder( Game window ) { public ChunkMeshBuilder( Game window ) {
Window = window; Window = window;
@ -20,8 +23,8 @@ namespace ClassicalSharp {
protected int width, length, height; protected int width, length, height;
protected int maxX, maxY, maxZ; protected int maxX, maxY, maxZ;
protected byte[] counts = new byte[16 * 16 * 16 * 6]; protected byte[] counts = new byte[chunkSize3 * 6];
protected byte[] chunk = new byte[( 16 + 2 ) * ( 16 + 2 ) * ( 16 + 2 )]; protected byte[] chunk = new byte[extChunkSize3];
public virtual bool UsesLighting { public virtual bool UsesLighting {
get { return false; } get { return false; }
@ -34,13 +37,13 @@ namespace ClassicalSharp {
Stretch( x1, y1, z1 ); Stretch( x1, y1, z1 );
PostStretchTiles( x1, y1, z1 ); PostStretchTiles( x1, y1, z1 );
int xMax = Math.Min( width, x1 + 16 ); int xMax = Math.Min( width, x1 + chunkSize );
int yMax = Math.Min( height, y1 + 16 ); int yMax = Math.Min( height, y1 + chunkSize );
int zMax = Math.Min( length, z1 + 16 ); int zMax = Math.Min( length, z1 + chunkSize );
for( int y = y1, yy = 0; y < yMax; y++, yy++ ) { for( int y = y1, yy = 0; y < yMax; y++, yy++ ) {
for( int z = z1, zz = 0; z < zMax; z++, zz++ ) { for( int z = z1, zz = 0; z < zMax; z++, zz++ ) {
int chunkIndex = ( yy + 1 ) * 324 + ( zz + 1 ) * 18 + ( -1 + 1 ); int chunkIndex = ( yy + 1 ) * extChunkSize2 + ( zz + 1 ) * extChunkSize + ( -1 + 1 );
for( int x = x1, xx = 0; x < xMax; x++, xx++ ) { for( int x = x1, xx = 0; x < xMax; x++, xx++ ) {
chunkIndex++; chunkIndex++;
RenderTile( chunkIndex, xx, yy, zz, x, y, z ); RenderTile( chunkIndex, xx, yy, zz, x, y, z );
@ -55,7 +58,7 @@ namespace ClassicalSharp {
fixed( byte* chunkPtr = chunk, mapPtr = map.mapData ) { fixed( byte* chunkPtr = chunk, mapPtr = map.mapData ) {
int* chunkIntPtr = (int*)chunkPtr; int* chunkIntPtr = (int*)chunkPtr;
for( int i = 0; i < ( 18 * 18 * 18 ) / 4; i++ ) { for( int i = 0; i < extChunkSize3 / 4; i++ ) {
*chunkIntPtr++ = 0; *chunkIntPtr++ = 0;
} }
@ -69,7 +72,7 @@ namespace ClassicalSharp {
if( z > maxZ ) break; if( z > maxZ ) break;
int index = ( y * length + z ) * width + ( x1 - 1 - 1 ); int index = ( y * length + z ) * width + ( x1 - 1 - 1 );
int chunkIndex = ( yy + 1 ) * 324 + ( zz + 1 ) * 18 + ( -1 ); int chunkIndex = ( yy + 1 ) * extChunkSize2 + ( zz + 1 ) * extChunkSize + ( -1 );
for( int xx = -1; xx < 17; xx++ ) { for( int xx = -1; xx < 17; xx++ ) {
int x = xx + x1; int x = xx + x1;
@ -155,13 +158,13 @@ namespace ClassicalSharp {
counts[i] = 1; counts[i] = 1;
} }
int xMax = Math.Min( width, x1 + 16 ); int xMax = Math.Min( width, x1 + chunkSize );
int yMax = Math.Min( height, y1 + 16 ); int yMax = Math.Min( height, y1 + chunkSize );
int zMax = Math.Min( length, z1 + 16 ); int zMax = Math.Min( length, z1 + chunkSize );
for( int y = y1, yy = 0; y < yMax; y++, yy++ ) { for( int y = y1, yy = 0; y < yMax; y++, yy++ ) {
for( int z = z1, zz = 0; z < zMax; z++, zz++ ) { for( int z = z1, zz = 0; z < zMax; z++, zz++ ) {
int chunkIndex = ( yy + 1 ) * 324 + ( zz + 1 ) * 18 + ( -1 + 1 ); int chunkIndex = ( yy + 1 ) * extChunkSize2 + ( zz + 1 ) * extChunkSize + ( -1 + 1 );
for( int x = x1, xx = 0; x < xMax; x++, xx++ ) { for( int x = x1, xx = 0; x < xMax; x++, xx++ ) {
chunkIndex++; chunkIndex++;
byte tile = chunk[chunkIndex]; byte tile = chunk[chunkIndex];