Skip to content

HSB coloring for ClickGUI rainbow mode, closes #311 #316

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 23, 2022
Merged

HSB coloring for ClickGUI rainbow mode, closes #311 #316

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
26622bb
hsb coloring for rainbow, closes #311
May 23, 2022
8e15f5b
group settings, remove unused val
May 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/main/kotlin/com/lambda/client/gui/hudgui/elements/client/ModuleList.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ internal object ModuleList : HudElement(
private val rainbow by setting("Rainbow", true)
private val rainbowLength by setting("Rainbow Length", 10.0f, 1.0f..20.0f, 0.5f, { rainbow })
private val indexedHue by setting("Indexed Hue", 0.5f, 0.0f..1.0f, 0.05f, { rainbow })
private val saturation by setting("Saturation", 1.0f, 0.0f..1.0f, 0.05f, { rainbow })
private val brightness by setting("Brightness", 1.0f, 0.0f..1.0f, 0.05f, { rainbow })
private val primary by setting("Primary Color", ColorHolder(155, 144, 255), false)
private val secondary by setting("Secondary Color", ColorHolder(255, 255, 255), false)

Expand Down Expand Up @@ -103,7 +105,6 @@ internal object ModuleList : HudElement(
}

private fun drawModuleList() {
val primaryHsb = Color.RGBtoHSB(primary.r, primary.g, primary.b, null)
val lengthMs = rainbowLength * 1000.0f
val timedHue = System.currentTimeMillis() % lengthMs.toLong() / lengthMs

Expand All @@ -127,7 +128,7 @@ internal object ModuleList : HudElement(

if (rainbow) {
val hue = timedHue + indexedHue * 0.05f * index++
val color = ColorConverter.hexToRgb(Color.HSBtoRGB(hue, primaryHsb[1], primaryHsb[2]))
val color = ColorConverter.hexToRgb(Color.HSBtoRGB(hue, saturation, brightness))
module.newTextLine(color).drawLine(progress, true, HAlign.LEFT, FontRenderAdapter.useCustomFont)
} else {
textLine.drawLine(progress, true, HAlign.LEFT, FontRenderAdapter.useCustomFont)
Expand Down