AstralTransRocketries/ClassiCube
1
0
Fork 0
mirror of https://github.com/ClassiCube/ClassiCube.git synced 2025-09-16 02:56:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix issue with non 32bpp skins crashing the client.

Browse Source
This commit is contained in:
UnknownShadow200 2015-09-19 19:39:12 +10:00
parent ee16d19678
commit c756094023
2 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
ClassicalSharp/GraphicsAPI/IGraphicsApi.cs
View File

@ -19,10 +19,24 @@ namespace ClassicalSharp.GraphicsAPI {
public int CreateTexture( Bitmap bmp ) { public int CreateTexture( Bitmap bmp ) {
Rectangle rec = new Rectangle( 0, 0, bmp.Width, bmp.Height ); Rectangle rec = new Rectangle( 0, 0, bmp.Width, bmp.Height );
BitmapData data = bmp.LockBits( rec, ImageLockMode.ReadOnly, bmp.PixelFormat ); // Convert other pixel formats into 32bpp formats.
int texId = CreateTexture( data.Width, data.Height, data.Scan0 ); if( !FastBitmap.CheckFormat( bmp.PixelFormat ) ) {
bmp.UnlockBits( data ); Utils.LogDebug( "Converting " + bmp.PixelFormat + " into 32bpp image" );
return texId; using( Bitmap _32bmp = new Bitmap( bmp.Width, bmp.Height ) ) {
using( Graphics g = Graphics.FromImage( _32bmp ) )
g.DrawImage( bmp, 0, 0, bmp.Width, bmp.Height );
BitmapData data = _32bmp.LockBits( rec, ImageLockMode.ReadOnly, _32bmp.PixelFormat );
int texId = CreateTexture( data.Width, data.Height, data.Scan0 );
_32bmp.UnlockBits( data );
return texId;
}
} else {
BitmapData data = bmp.LockBits( rec, ImageLockMode.ReadOnly, bmp.PixelFormat );
int texId = CreateTexture( data.Width, data.Height, data.Scan0 );
bmp.UnlockBits( data );
return texId;
}
} }
public int CreateTexture( FastBitmap bmp ) { public int CreateTexture( FastBitmap bmp ) {
@ -179,7 +193,7 @@ namespace ClassicalSharp.GraphicsAPI {
public virtual void Draw2DQuad( float x, float y, float width, float height, FastColour col ) { public virtual void Draw2DQuad( float x, float y, float width, float height, FastColour col ) {
quadVerts[0] = new VertexPos3fCol4b( x, y, 0, col ); quadVerts[0] = new VertexPos3fCol4b( x, y, 0, col );
quadVerts[1] = new VertexPos3fCol4b( x + width, y, 0, col ); quadVerts[1] = new VertexPos3fCol4b( x + width, y, 0, col );
quadVerts[2] = new VertexPos3fCol4b( x + width, y + height, 0, col ); quadVerts[2] = new VertexPos3fCol4b( x + width, y + height, 0, col );
quadVerts[3] = new VertexPos3fCol4b( x, y + height, 0, col ); quadVerts[3] = new VertexPos3fCol4b( x, y + height, 0, col );
BeginVbBatch( VertexFormat.Pos3fCol4b ); BeginVbBatch( VertexFormat.Pos3fCol4b );
DrawDynamicIndexedVb( DrawMode.Triangles, quadVb, quadVerts, 4, 6 ); DrawDynamicIndexedVb( DrawMode.Triangles, quadVb, quadVerts, 4, 6 );
@ -199,7 +213,7 @@ namespace ClassicalSharp.GraphicsAPI {
#endif #endif
texVerts[0] = new VertexPos3fTex2f( x1, y1, 0, tex.U1, tex.V1 ); texVerts[0] = new VertexPos3fTex2f( x1, y1, 0, tex.U1, tex.V1 );
texVerts[1] = new VertexPos3fTex2f( x2, y1, 0, tex.U2, tex.V1 ); texVerts[1] = new VertexPos3fTex2f( x2, y1, 0, tex.U2, tex.V1 );
texVerts[2] = new VertexPos3fTex2f( x2, y2, 0, tex.U2, tex.V2 ); texVerts[2] = new VertexPos3fTex2f( x2, y2, 0, tex.U2, tex.V2 );
texVerts[3] = new VertexPos3fTex2f( x1, y2, 0, tex.U1, tex.V2 ); texVerts[3] = new VertexPos3fTex2f( x1, y2, 0, tex.U1, tex.V2 );
BeginVbBatch( VertexFormat.Pos3fTex2f ); BeginVbBatch( VertexFormat.Pos3fTex2f );
DrawDynamicIndexedVb( DrawMode.Triangles, texVb, texVerts, 4, 6 ); DrawDynamicIndexedVb( DrawMode.Triangles, texVb, texVerts, 4, 6 );

7
ClassicalSharp/Utils/FastBitmap.cs
View File

@ -34,14 +34,17 @@ namespace ClassicalSharp {
public int Stride; public int Stride;
public int Width, Height; public int Width, Height;
public static bool CheckFormat( PixelFormat format ) {
return format == PixelFormat.Format32bppRgb || format == PixelFormat.Format32bppArgb;
}
public void LockBits() { public void LockBits() {
if( Bitmap == null ) throw new InvalidOperationException( "Underlying bitmap is null." ); if( Bitmap == null ) throw new InvalidOperationException( "Underlying bitmap is null." );
if( data != null ) return; if( data != null ) return;
PixelFormat format = Bitmap.PixelFormat; PixelFormat format = Bitmap.PixelFormat;
if( !( format == PixelFormat.Format32bppArgb || format == PixelFormat.Format32bppRgb ) ) { if( !CheckFormat( format ) )
throw new NotSupportedException( "Unsupported bitmap pixel format: " + format ); throw new NotSupportedException( "Unsupported bitmap pixel format: " + format );
}
Rectangle rec = new Rectangle( 0, 0, Bitmap.Width, Bitmap.Height ); Rectangle rec = new Rectangle( 0, 0, Bitmap.Width, Bitmap.Height );
data = Bitmap.LockBits( rec, ImageLockMode.ReadWrite, format ); data = Bitmap.LockBits( rec, ImageLockMode.ReadWrite, format );