kaze/orx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove dead code and make getLuminance and getContrast public

Browse Source
This commit is contained in:
Ricardo Matias
2020-04-25 10:11:21 +02:00
committed by Edwin Jakobs
parent 9f3e43c39e
commit e29c670cf3
2 changed files with 4 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
orx-palette/src/main/kotlin/ColorUtils.kt
View File

@@ -4,31 +4,12 @@ import org.openrndr.color.ColorRGBa
import org.openrndr.color.Linearity import org.openrndr.color.Linearity
// https://www.w3.org/TR/2008/REC-WCAG20-20081211/#relativeluminancedef // https://www.w3.org/TR/2008/REC-WCAG20-20081211/#relativeluminancedef
internal fun getLuminance(color: ColorRGBa): Double = 0.2126 * color.r + 0.7152 * color.g + 0.0722 * color.b fun getLuminance(color: ColorRGBa): Double = 0.2126 * color.r + 0.7152 * color.g + 0.0722 * color.b
// see http://www.w3.org/TR/2008/REC-WCAG20-20081211/#contrast-ratiodef // see http://www.w3.org/TR/2008/REC-WCAG20-20081211/#contrast-ratiodef
internal fun getContrast(colorA: ColorRGBa, colorB: ColorRGBa): Double { fun getContrast(colorA: ColorRGBa, colorB: ColorRGBa): Double {
val l1 = getLuminance(colorA) val l1 = getLuminance(colorA)
val l2 = getLuminance(colorB) val l2 = getLuminance(colorB)
return if (l1 > l2) (l1 + 0.05) / (l2 + 0.05) else (l2 + 0.05) / (l1 + 0.05); return if (l1 > l2) (l1 + 0.05) / (l2 + 0.05) else (l2 + 0.05) / (l1 + 0.05)
} }
// TODO(ricardomatias) Remove this when 0.3.36 is released
internal fun fromHex(hex: String): ColorRGBa {
val parsedHex = hex.replace("#", "")
val len = parsedHex.length
val mult = len / 3
val colors = (0..2).map { idx ->
var c = parsedHex.substring(idx * mult, (idx + 1) * mult)
c = if (len == 3) c + c else c
Integer.valueOf(c, 16)
}
val (r, g, b) = colors
return ColorRGBa(r / 255.0, g / 255.0, b / 255.0, 1.0, Linearity.SRGB)
}

1
orx-palette/src/main/kotlin/PaletteStudio.kt
View File

@@ -13,6 +13,7 @@ import org.openrndr.color.ColorRGBa.Companion.GREEN
import org.openrndr.color.ColorRGBa.Companion.PINK import org.openrndr.color.ColorRGBa.Companion.PINK
import org.openrndr.color.ColorRGBa.Companion.RED import org.openrndr.color.ColorRGBa.Companion.RED
import org.openrndr.color.ColorRGBa.Companion.YELLOW import org.openrndr.color.ColorRGBa.Companion.YELLOW
import org.openrndr.color.ColorRGBa.Companion.fromHex
import org.openrndr.resourceUrl import org.openrndr.resourceUrl
import java.io.File import java.io.File
import java.net.URL import java.net.URL