renamed the backend directories so they match the package names

backend/goglbackend/clip.go

@@ -3,7 +3,7 @@ package goglbackend
 import (
 	"unsafe"
 
-	"github.com/tfriedel6/canvas/backend/gogl/gl"
+	"github.com/tfriedel6/canvas/backend/goglbackend/gl"
 )
 
 func (b *GoGLBackend) ClearClip() {

backend/goglbackend/fill.go

@@ -6,7 +6,7 @@ import (
 	"unsafe"
 
 	"github.com/tfriedel6/canvas/backend/backendbase"
-	"github.com/tfriedel6/canvas/backend/gogl/gl"
+	"github.com/tfriedel6/canvas/backend/goglbackend/gl"
 )
 
 func (b *GoGLBackend) Clear(pts [4][2]float64) {

backend/goglbackend/gogl.go

@@ -6,7 +6,7 @@ import (
 	"math"
 
 	"github.com/tfriedel6/canvas/backend/backendbase"
-	"github.com/tfriedel6/canvas/backend/gogl/gl"
+	"github.com/tfriedel6/canvas/backend/goglbackend/gl"
 )
 
 const alphaTexSize = 2048

backend/goglbackend/gradients.go

@@ -4,7 +4,7 @@ import (
 	"runtime"
 
 	"github.com/tfriedel6/canvas/backend/backendbase"
-	"github.com/tfriedel6/canvas/backend/gogl/gl"
+	"github.com/tfriedel6/canvas/backend/goglbackend/gl"
 )
 
 // LinearGradient is a gradient with any number of

backend/goglbackend/imagedata.go

@@ -5,7 +5,7 @@ import (
 	"image/color"
 	"unsafe"
 
-	"github.com/tfriedel6/canvas/backend/gogl/gl"
+	"github.com/tfriedel6/canvas/backend/goglbackend/gl"
 )
 
 // GetImageData returns an RGBA image of the current image

backend/goglbackend/images.go

@@ -7,7 +7,7 @@ import (
 	"unsafe"
 
 	"github.com/tfriedel6/canvas/backend/backendbase"
-	"github.com/tfriedel6/canvas/backend/gogl/gl"
+	"github.com/tfriedel6/canvas/backend/goglbackend/gl"
 )
 
 // Image represents a loaded image that can be used in various drawing functions

backend/goglbackend/shader.go

@@ -8,7 +8,7 @@ import (
 	"unicode"
 	"unicode/utf8"
 
-	"github.com/tfriedel6/canvas/backend/gogl/gl"
+	"github.com/tfriedel6/canvas/backend/goglbackend/gl"
 )
 
 type shaderProgram struct {

backend/xmobilebackend/clip.go

@@ -3,7 +3,7 @@ package xmobilebackend
 import (
 	"unsafe"
 
-	"golang.org/x/mobile/gl"
+	"github.com/tfriedel6/canvas/backend/goglbackend/gl"
 )
 
 func (b *XMobileBackend) ClearClip() {

backend/xmobilebackend/fill.go

@@ -6,7 +6,7 @@ import (
 	"unsafe"
 
 	"github.com/tfriedel6/canvas/backend/backendbase"
-	"golang.org/x/mobile/gl"
+	"github.com/tfriedel6/canvas/backend/goglbackend/gl"
 )
 
 func (b *XMobileBackend) Clear(pts [4][2]float64) {

backend/xmobilebackend/gen/gen.go

@@ -18,8 +18,8 @@ func main() {
 		}
 		d1 := filepath.Base(dir)
 		d2 := filepath.Base(filepath.Dir(dir))
-		if d2 != "backend" || d1 != "xmobile" {
+		if d2 != "backend" || d1 != "xmobilebackend" {
-			log.Fatalln("This must be run in the backend/xmobile directory")
+			log.Fatalln("This must be run in the backend/xmobilebackend directory")
 		}
 	}
 
@@ -41,16 +41,16 @@ func main() {
 	}
 
 	{ // copy gogl files
-		fis, err := ioutil.ReadDir("../gogl")
+		fis, err := ioutil.ReadDir("../goglbackend")
 		if err != nil {
-			log.Fatalf("Failed to read dir ../gogl: %v", err)
+			log.Fatalf("Failed to read dir ../goglbackend: %v", err)
 		}
 
 		for _, fi := range fis {
 			if !strings.HasSuffix(fi.Name(), ".go") || fi.Name() == "shader.go" {
 				continue
 			}
-			path := filepath.Join("../gogl", fi.Name())
+			path := filepath.Join("../goglbackend", fi.Name())
 			data, err := ioutil.ReadFile(path)
 			if err != nil {
 				log.Fatalf("Failed to read file %s: %v", path, err)

backend/xmobilebackend/gradients.go

@@ -4,7 +4,7 @@ import (
 	"runtime"
 
 	"github.com/tfriedel6/canvas/backend/backendbase"
-	"golang.org/x/mobile/gl"
+	"github.com/tfriedel6/canvas/backend/goglbackend/gl"
 )
 
 // LinearGradient is a gradient with any number of

backend/xmobilebackend/imagedata.go

@@ -5,7 +5,7 @@ import (
 	"image/color"
 	"unsafe"
 
-	"golang.org/x/mobile/gl"
+	"github.com/tfriedel6/canvas/backend/goglbackend/gl"
 )
 
 // GetImageData returns an RGBA image of the current image

backend/xmobilebackend/images.go

@@ -7,7 +7,7 @@ import (
 	"unsafe"
 
 	"github.com/tfriedel6/canvas/backend/backendbase"
-	"golang.org/x/mobile/gl"
+	"github.com/tfriedel6/canvas/backend/goglbackend/gl"
 )
 
 // Image represents a loaded image that can be used in various drawing functions

backend/xmobilebackend/shaders.go

@@ -246,7 +246,7 @@ void main() {
 		return;
 	}
 	float o = max(o1, o2);
-	float r = radFrom + o * (radTo - radFrom);
+	//float r = radFrom + o * (radTo - radFrom);
     vec4 col = texture2D(gradient, vec2(o, 0.0));
     col.a *= texture2D(alphaTex, v_atc).a * globalAlpha;
 	gl_FragColor = col;

backend/xmobilebackend/xmobile.go

@@ -8,7 +8,7 @@ import (
 	"unsafe"
 
 	"github.com/tfriedel6/canvas/backend/backendbase"
-	"golang.org/x/mobile/gl"
+	"github.com/tfriedel6/canvas/backend/goglbackend/gl"
 )
 
 const alphaTexSize = 2048

examples/android/android.go

@@ -4,7 +4,7 @@ import (
 	"math"
 
 	"github.com/tfriedel6/canvas"
-	"github.com/tfriedel6/canvas/backend/gogl"
+	"github.com/tfriedel6/canvas/backend/goglbackend"
 )
 
 var cv *canvas.Canvas

examples/glfw/glfw.go

@@ -7,7 +7,7 @@ import (
 	"github.com/go-gl/gl/v3.2-core/gl"
 	"github.com/go-gl/glfw/v3.2/glfw"
 	"github.com/tfriedel6/canvas"
-	"github.com/tfriedel6/canvas/backend/gogl"
+	"github.com/tfriedel6/canvas/backend/goglbackend"
 )
 
 func main() {

examples/gomobile/gomobile.go

@@ -6,7 +6,7 @@ import (
 	"time"
 
 	"github.com/tfriedel6/canvas"
-	"github.com/tfriedel6/canvas/backend/xmobile"
+	"github.com/tfriedel6/canvas/backend/xmobilebackend"
 	"golang.org/x/mobile/app"
 	"golang.org/x/mobile/event/lifecycle"
 	"golang.org/x/mobile/event/paint"

examples/ios/ios.go

@@ -4,7 +4,7 @@ import (
 	"math"
 
 	"github.com/tfriedel6/canvas"
-	"github.com/tfriedel6/canvas/backend/gogl"
+	"github.com/tfriedel6/canvas/backend/goglbackend"
 )
 
 var cv *canvas.Canvas

examples/sdl/sdl.go

@@ -7,7 +7,7 @@ import (
 
 	"github.com/go-gl/gl/v3.2-core/gl"
 	"github.com/tfriedel6/canvas"
-	"github.com/tfriedel6/canvas/backend/gogl"
+	"github.com/tfriedel6/canvas/backend/goglbackend"
 	"github.com/veandco/go-sdl2/sdl"
 )
 

examples/shiny/shiny.go

@@ -4,7 +4,7 @@ import (
 	"log"
 
 	"github.com/tfriedel6/canvas"
-	"github.com/tfriedel6/canvas/backend/xmobile"
+	"github.com/tfriedel6/canvas/backend/xmobilebackend"
 	"golang.org/x/exp/shiny/driver/gldriver"
 	"golang.org/x/exp/shiny/screen"
 	"golang.org/x/exp/shiny/widget"

glfwcanvas/glfwcanvas.go

@@ -12,7 +12,7 @@ import (
 	"github.com/go-gl/gl/v3.2-core/gl"
 	"github.com/go-gl/glfw/v3.2/glfw"
 	"github.com/tfriedel6/canvas"
-	"github.com/tfriedel6/canvas/backend/gogl"
+	"github.com/tfriedel6/canvas/backend/goglbackend"
 )
 
 // Window represents the opened window with GL context. The Mouse* and Key*

sdlcanvas/sdlcanvas.go

@@ -11,7 +11,7 @@ import (
 
 	"github.com/go-gl/gl/v3.2-core/gl"
 	"github.com/tfriedel6/canvas"
-	"github.com/tfriedel6/canvas/backend/gogl"
+	"github.com/tfriedel6/canvas/backend/goglbackend"
 	"github.com/veandco/go-sdl2/sdl"
 )