Upgrade tomo version

canvas/texture.go

@@ -1,6 +1,8 @@
 package xcanvas
 
 import "image"
+import "image/color"
+import "github.com/jezek/xgbutil/xgraphics"
 import "git.tebibyte.media/tomo/tomo/canvas"
 
 // Texture is a read-only image texture that can be quickly written to a canvas.
@@ -40,16 +42,43 @@ func NewTextureFrom (source image.Image) *Texture {
 	return texture
 }
 
+func (this *Texture) BGRAAt (x, y int) xgraphics.BGRA {
+	if !(image.Point{ x, y }.In(this.rect)) {
+		return xgraphics.BGRA { }
+	}
+	index := this.PixOffset(x, y)
+	return xgraphics.BGRA {
+		B: this.pix[index    ],
+		G: this.pix[index + 1],
+		R: this.pix[index + 2],
+		A: this.pix[index + 3],
+	}
+}
+
+func (this *Texture) At (x, y int) color.Color {
+	return this.BGRAAt(x, y)
+}
+
 // Bounds returns the bounding rectangle of this texture.
 func (this *Texture) Bounds () image.Rectangle {
 	return this.rect
 }
 
+func (this *Texture) ColorModel () color.Model {
+	return xgraphics.BGRAModel
+}
+
 // Opaque reports whether or not the texture is fully opaque.
 func (this *Texture) Opaque () bool {
 	return !this.transparent
 }
 
+func (this *Texture) PixOffset (x, y int) int {
+	x = wrap(x, this.rect.Min.X, this.rect.Max.X)
+	y = wrap(y, this.rect.Min.Y, this.rect.Max.Y)
+	return x * 4 + y * this.stride
+}
+
 // Close frees the texture from memory.
 func (this *Texture) Close () error {
 	// i lied we dont actually need to close this, but we will once this
@@ -64,12 +93,6 @@ func (this *Texture) Clip (bounds image.Rectangle) canvas.Texture {
 	return &clipped
 }
 
-func (this *Texture) PixOffset (x, y int) int {
-	x = wrap(x, this.rect.Min.X, this.rect.Max.X)
-	y = wrap(y, this.rect.Min.Y, this.rect.Max.Y)
-	return x * 4 + y * this.stride
-}
-
 // AssertTexture checks if a given canvas.Texture is a texture from this package.
 func AssertTexture (unknown canvas.Texture) *Texture {
 	if tx, ok := unknown.(*Texture); ok {