use image.Image instead of a specific implementation

bsmr · Feb 9, 2021 · 783ca25 · 783ca25
1 parent ecab109
commit 783ca25
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 8 deletions.
diff --git a/drivers/js/js.go b/drivers/js/js.go
@@ -4,6 +4,7 @@ package js
 import (
 	"context"
 	"image"
+	"image/draw"
 	"log"
 	"time"
 	"unicode/utf8"
@@ -16,7 +17,7 @@ import (
 // TileManager manages tiles fetching.
 type TileManager interface {
 	// GetImage returns the image to be used for a given cell style.
-	GetImage(gruid.Cell) *image.RGBA
+	GetImage(gruid.Cell) image.Image
 
 	// TileSize returns the (width, height) in pixels of the tiles. Both
 	// should be positive and non-zero.
@@ -358,7 +359,15 @@ func (dr *Driver) draw(cell gruid.Cell, x, y int) {
 			log.Printf("no tile for %+v", cell)
 			return
 		}
-		buf := img.Pix
+		var rgbaimg *image.RGBA
+		switch img := img.(type) {
+		case *image.RGBA:
+			rgbaimg = img
+		default:
+			rect := img.Bounds()
+			draw.Draw(rgbaimg, rect, img, rect.Min, draw.Src)
+		}
+		buf := rgbaimg.Pix
 		ua := js.Global().Get("Uint8Array").New(js.ValueOf(len(buf)))
 		js.CopyBytesToJS(ua, buf)
 		ca := js.Global().Get("Uint8ClampedArray").New(ua)

diff --git a/drivers/sdl/sdl.go b/drivers/sdl/sdl.go
@@ -20,7 +20,7 @@ import (
 // TileManager manages tiles fetching.
 type TileManager interface {
 	// GetImage returns the image to be used for a given cell style.
-	GetImage(gruid.Cell) *image.RGBA
+	GetImage(gruid.Cell) image.Image
 
 	// TileSize returns the (width, height) in pixels of the tiles. Both
 	// should be positive and non-zero.

diff --git a/examples/messages/tiles.go b/examples/messages/tiles.go
@@ -45,7 +45,7 @@ type TileDrawer struct {
 	drawer *tiles.Drawer
 }
 
-func (t *TileDrawer) GetImage(c gruid.Cell) *image.RGBA {
+func (t *TileDrawer) GetImage(c gruid.Cell) image.Image {
 	// we use some selenized colors
 	fg := image.NewUniform(color.RGBA{0xad, 0xbc, 0xbc, 255})
 	switch c.Style.Fg {

diff --git a/examples/movement/tiles.go b/examples/movement/tiles.go
@@ -45,7 +45,7 @@ type TileDrawer struct {
 	drawer *tiles.Drawer
 }
 
-func (t *TileDrawer) GetImage(c gruid.Cell) *image.RGBA {
+func (t *TileDrawer) GetImage(c gruid.Cell) image.Image {
 	// we use some selenized colors
 	fg := image.NewUniform(color.RGBA{0xad, 0xbc, 0xbc, 255})
 	bg := image.NewUniform(color.RGBA{0x18, 0x49, 0x56, 255})

diff --git a/examples/pager/tiles.go b/examples/pager/tiles.go
@@ -45,7 +45,7 @@ type TileDrawer struct {
 	drawer *tiles.Drawer
 }
 
-func (t *TileDrawer) GetImage(c gruid.Cell) *image.RGBA {
+func (t *TileDrawer) GetImage(c gruid.Cell) image.Image {
 	// we use some selenized colors
 	fg := image.NewUniform(color.RGBA{0xad, 0xbc, 0xbc, 255})
 	switch c.Style.Fg {

diff --git a/tiles/drawer.go b/tiles/drawer.go
@@ -41,14 +41,14 @@ func NewDrawer(face font.Face) (*Drawer, error) {
 
 // Draw draws a rune and returns the produced image with foreground and
 // background colors given by images fg and bg.
-func (d *Drawer) Draw(r rune, fg, bg image.Image) *image.RGBA {
+func (d *Drawer) Draw(r rune, fg, bg image.Image) image.Image {
 	d.drawer.Dot = d.dot
 	d.drawer.Src = fg
 	d.drawer.Dst = image.NewRGBA(d.rect)
 	rect := d.drawer.Dst.Bounds()
 	draw.Draw(d.drawer.Dst, rect, bg, rect.Min, draw.Src)
 	d.drawer.DrawString(string(r))
-	img := d.drawer.Dst.(*image.RGBA)
+	img := d.drawer.Dst
 	return img
 }