Repo-Mirror/Leaf
9
0
Fork 0
mirror of https://github.com/Winds-Studio/Leaf.git synced 2026-01-03 22:26:19 +00:00
Code Issues Releases Activity

Paper PR: Optimise color distance check in MapPalette by removing floating point math

Browse Source
This commit is contained in:
Dreeam
2024-08-09 03:18:20 +08:00
parent 8cfb6f0bd3
commit dbfeb875d7
2 changed files with 118 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
patches/api/0011-Paper-PR-Optimise-color-distance-check-in-MapPalette.patch Normal file
View File

@@ -0,0 +1,40 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Barnaby <22575741+barnabwhy@users.noreply.github.com>
Date: Sat, 29 Jun 2024 12:04:48 +0100
Subject: [PATCH] Paper PR: Optimise color distance check in MapPalette by
removing floating point math
Original license: GPLv3
Original project: https://github.com/PaperMC/Paper
Paper pull request: https://github.com/PaperMC/Paper/pull/11000
diff --git a/src/main/java/org/bukkit/map/MapPalette.java b/src/main/java/org/bukkit/map/MapPalette.java
index 7d4172dbe5247f4cbe776334d99c4e4c40ac7dbb..1cda69ab051a327694215b6eb75e02ce3273beeb 100644
--- a/src/main/java/org/bukkit/map/MapPalette.java
+++ b/src/main/java/org/bukkit/map/MapPalette.java
@@ -31,14 +31,19 @@ public final class MapPalette {
}
private static double getDistance(@NotNull Color c1, @NotNull Color c2) {
- double rmean = (c1.getRed() + c2.getRed()) / 2.0;
- double r = c1.getRed() - c2.getRed();
- double g = c1.getGreen() - c2.getGreen();
+ // Paper start - Optimize color distance calculation by removing floating point math
+ int rsum = c1.getRed() + c2.getRed(); // Use sum instead of mean for no division
+ int r = c1.getRed() - c2.getRed();
+ int g = c1.getGreen() - c2.getGreen();
int b = c1.getBlue() - c2.getBlue();
- double weightR = 2 + rmean / 256.0;
- double weightG = 4.0;
- double weightB = 2 + (255 - rmean) / 256.0;
+ // All weights are 512x their original to avoid floating point division
+ int weightR = 1024 + rsum;
+ int weightG = 2048;
+ int weightB = 1024 + (255*2 - rsum);
+
+ // Division by 256 here is unnecessary as this won't change the result of the sort
return weightR * r * r + weightG * g * g + weightB * b * b;
+ // Paper end
}
@NotNull