Project-Ely
/
project-ely
2
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Fix up makefile. Fix linter complaints.

main
Sean Hickey 2022-09-29 17:34:00 -07:00
parent f2cd54f501
commit b2d3111d7c
3 changed files with 38 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Makefile
View File

@ -1,15 +1,20 @@
EXECUTABLE=project-ely EXECUTABLE=project-ely
GO=go
GO_BUILD=build -x -v
GO_BUILD_DEBUG=${GO_BUILD} -gcflags=all="-N -l"
GO_BUILD_RELEASE=${GO_BUILD} -trimpath -tags static -ldflags "-s -w"
GO_BUILD_RELEASE_WINDOWS=${GO_BUILD} -trimpath -tags static -ldflags "-s -w -H windowsgui"
all: release all: release
dependencies: dependencies:
go mod tidy ${GO} mod tidy
debug: linter dependencies debug: linter dependencies
go build -x -v -gcflags=all="-N -l" ${GO} ${GO_BUILD_DEBUG}
release: linter dependencies release: linter dependencies
go build -x -v -ldflags "-s -w" ${GO} ${GO_BUILD_RELEASE}
linter: linter:
golangci-lint run golangci-lint run
@ -24,14 +29,14 @@ cross_windows:
CC=x86_64-w64-mingw32-gcc \ CC=x86_64-w64-mingw32-gcc \
GOOS=windows \ GOOS=windows \
GOARCH=amd64 \ GOARCH=amd64 \
go build -x -v -ldflags "-s -w" ${GO} ${GO_BUILD_RELEASE}
cross_windows_x86: cross_windows_x86:
CGO_ENABLED=1 \ CGO_ENABLED=1 \
CC=i686-w64-mingw32-gcc \ CC=i686-w64-mingw32-gcc \
GOOS=windows \ GOOS=windows \
GOARCH=386 \ GOARCH=386 \
go build -x -v -ldflags "-s -w" ${GO} ${GO_BUILD_RELEASE}
goimports_everything: goimports_everything:
find . -name "*.go" -exec goimports -w {} \; find . -name "*.go" -exec goimports -w {} \;

7
internal/game/window.go
View File

@ -1,6 +1,8 @@
package game package game
import ( import (
"log"
"github.com/veandco/go-sdl2/sdl" "github.com/veandco/go-sdl2/sdl"
) )
@ -40,7 +42,10 @@ func NewWindow(title string) (*window, error) {
func (g *window) Destroy() { func (g *window) Destroy() {
if g.SdlWindow != nil { if g.SdlWindow != nil {
sdl.Do(func() { sdl.Do(func() {
g.SdlWindow.Destroy() err := g.SdlWindow.Destroy()
if err != nil {
log.Printf("error destroying SdlWindow: %v\n", err)
}
}) })
} }
} }

27
main.go
View File

@ -71,7 +71,10 @@ func run(configMap gosimpleconf.ConfigMap) error {
} }
defer func() { defer func() {
sdl.Do(func() { sdl.Do(func() {
renderer.Destroy() err = renderer.Destroy()
if err != nil {
log.Printf("error destroying renderer: %v\n", err)
}
}) })
}() }()
@ -99,7 +102,11 @@ func run(configMap gosimpleconf.ConfigMap) error {
} }
defer func() { defer func() {
sdl.Do(func() { sdl.Do(func() {
penguinTexture.Destroy() err = penguinTexture.Destroy()
if err != nil {
log.Printf("error destroying renderer: %v\n", err)
}
}) })
}() }()
@ -170,15 +177,25 @@ func run(configMap gosimpleconf.ConfigMap) error {
// Background // Background
sdl.Do(func() { sdl.Do(func() {
renderer.SetDrawColor(0, 120, 0, 255) err = renderer.SetDrawColor(0, 120, 0, 255)
renderer.Clear() if err != nil {
log.Printf("error in renderer.SetDrawColor: %v\n", err)
}
err = renderer.Clear()
if err != nil {
log.Printf("error in renderer.Clear: %v\n", err)
}
}) })
// Square // Square
sdl.Do(func() { sdl.Do(func() {
//renderer.SetDrawColor(0, 0, 255, 255) //renderer.SetDrawColor(0, 0, 255, 255)
rect = &sdl.Rect{X: x, Y: y, W: 200, H: 200} rect = &sdl.Rect{X: x, Y: y, W: 200, H: 200}
renderer.Copy(penguinTexture, penguinRect, rect) err = renderer.Copy(penguinTexture, penguinRect, rect)
if err != nil {
log.Printf("error in renderer.Copy: %v\n", err)
}
//renderer.DrawRect(rect) //renderer.DrawRect(rect)
//renderer.FillRect(rect) //renderer.FillRect(rect)
}) })