tibs/cauldron-dyeing
1
0
Fork 0
mirror of https://github.com/TibiNonEst/cauldron-dyeing.git synced 2024-11-24 03:27:19 -05:00
Code Issues Projects Releases Packages Wiki Activity

Fix color blending averages

Browse source
This commit is contained in:
tibs 2022-01-10 10:27:41 -05:00
parent f885301e64
commit bf13d88263
Signed by untrusted user who does not match committer: tibs
GPG key ID: 047833989F50F88F
1 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/main/java/me/tibinonest/mods/cauldron_dyeing/block/WaterCauldronBlockEntity.java
View file

@ -29,21 +29,23 @@ public class WaterCauldronBlockEntity extends BlockEntity {
newColor[1] = (int) (colorComponents[1] * 255.0f); newColor[1] = (int) (colorComponents[1] * 255.0f);
newColor[2] = (int) (colorComponents[2] * 255.0f); newColor[2] = (int) (colorComponents[2] * 255.0f);
var workingColor = hasColor() ? color : new int[]{0, 0, 0}; if (hasColor()) {
var avgColor = new int[3];
avgColor[0] = (color[0] + newColor[0]) / 2;
avgColor[1] = (color[1] + newColor[1]) / 2;
avgColor[2] = (color[2] + newColor[2]) / 2;
var avgColor = new int[3]; var avgMax = (Ints.max(color) + Ints.max(newColor)) / 2.0f;
avgColor[0] = (workingColor[0] + newColor[0]) / 2;
avgColor[1] = (workingColor[1] + newColor[1]) / 2;
avgColor[2] = (workingColor[2] + newColor[2]) / 2;
var avgMax = (Ints.max(workingColor) + Ints.max(newColor)) / 2.0f; var maxOfAvg = (float) Ints.max(avgColor);
var gainFactor = avgMax / maxOfAvg;
var maxOfAvg = (float) Ints.max(avgColor); color[0] = (int) (avgColor[0] * gainFactor);
var gainFactor = avgMax / maxOfAvg; color[1] = (int) (avgColor[1] * gainFactor);
color[2] = (int) (avgColor[2] * gainFactor);
color[0] = (int) (avgColor[0] * gainFactor); } else {
color[1] = (int) (avgColor[1] * gainFactor); color = newColor;
color[2] = (int) (avgColor[2] * gainFactor); }
markDirty(); markDirty();
rebuildBlock(); rebuildBlock();