sketchy to gaul color library transition

Author: aldernero

controls.go

@@ -51,7 +51,7 @@ type Slider struct {
 	GradientEndColor   string     `json:"GradientEndColor"`
 	TextColor          string     `json:"TextColor"`
 	DrawRect           bool       `json:"DrawRect"`
-	colors             ColorConfig
+	colors             gaul.ColorConfig
 	DidJustChange      bool `json:"-"`
 	fontFamily         *canvas.FontFamily
 	fontFace           *canvas.FontFace
@@ -68,7 +68,7 @@ type Toggle struct {
 	BackgroundColor string     `json:"BackgroundColor"`
 	FillColor       string     `json:"FillColor"`
 	TextColor       string     `json:"TextColor"`
-	colors          ColorConfig
+	colors          gaul.ColorConfig
 	DidJustChange   bool `json:"-"`
 	wasPressed      bool
 	fontFamily      *canvas.FontFamily
@@ -298,10 +298,10 @@ func (t *Toggle) SetFont(ff *canvas.FontFamily) {
 }
 
 func (s *Slider) parseColors() {
-	s.colors.Set(s.BackgroundColor, BackgroundColorType, SliderBackgroundColor)
-	s.colors.Set(s.OutlineColor, OutlineColorType, SliderOutlineColor)
-	s.colors.Set(s.TextColor, TextColorType, SliderTextColor)
-	s.colors.Set(s.FillColor, FillColorType, SliderFillColor)
+	s.colors.Set(s.BackgroundColor, gaul.BackgroundColorType, SliderBackgroundColor)
+	s.colors.Set(s.OutlineColor, gaul.OutlineColorType, SliderOutlineColor)
+	s.colors.Set(s.TextColor, gaul.TextColorType, SliderTextColor)
+	s.colors.Set(s.FillColor, gaul.FillColorType, SliderFillColor)
 	if s.UseGradientFill {
 		c1 := SliderGradientStart
 		c2 := SliderGradientEnd
@@ -311,13 +311,13 @@ func (s *Slider) parseColors() {
 		if s.GradientEndColor != "" {
 			c2 = s.GradientEndColor
 		}
-		s.colors.Gradient = NewSimpleGradientFromNamed(c1, c2)
+		s.colors.Gradient = gaul.NewSimpleGradientFromNamed(c1, c2)
 	}
 }
 
 func (t *Toggle) parseColors() {
-	t.colors.Set(t.BackgroundColor, BackgroundColorType, ToggleBackgroundColor)
-	t.colors.Set(t.OutlineColor, OutlineColorType, ToggleOutlineColor)
-	t.colors.Set(t.TextColor, TextColorType, ToggleTextColor)
-	t.colors.Set(t.FillColor, FillColorType, ToggleFillColor)
+	t.colors.Set(t.BackgroundColor, gaul.BackgroundColorType, ToggleBackgroundColor)
+	t.colors.Set(t.OutlineColor, gaul.OutlineColorType, ToggleOutlineColor)
+	t.colors.Set(t.TextColor, gaul.TextColorType, ToggleTextColor)
+	t.colors.Set(t.FillColor, gaul.FillColorType, ToggleFillColor)
 }

examples/fractal/main.go

@@ -10,7 +10,7 @@ import (
 	"github.com/hajimehoshi/ebiten/v2"
 )
 
-var synthwavePalette sketchy.Gradient
+var synthwavePalette gaul.Gradient
 
 func drawLines(l gaul.Line, n int, p float64, ctx *canvas.Context) {
 	if n == 0 {
@@ -69,7 +69,7 @@ func main() {
 	s.Updater = update
 	s.Drawer = draw
 	s.Init()
-	synthwavePalette = sketchy.NewGradientFromNamed([]string{"#1bbbd9", "#f900a4"})
+	synthwavePalette = gaul.NewGradientFromNamed([]string{"#1bbbd9", "#f900a4"})
 	ebiten.SetWindowSize(int(s.ControlWidth+s.SketchWidth), int(s.SketchHeight))
 	ebiten.SetWindowTitle("Sketchy - " + s.Title)
 	ebiten.SetWindowResizingMode(ebiten.WindowResizingModeDisabled)

examples/lissajous/main.go

@@ -57,7 +57,6 @@ func main() {
 	ebiten.SetWindowSize(int(s.ControlWidth+s.SketchWidth), int(s.SketchHeight))
 	ebiten.SetWindowTitle("Sketchy - " + s.Title)
 	ebiten.SetWindowResizingMode(ebiten.WindowResizingModeDisabled)
-	ebiten.SetFPSMode(ebiten.FPSModeVsyncOffMaximum)
 	if err := ebiten.RunGame(s); err != nil {
 		log.Fatal(err)
 	}

examples/scale_rotate/main.go

@@ -65,7 +65,6 @@ func main() {
 	ebiten.SetWindowSize(int(s.ControlWidth+s.SketchWidth), int(s.SketchHeight))
 	ebiten.SetWindowTitle("Sketchy - " + s.Title)
 	ebiten.SetWindowResizingMode(ebiten.WindowResizingModeDisabled)
-	ebiten.SetFPSMode(ebiten.FPSModeVsyncOffMaximum)
 	if err := ebiten.RunGame(s); err != nil {
 		log.Fatal(err)
 	}

go.mod

@@ -3,11 +3,10 @@ module github.com/aldernero/sketchy
 go 1.18
 
 require (
-	github.com/aldernero/gaul v0.0.0-20230212032317-80af67ca17bf
-	github.com/hajimehoshi/ebiten/v2 v2.4.16
+	github.com/aldernero/gaul v0.0.0-20230320013343-9671cb8e2d51
+	github.com/hajimehoshi/ebiten/v2 v2.5.0
 	github.com/lucasb-eyer/go-colorful v1.2.0
-	github.com/tdewolff/canvas v0.0.0-20221230020303-9eb6d3934367
-	golang.org/x/image v0.4.0
+	github.com/tdewolff/canvas v0.0.0-20230323191751-ed85723e0088
 )
 
 require (
@@ -18,21 +17,22 @@ require (
 	github.com/benoitkugler/textlayout v0.3.0 // indirect
 	github.com/benoitkugler/textprocessing v0.0.2 // indirect
 	github.com/dsnet/compress v0.0.1 // indirect
-	github.com/ebitengine/purego v0.1.1 // indirect
-	github.com/go-fonts/latin-modern v0.2.0 // indirect
+	github.com/ebitengine/purego v0.3.1 // indirect
+	github.com/go-fonts/latin-modern v0.3.0 // indirect
 	github.com/go-gl/glfw/v3.3/glfw v0.0.0-20221017161538-93cebf72946b // indirect
-	github.com/go-latex/latex v0.0.0-20210823091927-c0d11ff05a81 // indirect
+	github.com/go-latex/latex v0.0.0-20230307184459-12ec69307ad9 // indirect
 	github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 // indirect
-	github.com/hajimehoshi/file2byteslice v1.0.0 // indirect
 	github.com/jezek/xgb v1.1.0 // indirect
 	github.com/ojrac/opensimplex-go v1.0.2 // indirect
-	github.com/tdewolff/minify/v2 v2.12.4 // indirect
+	github.com/tdewolff/minify/v2 v2.12.5 // indirect
 	github.com/tdewolff/parse/v2 v2.6.5 // indirect
 	github.com/wcharczuk/go-chart/v2 v2.1.0 // indirect
-	golang.org/x/exp/shiny v0.0.0-20230210204819-062eb4c674ab // indirect
-	golang.org/x/mobile v0.0.0-20221110043201-43a038452099 // indirect
-	golang.org/x/sys v0.5.0 // indirect
-	golang.org/x/text v0.7.0 // indirect
+	golang.org/x/exp/shiny v0.0.0-20230321023759-10a507213a29 // indirect
+	golang.org/x/image v0.6.0 // indirect
+	golang.org/x/mobile v0.0.0-20230301163155-e0f57694e12c // indirect
+	golang.org/x/sync v0.1.0 // indirect
+	golang.org/x/sys v0.6.0 // indirect
+	golang.org/x/text v0.8.0 // indirect
 	gonum.org/v1/plot v0.12.0 // indirect
 	star-tex.org/x/tex v0.4.0 // indirect
 )