Replaced orange with a dim/grey color
This commit is contained in:
parent
f55f98651f
commit
9a8bb85afc
@ -118,9 +118,17 @@ func (backend *Backend) drawRune (
|
|||||||
backend.boundsOfCell(x, y))
|
backend.boundsOfCell(x, y))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// cue a series of pointless optimizations
|
||||||
|
alphaMask, isAlpha := mask.(*image.Alpha)
|
||||||
|
if isAlpha {
|
||||||
|
backend.sprayRuneMaskAlpha (
|
||||||
|
alphaMask, destinationRectangle,
|
||||||
|
maskPoint, backend.colors[runeColor])
|
||||||
|
} else {
|
||||||
backend.sprayRuneMask (
|
backend.sprayRuneMask (
|
||||||
mask, destinationRectangle,
|
mask, destinationRectangle,
|
||||||
maskPoint, backend.colors[runeColor])
|
maskPoint, backend.colors[runeColor])
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (backend *Backend) sprayRuneMask (
|
func (backend *Backend) sprayRuneMask (
|
||||||
@ -150,6 +158,32 @@ func (backend *Backend) sprayRuneMask (
|
|||||||
}}
|
}}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (backend *Backend) sprayRuneMaskAlpha (
|
||||||
|
mask *image.Alpha,
|
||||||
|
bounds image.Rectangle,
|
||||||
|
maskPoint image.Point,
|
||||||
|
fill xgraphics.BGRA,
|
||||||
|
) {
|
||||||
|
maxX := bounds.Max.X - bounds.Min.X
|
||||||
|
maxY := bounds.Max.Y - bounds.Min.Y
|
||||||
|
|
||||||
|
for y := 0; y < maxY; y ++ {
|
||||||
|
for x := 0; x < maxX; x ++ {
|
||||||
|
alpha := mask.AlphaAt(x + maskPoint.X, y + maskPoint.Y).A
|
||||||
|
backend.canvas.SetBGRA (
|
||||||
|
x + bounds.Min.X,
|
||||||
|
y + bounds.Min.Y - backend.metrics.descent,
|
||||||
|
xgraphics.BlendBGRA (
|
||||||
|
backend.colors[stone.ColorBackground],
|
||||||
|
xgraphics.BGRA {
|
||||||
|
R: fill.R,
|
||||||
|
G: fill.G,
|
||||||
|
B: fill.B,
|
||||||
|
A: alpha,
|
||||||
|
}))
|
||||||
|
}}
|
||||||
|
}
|
||||||
|
|
||||||
func fillRectangle (
|
func fillRectangle (
|
||||||
source image.Image,
|
source image.Image,
|
||||||
destination draw.Image,
|
destination draw.Image,
|
||||||
|
@ -8,8 +8,8 @@ type Color uint8
|
|||||||
const (
|
const (
|
||||||
ColorBackground Color = 0x0
|
ColorBackground Color = 0x0
|
||||||
ColorForeground Color = 0x1
|
ColorForeground Color = 0x1
|
||||||
ColorRed Color = 0x2
|
ColorDim Color = 0x2
|
||||||
ColorOrange Color = 0x3
|
ColorRed Color = 0x3
|
||||||
ColorYellow Color = 0x4
|
ColorYellow Color = 0x4
|
||||||
ColorGreen Color = 0x5
|
ColorGreen Color = 0x5
|
||||||
ColorBlue Color = 0x6
|
ColorBlue Color = 0x6
|
||||||
|
@ -55,10 +55,10 @@ func (config *Config) load () {
|
|||||||
color.RGBA { R: 0, G: 0, B: 0, A: 0 },
|
color.RGBA { R: 0, G: 0, B: 0, A: 0 },
|
||||||
// foreground
|
// foreground
|
||||||
color.RGBA { R: 0xFF, G: 0xFF, B: 0xFF, A: 0xFF },
|
color.RGBA { R: 0xFF, G: 0xFF, B: 0xFF, A: 0xFF },
|
||||||
|
// dim
|
||||||
|
color.RGBA { R: 0x80, G: 0x80, B: 0x80, A: 0xFF },
|
||||||
// red
|
// red
|
||||||
color.RGBA { R: 0xFF, G: 0x00, B: 0x00, A: 0xFF },
|
color.RGBA { R: 0xFF, G: 0x00, B: 0x00, A: 0xFF },
|
||||||
// orange
|
|
||||||
color.RGBA { R: 0xFF, G: 0x80, B: 0x00, A: 0xFF },
|
|
||||||
// yellow
|
// yellow
|
||||||
color.RGBA { R: 0xFF, G: 0xFF, B: 0x00, A: 0xFF },
|
color.RGBA { R: 0xFF, G: 0xFF, B: 0x00, A: 0xFF },
|
||||||
// green
|
// green
|
||||||
@ -154,10 +154,10 @@ func (config *Config) loadFile (path string) {
|
|||||||
config.colors[ColorBackground] = valueColor
|
config.colors[ColorBackground] = valueColor
|
||||||
case "colorForeground":
|
case "colorForeground":
|
||||||
config.colors[ColorForeground] = valueColor
|
config.colors[ColorForeground] = valueColor
|
||||||
|
case "colorDim":
|
||||||
|
config.colors[ColorDim] = valueColor
|
||||||
case "colorRed":
|
case "colorRed":
|
||||||
config.colors[ColorRed] = valueColor
|
config.colors[ColorRed] = valueColor
|
||||||
case "colorOrange":
|
|
||||||
config.colors[ColorOrange] = valueColor
|
|
||||||
case "colorYellow":
|
case "colorYellow":
|
||||||
config.colors[ColorYellow] = valueColor
|
config.colors[ColorYellow] = valueColor
|
||||||
case "colorGreen":
|
case "colorGreen":
|
||||||
|
Loading…
Reference in New Issue
Block a user