Merge remote-tracking branch 'runelite/master'

This commit is contained in:
Owain van Brakel
2021-08-05 00:10:59 +02:00
55 changed files with 997 additions and 336 deletions

View File

@@ -116,6 +116,7 @@ public class ColorUtilTest
assertEquals(new Color(128, 128, 128), ColorUtil.colorLerp(Color.BLACK, Color.WHITE, 0.5));
assertEquals(Color.BLACK, ColorUtil.colorLerp(Color.BLACK, Color.CYAN, 0));
assertEquals(Color.CYAN, ColorUtil.colorLerp(Color.BLACK, Color.CYAN, 1));
assertEquals(new Color(0x80800080, true), ColorUtil.colorLerp(new Color(0xff0000ff, true), new Color(0x00ff0000, true), 0.5));
}
@Test