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

Fix QuadTransformer normal processing.

Browse source
This commit is contained in:
David Quintana 2020-01-07 23:51:44 +01:00
parent dd0260c476
commit c4c760bfb3
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/main/java/net/minecraftforge/client/model/QuadTransformer.java
View file

@ -70,17 +70,18 @@ public class QuadTransformer
int normalIn = getAtByteOffset(inData,offset); int normalIn = getAtByteOffset(inData,offset);
if (normalIn != 0) if (normalIn != 0)
{ {
float x = (((normalIn) >> 24) & 0xFF) / 255.0f;
float y = (((normalIn << 8) >> 24) & 0xFF) / 255.0f; float x = ((byte)((normalIn) >> 24)) / 127.0f;
float z = (((normalIn << 16) >> 24) & 0xFF) / 255.0f; float y = ((byte)((normalIn << 8) >> 24)) / 127.0f;
float z = ((byte)((normalIn << 16) >> 24)) / 127.0f;
Vector3f pos = new Vector3f(x, y, z); Vector3f pos = new Vector3f(x, y, z);
transform.transformNormal(pos); transform.transformNormal(pos);
pos.func_229194_d_(); pos.func_229194_d_();
int normalOut = (((int) (x / 255.0) & 0xFF) << 24) | int normalOut = ((((byte)(x / 127.0f)) & 0xFF) << 24) |
(((int) (y / 255.0) & 0xFF) << 16) | ((((byte)(y / 127.0f)) & 0xFF) << 16) |
(((int) (z / 255.0) & 0xFF) << 8) | ((((byte)(z / 127.0f)) & 0xFF) << 8) |
(normalIn & 0xFF); (normalIn & 0xFF);
putAtByteOffset(outData, offset, normalOut); putAtByteOffset(outData, offset, normalOut);
@ -108,7 +109,10 @@ public class QuadTransformer
int shift = (offset % 4) * 8; int shift = (offset % 4) * 8;
if (shift == 0) if (shift == 0)
{
outData[index] = value; outData[index] = value;
return;
}
int lsbMask = 0xFFFFFFFF >>> (32-shift); int lsbMask = 0xFFFFFFFF >>> (32-shift);
int msbMask = 0xFFFFFFFF << shift; int msbMask = 0xFFFFFFFF << shift;