AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-22 02:42:16 -04:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Color: Better methods of brightening and darkening colors (#13611)"

Browse Source 
This reverts commit bee216aa3dcfd4d60efe0bdd3354a2514e2c8951.
This commit is contained in:
yairm210 2025-07-15 13:02:14 +03:00
parent b82fec2846
commit 2a36f43370
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
core/src/com/unciv/ui/components/extensions/Scene2dExtensions.kt
View File

@ -42,7 +42,6 @@ import com.unciv.ui.components.input.onChange
import com.unciv.ui.images.IconCircleGroup
import com.unciv.ui.images.ImageGetter
import com.unciv.ui.screens.basescreen.BaseScreen
import kotlin.math.max
/**
* Collection of extension functions mostly for libGdx widgets
@ -94,16 +93,12 @@ fun colorFromHex(hexColor: Int): Color {
fun colorFromRGB(r: Int, g: Int, b: Int) = Color(r / 255f, g / 255f, b / 255f, 1f)
/** Create a new [Color] instance from r/g/b given as Integers in the range 0..255 in the form of a 3-element List [rgb] */
fun colorFromRGB(rgb: List<Int>) = colorFromRGB(rgb[0], rgb[1], rgb[2])
/** Linearly interpolates between this [Color] and [BLACK][ImageGetter.CHARCOAL] by [t] which is in the range [[0,1]],
* preserving color ratio in RGB. The result is returned as a new instance. */
fun Color.darken(t: Float): Color = Color(this).mul(t)
/** Linearly interpolates between this [Color] and [WHITE][Color.WHITE] by [t] which is in the range [[0,1]],
* preserving color ratio in RGB. The result is returned as a new instance. */
fun Color.brighten(t: Float): Color = Color(this).let {
val lightness = max(r, max(g, b))
val targetRatio = (lightness + t * (1 - lightness)) / lightness
return it.mul(targetRatio)
}
/** Linearly interpolates between this [Color] and [BLACK][ImageGetter.CHARCOAL] by [t] which is in the range [[0,1]].
* The result is returned as a new instance. */
fun Color.darken(t: Float): Color = Color(this).lerp(Color.BLACK, t)
/** Linearly interpolates between this [Color] and [WHITE][Color.WHITE] by [t] which is in the range [[0,1]].
* The result is returned as a new instance. */
fun Color.brighten(t: Float): Color = Color(this).lerp(Color.WHITE, t)
fun Actor.centerX(parent: Actor) { x = parent.width / 2 - width / 2 }