From 387384eacacbea8b8788bdfa1aa01f7cad2b13f7 Mon Sep 17 00:00:00 2001 From: Sean Hickey Date: Sat, 25 Feb 2023 23:35:40 -0800 Subject: [PATCH] Update to git.wisellama.rocks, fix some linter issues --- go.mod | 4 ++-- go.sum | 4 ++-- main.go | 9 +++++---- pkg/breakout/ball.go | 2 +- pkg/breakout/brick.go | 2 +- pkg/breakout/paddle.go | 2 +- pkg/breakout/sidewalls.go | 2 +- pkg/breakout/targets.go | 6 +++--- pkg/config/config.go | 2 +- pkg/config/logging.go | 2 +- pkg/game/gamewindow.go | 8 ++++---- pkg/game/opengl.go | 8 ++++---- pkg/globject/aabb.go | 2 +- pkg/globject/box.go | 18 +++++++++--------- pkg/globject/camera.go | 2 +- pkg/globject/directional_light.go | 2 +- pkg/globject/face.go | 13 +++++++++---- pkg/globject/material.go | 2 +- pkg/globject/point_light.go | 2 +- pkg/globject/triangle.go | 7 ++++++- pkg/glshader/glshader.go | 2 +- 21 files changed, 56 insertions(+), 45 deletions(-) diff --git a/go.mod b/go.mod index da4d8c9..8320751 100644 --- a/go.mod +++ b/go.mod @@ -1,9 +1,9 @@ -module gitea.wisellama.rocks/Wisellama/carpy-breakout +module git.wisellama.rocks/Wisellama/carpy-breakout go 1.17 require ( - gitea.wisellama.rocks/Wisellama/gosimpleconf v0.0.3 + git.wisellama.rocks/Wisellama/gosimpleconf v0.1.0 github.com/go-gl/gl v0.0.0-20211025173605-bda47ffaa784 github.com/go-gl/mathgl v1.0.0 github.com/veandco/go-sdl2 v0.4.10 diff --git a/go.sum b/go.sum index e0e5b50..3b86914 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,5 @@ -gitea.wisellama.rocks/Wisellama/gosimpleconf v0.0.3 h1:g4hcc7TjodjMNrSEQ3UO96HXvltHc2EOiudS+Wfle60= -gitea.wisellama.rocks/Wisellama/gosimpleconf v0.0.3/go.mod h1:kY9gQL8laVTe+tW0ue5bYb6QThw78d7mx6AHwQ5CIzc= +git.wisellama.rocks/Wisellama/gosimpleconf v0.1.0 h1:Z2FAzARct8ShV4NSueC/y+PyuSQVcyo4WnW7GoZ9L10= +git.wisellama.rocks/Wisellama/gosimpleconf v0.1.0/go.mod h1:Gg1vUTBRZD7qcXvdF8L50PsnL9coLt/XbWa5BwSDN/M= github.com/go-gl/gl v0.0.0-20211025173605-bda47ffaa784 h1:1Zi56D0LNfvkzM+BdoxKryvUEdyWO7LP8oRT+oSYJW0= github.com/go-gl/gl v0.0.0-20211025173605-bda47ffaa784/go.mod h1:9YTyiznxEY1fVinfM7RvRcjRHbw2xLBJ3AAGIT0I4Nw= github.com/go-gl/mathgl v1.0.0 h1:t9DznWJlXxxjeeKLIdovCOVJQk/GzDEL7h/h+Ro2B68= diff --git a/main.go b/main.go index 5d3b62b..dbf78de 100644 --- a/main.go +++ b/main.go @@ -5,9 +5,9 @@ import ( "os" "runtime/pprof" - "gitea.wisellama.rocks/Wisellama/carpy-breakout/pkg/config" - "gitea.wisellama.rocks/Wisellama/carpy-breakout/pkg/game" - "gitea.wisellama.rocks/Wisellama/gosimpleconf" + "git.wisellama.rocks/Wisellama/carpy-breakout/pkg/config" + "git.wisellama.rocks/Wisellama/carpy-breakout/pkg/game" + "git.wisellama.rocks/Wisellama/gosimpleconf" ) func main() { @@ -26,7 +26,8 @@ func main() { // Setup cpu profiling if configured cpuProfile := gosimpleconf.Bool(configMap["cpuprofile.enabled"]) if cpuProfile { - f, err := os.Create(configMap["cpuprofile.file"]) + var f *os.File + f, err = os.Create(configMap["cpuprofile.file"]) if err != nil { log.Fatalf("error creating file for cpuprofile: %v", err) } diff --git a/pkg/breakout/ball.go b/pkg/breakout/ball.go index 8f3be00..8ab8197 100644 --- a/pkg/breakout/ball.go +++ b/pkg/breakout/ball.go @@ -3,7 +3,7 @@ package breakout import ( "log" - "gitea.wisellama.rocks/Wisellama/carpy-breakout/pkg/globject" + "git.wisellama.rocks/Wisellama/carpy-breakout/pkg/globject" "github.com/go-gl/mathgl/mgl32" ) diff --git a/pkg/breakout/brick.go b/pkg/breakout/brick.go index cb39b00..2af5e67 100644 --- a/pkg/breakout/brick.go +++ b/pkg/breakout/brick.go @@ -1,7 +1,7 @@ package breakout import ( - "gitea.wisellama.rocks/Wisellama/carpy-breakout/pkg/globject" + "git.wisellama.rocks/Wisellama/carpy-breakout/pkg/globject" "github.com/go-gl/mathgl/mgl32" ) diff --git a/pkg/breakout/paddle.go b/pkg/breakout/paddle.go index 9a84953..b049876 100644 --- a/pkg/breakout/paddle.go +++ b/pkg/breakout/paddle.go @@ -1,6 +1,6 @@ package breakout -import "gitea.wisellama.rocks/Wisellama/carpy-breakout/pkg/globject" +import "git.wisellama.rocks/Wisellama/carpy-breakout/pkg/globject" type Paddle struct { Box *globject.Box diff --git a/pkg/breakout/sidewalls.go b/pkg/breakout/sidewalls.go index b476dd5..29d3eb4 100644 --- a/pkg/breakout/sidewalls.go +++ b/pkg/breakout/sidewalls.go @@ -1,7 +1,7 @@ package breakout import ( - "gitea.wisellama.rocks/Wisellama/carpy-breakout/pkg/globject" + "git.wisellama.rocks/Wisellama/carpy-breakout/pkg/globject" "github.com/go-gl/mathgl/mgl32" ) diff --git a/pkg/breakout/targets.go b/pkg/breakout/targets.go index 9be28ee..0a89418 100644 --- a/pkg/breakout/targets.go +++ b/pkg/breakout/targets.go @@ -1,16 +1,16 @@ package breakout import ( - "gitea.wisellama.rocks/Wisellama/carpy-breakout/pkg/globject" + "git.wisellama.rocks/Wisellama/carpy-breakout/pkg/globject" "github.com/go-gl/mathgl/mgl32" ) type Targets struct { - Rows int - Columns int Bricks []*Brick TopRight mgl32.Vec3 BottomLeft mgl32.Vec3 + Rows int + Columns int } func NewTargets(numRows, numColumns int, adjustPos mgl32.Vec3) *Targets { diff --git a/pkg/config/config.go b/pkg/config/config.go index 14e9834..ba8afdd 100644 --- a/pkg/config/config.go +++ b/pkg/config/config.go @@ -1,7 +1,7 @@ package config import ( - "gitea.wisellama.rocks/Wisellama/gosimpleconf" + "git.wisellama.rocks/Wisellama/gosimpleconf" ) func Configure() (gosimpleconf.ConfigMap, error) { diff --git a/pkg/config/logging.go b/pkg/config/logging.go index bd78a2a..dd8e366 100644 --- a/pkg/config/logging.go +++ b/pkg/config/logging.go @@ -4,7 +4,7 @@ import ( "log" "os" - "gitea.wisellama.rocks/Wisellama/gosimpleconf" + "git.wisellama.rocks/Wisellama/gosimpleconf" ) func SetupLogging(configMap gosimpleconf.ConfigMap) error { diff --git a/pkg/game/gamewindow.go b/pkg/game/gamewindow.go index 647ac70..8f814d7 100644 --- a/pkg/game/gamewindow.go +++ b/pkg/game/gamewindow.go @@ -4,10 +4,10 @@ import ( "fmt" "log" - "gitea.wisellama.rocks/Wisellama/carpy-breakout/pkg/breakout" - "gitea.wisellama.rocks/Wisellama/carpy-breakout/pkg/config" - "gitea.wisellama.rocks/Wisellama/carpy-breakout/pkg/globject" - "gitea.wisellama.rocks/Wisellama/carpy-breakout/pkg/glshader" + "git.wisellama.rocks/Wisellama/carpy-breakout/pkg/breakout" + "git.wisellama.rocks/Wisellama/carpy-breakout/pkg/config" + "git.wisellama.rocks/Wisellama/carpy-breakout/pkg/globject" + "git.wisellama.rocks/Wisellama/carpy-breakout/pkg/glshader" gl "github.com/go-gl/gl/v3.1/gles2" "github.com/go-gl/mathgl/mgl32" "github.com/veandco/go-sdl2/sdl" diff --git a/pkg/game/opengl.go b/pkg/game/opengl.go index db7568f..41ee497 100644 --- a/pkg/game/opengl.go +++ b/pkg/game/opengl.go @@ -4,10 +4,10 @@ import ( "log" "runtime" - "gitea.wisellama.rocks/Wisellama/carpy-breakout/pkg/breakout" - "gitea.wisellama.rocks/Wisellama/carpy-breakout/pkg/config" - "gitea.wisellama.rocks/Wisellama/carpy-breakout/pkg/globject" - "gitea.wisellama.rocks/Wisellama/gosimpleconf" + "git.wisellama.rocks/Wisellama/carpy-breakout/pkg/breakout" + "git.wisellama.rocks/Wisellama/carpy-breakout/pkg/config" + "git.wisellama.rocks/Wisellama/carpy-breakout/pkg/globject" + "git.wisellama.rocks/Wisellama/gosimpleconf" gl "github.com/go-gl/gl/v3.1/gles2" "github.com/go-gl/mathgl/mgl32" "github.com/veandco/go-sdl2/sdl" diff --git a/pkg/globject/aabb.go b/pkg/globject/aabb.go index c8ff81b..1f650d4 100644 --- a/pkg/globject/aabb.go +++ b/pkg/globject/aabb.go @@ -1,7 +1,7 @@ package globject import ( - "gitea.wisellama.rocks/Wisellama/carpy-breakout/pkg/math" + "git.wisellama.rocks/Wisellama/carpy-breakout/pkg/math" "github.com/go-gl/mathgl/mgl32" ) diff --git a/pkg/globject/box.go b/pkg/globject/box.go index a9968ee..b1b8bb5 100644 --- a/pkg/globject/box.go +++ b/pkg/globject/box.go @@ -1,29 +1,29 @@ package globject import ( - "gitea.wisellama.rocks/Wisellama/carpy-breakout/pkg/glshader" + "git.wisellama.rocks/Wisellama/carpy-breakout/pkg/glshader" gl "github.com/go-gl/gl/v3.1/gles2" "github.com/go-gl/mathgl/mgl32" ) type Box struct { - Size int32 - Width float32 - Height float32 - Depth float32 + baseAABB *AABB + + Material *Material Faces []*Face + VertexArray []float32 Translation mgl32.Vec3 Velocity mgl32.Vec3 Rotation mgl32.Vec3 RotationVelocity mgl32.Vec3 - VertexArray []float32 - Material *Material + Size int32 + Width float32 + Height float32 + Depth float32 GLProgram uint32 GLVertexArrayID uint32 GLVertexBufferID uint32 Wireframe bool - - baseAABB *AABB } func NewBox( diff --git a/pkg/globject/camera.go b/pkg/globject/camera.go index f933887..d84ade9 100644 --- a/pkg/globject/camera.go +++ b/pkg/globject/camera.go @@ -1,7 +1,7 @@ package globject import ( - "gitea.wisellama.rocks/Wisellama/carpy-breakout/pkg/glshader" + "git.wisellama.rocks/Wisellama/carpy-breakout/pkg/glshader" "github.com/go-gl/mathgl/mgl32" ) diff --git a/pkg/globject/directional_light.go b/pkg/globject/directional_light.go index 6f62413..29119b0 100644 --- a/pkg/globject/directional_light.go +++ b/pkg/globject/directional_light.go @@ -1,7 +1,7 @@ package globject import ( - "gitea.wisellama.rocks/Wisellama/carpy-breakout/pkg/glshader" + "git.wisellama.rocks/Wisellama/carpy-breakout/pkg/glshader" "github.com/go-gl/mathgl/mgl32" ) diff --git a/pkg/globject/face.go b/pkg/globject/face.go index 5ee2a48..79c87c3 100644 --- a/pkg/globject/face.go +++ b/pkg/globject/face.go @@ -3,18 +3,18 @@ package globject import ( "log" - "gitea.wisellama.rocks/Wisellama/carpy-breakout/pkg/glshader" - "gitea.wisellama.rocks/Wisellama/carpy-breakout/pkg/math" + "git.wisellama.rocks/Wisellama/carpy-breakout/pkg/glshader" + "git.wisellama.rocks/Wisellama/carpy-breakout/pkg/math" gl "github.com/go-gl/gl/v3.1/gles2" "github.com/go-gl/mathgl/mgl32" ) type Face struct { + Material *Material Triangles []*Triangle LineLoopVertexArray []float32 GLLineLoopVertexArrayID uint32 GLLineLoopVertexBufferID uint32 - Material *Material } func NewFace( @@ -101,10 +101,15 @@ func newFaceVertex( func (f *Face) GetVertexArray() []float32 { a := make([]float32, 2*3*VertexSize) + i := 0 for _, triangle := range f.Triangles { for _, vertex := range triangle.Vertices { - a = append(a, vertex.GetVertexArray()...) + va := vertex.GetVertexArray() + for _, v := range va { + a[i] = v + i++ + } } } diff --git a/pkg/globject/material.go b/pkg/globject/material.go index b232117..a26eb8d 100644 --- a/pkg/globject/material.go +++ b/pkg/globject/material.go @@ -1,7 +1,7 @@ package globject import ( - "gitea.wisellama.rocks/Wisellama/carpy-breakout/pkg/glshader" + "git.wisellama.rocks/Wisellama/carpy-breakout/pkg/glshader" "github.com/go-gl/mathgl/mgl32" ) diff --git a/pkg/globject/point_light.go b/pkg/globject/point_light.go index 3f8f93b..c2a7864 100644 --- a/pkg/globject/point_light.go +++ b/pkg/globject/point_light.go @@ -1,7 +1,7 @@ package globject import ( - "gitea.wisellama.rocks/Wisellama/carpy-breakout/pkg/glshader" + "git.wisellama.rocks/Wisellama/carpy-breakout/pkg/glshader" "github.com/go-gl/mathgl/mgl32" ) diff --git a/pkg/globject/triangle.go b/pkg/globject/triangle.go index a33c5c9..c5af964 100644 --- a/pkg/globject/triangle.go +++ b/pkg/globject/triangle.go @@ -14,9 +14,14 @@ func NewTriangle(a, b, c *Vertex) *Triangle { func (t *Triangle) GetVertexArray() []float32 { a := make([]float32, 3*VertexSize) + i := 0 for _, vertex := range t.Vertices { - a = append(a, vertex.GetVertexArray()...) + va := vertex.GetVertexArray() + for _, v := range va { + a[i] = v + i++ + } } return a diff --git a/pkg/glshader/glshader.go b/pkg/glshader/glshader.go index 9e23b33..1384559 100644 --- a/pkg/glshader/glshader.go +++ b/pkg/glshader/glshader.go @@ -86,7 +86,7 @@ func compileShader(source string, shaderType uint32) (uint32, error) { func NewTexture(file string) (uint32, error) { imgFile, err := os.Open(file) if err != nil { - return 0, fmt.Errorf("texture %q file not found found: %v", file, err) + return 0, fmt.Errorf("texture %q file not found found: %w", file, err) } img, _, err := image.Decode(imgFile)