From bbcb712b73aced531eeb98f5976c85a14db47376 Mon Sep 17 00:00:00 2001 From: Thomas Friedel Date: Wed, 24 Apr 2019 15:57:43 +0200 Subject: [PATCH] renamed the backend directories so they match the package names --- backend/{gogl => goglbackend}/clip.go | 2 +- backend/{gogl => goglbackend}/fill.go | 2 +- backend/{gogl => goglbackend}/gl/conversions.go | 0 backend/{gogl => goglbackend}/gl/khrplatform.h | 0 backend/{gogl => goglbackend}/gl/package.go | 0 backend/{gogl => goglbackend}/gl/procaddr.go | 0 backend/{gogl => goglbackend}/gl/procaddr_mobile.go | 0 backend/{gogl => goglbackend}/gogl.go | 2 +- backend/{gogl => goglbackend}/gradients.go | 2 +- backend/{gogl => goglbackend}/imagedata.go | 2 +- backend/{gogl => goglbackend}/images.go | 2 +- backend/{gogl => goglbackend}/shader.go | 2 +- backend/{gogl => goglbackend}/shaders.go | 0 backend/{software => softwarebackend}/color.go | 0 backend/{software => softwarebackend}/fill.go | 0 backend/{software => softwarebackend}/images.go | 0 backend/{software => softwarebackend}/software.go | 0 backend/{software => softwarebackend}/triangles.go | 0 backend/{xmobile => xmobilebackend}/clip.go | 2 +- backend/{xmobile => xmobilebackend}/fill.go | 2 +- backend/{xmobile => xmobilebackend}/gen/gen.go | 10 +++++----- backend/{xmobile => xmobilebackend}/gradients.go | 2 +- backend/{xmobile => xmobilebackend}/imagedata.go | 2 +- backend/{xmobile => xmobilebackend}/images.go | 2 +- backend/{xmobile => xmobilebackend}/shader.go | 0 backend/{xmobile => xmobilebackend}/shaders.go | 2 +- backend/{xmobile => xmobilebackend}/xmobile.go | 2 +- examples/android/android.go | 2 +- examples/glfw/glfw.go | 2 +- examples/gomobile/gomobile.go | 2 +- examples/ios/ios.go | 2 +- examples/sdl/sdl.go | 2 +- examples/shiny/shiny.go | 2 +- glfwcanvas/glfwcanvas.go | 2 +- sdlcanvas/sdlcanvas.go | 2 +- 35 files changed, 27 insertions(+), 27 deletions(-) rename backend/{gogl => goglbackend}/clip.go (96%) rename backend/{gogl => goglbackend}/fill.go (99%) rename backend/{gogl => goglbackend}/gl/conversions.go (100%) rename backend/{gogl => goglbackend}/gl/khrplatform.h (100%) rename backend/{gogl => goglbackend}/gl/package.go (100%) rename backend/{gogl => goglbackend}/gl/procaddr.go (100%) rename backend/{gogl => goglbackend}/gl/procaddr_mobile.go (100%) rename backend/{gogl => goglbackend}/gogl.go (99%) rename backend/{gogl => goglbackend}/gradients.go (98%) rename backend/{gogl => goglbackend}/imagedata.go (98%) rename backend/{gogl => goglbackend}/images.go (99%) rename backend/{gogl => goglbackend}/shader.go (98%) rename backend/{gogl => goglbackend}/shaders.go (100%) rename backend/{software => softwarebackend}/color.go (100%) rename backend/{software => softwarebackend}/fill.go (100%) rename backend/{software => softwarebackend}/images.go (100%) rename backend/{software => softwarebackend}/software.go (100%) rename backend/{software => softwarebackend}/triangles.go (100%) rename backend/{xmobile => xmobilebackend}/clip.go (96%) rename backend/{xmobile => xmobilebackend}/fill.go (99%) rename backend/{xmobile => xmobilebackend}/gen/gen.go (97%) rename backend/{xmobile => xmobilebackend}/gradients.go (98%) rename backend/{xmobile => xmobilebackend}/imagedata.go (98%) rename backend/{xmobile => xmobilebackend}/images.go (99%) rename backend/{xmobile => xmobilebackend}/shader.go (100%) rename backend/{xmobile => xmobilebackend}/shaders.go (99%) rename backend/{xmobile => xmobilebackend}/xmobile.go (99%) diff --git a/backend/gogl/clip.go b/backend/goglbackend/clip.go similarity index 96% rename from backend/gogl/clip.go rename to backend/goglbackend/clip.go index 4979438..fd95a82 100644 --- a/backend/gogl/clip.go +++ b/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() { diff --git a/backend/gogl/fill.go b/backend/goglbackend/fill.go similarity index 99% rename from backend/gogl/fill.go rename to backend/goglbackend/fill.go index 68e5c58..2baba74 100644 --- a/backend/gogl/fill.go +++ b/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) { diff --git a/backend/gogl/gl/conversions.go b/backend/goglbackend/gl/conversions.go similarity index 100% rename from backend/gogl/gl/conversions.go rename to backend/goglbackend/gl/conversions.go diff --git a/backend/gogl/gl/khrplatform.h b/backend/goglbackend/gl/khrplatform.h similarity index 100% rename from backend/gogl/gl/khrplatform.h rename to backend/goglbackend/gl/khrplatform.h diff --git a/backend/gogl/gl/package.go b/backend/goglbackend/gl/package.go similarity index 100% rename from backend/gogl/gl/package.go rename to backend/goglbackend/gl/package.go diff --git a/backend/gogl/gl/procaddr.go b/backend/goglbackend/gl/procaddr.go similarity index 100% rename from backend/gogl/gl/procaddr.go rename to backend/goglbackend/gl/procaddr.go diff --git a/backend/gogl/gl/procaddr_mobile.go b/backend/goglbackend/gl/procaddr_mobile.go similarity index 100% rename from backend/gogl/gl/procaddr_mobile.go rename to backend/goglbackend/gl/procaddr_mobile.go diff --git a/backend/gogl/gogl.go b/backend/goglbackend/gogl.go similarity index 99% rename from backend/gogl/gogl.go rename to backend/goglbackend/gogl.go index 14bf820..0d40856 100644 --- a/backend/gogl/gogl.go +++ b/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 diff --git a/backend/gogl/gradients.go b/backend/goglbackend/gradients.go similarity index 98% rename from backend/gogl/gradients.go rename to backend/goglbackend/gradients.go index 49dee06..b4313a0 100644 --- a/backend/gogl/gradients.go +++ b/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 diff --git a/backend/gogl/imagedata.go b/backend/goglbackend/imagedata.go similarity index 98% rename from backend/gogl/imagedata.go rename to backend/goglbackend/imagedata.go index 6aeb87b..d3bf9bb 100644 --- a/backend/gogl/imagedata.go +++ b/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 diff --git a/backend/gogl/images.go b/backend/goglbackend/images.go similarity index 99% rename from backend/gogl/images.go rename to backend/goglbackend/images.go index 070a027..c47c977 100644 --- a/backend/gogl/images.go +++ b/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 diff --git a/backend/gogl/shader.go b/backend/goglbackend/shader.go similarity index 98% rename from backend/gogl/shader.go rename to backend/goglbackend/shader.go index a5d57f9..c1c0172 100644 --- a/backend/gogl/shader.go +++ b/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 { diff --git a/backend/gogl/shaders.go b/backend/goglbackend/shaders.go similarity index 100% rename from backend/gogl/shaders.go rename to backend/goglbackend/shaders.go diff --git a/backend/software/color.go b/backend/softwarebackend/color.go similarity index 100% rename from backend/software/color.go rename to backend/softwarebackend/color.go diff --git a/backend/software/fill.go b/backend/softwarebackend/fill.go similarity index 100% rename from backend/software/fill.go rename to backend/softwarebackend/fill.go diff --git a/backend/software/images.go b/backend/softwarebackend/images.go similarity index 100% rename from backend/software/images.go rename to backend/softwarebackend/images.go diff --git a/backend/software/software.go b/backend/softwarebackend/software.go similarity index 100% rename from backend/software/software.go rename to backend/softwarebackend/software.go diff --git a/backend/software/triangles.go b/backend/softwarebackend/triangles.go similarity index 100% rename from backend/software/triangles.go rename to backend/softwarebackend/triangles.go diff --git a/backend/xmobile/clip.go b/backend/xmobilebackend/clip.go similarity index 96% rename from backend/xmobile/clip.go rename to backend/xmobilebackend/clip.go index 67979eb..c0b6098 100755 --- a/backend/xmobile/clip.go +++ b/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() { diff --git a/backend/xmobile/fill.go b/backend/xmobilebackend/fill.go similarity index 99% rename from backend/xmobile/fill.go rename to backend/xmobilebackend/fill.go index 8f27cba..3863c53 100755 --- a/backend/xmobile/fill.go +++ b/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) { diff --git a/backend/xmobile/gen/gen.go b/backend/xmobilebackend/gen/gen.go similarity index 97% rename from backend/xmobile/gen/gen.go rename to backend/xmobilebackend/gen/gen.go index 0c4b2fc..e52818f 100644 --- a/backend/xmobile/gen/gen.go +++ b/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" { - log.Fatalln("This must be run in the backend/xmobile directory") + if d2 != "backend" || d1 != "xmobilebackend" { + 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) diff --git a/backend/xmobile/gradients.go b/backend/xmobilebackend/gradients.go similarity index 98% rename from backend/xmobile/gradients.go rename to backend/xmobilebackend/gradients.go index 8163f64..cd6b996 100755 --- a/backend/xmobile/gradients.go +++ b/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 diff --git a/backend/xmobile/imagedata.go b/backend/xmobilebackend/imagedata.go similarity index 98% rename from backend/xmobile/imagedata.go rename to backend/xmobilebackend/imagedata.go index 86bd625..f25ee4d 100755 --- a/backend/xmobile/imagedata.go +++ b/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 diff --git a/backend/xmobile/images.go b/backend/xmobilebackend/images.go similarity index 99% rename from backend/xmobile/images.go rename to backend/xmobilebackend/images.go index c7c4dfb..f017d78 100755 --- a/backend/xmobile/images.go +++ b/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 diff --git a/backend/xmobile/shader.go b/backend/xmobilebackend/shader.go similarity index 100% rename from backend/xmobile/shader.go rename to backend/xmobilebackend/shader.go diff --git a/backend/xmobile/shaders.go b/backend/xmobilebackend/shaders.go similarity index 99% rename from backend/xmobile/shaders.go rename to backend/xmobilebackend/shaders.go index 5615173..cae0b26 100755 --- a/backend/xmobile/shaders.go +++ b/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; diff --git a/backend/xmobile/xmobile.go b/backend/xmobilebackend/xmobile.go similarity index 99% rename from backend/xmobile/xmobile.go rename to backend/xmobilebackend/xmobile.go index 4dffdf1..742a9b0 100755 --- a/backend/xmobile/xmobile.go +++ b/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 diff --git a/examples/android/android.go b/examples/android/android.go index 0de6dde..4c29fa7 100644 --- a/examples/android/android.go +++ b/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 diff --git a/examples/glfw/glfw.go b/examples/glfw/glfw.go index 80df12b..1f0b3dd 100644 --- a/examples/glfw/glfw.go +++ b/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() { diff --git a/examples/gomobile/gomobile.go b/examples/gomobile/gomobile.go index 8756283..a434515 100644 --- a/examples/gomobile/gomobile.go +++ b/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" diff --git a/examples/ios/ios.go b/examples/ios/ios.go index a952319..89b4630 100644 --- a/examples/ios/ios.go +++ b/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 diff --git a/examples/sdl/sdl.go b/examples/sdl/sdl.go index d201d2b..cad4fa0 100644 --- a/examples/sdl/sdl.go +++ b/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" ) diff --git a/examples/shiny/shiny.go b/examples/shiny/shiny.go index c42235a..99bd521 100644 --- a/examples/shiny/shiny.go +++ b/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" diff --git a/glfwcanvas/glfwcanvas.go b/glfwcanvas/glfwcanvas.go index 727bae7..07caea6 100644 --- a/glfwcanvas/glfwcanvas.go +++ b/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* diff --git a/sdlcanvas/sdlcanvas.go b/sdlcanvas/sdlcanvas.go index fa83d67..211d632 100644 --- a/sdlcanvas/sdlcanvas.go +++ b/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" )