Should work with sub-images now

examples/glaggle/main.go

@@ -1,7 +1,6 @@
 package main
 
 import "os"
-import "math"
 import "image"
 import "image/png"
 import "git.tebibyte.media/tomo/ggfx"
@@ -11,24 +10,24 @@ func main () {
 	canvas := ggfx.Image[uint8] {
 		Pix:    img.Pix,
 		Stride: img.Stride,
-		Bounds: img.Rect,
+		Rect:   img.Rect,
 		Width:  4,
 	}
 	black  := []uint8 { 0,   0,   0, 255 }
 	yellow := []uint8 { 255, 255, 0, 255 }
-	midpoint := image.Pt(canvas.Bounds.Dx() / 2, canvas.Bounds.Dy() / 2)
+	midpoint := image.Pt(canvas.Rect.Dx() / 2, canvas.Rect.Dy() / 2)
 
-	face := circle(32, 100, midpoint)
+	face := ggfx.Circle(32, 100, midpoint)
 	canvas.FillPolygon(yellow, face...)
 	canvas.StrokePolygon(black, 2, face...)
 	
-	eye := circle(12, 16, midpoint.Add(image.Pt(-40, -30)))
+	eye := ggfx.Circle(12, 16, midpoint.Add(image.Pt(-40, -30)))
 	canvas.FillPolygon(black, eye...)
-	eye = circle(12, 16, midpoint.Add(image.Pt(40, -30)))
+	eye = ggfx.Circle(12, 16, midpoint.Add(image.Pt(40, -30)))
 	canvas.FillPolygon(black, eye...)
 
-	mouth := circle(16, 70, midpoint)
-	canvas.StrokePolygon(black, 2, mouth[1:8]...)
+	mouth := ggfx.Circle(24, 70, midpoint)
+	canvas.PolyLine(black, 2, mouth[1:12]...)
 	
 	file, err := os.Create("TEST.png")
 	if err != nil { panic(err.Error()) }
@@ -38,15 +37,3 @@ func main () {
 	
 	println("Open TEST.png to see the result.")
 }
-	
-func circle (resolution int, radius float64, center image.Point) []image.Point {
-	points := make([]image.Point, resolution)
-	for index := range points {
-		angle := float64(index) * ((2 * math.Pi) / float64(len(points)))
-		point := image.Pt (
-			int(math.Cos(angle) * radius),
-			int(math.Sin(angle) * radius))
-		points[index] = point.Add(center)
-	}
-	return points
-}

examples/icon/main.go

@@ -0,0 +1,40 @@
+package main
+
+import "os"
+import "image"
+import "image/png"
+import "git.tebibyte.media/tomo/ggfx"
+
+func main () {
+	img := image.NewRGBA(image.Rect(0, 0, 256, 256))
+	canvas := ggfx.Image[uint8] {
+		Pix:    img.Pix,
+		Stride: img.Stride,
+		Rect:   img.Rect,
+		Width:  4,
+	}
+	black  := []uint8 { 0,   0,  0, 255 }
+	orange := []uint8 { 255, 48, 0, 255 }
+	midpoint := image.Pt(canvas.Rect.Dx() / 2, canvas.Rect.Dy() / 2)
+
+	canvas.FillRectangle(orange, canvas.Rect)
+	for x := 1; x <= 6; x ++ {
+		point := image.Pt(x, 7 - x)
+		canvas.FillRectangle(black, image.Rectangle {
+			Min: point.Mul(32),
+			Max: point.Add(image.Pt(1, 1)).Mul(32),
+		})
+	}
+
+	ring := ggfx.Circle(32, 88, midpoint)
+	canvas.StrokePolygon(orange, 32, ring...)
+	canvas.StrokePolygon(black, 16, ring...)
+	
+	file, err := os.Create("TEST.png")
+	if err != nil { panic(err.Error()) }
+	defer file.Close()
+	err = png.Encode(file, img)
+	if err != nil { panic(err.Error()) }
+	
+	println("Open TEST.png to see the result.")
+}

ggfx.go

@@ -13,10 +13,18 @@ type Image[T any] struct {
 	// Width specifies how many slice elements make up a single pixel.
 	Width int
 
-	// Bounds specifies a rectangle that all drawing operations will be
+	// Rect specifies a rectangle that all drawing operations will be
 	// clipped to. It must not reside outside of Data. It is measured in
 	// pixels and not slice elements.
-	Bounds image.Rectangle
+	Rect image.Rectangle
+}
+
+func (this Image[T]) Bounds () image.Rectangle {
+	return this.Rect
+}
+
+func (this Image[T]) PixOffset (x, y int) int {
+	return (y - this.Rect.Min.Y) * this.Stride + (x - this.Rect.Min.X) * this.Width
 }
 
 func (this Image[T]) assertWidth (pixel []T) {	

line.go

@@ -25,12 +25,9 @@ func (this Image[T]) lineInternal (
 ) {
 	context := linePlottingContext[T] {
 		plottingContext: plottingContext[T] {
-			data:   this.Pix,
-			stride: this.Stride,
+			Image:  this,
 			color:  stroke,
 			weight: weight,
-			bounds: this.Bounds,
-			width:  this.Width,
 			offset: offset,
 		},
 		min: min,

plot.go

@@ -3,12 +3,9 @@ package ggfx
 import "image"
 
 type plottingContext[T any] struct {
-	data   []T
-	stride int
+	Image[T]
 	color  T
 	weight int
-	bounds image.Rectangle
-	width  int
 	offset int
 }
 
@@ -16,14 +13,14 @@ func (context plottingContext[T]) square (center image.Point) (square image.Rect
 	return image.Rect(0, 0, context.weight, context.weight).
 		Sub(image.Pt(context.weight / 2, context.weight / 2)).
 		Add(center).
-		Intersect(context.bounds)
+		Intersect(context.Rect)
 }
 
 func (context plottingContext[T]) plot (center image.Point) {
 	square := context.square(center)
 	for y := square.Min.Y; y < square.Max.Y; y ++ {
 	for x := square.Min.X; x < square.Max.X; x ++ {
-		index := y * context.stride + x * context.width + context.offset
-		context.data[index] = context.color
+		index := context.PixOffset(x, y) + context.offset
+		context.Pix[index] = context.color
 	}}
 }

polygon.go

@@ -5,7 +5,7 @@ import "image"
 
 func (this Image[T]) FillPolygon (fill []T, points ...image.Point) {
 	this.assertWidth(fill)
-	if len(points) < 2 { return }
+	if len(points) < 3 { return }
 
 	// figure out the bounds of the polygon so we don't test empty space
 	var area image.Rectangle
@@ -17,7 +17,7 @@ func (this Image[T]) FillPolygon (fill []T, points ...image.Point) {
 		if point.X > area.Max.X { area.Max.X = point.X }
 		if point.Y > area.Max.Y { area.Max.Y = point.Y }
 	}
-	area = this.Bounds.Intersect(area)
+	area = this.Rect.Intersect(area)
 	if area.Empty() { return }
 	
 	// this algorithm is adapted from:
@@ -70,9 +70,7 @@ func (this Image[T]) FillPolygon (fill []T, points ...image.Point) {
 				// fill for each pixel part
 				for offset, part := range fill {
 					for x := left; x < right; x ++ {
-						index :=
-							y * this.Stride + x *
-							this.Width + offset
+						index := this.PixOffset(x, y) + offset
 						this.Pix[index] = part
 					}
 				}
@@ -88,3 +86,12 @@ func (this Image[T]) StrokePolygon (stroke []T, weight int, points ...image.Poin
 		prevPoint = point
 	}
 }
+
+func (this Image[T]) PolyLine (stroke []T, weight int, points ...image.Point) {
+	if len(points) < 2 { return }
+	prevPoint := points[0]
+	for _, point := range points[1:] {
+		this.Line(stroke, weight, prevPoint, point)
+		prevPoint = point
+	}
+}

rectangle.go

@@ -4,14 +4,14 @@ import "image"
 
 func (this Image[T]) FillRectangle (fill []T, rectangle image.Rectangle) {
 	this.assertWidth(fill)
-	rectangle = this.Bounds.Intersect(rectangle.Canon())
+	rectangle = this.Rect.Intersect(rectangle.Canon())
 	if rectangle.Empty () { return }
 	
 	var pos image.Point
 	for pos.Y = rectangle.Min.Y; pos.Y < rectangle.Max.Y; pos.Y ++ {
 	for offset, part := range fill {
 	for pos.X = rectangle.Min.X; pos.X < rectangle.Max.X; pos.X ++ {
-		index := pos.Y * this.Stride + pos.X * this.Width + offset
+		index := this.PixOffset(pos.X, pos.Y) + offset
 		this.Pix[index] = part
 	}}}
 }

shapes.go

@@ -0,0 +1,16 @@
+package ggfx
+
+import "math"
+import "image"
+
+func Circle (resolution int, radius float64, center image.Point) []image.Point {
+	points := make([]image.Point, resolution)
+	for index := range points {
+		angle := float64(index) * ((2 * math.Pi) / float64(len(points)))
+		point := image.Pt (
+			int(math.Cos(angle) * radius),
+			int(math.Sin(angle) * radius))
+		points[index] = point.Add(center)
+	}
+	return points
+}