A whole new iteration of RallyMKA

.github/workflows/go.yml

@@ -21,9 +21,9 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Setup Go
-        uses: actions/setup-go@v2.1.3
+        uses: actions/setup-go@v3
         with:
-          go-version: 1.18
+          go-version: 1.19
 
       - name: Install Linux Packages
         if: matrix.os == 'ubuntu-latest'

.gitignore

@@ -9,3 +9,6 @@
 
 # Distribution
 /dist
+
+# Go
+trace.out

README.md

@@ -1,15 +1,15 @@
 # Rally MKA [![Go Report Card](https://goreportcard.com/badge/github.com/mokiat/rally-mka)](https://goreportcard.com/report/github.com/mokiat/rally-mka) [![Go Reference](https://pkg.go.dev/badge/github.com/mokiat/rally-mka@master.svg)](https://pkg.go.dev/github.com/mokiat/rally-mka@master)
 
-Rally MKA is a really old game/demo of mine ported to Go for fun and as a way to experiment with new concepts.
+Rally MKA is a really old game/demo of mine ported to Go for fun and as a way to experiment with new concepts. It is also a showcase for the [lacking](https://github.com/mokiat/lacking) game engine.
+
+[![Game Screenshot](preview.png)](https://mokiat.itch.io/rally-mka)
 
-[![Game Screenshot](preview.png)](http://mokiat.com/rally-mka/)
 
 ## User's Guide
 
 ### Browser
 
-Use the following link to try the game in the browser:
-http://mokiat.com/rally-mka/
+You can play the game on [itch.io](https://mokiat.itch.io/rally-mka).
 
 The preferred browser is [Chrome](https://www.google.com/chrome/), which at the time of writing appears to best support WebGL2, WebAssembly and Game Controllers.
 
@@ -19,27 +19,13 @@ Check the [Releases](https://github.com/mokiat/rally-mka/releases) section for r
 
 The requirement is that your OS supports `OpenGL 4.6`.
 
-### Controls
-
-Use the following keyboard keys when playing:
-
-- `Left Arrow` - Steer left
-- `Right Arrow` - Steer right
-- `Up Arrow` - Accelerate
-- `Down Arrow` - Decelerate
-- `a`, `s`, `d`, `w` - Rotate camera
-- `q`, `e` - Zoom in/out camera
-- `Enter` - Flip car
-
-In addition, the game supports using a Game Controller.
-
 ## Developer's Guide
 
 This section describes how to setup the project on your machine and compile it yourself.
 
 ### Prerequisites
 
-- You need [Go 1.18](https://golang.org/dl/) or newer.
+- You need [Go 1.20](https://golang.org/dl/) or newer.
 - You need the [Git LFS](https://git-lfs.github.com/) plugin. As the project contains large images and models, this is the official way on how not to clog a repository.
 - Follow the instructions on the [GLFW for Go](https://github.com/go-gl/glfw) repository and make sure you can run the [GLFW examples](https://github.com/go-gl/example) on your platform.
 - Make sure you have [Task](https://taskfile.dev/) installed, as this project uses Taskfiles.
@@ -87,7 +73,7 @@ This section describes how to setup the project on your machine and compile it y
    task wasm
    ```
 
-1. Run HTTP server
+1. Run an HTTP server
 
    ```sh
    task web
@@ -104,15 +90,3 @@ All source code in this project is licensed under [Apache License v2](LICENSE).
 ### Assets
 
 Assets (images, models, textures, etc.) are distributed under the [Creative Commons Attribution 4.0 International](http://creativecommons.org/licenses/by/4.0/) license.
-
-## Special Thanks
-
-The following projects and individuals have contributed significantly to the project:
-
-- **[The Go Team](https://go.dev/)** for making Go programming language.
-- **[GLFW for Go](https://github.com/go-gl/glfw)** for making it possible to use GLFW and OpenGL in Go.
-- **[LearnOpenGL](https://learnopengl.com/)** for the amazing tutorials.
-- **[Poly Haven](https://polyhaven.com/)** for the excellent free images.
-- **[Erin Catto](https://github.com/erincatto)** for all the presentations and articles that were used as reference for the physics engine.
-- **[Bo0mer](https://github.com/Bo0mer)** for the panoramic image that was used to generate the original `city` skybox images.
-- And everyone else whose repository has been used as a dependency.

Taskfile.yml

@@ -2,21 +2,25 @@ version: '3'
 
 tasks:
 
+  licenses:
+    cmds:
+      - go run github.com/google/go-licenses@v1.6.0 report --template ./resources/licenses.tmpl ./cmd/rallymka ./cmd/rallypack | fold -w 80 -s > ./resources/licenses.txt
+
+  pack:
+    cmds:
+      - go run './cmd/rallypack'
+
   webpack:
     cmds:
       - mkdir -p 'assets/web'
-      - cp 'resources/icon.png' 'assets/web/favicon.png'
+      - cp 'resources/ui/images/icon.png' 'assets/web/favicon.png'
       - cp 'resources/web/main.css' 'assets/web/main.css'
       - cp 'resources/web/main.js' 'assets/web/main.js'
       - cp 'resources/web/index.html' 'assets/index.html'
       - cp "$(go env GOROOT)/misc/wasm/wasm_exec.js" 'assets/web'
 
-  pack:
-    cmds:
-      - go run './cmd/rallypack'
-
   assets:
-    deps: [webpack, pack]
+    deps: [pack, webpack]
 
   run:
     cmds:
@@ -31,8 +35,29 @@ tasks:
       GOOS: js
       GOARCH: wasm
     cmds:
-      - go build -o './assets/web/main.wasm' './cmd/rallywasm'
+      - go build -o './assets/web/main.wasm' './cmd/rallymka'
 
   web:
     cmds:
-      - go run 'github.com/mokiat/httpserv@master' -dir './assets' -host '127.0.0.1'
+      - go run 'github.com/mokiat/httpserv@v1.0.0' -dir './assets' -host '127.0.0.1'
+
+  profile-cpu:
+    cmds:
+      - go tool pprof 'http://localhost:6060/debug/pprof/profile?seconds=30'
+
+  profile-alloc:
+    cmds:
+      - go tool pprof 'http://localhost:6060/debug/pprof/allocs?seconds=30'
+
+  profile-heap:
+    cmds:
+      - go tool pprof 'http://localhost:6060/debug/pprof/heap?seconds=30'
+
+  profile-snap:
+    cmds:
+      - go tool pprof 'http://localhost:6060/debug/pprof/heap'
+
+  trace:
+    cmds:
+      - curl -o trace.out 'http://localhost:6060/debug/pprof/trace?seconds=30'
+      - go tool trace trace.out

cmd/rallymka/app_cgo.go

@@ -0,0 +1,43 @@
+//go:build !js
+
+package main
+
+import (
+	"fmt"
+
+	glapp "github.com/mokiat/lacking-gl/app"
+	glgame "github.com/mokiat/lacking-gl/game"
+	glrender "github.com/mokiat/lacking-gl/render"
+	glui "github.com/mokiat/lacking-gl/ui"
+	"github.com/mokiat/lacking/app"
+	"github.com/mokiat/lacking/game"
+	"github.com/mokiat/lacking/game/asset"
+	"github.com/mokiat/lacking/ui"
+	"github.com/mokiat/lacking/ui/mat"
+	"github.com/mokiat/lacking/util/resource"
+	gameui "github.com/mokiat/rally-mka/internal/ui"
+)
+
+func runApplication() error {
+	registry, err := asset.NewDirRegistry(".")
+	if err != nil {
+		return fmt.Errorf("failed to initialize registry: %w", err)
+	}
+
+	renderAPI := glrender.NewAPI()
+	gameController := game.NewController(registry, renderAPI, glgame.NewShaderCollection())
+	resourceLocator := mat.WrappedResourceLocator(resource.NewFileLocator("./resources"))
+	uiCfg := ui.NewConfig(resourceLocator, renderAPI, glui.NewShaderCollection())
+	uiController := ui.NewController(uiCfg, func(w *ui.Window) {
+		gameui.BootstrapApplication(w, gameController)
+	})
+
+	cfg := glapp.NewConfig("Rally MKA", 1024, 576)
+	cfg.SetFullscreen(true)
+	cfg.SetMaximized(false)
+	cfg.SetMinSize(1024, 576)
+	cfg.SetVSync(true)
+	cfg.SetIcon("resources/ui/images/icon.png")
+	cfg.SetMaximized(true)
+	return glapp.Run(cfg, app.NewLayeredController(gameController, uiController))
+}

cmd/rallywasm/main.go → cmd/rallymka/app_js.go

@@ -1,56 +1,39 @@
-//go:build js && wasm
+//go:build js
 
 package main
 
 import (
 	"fmt"
-	"os"
 
 	jsapp "github.com/mokiat/lacking-js/app"
 	jsgame "github.com/mokiat/lacking-js/game"
 	jsrender "github.com/mokiat/lacking-js/render"
 	jsui "github.com/mokiat/lacking-js/ui"
 	"github.com/mokiat/lacking/app"
+	"github.com/mokiat/lacking/game"
 	"github.com/mokiat/lacking/game/asset"
-	"github.com/mokiat/lacking/game/graphics"
-	"github.com/mokiat/lacking/log"
 	"github.com/mokiat/lacking/ui"
 	"github.com/mokiat/lacking/ui/mat"
 	"github.com/mokiat/lacking/util/resource"
-	"github.com/mokiat/rally-mka/internal/game"
 	gameui "github.com/mokiat/rally-mka/internal/ui"
 	"github.com/mokiat/rally-mka/resources"
 )
 
-func main() {
-	log.Info("Started")
-	if err := runApplication(); err != nil {
-		log.Error("Crashed: %v", err)
-		os.Exit(1)
-	}
-	log.Info("Stopped")
-}
-
 func runApplication() error {
 	registry, err := asset.NewWebRegistry(".")
 	if err != nil {
 		return fmt.Errorf("failed to initialize registry: %w", err)
 	}
 	resourceLocator := mat.WrappedResourceLocator(resource.NewFSLocator(resources.UI))
 	renderAPI := jsrender.NewAPI()
-	graphicsEngine := graphics.NewEngine(renderAPI, jsgame.NewShaderCollection())
-	gameController := game.NewController(registry, graphicsEngine)
+	gameController := game.NewController(registry, renderAPI, jsgame.NewShaderCollection())
 	uiCfg := ui.NewConfig(resourceLocator, renderAPI, jsui.NewShaderCollection())
 	uiController := ui.NewController(uiCfg, func(w *ui.Window) {
 		gameui.BootstrapApplication(w, gameController)
 	})
 
 	cfg := jsapp.NewConfig("screen")
 	cfg.AddGLExtension("EXT_color_buffer_float")
-
-	controller := app.NewLayeredController(
-		gameController,
-		uiController,
-	)
-	return jsapp.Run(cfg, controller)
+	cfg.SetFullscreen(false)
+	return jsapp.Run(cfg, app.NewLayeredController(gameController, uiController))
 }

cmd/rallymka/main.go

@@ -1,22 +1,9 @@
 package main
 
 import (
-	"fmt"
 	"os"
 
-	glapp "github.com/mokiat/lacking-gl/app"
-	glgame "github.com/mokiat/lacking-gl/game"
-	glrender "github.com/mokiat/lacking-gl/render"
-	glui "github.com/mokiat/lacking-gl/ui"
-	"github.com/mokiat/lacking/app"
-	"github.com/mokiat/lacking/game/asset"
-	"github.com/mokiat/lacking/game/graphics"
 	"github.com/mokiat/lacking/log"
-	"github.com/mokiat/lacking/ui"
-	"github.com/mokiat/lacking/ui/mat"
-	"github.com/mokiat/lacking/util/resource"
-	"github.com/mokiat/rally-mka/internal/game"
-	gameui "github.com/mokiat/rally-mka/internal/ui"
 )
 
 func main() {
@@ -27,29 +14,3 @@ func main() {
 	}
 	log.Info("Stopped")
 }
-
-func runApplication() error {
-	cfg := glapp.NewConfig("Rally MKA", 1024, 576)
-	cfg.SetVSync(true)
-	cfg.SetIcon("resources/icon.png")
-
-	registry, err := asset.NewDirRegistry(".")
-	if err != nil {
-		return fmt.Errorf("failed to initialize registry: %w", err)
-	}
-
-	renderAPI := glrender.NewAPI()
-	graphicsEngine := graphics.NewEngine(renderAPI, glgame.NewShaderCollection())
-	gameController := game.NewController(registry, graphicsEngine)
-	resourceLocator := mat.WrappedResourceLocator(resource.NewFileLocator("./resources"))
-	uiCfg := ui.NewConfig(resourceLocator, renderAPI, glui.NewShaderCollection())
-	uiController := ui.NewController(uiCfg, func(w *ui.Window) {
-		gameui.BootstrapApplication(w, gameController)
-	})
-
-	controller := app.NewLayeredController(
-		gameController,
-		uiController,
-	)
-	return glapp.Run(cfg, controller)
-}