Merge pull request #288 from sudoless/master

Apply gofumpt and style changes + Optimization in GLShader.Update()

data.go

@@ -8,15 +8,13 @@ import (
 	"math"
 )
 
-var (
+// zeroValueTriangleData is the default value of a TriangleData element
-	// zeroValueTriangleData is the default value of a TriangleData element
+var zeroValueTriangleData = struct {
-	zeroValueTriangleData = struct {
 	Position  Vec
 	Color     RGBA
 	Picture   Vec
 	Intensity float64
-	}{Color: RGBA{1, 1, 1, 1}}
+}{Color: RGBA{1, 1, 1, 1}}
-)
 
 // TrianglesData specifies a list of Triangles vertices with three common properties:
 // TrianglesPosition, TrianglesColor and TrianglesPicture.

geometry_test.go

@@ -1236,7 +1236,8 @@ func TestLine_Intersect(t *testing.T) {
 			args:   args{k: pixel.L(pixel.V(0, 1), pixel.V(10, 11))},
 			want:   pixel.ZV,
 			want1:  false,
-		}, {
+		},
+		{
 			name:   "Lines intersect",
 			fields: fields{A: pixel.V(600, 600), B: pixel.V(925, 150)},
 			args:   args{k: pixel.L(pixel.V(740, 255), pixel.V(925, 255))},

imdraw/imdraw.go

@@ -128,9 +128,9 @@ func (imd *IMDraw) Draw(t pixel.Target) {
 // Push adds some points to the IM queue. All Pushed points will have the same properties except for
 // the position.
 func (imd *IMDraw) Push(pts ...pixel.Vec) {
-	//Assert that Color is of type pixel.RGBA,
+	// Assert that Color is of type pixel.RGBA,
 	if _, ok := imd.Color.(pixel.RGBA); !ok {
-		//otherwise cast it
+		// otherwise cast it
 		imd.Color = pixel.ToRGBA(imd.Color)
 	}
 	opts := point{

pixel_test.go

@@ -12,9 +12,9 @@ import (
 	"github.com/faiface/pixel/pixelgl"
 )
 
-var (
+// onePixelImage is the byte representation of a 1x1 solid white png file
-	// onePixelImage is the byte representation of a 1x1 solid white png file
+var onePixelImage = []byte{
-	onePixelImage = []byte{137, 80, 78, 71, 13, 10, 26, 10, 0, 0, 0, 13, 73, 72, 68, 82, 0, 0, 0, 1, 0, 0, 0, 1, 8, 2,
+	137, 80, 78, 71, 13, 10, 26, 10, 0, 0, 0, 13, 73, 72, 68, 82, 0, 0, 0, 1, 0, 0, 0, 1, 8, 2,
 	0, 0, 0, 144, 119, 83, 222, 0, 0, 1, 130, 105, 67, 67, 80, 73, 67, 67, 32, 112, 114, 111, 102, 105, 108, 101, 0,
 	0, 40, 145, 125, 145, 59, 72, 3, 65, 20, 69, 143, 73, 68, 17, 37, 133, 41, 68, 44, 182, 80, 43, 5, 81, 17, 75,
 	141, 66, 16, 34, 132, 168, 96, 212, 194, 221, 141, 137, 66, 118, 13, 187, 9, 54, 150, 130, 109, 192, 194, 79,
@@ -35,8 +35,8 @@ var (
 	120, 165, 63, 118, 0, 0, 0, 7, 116, 73, 77, 69, 7, 227, 4, 15, 10, 5, 36, 189, 4, 224, 88, 0, 0, 0, 25, 116, 69,
 	88, 116, 67, 111, 109, 109, 101, 110, 116, 0, 67, 114, 101, 97, 116, 101, 100, 32, 119, 105, 116, 104, 32, 71,
 	73, 77, 80, 87, 129, 14, 23, 0, 0, 0, 12, 73, 68, 65, 84, 8, 215, 99, 120, 241, 226, 61, 0, 5, 123, 2, 192, 194,
-		77, 211, 95, 0, 0, 0, 0, 73, 69, 78, 68, 174, 66, 96, 130}
+	77, 211, 95, 0, 0, 0, 0, 73, 69, 78, 68, 174, 66, 96, 130,
-)
+}
 
 func TestMain(m *testing.M) {
 	pixelgl.Run(func() {

pixelgl/canvas.go

@@ -135,7 +135,7 @@ func (c *Canvas) SetBounds(bounds pixel.Rect) {
 		c.sprite = pixel.NewSprite(nil, pixel.Rect{})
 	}
 	c.sprite.Set(c, c.Bounds())
-	//c.sprite.SetMatrix(pixel.IM.Moved(c.Bounds().Center()))
+	// c.sprite.SetMatrix(pixel.IM.Moved(c.Bounds().Center()))
 }
 
 // Bounds returns the rectangular bounds of the Canvas.

pixelgl/glshader.go

@@ -40,10 +40,10 @@ const (
 )
 
 var defaultCanvasVertexFormat = glhf.AttrFormat{
-	canvasPosition:  {Name: "aPosition", Type: glhf.Vec2},
+	canvasPosition:  glhf.Attr{Name: "aPosition", Type: glhf.Vec2},
-	canvasColor:     {Name: "aColor", Type: glhf.Vec4},
+	canvasColor:     glhf.Attr{Name: "aColor", Type: glhf.Vec4},
-	canvasTexCoords: {Name: "aTexCoords", Type: glhf.Vec2},
+	canvasTexCoords: glhf.Attr{Name: "aTexCoords", Type: glhf.Vec2},
-	canvasIntensity: {Name: "aIntensity", Type: glhf.Float},
+	canvasIntensity: glhf.Attr{Name: "aIntensity", Type: glhf.Float},
 }
 
 // Sets up a base shader with everything needed for a Pixel
@@ -68,13 +68,14 @@ func NewGLShader(fragmentShader string) *GLShader {
 
 // Update reinitialize GLShader data and recompile the underlying gl shader object
 func (gs *GLShader) Update() {
-	gs.uf = nil
+	gs.uf = make([]glhf.Attr, len(gs.uniforms))
-	for _, u := range gs.uniforms {
+	for idx := range gs.uniforms {
-		gs.uf = append(gs.uf, glhf.Attr{
+		gs.uf[idx] = glhf.Attr{
-			Name: u.Name,
+			Name: gs.uniforms[idx].Name,
-			Type: u.Type,
+			Type: gs.uniforms[idx].Type,
-		})
 		}
+	}
+
 	var shader *glhf.Shader
 	mainthread.Call(func() {
 		var err error

text/text_test.go

@@ -76,7 +76,7 @@ func BenchmarkTextWrite(b *testing.B) {
 		b.Run(fmt.Sprintf("%d", len(chunk)), func(b *testing.B) {
 			txt := text.New(pixel.ZV, atlas)
 			for i := 0; i < b.N; i++ {
-				txt.Write(chunk)
+				_, _ = txt.Write(chunk)
 			}
 		})
 	}