Updated to use new TextureRGBA

jphsd · Sep 9, 2024 · d5104b4 · d5104b4
1 parent 56859d6
commit d5104b4
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 23 deletions.
diff --git a/cmd/component.go b/cmd/component.go
@@ -24,15 +24,14 @@ func main() {
 		res := image.NewRGBA(image.Rect(0, 0, width*3, height))
 		cf := random.MakeComponent()
 		// Color
-		img := texture.NewRGBA(width, height, cf.Color, 0, 0, 1, 1)
+		img := texture.NewTextureRGBA(width, height, cf.Color, 0, 0, 1, 1, false)
 		draw.Draw(res, image.Rect(0, 0, width, height), img, image.Point{}, draw.Src)
 		// Alpha
-		alpha := texture.NewColorGray(cf.Value)
-		img = texture.NewRGBA(width, height, alpha, 0, 0, 1, 1)
-		draw.Draw(res, image.Rect(width, 0, 2*width, height), img, image.Point{}, draw.Src)
+		gimg := texture.NewTextureGray16(width, height, cf.Value, 0, 0, 1, 1, false)
+		draw.Draw(res, image.Rect(width, 0, 2*width, height), gimg, image.Point{}, draw.Src)
 		// Bump Map
 		bm := &surface.BumpMap{surface.DefaultAmbient, nil, nil, cf.Vector}
-		img = texture.NewRGBA(width, height, bm, 0, 0, 1, 1)
+		img = texture.NewTextureRGBA(width, height, bm, 0, 0, 1, 1, false)
 		draw.Draw(res, image.Rect(2*width, 0, 3*width, height), img, image.Point{}, draw.Src)
 		gi.SaveImage(res, fmt.Sprintf("%06d", cnt))
 		cnt++

diff --git a/cmd/ifs.go b/cmd/ifs.go
@@ -24,8 +24,7 @@ func main() {
 	xfm3 := g2d.BoxTransform(0, 0, 600, 0, 600, 200, 200, 400, 200, 400)
 	for i := 1; i < 7; i++ {
 		src := texture.NewIFS([]float64{float64(width), float64(height)}, []*g2d.Aff3{xfm1, xfm2, xfm3}, i)
-		cf := texture.NewColorGray(src)
-		img := texture.NewRGBA(width, height, cf, 0, 0, 1, 1)
+		img := texture.NewTextureGray16(width, height, src, 0, 0, 1, 1, false)
 		gi.SaveImage(img, fmt.Sprintf("ifs-%d", i))
 	}
 }
diff --git a/cmd/image.go b/cmd/image.go
@@ -33,7 +33,7 @@ func main() {
 	xfm.RotateAbout(rand.Float64()*math.Pi*2, float64(width)/2, float64(height)/2)
 	f3 := texture.NewTransformCF(f2, xfm)
 
-	out := texture.NewRGBA(width, height, f3, 0, 0, 1, 1)
+	out := texture.NewTextureRGBA(width, height, f3, 0, 0, 1, 1, false)
 	image.SaveImage(out, "image")
 	texture.SaveJSON(f3, "image")
 }
diff --git a/cmd/kaleido.go b/cmd/kaleido.go
@@ -27,7 +27,7 @@ func main() {
 	for true {
 		a := 0.0
 		cf := random.MakeColorField(6, 0)
-		img := texture.NewRGBA(width, height, cf, 0, 0, 1, 1)
+		img := texture.NewTextureRGBA(width, height, cf, 0, 0, 1, 1, false)
 		gi.SaveImage(img, fmt.Sprintf("%06d-0k", cnt))
 
 		pts := make([][]float64, *n*2)
@@ -52,7 +52,7 @@ func main() {
 		}
 		cf = texture.NewReflectCF(cf, prev, pts[0])
 
-		img = texture.NewRGBA(width, height, cf, 0, 0, 1, 1)
+		img = texture.NewTextureRGBA(width, height, cf, 0, 0, 1, 1, false)
 		gi.SaveImage(img, fmt.Sprintf("%06d-1k", cnt))
 
 		// Zoom out
@@ -61,7 +61,7 @@ func main() {
 		xfm.ScaleAbout(2, 2, 400, 400)
 		cf = texture.NewTransformCF(cf, xfm)
 
-		img = texture.NewRGBA(width, height, cf, 0, 0, 1, 1)
+		img = texture.NewTextureRGBA(width, height, cf, 0, 0, 1, 1, false)
 		gi.SaveImage(img, fmt.Sprintf("%06d-2k", cnt))
 
 		cnt++

diff --git a/cmd/morph.go b/cmd/morph.go
@@ -25,7 +25,6 @@ func main() {
 
 	f3 := texture.NewEdge(f2, texture.Z4Support(1, 1))
 
-	cf2 := texture.NewColorGray(f3)
-	fimg := texture.NewRGBA(width, height, cf2, 0, 0, 1, 1)
+	fimg := texture.NewTextureGray16(width, height, f3, 0, 0, 1, 1, false)
 	image.SaveImage(fimg, "morph")
 }
diff --git a/cmd/radialref.go b/cmd/radialref.go
@@ -26,14 +26,14 @@ func main() {
 	for true {
 		a := 0.0
 		cf := random.MakeColorField(6, 0)
-		img := texture.NewRGBA(width, height, cf, 0, 0, 1, 1)
+		img := texture.NewTextureRGBA(width, height, cf, 0, 0, 1, 1, false)
 		gi.SaveImage(img, fmt.Sprintf("%06d-0rr", cnt))
 
 		for i := 0; i < *n; i++ {
 			cf = texture.NewReflectCF(cf, []float64{400, 400}, []float64{400 + math.Cos(a)*r, 400 + math.Sin(a)*r})
 			a += da
 		}
-		img = texture.NewRGBA(width, height, cf, 0, 0, 1, 1)
+		img = texture.NewTextureRGBA(width, height, cf, 0, 0, 1, 1, false)
 		gi.SaveImage(img, fmt.Sprintf("%06d-1rr", cnt))
 
 		cnt++

diff --git a/cmd/random.go b/cmd/random.go
@@ -23,7 +23,7 @@ func main() {
 	for cnt < 100 {
 		name := fmt.Sprintf("%06d", cnt)
 		cf := random.MakeColorField(6, 0)
-		img := texture.NewRGBA(width, height, cf, 0, 0, 1, 1)
+		img := texture.NewTextureRGBA(width, height, cf, 0, 0, 1, 1, false)
 		image.SaveImage(img, name)
 		texture.SaveJSON(cf, name)
 		cnt++

diff --git a/cmd/triang.go b/cmd/triang.go
@@ -20,7 +20,7 @@ func main() {
 	cnt := 0
 	for true {
 		cf := random.MakeColorField(6, 0)
-		img := texture.NewRGBA(width, height, cf, 0, 0, 1, 1)
+		img := texture.NewTextureRGBA(width, height, cf, 0, 0, 1, 1, false)
 		gi.SaveImage(img, fmt.Sprintf("%06d-0t", cnt))
 
 		cf = texture.NewReflectCF(cf, []float64{400, 100}, []float64{746, 700})
@@ -30,15 +30,15 @@ func main() {
 		// Repeat to catch other reflections
 		cf = texture.NewReflectCF(cf, []float64{400, 100}, []float64{746, 700})
 		cf = texture.NewReflectCF(cf, []float64{746, 700}, []float64{54, 700})
-		img = texture.NewRGBA(width, height, cf, 0, 0, 1, 1)
+		img = texture.NewTextureRGBA(width, height, cf, 0, 0, 1, 1, false)
 		gi.SaveImage(img, fmt.Sprintf("%06d-1t", cnt))
 
 		// Zoom out
 		xfm := g2d.NewAff3()
 		xfm.ScaleAbout(2, 2, 400, 400)
 		cf = texture.NewTransformCF(cf, xfm)
 
-		img = texture.NewRGBA(width, height, cf, 0, 0, 1, 1)
+		img = texture.NewTextureRGBA(width, height, cf, 0, 0, 1, 1, false)
 		gi.SaveImage(img, fmt.Sprintf("%06d-zt", cnt))
 
 		cnt++

diff --git a/cmd/warp.go b/cmd/warp.go
@@ -3,7 +3,6 @@
 package main
 
 import (
-	g2d "github.com/jphsd/graphics2d"
 	"github.com/jphsd/graphics2d/image"
 	"github.com/jphsd/texture"
 )
@@ -13,7 +12,6 @@ func main() {
 	width, height := 1000, 1000
 
 	f1 := texture.NewSquares(25)
-	cf := texture.NewColorGray(f1)
 
 	//rwf := IdentityWF{}
 	//rwf := texture.NewRadialWF([]float64{500, 500}, 1,  1)
@@ -26,9 +24,9 @@ func main() {
 	rwf := texture.NewRadialRippleWF([]float64{500, 500}, 100, 10, 0)
 	//rwf := texture.NewRadialWiggleWF([]float64{500, 500}, 100, 0.1, 0)
 
-	wf := texture.NewWarpCF(cf, rwf)
+	wf := texture.NewWarp(f1, rwf)
 
-	img := texture.NewRGBA(width, height, wf, 0, 0, 1, 1)
+	img := texture.NewTextureGray16(width, height, wf, 0, 0, 1, 1, false)
 
 	image.SaveImage(img, "warp")
 }