keith/ForgePatch
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity

Avoid discarding the bottom 4 bits of the lightmap coords. It turns out vanilla relies on those bits. Fixes some blocks being darker than they should be in certain circumstances.

Browse source
This commit is contained in:
David Quintana 2020-05-04 01:13:43 +02:00
parent c3e4d303e9
commit 6551ccc247
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/main/java/net/minecraftforge/client/extensions/IForgeVertexBuilder.java
View file

@ -109,14 +109,14 @@ public interface IForgeVertexBuilder
} }
default int applyBakedLighting(int lightmapCoord, ByteBuffer data) { default int applyBakedLighting(int lightmapCoord, ByteBuffer data) {
int bl = LightTexture.getLightBlock(lightmapCoord); int bl = lightmapCoord&0xFFFF;
int sl = LightTexture.getLightSky(lightmapCoord); int sl = (lightmapCoord>>16)&0xFFFF;
int offset = LightUtil.getLightOffset(0) * 4; // int offset for vertex 0 * 4 bytes per int int offset = LightUtil.getLightOffset(0) * 4; // int offset for vertex 0 * 4 bytes per int
int blBaked = Short.toUnsignedInt(data.getShort(offset)) >> 4; int blBaked = Short.toUnsignedInt(data.getShort(offset));
int slBaked = Short.toUnsignedInt(data.getShort(offset + 2)) >> 4; int slBaked = Short.toUnsignedInt(data.getShort(offset + 2));
bl = Math.max(bl, blBaked); bl = Math.max(bl, blBaked);
sl = Math.max(sl, slBaked); sl = Math.max(sl, slBaked);
return LightTexture.packLight(bl, sl); return bl | (sl<<16);
} }
default void applyBakedNormals(Vector3f generated, ByteBuffer data, Matrix3f normalTransform) { default void applyBakedNormals(Vector3f generated, ByteBuffer data, Matrix3f normalTransform) {