Skip to content

Commit e29c670

Browse files
ricardomatiasedwinRNDR
authored andcommitted
Remove dead code and make getLuminance and getContrast public
1 parent 9f3e43c commit e29c670

File tree

2 files changed

+4
-22
lines changed

2 files changed

+4
-22
lines changed

orx-palette/src/main/kotlin/ColorUtils.kt

Lines changed: 3 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -4,31 +4,12 @@ import org.openrndr.color.ColorRGBa
44
import org.openrndr.color.Linearity
55

66
// https://www.w3.org/TR/2008/REC-WCAG20-20081211/#relativeluminancedef
7-
internal fun getLuminance(color: ColorRGBa): Double = 0.2126 * color.r + 0.7152 * color.g + 0.0722 * color.b
7+
fun getLuminance(color: ColorRGBa): Double = 0.2126 * color.r + 0.7152 * color.g + 0.0722 * color.b
88

99
// see http://www.w3.org/TR/2008/REC-WCAG20-20081211/#contrast-ratiodef
10-
internal fun getContrast(colorA: ColorRGBa, colorB: ColorRGBa): Double {
10+
fun getContrast(colorA: ColorRGBa, colorB: ColorRGBa): Double {
1111
val l1 = getLuminance(colorA)
1212
val l2 = getLuminance(colorB)
1313

14-
return if (l1 > l2) (l1 + 0.05) / (l2 + 0.05) else (l2 + 0.05) / (l1 + 0.05);
14+
return if (l1 > l2) (l1 + 0.05) / (l2 + 0.05) else (l2 + 0.05) / (l1 + 0.05)
1515
}
16-
17-
// TODO(ricardomatias) Remove this when 0.3.36 is released
18-
internal fun fromHex(hex: String): ColorRGBa {
19-
val parsedHex = hex.replace("#", "")
20-
val len = parsedHex.length
21-
val mult = len / 3
22-
23-
val colors = (0..2).map { idx ->
24-
var c = parsedHex.substring(idx * mult, (idx + 1) * mult)
25-
26-
c = if (len == 3) c + c else c
27-
28-
Integer.valueOf(c, 16)
29-
}
30-
31-
val (r, g, b) = colors
32-
33-
return ColorRGBa(r / 255.0, g / 255.0, b / 255.0, 1.0, Linearity.SRGB)
34-
}

orx-palette/src/main/kotlin/PaletteStudio.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import org.openrndr.color.ColorRGBa.Companion.GREEN
1313
import org.openrndr.color.ColorRGBa.Companion.PINK
1414
import org.openrndr.color.ColorRGBa.Companion.RED
1515
import org.openrndr.color.ColorRGBa.Companion.YELLOW
16+
import org.openrndr.color.ColorRGBa.Companion.fromHex
1617
import org.openrndr.resourceUrl
1718
import java.io.File
1819
import java.net.URL

0 commit comments

Comments
 (0)