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

Fix issues with tinted full bright blocks. (Thanks setey1)

Browse Source
This commit is contained in:
UnknownShadow200 2017-01-08 11:37:04 +11:00
parent e820ddc6a8
commit fd6fbe5582
2 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ClassicalSharp/Entities/Model/BlockModel.cs
View File

@ -75,8 +75,10 @@ namespace ClassicalSharp.Model {
return base.RenderDistance(p);
}
int lastTexId = -1;
int lastTexId = -1, brightCol;
protected override void DrawModel(Player p) {
brightCol = FastColour.WhitePacked;
// TODO: using 'is' is ugly, but means we can avoid creating
// a string every single time held block changes.
if (p is FakePlayer) {
@ -99,6 +101,8 @@ namespace ClassicalSharp.Model {
if (game.BlockInfo.Tinted[block]) {
FastColour fogCol = game.BlockInfo.FogColour[block];
brightCol = fogCol.Pack();
FastColour newCol = FastColour.Unpack(col);
newCol *= fogCol;
col = newCol.Pack();
@ -186,7 +190,7 @@ namespace ClassicalSharp.Model {
int texId = game.BlockInfo.GetTextureLoc(block, side), texIndex = 0;
TextureRec rec = atlas.GetTexRec(texId, 1, out texIndex);
FlushIfNotSame(texIndex);
int col = bright ? FastColour.WhitePacked : (NoShade ? this.col : FastColour.ScalePacked(this.col, shade));
int col = bright ? brightCol : (NoShade ? this.col : FastColour.ScalePacked(this.col, shade));
float vOrigin = (texId % atlas.elementsPerAtlas1D) * atlas.invElementSize;
rec.U1 = minBB.X; rec.U2 = maxBB.X;
@ -203,7 +207,7 @@ namespace ClassicalSharp.Model {
int texId = game.BlockInfo.GetTextureLoc(block, side), texIndex = 0;
TextureRec rec = atlas.GetTexRec(texId, 1, out texIndex);
FlushIfNotSame(texIndex);
int col = bright ? FastColour.WhitePacked : (NoShade ? this.col : FastColour.ScalePacked(this.col, shade));
int col = bright ? brightCol : (NoShade ? this.col : FastColour.ScalePacked(this.col, shade));
if (side == Side.Back) {
rec.U1 = minBB.X; rec.U2 = maxBB.X * 15.99f/16f;
@ -225,7 +229,7 @@ namespace ClassicalSharp.Model {
int texId = game.BlockInfo.GetTextureLoc(block, side), texIndex = 0;
TextureRec rec = atlas.GetTexRec(texId, 1, out texIndex);
FlushIfNotSame(texIndex);
int col = bright ? FastColour.WhitePacked : (NoShade ? this.col : FastColour.ScalePacked(this.col, shade));
int col = bright ? brightCol : (NoShade ? this.col : FastColour.ScalePacked(this.col, shade));
if (side == Side.Left) {
rec.U1 = minBB.Z; rec.U2 = maxBB.Z * 15.99f/16f;
@ -255,7 +259,7 @@ namespace ClassicalSharp.Model {
FlushIfNotSame(texIndex);
if (height != 1)
rec.V2 = rec.V1 + height * atlas.invElementSize * (15.99f/16f);
int col = bright ? FastColour.WhitePacked : this.col;
int col = bright ? brightCol : this.col;
float p1 = 0, p2 = 0;
if (firstPart) { // Need to break into two quads for when drawing a sprite model in hand.
@ -283,7 +287,7 @@ namespace ClassicalSharp.Model {
FlushIfNotSame(texIndex);
if (height != 1)
rec.V2 = rec.V1 + height * atlas.invElementSize * (15.99f/16f);
int col = bright ? FastColour.WhitePacked : this.col;
int col = bright ? brightCol : this.col;
float x1 = 0, x2 = 0, z1 = 0, z2 = 0;
if (firstPart) {

14
ClassicalSharp/Particles/Particle.cs
View File

@ -89,13 +89,13 @@ namespace ClassicalSharp.Particles {
Vector3I P = Vector3I.Floor(Position);
col = game.World.IsValidPos(P) ?
game.Lighting.LightCol_ZSide(P.X, P.Y, P.Z) : game.Lighting.OutsideZSide;
if (game.BlockInfo.Tinted[block]) {
FastColour fogCol = game.BlockInfo.FogColour[block];
FastColour newCol = FastColour.Unpack(col);
newCol *= fogCol;
col = newCol.Pack();
}
}
if (game.BlockInfo.Tinted[block]) {
FastColour fogCol = game.BlockInfo.FogColour[block];
FastColour newCol = FastColour.Unpack(col);
newCol *= fogCol;
col = newCol.Pack();
}
DoRender(game, ref terrainSize, ref rec, col, vertices, ref index);
}