AstralTransRocketries/ClassiCube
1
0
Fork 0
mirror of https://github.com/ClassiCube/ClassiCube.git synced 2025-09-15 10:35:11 -04:00
Code Issues Packages Projects Releases Wiki Activity

Respect whether a block is 'full bright' for block models.

Browse Source
This commit is contained in:
UnknownShadow200 2015-12-01 16:58:43 +11:00
parent 59d0b2da74
commit 5987d152b1
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ClassicalSharp/2D/Screens/ChatScreen.cs
View File

@ -88,7 +88,7 @@ namespace ClassicalSharp {
fontSize = (int)(14 * game.GuiScale); fontSize = (int)(14 * game.GuiScale);
Utils.Clamp( ref fontSize, 8, 60 ); Utils.Clamp( ref fontSize, 8, 60 );
announcementFont = new Font( "Arial", fontSize ); announcementFont = new Font( "Arial", fontSize );
blockSize = (int)(40 * game.GuiScale); blockSize = (int)(23 * 2 * game.GuiScale);
textInput = new TextInputWidget( game, chatFont, chatInputFont ); textInput = new TextInputWidget( game, chatFont, chatInputFont );
textInput.YOffset = blockSize + 5; textInput.YOffset = blockSize + 5;
@ -182,7 +182,7 @@ namespace ClassicalSharp {
public override void OnResize( int oldWidth, int oldHeight, int width, int height ) { public override void OnResize( int oldWidth, int oldHeight, int width, int height ) {
announcementTex.X1 += (width - oldWidth) / 2; announcementTex.X1 += (width - oldWidth) / 2;
announcementTex.Y1 += (height - oldHeight) / 2; announcementTex.Y1 += (height - oldHeight) / 2;
blockSize = (int)(40 * game.GuiScale); blockSize = (int)(23 * 2 * game.GuiScale);
textInput.YOffset = blockSize + 5; textInput.YOffset = blockSize + 5;
bottomRight.YOffset = blockSize * 3 / 2; bottomRight.YOffset = blockSize * 3 / 2;

10
ClassicalSharp/Model/BlockModel.cs
View File

@ -11,6 +11,7 @@ namespace ClassicalSharp.Model {
float blockHeight; float blockHeight;
TerrainAtlas1D atlas; TerrainAtlas1D atlas;
const float adjust = 0.1f, extent = 0.5f; const float adjust = 0.1f, extent = 0.5f;
bool bright;
public BlockModel( Game game ) : base( game ) { public BlockModel( Game game ) : base( game ) {
} }
@ -55,6 +56,7 @@ namespace ClassicalSharp.Model {
lastTexId = -1; lastTexId = -1;
blockHeight = game.BlockInfo.Height[block]; blockHeight = game.BlockInfo.Height[block];
atlas = game.TerrainAtlas1D; atlas = game.TerrainAtlas1D;
bright = game.BlockInfo.FullBright[block];
if( game.BlockInfo.IsSprite[block] ) { if( game.BlockInfo.IsSprite[block] ) {
SpriteXQuad( TileSide.Right, true ); SpriteXQuad( TileSide.Right, true );
@ -83,7 +85,7 @@ namespace ClassicalSharp.Model {
int texId = game.BlockInfo.GetTextureLoc( block, side ), texIndex = 0; int texId = game.BlockInfo.GetTextureLoc( block, side ), texIndex = 0;
TextureRec rec = atlas.GetTexRec( texId, 1, out texIndex ); TextureRec rec = atlas.GetTexRec( texId, 1, out texIndex );
FlushIfNotSame( texIndex ); FlushIfNotSame( texIndex );
FastColour col = FastColour.Scale( this.col, shade ); FastColour col = bright ? FastColour.White : FastColour.Scale( this.col, shade );
cache.vertices[index++] = new VertexPos3fTex2fCol4b( -extent, y, -extent, rec.U1, rec.V1, col ); cache.vertices[index++] = new VertexPos3fTex2fCol4b( -extent, y, -extent, rec.U1, rec.V1, col );
cache.vertices[index++] = new VertexPos3fTex2fCol4b( extent, y, -extent, rec.U2, rec.V1, col ); cache.vertices[index++] = new VertexPos3fTex2fCol4b( extent, y, -extent, rec.U2, rec.V1, col );
@ -95,7 +97,7 @@ namespace ClassicalSharp.Model {
int texId = game.BlockInfo.GetTextureLoc( block, side ), texIndex = 0; int texId = game.BlockInfo.GetTextureLoc( block, side ), texIndex = 0;
TextureRec rec = atlas.GetTexRec( texId, 1, out texIndex ); TextureRec rec = atlas.GetTexRec( texId, 1, out texIndex );
FlushIfNotSame( texIndex ); FlushIfNotSame( texIndex );
FastColour col = FastColour.Scale( this.col, shade ); FastColour col = bright ? FastColour.White : FastColour.Scale( this.col, shade );
if( blockHeight != 1 ) if( blockHeight != 1 )
rec.V2 = rec.V1 + blockHeight * atlas.invElementSize * (15.99f/16f); rec.V2 = rec.V1 + blockHeight * atlas.invElementSize * (15.99f/16f);
@ -111,7 +113,7 @@ namespace ClassicalSharp.Model {
int texId = game.BlockInfo.GetTextureLoc( block, side ), texIndex = 0; int texId = game.BlockInfo.GetTextureLoc( block, side ), texIndex = 0;
TextureRec rec = atlas.GetTexRec( texId, 1, out texIndex ); TextureRec rec = atlas.GetTexRec( texId, 1, out texIndex );
FlushIfNotSame( texIndex ); FlushIfNotSame( texIndex );
FastColour col = FastColour.Scale( this.col, shade ); FastColour col = bright ? FastColour.White : FastColour.Scale( this.col, shade );
if( blockHeight != 1 ) if( blockHeight != 1 )
rec.V2 = rec.V1 + blockHeight * atlas.invElementSize * (15.99f/16f); rec.V2 = rec.V1 + blockHeight * atlas.invElementSize * (15.99f/16f);
@ -129,6 +131,7 @@ namespace ClassicalSharp.Model {
FlushIfNotSame( texIndex ); FlushIfNotSame( texIndex );
if( blockHeight != 1 ) if( blockHeight != 1 )
rec.V2 = rec.V1 + blockHeight * atlas.invElementSize * (15.99f/16f); rec.V2 = rec.V1 + blockHeight * atlas.invElementSize * (15.99f/16f);
FastColour col = bright ? FastColour.White : this.col;
float p1, p2; float p1, p2;
if( firstPart ) { // Need to break into two quads for when drawing a sprite model in hand. if( firstPart ) { // Need to break into two quads for when drawing a sprite model in hand.
@ -148,6 +151,7 @@ namespace ClassicalSharp.Model {
FlushIfNotSame( texIndex ); FlushIfNotSame( texIndex );
if( blockHeight != 1 ) if( blockHeight != 1 )
rec.V2 = rec.V1 + blockHeight * atlas.invElementSize * (15.99f/16f); rec.V2 = rec.V1 + blockHeight * atlas.invElementSize * (15.99f/16f);
FastColour col = bright ? FastColour.White : this.col;
float x1, x2, z1, z2; float x1, x2, z1, z2;
if( firstPart ) { if( firstPart ) {