Apple/Geyser
1
0
Fork 0
forked from GeyserMC/Geyser
Code Issues Pull requests Projects Releases Wiki Activity

Update closest color conversion (#1057)

Browse source 
ViaVersion altered their color conversion to fix an issue and this just copies those changes
This commit is contained in:
rtm516 2020-07-30 21:09:53 +01:00 committed by GitHub
parent 427cb69a14
commit 50346a95cd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
connector/src/main/java/org/geysermc/connector/utils/MessageUtils.java
View file

@ -400,13 +400,16 @@ public class MessageUtils {
int testB = testColor.getValue() & 0xFF; int testB = testColor.getValue() & 0xFF;
// Check by the greatest diff of the 3 values // Check by the greatest diff of the 3 values
int rDiff = Math.abs(testR - r); int rAverage = (testR + r) / 2;
int gDiff = Math.abs(testG - g); int rDiff = testR - r;
int bDiff = Math.abs(testB - b); int gDiff = testG - g;
int maxDiff = Math.max(Math.max(rDiff, gDiff), bDiff); int bDiff = testB - b;
if (closest == null || maxDiff < smallestDiff) { int diff = ((2 + (rAverage >> 8)) * rDiff * rDiff)
+ (4 * gDiff * gDiff)
+ ((2 + ((255 - rAverage) >> 8)) * bDiff * bDiff);
if (closest == null || diff < smallestDiff) {
closest = testColor.getKey(); closest = testColor.getKey();
smallestDiff = maxDiff; smallestDiff = diff;
} }
} }