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

Slight idiomatization and add configurable keys

Browse Source
This commit is contained in:
Edwin Jakobs
2019-11-19 12:00:55 +01:00
parent 9b691e04c4
commit 3d1a472753
1 changed files with 53 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,6 +2,7 @@ package org.openrndr.extra.palette
import mu.KotlinLogging import mu.KotlinLogging
import com.google.gson.GsonBuilder import com.google.gson.GsonBuilder
import com.google.gson.JsonParseException
import org.openrndr.Extension import org.openrndr.Extension
import org.openrndr.Keyboard import org.openrndr.Keyboard
import org.openrndr.Program import org.openrndr.Program
@@ -11,7 +12,6 @@ import org.openrndr.color.ColorRGBa.Companion.BLACK
import org.openrndr.color.ColorRGBa.Companion.GREEN 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.WHITE
import org.openrndr.color.ColorRGBa.Companion.YELLOW import org.openrndr.color.ColorRGBa.Companion.YELLOW
import org.openrndr.resourceUrl import org.openrndr.resourceUrl
import java.io.File import java.io.File
@@ -21,13 +21,11 @@ import kotlin.math.min
internal val logger = KotlinLogging.logger {} internal val logger = KotlinLogging.logger {}
internal typealias Colors = List<ColorRGBa> class Palette(
data class Palette(
val background: ColorRGBa, val background: ColorRGBa,
val foreground: ColorRGBa, val foreground: ColorRGBa,
val colors: Colors, val colors: List<ColorRGBa>,
val colors2: Colors val colors2: List<ColorRGBa>
) )
internal val defaultPalette: Palette = Palette( internal val defaultPalette: Palette = Palette(
@@ -45,9 +43,13 @@ class PaletteStudio(
collection: Collections = Collections.ONE, collection: Collections = Collections.ONE,
val colorCountConstraint: Int = 0 val colorCountConstraint: Int = 0
) : Extension { ) : Extension {
var palettes: MutableList<MutableList<ColorRGBa>> = mutableListOf() var palettes: MutableList<List<ColorRGBa>> = mutableListOf()
var palette: Palette = defaultPalette var palette: Palette = defaultPalette
var randomPaletteKey = 'l'
var randomizeKey = 'k'
private var paletteIndex: Int = 0 private var paletteIndex: Int = 0
enum class SortBy { enum class SortBy {
@@ -64,19 +66,22 @@ class PaletteStudio(
Collections.THREE to getCollPath("3") Collections.THREE to getCollPath("3")
) )
var background: ColorRGBa = defaultPalette.background val background: ColorRGBa
get() { get() {
return palette.background return palette.background
} }
var foreground: ColorRGBa = defaultPalette.foreground
val foreground: ColorRGBa
get() { get() {
return palette.foreground return palette.foreground
} }
var colors: Colors = defaultPalette.colors
val colors: List<ColorRGBa>
get() { get() {
return palette.colors return palette.colors
} }
var colors2: Colors = defaultPalette.colors2
val colors2: List<ColorRGBa>
get() { get() {
return palette.colors2 return palette.colors2
} }
@@ -88,8 +93,7 @@ class PaletteStudio(
} }
private fun loadCollection(newCollection: Collections) { private fun loadCollection(newCollection: Collections) {
val collectionPath: URL = collectionsResource[newCollection]!! val collectionPath: URL = collectionsResource.getValue(newCollection)
palettes = mutableListOf() palettes = mutableListOf()
loadFromURL(collectionPath) loadFromURL(collectionPath)
@@ -106,58 +110,51 @@ class PaletteStudio(
val clipData = gson.fromJson( val clipData = gson.fromJson(
contents, Array<Array<String>>::class.java contents, Array<Array<String>>::class.java
).toList() )
for (p in clipData) { for (p in clipData) {
val palette = mutableListOf<ColorRGBa>() val palette = p.map { fromHex(it) }
for (colorStr in p.toList()) {
val colorInt = fromHex(colorStr)
palette.add(colorInt)
}
palettes.add(palette) palettes.add(palette)
} }
} catch (ex: Exception) { } catch (ex: JsonParseException) {
logger.error(ex) { "Error: Could not load palettes" } error("Only JSON files with Array<Array<String>> structure can be loaded using this method")
logger.info { "Only JSON files with Array<Array<String>> structure can be loaded using this method" }
} }
} }
private fun loadFromURL(url: URL): Unit = load(url.readText()) private fun loadFromURL(url: URL): Unit = load(url.readText())
private fun createPalette(colors: MutableList<ColorRGBa>) : Palette { private fun createPalette(colors: List<ColorRGBa>): Palette {
when(sortBy) { val sortedColors = when (sortBy) {
SortBy.DARKEST -> { SortBy.DARKEST -> {
val darkest = Comparator<ColorRGBa> { c1: ColorRGBa, c2: ColorRGBa -> (getLuminance(c1) - getLuminance(c2)).toInt() } val darkest = Comparator<ColorRGBa> { c1: ColorRGBa, c2: ColorRGBa -> (getLuminance(c1) - getLuminance(c2)).toInt() }
colors.sortWith(darkest) colors.sortedWith(darkest)
} }
SortBy.BRIGHTEST -> { SortBy.BRIGHTEST -> {
val brightest = Comparator<ColorRGBa> { c1: ColorRGBa, c2: ColorRGBa -> (getLuminance(c2) - getLuminance(c1)).toInt() } val brightest = Comparator<ColorRGBa> { c1: ColorRGBa, c2: ColorRGBa -> (getLuminance(c2) - getLuminance(c1)).toInt() }
colors.sortWith(brightest) colors.sortedWith(brightest)
}
SortBy.NO_SORTING -> {
colors
} }
SortBy.NO_SORTING -> {}
} }
val background = colors.first() val background = sortedColors.first()
val foreground = sortedColors
val foreground = colors .takeLast(sortedColors.size - 1)
.takeLast(colors.size - 1)
.map { getContrast(background, it) to it } .map { getContrast(background, it) to it }
.maxBy { it.first }!! .maxBy { it.first }!!
.second .second
var constraint = colors.size var constraint = sortedColors.size
var constraint2 = colors.size var constraint2 = sortedColors.size
if (colorCountConstraint > 0 && colorCountConstraint < colors.size) { if (colorCountConstraint > 0 && colorCountConstraint < sortedColors.size) {
constraint = colorCountConstraint constraint = colorCountConstraint
constraint2 = colorCountConstraint + 1 constraint2 = colorCountConstraint + 1
} }
val colors1 = colors.slice(0 until constraint) val colors1 = sortedColors.slice(0 until constraint)
val colors2 = colors.slice(1 until constraint2) val colors2 = sortedColors.slice(1 until constraint2)
return Palette(background, foreground, colors1, colors2) return Palette(background, foreground, colors1, colors2)
} }
@@ -183,12 +180,17 @@ class PaletteStudio(
} }
fun randomize() { fun randomize() {
palette = createPalette(Random.pick(palette.colors, count = palette.colors.size)) palette = Palette(
background,
foreground,
Random.pick(colors, count = colors.size),
Random.pick(colors2, count = colors2.size)
)
} }
fun randomPalette() { fun randomPalette() {
val comparison = palette.colors.toMutableList() val comparison = palette.colors.toMutableList()
val colors= Random.pick(palettes, comparison) as MutableList<ColorRGBa> val colors = Random.pick(palettes, comparison) as MutableList<ColorRGBa>
paletteIndex = palettes.indexOf(colors) paletteIndex = palettes.indexOf(colors)
palette = createPalette(colors) palette = createPalette(colors)
@@ -200,14 +202,16 @@ class PaletteStudio(
private fun registerKeybindings(keyboard: Keyboard) { private fun registerKeybindings(keyboard: Keyboard) {
keyboard.keyDown.listen { keyboard.keyDown.listen {
if (it.name == "l") { if (it.propagationCancelled) {
if (it.name == "$randomPaletteKey") {
randomPalette() randomPalette()
} }
if (it.name == "k") { if (it.name == "$randomizeKey") {
randomize() randomize()
} }
} }
} }
}
/* /*
* EXTENSION * EXTENSION