Lucifer3/Server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

refactorings + basis of script editor.

Browse Source
This commit is contained in:
gisle
2023-09-26 22:43:27 +02:00
parent 2188d489ea
commit 13da56009e
30 changed files with 52989 additions and 521 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/color/color.go
+7 -7
View File
@@ -116,7 +116,7 @@ func (col *Color) ToRGB() (col2 Color, ok bool) {
col2 = Color{RGB: &rgb}
ok = true
} else if col.K != nil {
rgb := kToRGB(*col.K)
rgb := KtoRGB(*col.K)
col2 = Color{RGB: &rgb}
ok = true
}
@@ -146,7 +146,7 @@ func (col *Color) ToHS() (col2 Color, ok bool) {
col2 = Color{HS: &hs}
ok = true
} else if col.K != nil {
hs := kToRGB(*col.K).ToHS()
hs := KtoRGB(*col.K).ToHS()
col2 = Color{HS: &hs}
ok = true
}
@@ -202,7 +202,7 @@ func (col *Color) ToXY() (col2 Color, ok bool) {
col2 = Color{XY: &xy}
ok = true
} else if col.K != nil {
xy := kToRGB(*col.K).ToXY()
xy := KtoRGB(*col.K).ToXY()
col2 = Color{XY: &xy}
ok = true
}
@@ -506,7 +506,7 @@ func hex2digit(h byte) int {
}
}
func kToRGB(kelvin int) RGB {
func KtoRGB(kelvin int) RGB {
if kelvin < 1000 {
kelvin = 1000
} else if kelvin > 12000 {
@@ -523,9 +523,9 @@ func kToRGB(kelvin int) RGB {
ceilRGB := kelvinRGBTable[ceil]
return RGB{
Red: (floorRGB.Red * fac) + (ceilRGB.Red * (1 - fac)),
Green: (floorRGB.Green * fac) + (ceilRGB.Green * (1 - fac)),
Blue: (floorRGB.Blue * fac) + (ceilRGB.Blue * (1 - fac)),
Red: (floorRGB.Red * (1 - fac)) + (ceilRGB.Red * fac),
Green: (floorRGB.Green * (1 - fac)) + (ceilRGB.Green * fac),
Blue: (floorRGB.Blue * (1 - fac)) + (ceilRGB.Blue * fac),
}
}
internal/color/xy.go
+2 -2
View File
@@ -161,9 +161,9 @@ type XY struct {
}
func (xy XY) ToRGB() RGB {
h, s, _ := colorful.Xyy(xy.X, xy.Y, 0.5).Hsv()
h, s, _ := colorful.Xyy(xy.X, math.Max(xy.Y, 0.0001), 0.5).Hsv()
c := colorful.Hsv(math.Mod(h, 360), s, 1)
return RGB{Red: c.R, Green: c.G, Blue: c.B}
return RGB{Red: math.Max(c.R, 0), Green: math.Max(c.G, 0), Blue: math.Max(c.B, 0)}
}
func (xy XY) ToHS() HueSat {