taigrr/simplecolorpalettes
1
0
Fork 0
mirror of https://github.com/taigrr/simplecolorpalettes.git synced 2026-04-02 04:59:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

style: Updated to include consistent naming of variables

Browse Source
This commit is contained in:
Ethan Holz
2022-10-11 15:16:19 -05:00
parent db9002982d
commit bdf265b7a3
1 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
simplecolor/simplecolors.go
View File

@@ -33,15 +33,15 @@ func (n NamedPalette) ToPalette() color.Palette {
return color.Palette(x) return color.Palette(x)
} }
func (a SimplePalette) Sort() SimplePalette { func (s SimplePalette) Sort() SimplePalette {
sort.Sort(a) sort.Sort(s)
return a return s
} }
func (a SimplePalette) Join(b SimplePalette) SimplePalette { func (s SimplePalette) Join(b SimplePalette) SimplePalette {
m := make(map[SimpleColor]SimpleColor) m := make(map[SimpleColor]SimpleColor)
r := SimplePalette{} r := SimplePalette{}
for _, c := range a { for _, c := range s {
m[c] = c m[c] = c
} }
for _, c := range b { for _, c := range b {
@@ -80,32 +80,32 @@ func (c SimpleColor) ToShortHex() string {
return "#" + fmt.Sprintf("%06X", value) return "#" + fmt.Sprintf("%06X", value)
} }
func (s SimpleColor) RGBA() (r, g, b, a uint32) { func (c SimpleColor) RGBA() (r, g, b, a uint32) {
return uint32(s) >> 16 & 0xFF, uint32(s) >> 8 & 0xFF, uint32(s) & 0xFF, 0xFF return uint32(c) >> 16 & 0xFF, uint32(c) >> 8 & 0xFF, uint32(c) & 0xFF, 0xFF
} }
func (input SimpleColor) ToAnsi16() SimpleColor { func (c SimpleColor) ToAnsi16() SimpleColor {
color := ansi[0:16].ToPalette().Convert(input) color := ansi[0:16].ToPalette().Convert(c)
r, g, b, _ := color.RGBA() r, g, b, _ := color.RGBA()
return SimpleColor(uint32(r)<<16 + uint32(g)<<8 + b) return SimpleColor(uint32(r)<<16 + uint32(g)<<8 + b)
} }
func (input SimpleColor) ToExtendedAnsi() SimpleColor { func (c SimpleColor) ToExtendedAnsi() SimpleColor {
color := ansi.ToPalette().Convert(input) color := ansi.ToPalette().Convert(c)
r, g, b, _ := color.RGBA() r, g, b, _ := color.RGBA()
return SimpleColor(uint32(r)<<16 + uint32(g)<<8 + b) return SimpleColor(uint32(r)<<16 + uint32(g)<<8 + b)
} }
func (p NamedPalette) ToExtendedAnsi() NamedPalette { func (n NamedPalette) ToExtendedAnsi() NamedPalette {
for k, v := range p { for k, v := range n {
p[k] = v.ToExtendedAnsi() n[k] = v.ToExtendedAnsi()
} }
return p return n
} }
func (p SimplePalette) ToExtendedAnsi() (sp SimplePalette) { func (s SimplePalette) ToExtendedAnsi() (sp SimplePalette) {
used := make(map[SimpleColor]bool) used := make(map[SimpleColor]bool)
for _, x := range p { for _, x := range s {
clampedColor := x.ToExtendedAnsi() clampedColor := x.ToExtendedAnsi()
if _, found := used[clampedColor]; found { if _, found := used[clampedColor]; found {
continue continue
@@ -118,21 +118,21 @@ func (p SimplePalette) ToExtendedAnsi() (sp SimplePalette) {
return return
} }
func (e SimplePalette) Len() int { func (s SimplePalette) Len() int {
return len(e) return len(s)
} }
func (e SimplePalette) Less(i, j int) bool { func (s SimplePalette) Less(i, j int) bool {
return int(e[i]) < int(e[j]) return int(s[i]) < int(s[j])
} }
func (e SimplePalette) Swap(i, j int) { func (s SimplePalette) Swap(i, j int) {
e[i], e[j] = e[j], e[i] s[i], s[j] = s[j], s[i]
} }
func (p SimplePalette) ToAnsi16() (sp SimplePalette) { func (s SimplePalette) ToAnsi16() (sp SimplePalette) {
used := make(map[SimpleColor]bool) used := make(map[SimpleColor]bool)
for _, x := range p { for _, x := range s {
clampedColor := x.ToAnsi16() clampedColor := x.ToAnsi16()
if _, found := used[clampedColor]; found { if _, found := used[clampedColor]; found {
continue continue