Skip to content
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

Backend: SpecialColor translation #2854

Merged
merged 23 commits into from
Nov 22, 2024
Merged

Backend: SpecialColor translation #2854

Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
2689e3a
Rename .java to .kt
j10a1n15 Oct 28, 2024
714e617
translate to kotlin and improve
j10a1n15 Oct 28, 2024
1c43eea
move old method calls
j10a1n15 Oct 28, 2024
aa6f44a
update imports
j10a1n15 Oct 28, 2024
ded9159
improve color
j10a1n15 Oct 28, 2024
269f384
i love detekt
j10a1n15 Oct 28, 2024
7dffd9b
fix colors
j10a1n15 Oct 28, 2024
6936bad
use simpletimemark
j10a1n15 Oct 28, 2024
d2f3559
default radix is alr 10
j10a1n15 Oct 28, 2024
2534374
its not slightly modified anymore
j10a1n15 Oct 28, 2024
98f0a82
improve decomposing
j10a1n15 Oct 28, 2024
9703649
detekt?
CalMWolfs Oct 28, 2024
80b4a90
Merge branch 'beta' into backend/specialcolor
j10a1n15 Nov 1, 2024
07e8a7e
deprecated color utils to chroma color, move methods to special color…
j10a1n15 Nov 15, 2024
7e71d32
move methods I alr moved before
j10a1n15 Nov 15, 2024
944e220
Merge branch 'hannibal002:beta' into backend/specialcolor
j10a1n15 Nov 15, 2024
813d882
i hate you
j10a1n15 Nov 15, 2024
bc46863
Merge remote-tracking branch 'origin/backend/specialcolor' into backe…
j10a1n15 Nov 15, 2024
e152700
Merge branch 'hannibal002:beta' into backend/specialcolor
j10a1n15 Nov 19, 2024
338d391
Merge branch 'beta' into backend/specialcolor
j10a1n15 Nov 20, 2024
47bf80c
fix baseline
j10a1n15 Nov 20, 2024
c810a05
Merge branch 'beta' into backend/specialcolor
CalMWolfs Nov 22, 2024
25f3537
add some regex tests
CalMWolfs Nov 22, 2024
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
Prev Previous commit
Next Next commit
use simpletimemark 
Signed-off-by: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
  • Loading branch information
@j10a1n15
j10a1n15 committed Oct 28, 2024
commit 6936badd510135df6a7e0dc5640def6d274a64e6
6 changes: 3 additions & 3 deletions src/main/java/at/hannibal2/skyhanni/utils/SpecialColor.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,16 @@ object SpecialColor {
private const val RADIX = 10
private const val MIN_CHROMA_SECS = 1
private const val MAX_CHROMA_SECS = 60
private var startTime: Long = -1
private var startTime = SimpleTimeMark.farPast()

@Deprecated("", ReplaceWith("this.toChromaColor()"))
fun specialToChromaRGB(special: String): Int {
if (startTime < 0) startTime = System.currentTimeMillis()
if (startTime.isFarPast()) startTime = SimpleTimeMark.now()

val (b, g, r, a, chroma) = decompose(special)
val (hue, sat, bri) = Color.RGBtoHSB(r, g, b, null)

val adjustedHue = if (chroma > 0) (hue + ((System.currentTimeMillis() - startTime) / 1000f / chromaSpeed(chroma) % 1)).let {
val adjustedHue = if (chroma > 0) (hue + (startTime.passedSince().inWholeMilliseconds / 1000f / chromaSpeed(chroma) % 1)).let {
if (it < 0) it + 1f else it
} else hue

Expand Down
Loading