AstralTransRocketries/minosoft
1
0
Fork 0
mirror of https://gitlab.bixilon.de/bixilon/minosoft.git synced 2025-09-17 03:15:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

make SRGBA use rgba instead of abgr

Browse Source 
This really fixes mipmaps
This commit is contained in:
Moritz Zwerger 2023-12-14 23:54:44 +01:00
parent 14ee590e98
commit be30d5a3b4
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
1 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
src/main/java/example/jonathan2520/SRGBAverager.java
View File

@ -1,6 +1,6 @@
/* /*
* Minosoft * Minosoft
* Copyright (C) 2020-2022 Moritz Zwerger * Copyright (C) 2020-2023 Moritz Zwerger
* *
* This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
* *
@ -29,25 +29,25 @@ public class SRGBAverager {
// whatever reason to work. Note that Minecraft's original code // whatever reason to work. Note that Minecraft's original code
// would set the color to black; this is added functionality. // would set the color to black; this is added functionality.
float r = SRGB.decode(c0 & 0xff) float r = SRGB.decode(c0 >> 24 & 0xff)
+ SRGB.decode(c1 & 0xff) + SRGB.decode(c1 >> 24 & 0xff)
+ SRGB.decode(c2 & 0xff) + SRGB.decode(c2 >> 24 & 0xff)
+ SRGB.decode(c3 & 0xff); + SRGB.decode(c3 >> 24 & 0xff);
float g = SRGB.decode(c0 >> 8 & 0xff) float g = SRGB.decode(c0 >> 16 & 0xff)
+ SRGB.decode(c1 >> 8 & 0xff)
+ SRGB.decode(c2 >> 8 & 0xff)
+ SRGB.decode(c3 >> 8 & 0xff);
float b = SRGB.decode(c0 >> 16 & 0xff)
+ SRGB.decode(c1 >> 16 & 0xff) + SRGB.decode(c1 >> 16 & 0xff)
+ SRGB.decode(c2 >> 16 & 0xff) + SRGB.decode(c2 >> 16 & 0xff)
+ SRGB.decode(c3 >> 16 & 0xff); + SRGB.decode(c3 >> 16 & 0xff);
return SRGB.encode(0.25F * r) float b = SRGB.decode(c0 >>> 8 & 0xff)
| SRGB.encode(0.25F * g) << 8 + SRGB.decode(c1 >>> 8 & 0xff)
| SRGB.encode(0.25F * b) << 16 + SRGB.decode(c2 >>> 8 & 0xff)
| c0 & 0xff000000; + SRGB.decode(c3 >>> 8 & 0xff);
return SRGB.encode(0.25F * r) << 24
| SRGB.encode(0.25F * g) << 16
| SRGB.encode(0.25F * b) << 8
| c0 & 0x000000ff;
} else { } else {
// The general case. Well-defined if at least one alpha value is // The general case. Well-defined if at least one alpha value is
// not zero. If you do try to process all zeros, you get // not zero. If you do try to process all zeros, you get
@ -56,32 +56,32 @@ public class SRGBAverager {
// with that, but mind that producing or consuming a NaN causes an // with that, but mind that producing or consuming a NaN causes an
// extremely slow exception handler to be run on many CPUs. // extremely slow exception handler to be run on many CPUs.
float a0 = c0 >>> 24; float a0 = c0 & 0xff;
float a1 = c1 >>> 24; float a1 = c1 & 0xff;
float a2 = c2 >>> 24; float a2 = c2 & 0xff;
float a3 = c3 >>> 24; float a3 = c3 & 0xff;
float r = a0 * SRGB.decode(c0 & 0xff) float r = a0 * SRGB.decode(c0 >> 24 & 0xff)
+ a1 * SRGB.decode(c1 & 0xff) + a1 * SRGB.decode(c1 >> 24 & 0xff)
+ a2 * SRGB.decode(c2 & 0xff) + a2 * SRGB.decode(c2 >> 24 & 0xff)
+ a3 * SRGB.decode(c3 & 0xff); + a3 * SRGB.decode(c3 >> 24 & 0xff);
float g = a0 * SRGB.decode(c0 >> 8 & 0xff) float g = a0 * SRGB.decode(c0 >> 16 & 0xff)
+ a1 * SRGB.decode(c1 >> 8 & 0xff)
+ a2 * SRGB.decode(c2 >> 8 & 0xff)
+ a3 * SRGB.decode(c3 >> 8 & 0xff);
float b = a0 * SRGB.decode(c0 >> 16 & 0xff)
+ a1 * SRGB.decode(c1 >> 16 & 0xff) + a1 * SRGB.decode(c1 >> 16 & 0xff)
+ a2 * SRGB.decode(c2 >> 16 & 0xff) + a2 * SRGB.decode(c2 >> 16 & 0xff)
+ a3 * SRGB.decode(c3 >> 16 & 0xff); + a3 * SRGB.decode(c3 >> 16 & 0xff);
float b = a0 * SRGB.decode(c0 >> 8 & 0xff)
+ a1 * SRGB.decode(c1 >> 8 & 0xff)
+ a2 * SRGB.decode(c2 >> 8 & 0xff)
+ a3 * SRGB.decode(c3 >> 8 & 0xff);
float a = a0 + a1 + a2 + a3; float a = a0 + a1 + a2 + a3;
return SRGB.encode(r / a) return SRGB.encode(r / a) << 24
| SRGB.encode(g / a) << 8 | SRGB.encode(g / a) << 16
| SRGB.encode(b / a) << 16 | SRGB.encode(b / a) << 8
| (int) (0.25F * a + 0.5F) << 24; | (int) (0.25F * a + 0.5F);
} }
} }
} }