mokiat · mokiat · Oct 26, 2020 · Apr 7, 2020 · Apr 15, 2020 · Apr 15, 2020
diff --git a/Makefile b/Makefile
@@ -1,229 +1,7 @@
-RESOURCES_DIR=resources
-ASSETS_DIR=assets
-LEVEL_RESOURCES_DIR=$(RESOURCES_DIR)/levels
-LEVEL_ASSETS_DIR=$(ASSETS_DIR)/levels
-SHADER_RESOURCES_DIR=$(RESOURCES_DIR)/shaders
-PROGRAM_ASSETS_DIR=$(ASSETS_DIR)/programs
-MODEL_RESOURCES_DIR=$(RESOURCES_DIR)/models
-MODEL_ASSETS_DIR=$(ASSETS_DIR)/models
-MESH_RESOURCES_DIR=$(RESOURCES_DIR)/meshes
-MESH_ASSETS_DIR=$(ASSETS_DIR)/meshes
-CUBE_TEX_RESOURCES_DIR=$(RESOURCES_DIR)/textures/cube
-CUBE_TEX_ASSETS_DIR=$(ASSETS_DIR)/textures/cube
-TWOD_TEX_RESOURCES_DIR=$(RESOURCES_DIR)/textures/twod
-TWOD_TEX_ASSETS_DIR=$(ASSETS_DIR)/textures/twod
-
 .PHONY: assets
-assets: levels programs models meshes cubetextures twodtextures
-
-.PHONY: levels
-levels: \
-	$(LEVEL_ASSETS_DIR) \
-	$(LEVEL_ASSETS_DIR)/forest.dat \
-	$(LEVEL_ASSETS_DIR)/highway.dat \
-	$(LEVEL_ASSETS_DIR)/playground.dat
-
-$(LEVEL_ASSETS_DIR):
-	mkdir -p $(LEVEL_ASSETS_DIR)
-
-$(LEVEL_ASSETS_DIR)/forest.dat: \
-	$(LEVEL_RESOURCES_DIR)/forest.json
-	rallygen level $+ $@
-
-$(LEVEL_ASSETS_DIR)/highway.dat: \
-	$(LEVEL_RESOURCES_DIR)/highway.json
-	rallygen level $+ $@
-
-$(LEVEL_ASSETS_DIR)/playground.dat: \
-	$(LEVEL_RESOURCES_DIR)/playground.json
-	rallygen level $+ $@
-
-.PHONY: programs
-programs: \
-	$(PROGRAM_ASSETS_DIR) \
-	$(PROGRAM_ASSETS_DIR)/diffuse.dat \
-	$(PROGRAM_ASSETS_DIR)/skybox.dat \
-	$(PROGRAM_ASSETS_DIR)/deferred-geometry.dat \
-	$(PROGRAM_ASSETS_DIR)/deferred-lighting.dat \
-	$(PROGRAM_ASSETS_DIR)/debug.dat
-
-$(PROGRAM_ASSETS_DIR):
-	mkdir -p "$(PROGRAM_ASSETS_DIR)"
-
-$(PROGRAM_ASSETS_DIR)/diffuse.dat: \
-	$(SHADER_RESOURCES_DIR)/diffuse.vert \
-	$(SHADER_RESOURCES_DIR)/diffuse.frag
-	rallygen program $+ $@
-
-$(PROGRAM_ASSETS_DIR)/skybox.dat: \
-	$(SHADER_RESOURCES_DIR)/skybox.vert \
-	$(SHADER_RESOURCES_DIR)/skybox.frag
-	rallygen program $+ $@
-
-$(PROGRAM_ASSETS_DIR)/deferred-geometry.dat: \
-	$(SHADER_RESOURCES_DIR)/deferred-geometry.vert \
-	$(SHADER_RESOURCES_DIR)/deferred-geometry.frag
-	rallygen program $+ $@
-
-$(PROGRAM_ASSETS_DIR)/deferred-lighting.dat: \
-	$(SHADER_RESOURCES_DIR)/deferred-lighting.vert \
-	$(SHADER_RESOURCES_DIR)/deferred-lighting.frag
-	rallygen program $+ $@
-
-$(PROGRAM_ASSETS_DIR)/debug.dat: \
-	$(SHADER_RESOURCES_DIR)/debug.vert \
-	$(SHADER_RESOURCES_DIR)/debug.frag
-	rallygen program $+ $@
-
-.PHONY: models
-models: \
-	$(MODEL_ASSETS_DIR) \
-	$(MODEL_ASSETS_DIR)/tree.dat \
-	$(MODEL_ASSETS_DIR)/lamp.dat \
-	$(MODEL_ASSETS_DIR)/finish.dat \
-	$(MODEL_ASSETS_DIR)/suv.dat \
-	$(MODEL_ASSETS_DIR)/hatch.dat \
-	$(MODEL_ASSETS_DIR)/truck.dat
-
-$(MODEL_ASSETS_DIR):
-	mkdir -p "$(MODEL_ASSETS_DIR)"
-
-$(MODEL_ASSETS_DIR)/tree.dat: \
-	$(MODEL_RESOURCES_DIR)/tree.json
-	rallygen model $+ $@
-
-$(MODEL_ASSETS_DIR)/lamp.dat: \
-	$(MODEL_RESOURCES_DIR)/lamp.json
-	rallygen model $+ $@
-
-$(MODEL_ASSETS_DIR)/finish.dat: \
-	$(MODEL_RESOURCES_DIR)/finish.json
-	rallygen model $+ $@
-
-$(MODEL_ASSETS_DIR)/hatch.dat: \
-	$(MODEL_RESOURCES_DIR)/hatch.json
-	rallygen model $+ $@
-
-$(MODEL_ASSETS_DIR)/suv.dat: \
-	$(MODEL_RESOURCES_DIR)/suv.json
-	rallygen model $+ $@
-
-$(MODEL_ASSETS_DIR)/truck.dat: \
-	$(MODEL_RESOURCES_DIR)/truck.json
-	rallygen model $+ $@
-
-.PHONY: meshes
-meshes: \
-	$(MESH_ASSETS_DIR) \
-	$(MESH_ASSETS_DIR)/quad.dat \
-	$(MESH_ASSETS_DIR)/skybox.dat
-
-$(MESH_ASSETS_DIR):
-	mkdir -p "$(MESH_ASSETS_DIR)"
-
-$(MESH_ASSETS_DIR)/quad.dat: \
-	$(MESH_RESOURCES_DIR)/quad.json
-	rallygen mesh $+ $@
-
-$(MESH_ASSETS_DIR)/skybox.dat: \
-	$(MESH_RESOURCES_DIR)/skybox.json
-	rallygen mesh $+ $@
-
-.PHONY: cubetextures
-cubetextures:	\
-	$(CUBE_TEX_ASSETS_DIR) \
-	$(CUBE_TEX_ASSETS_DIR)/city.dat
-
-$(CUBE_TEX_ASSETS_DIR):
-	mkdir -p "$(CUBE_TEX_ASSETS_DIR)"
-
-$(CUBE_TEX_ASSETS_DIR)/city.dat: \
-	$(CUBE_TEX_RESOURCES_DIR)/city_front.png \
-	$(CUBE_TEX_RESOURCES_DIR)/city_back.png \
-	$(CUBE_TEX_RESOURCES_DIR)/city_left.png \
-	$(CUBE_TEX_RESOURCES_DIR)/city_right.png \
-	$(CUBE_TEX_RESOURCES_DIR)/city_top.png \
-	$(CUBE_TEX_RESOURCES_DIR)/city_bottom.png
-	rallygen cubetex --dimension 512 $+ $@
-
-.PHONY: twodtextures
-twodtextures: \
-	$(TWOD_TEX_ASSETS_DIR) \
-	$(TWOD_TEX_ASSETS_DIR)/loading.dat \
-	$(TWOD_TEX_ASSETS_DIR)/tree.dat \
-	$(TWOD_TEX_ASSETS_DIR)/lamp.dat \
-	$(TWOD_TEX_ASSETS_DIR)/finish.dat \
-	$(TWOD_TEX_ASSETS_DIR)/hatch_body.dat \
-	$(TWOD_TEX_ASSETS_DIR)/hatch_wheel.dat \
-	$(TWOD_TEX_ASSETS_DIR)/suv_body.dat \
-	$(TWOD_TEX_ASSETS_DIR)/suv_wheel.dat \
-	$(TWOD_TEX_ASSETS_DIR)/truck_body.dat \
-	$(TWOD_TEX_ASSETS_DIR)/truck_wheel.dat \
-	$(TWOD_TEX_ASSETS_DIR)/concrete.dat \
-	$(TWOD_TEX_ASSETS_DIR)/road.dat \
-	$(TWOD_TEX_ASSETS_DIR)/barrier.dat \
-	$(TWOD_TEX_ASSETS_DIR)/grass.dat \
-	$(TWOD_TEX_ASSETS_DIR)/gravel.dat
-
-$(TWOD_TEX_ASSETS_DIR):
-	mkdir -p "$(TWOD_TEX_ASSETS_DIR)"
-
-$(TWOD_TEX_ASSETS_DIR)/loading.dat: \
-	$(TWOD_TEX_RESOURCES_DIR)/loading.png
-	rallygen twodtex $+ $@
-
-$(TWOD_TEX_ASSETS_DIR)/tree.dat: \
-	$(TWOD_TEX_RESOURCES_DIR)/tree.png
-	rallygen twodtex $+ $@
-
-$(TWOD_TEX_ASSETS_DIR)/lamp.dat: \
-	$(TWOD_TEX_RESOURCES_DIR)/lamp.png
-	rallygen twodtex $+ $@
-
-$(TWOD_TEX_ASSETS_DIR)/finish.dat: \
-	$(TWOD_TEX_RESOURCES_DIR)/finish.png
-	rallygen twodtex $+ $@
-
-$(TWOD_TEX_ASSETS_DIR)/hatch_body.dat: \
-	$(TWOD_TEX_RESOURCES_DIR)/hatch_body.png
-	rallygen twodtex $+ $@
-
-$(TWOD_TEX_ASSETS_DIR)/hatch_wheel.dat: \
-	$(TWOD_TEX_RESOURCES_DIR)/hatch_wheel.png
-	rallygen twodtex $+ $@
-
-$(TWOD_TEX_ASSETS_DIR)/suv_body.dat: \
-	$(TWOD_TEX_RESOURCES_DIR)/suv_body.png
-	rallygen twodtex $+ $@
-
-$(TWOD_TEX_ASSETS_DIR)/suv_wheel.dat: \
-	$(TWOD_TEX_RESOURCES_DIR)/suv_wheel.png
-	rallygen twodtex $+ $@
-
-$(TWOD_TEX_ASSETS_DIR)/truck_body.dat: \
-	$(TWOD_TEX_RESOURCES_DIR)/truck_body.png
-	rallygen twodtex $+ $@
-
-$(TWOD_TEX_ASSETS_DIR)/truck_wheel.dat: \
-	$(TWOD_TEX_RESOURCES_DIR)/truck_wheel.png
-	rallygen twodtex $+ $@
-
-$(TWOD_TEX_ASSETS_DIR)/concrete.dat: \
-	$(TWOD_TEX_RESOURCES_DIR)/concrete.png
-	rallygen twodtex $+ $@
-
-$(TWOD_TEX_ASSETS_DIR)/road.dat: \
-	$(TWOD_TEX_RESOURCES_DIR)/road.png
-	rallygen twodtex $+ $@
-
-$(TWOD_TEX_ASSETS_DIR)/barrier.dat: \
-	$(TWOD_TEX_RESOURCES_DIR)/barrier.png
-	rallygen twodtex $+ $@
-
-$(TWOD_TEX_ASSETS_DIR)/grass.dat: \
-	$(TWOD_TEX_RESOURCES_DIR)/grass.png
-	rallygen twodtex $+ $@
+assets:
+	go run cmd/rallypack/main.go
 
-$(TWOD_TEX_ASSETS_DIR)/gravel.dat: \
-	$(TWOD_TEX_RESOURCES_DIR)/gravel.png
-	rallygen twodtex $+ $@
+.PHONY: play
+play:
+	go run cmd/rallymka/main.go
diff --git a/README.md b/README.md
@@ -4,23 +4,15 @@ Rally MKA is a really old game of mine ported to Go for fun and as a way to try
 
 ![Game Screenshot](preview.png)
 
-**WARNING:** This repository is under heavy refactoring, experimentation and redesign and no branch is currently guaranteed to be stable or well documented! I am hoping to get things sorted out eventually and have feature branches contain experimental stuff.
-
-## Remarks
-
-Being a port of a very old project of mine, some remarks are in order:
-
-* Though some parts of the code I have rewritten entirely, others I have left as they were originally. Hence, nasty variable names and difficult to understand formulas are to be expected. The project was originally written in Delphi, back when 'clean code' wasn't something I was aware of.
-* Currently, the physics of the car is whacky. It was meant to be that way when I originally wrote it - I wanted a strange rally type drifting feel to it.
-* Though some corrections on the art have been made, it is quite dated.
+**WARNING:** This repository is under development, experimentation and redesign and is not guaranteed to be stable or well documented!
 
 ## Getting Started
 
-This section describes how to setup the project and run the game locally. If you are interested in just running the game, check the [Releases](https://github.com/mokiat/rally-mka/releases) section of the repository.
+This section describes how to setup the project and run the game locally.
 
 ### Prerequisites
 
-* You need [Go 1.14](https://golang.org/dl/) or newer.
+* You need [Go 1.15](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.
 
 ### Setting Up
@@ -44,14 +36,6 @@ This section describes how to setup the project and run the game locally. If you
     go mod download
     ```
 
-1. Build the rallygen tool
-
-    ```sh
-    (cd cmd/rallygen && go install)
-    ```
-
-    **Note:** This tool is used to convert raw image and model resources into an optimized format for the game.
-
 1. Generate game assets
 
     ```sh
@@ -61,7 +45,7 @@ This section describes how to setup the project and run the game locally. If you
 1. Run the game
 
     ```sh
-    go run cmd/rallymka/main.go
+    make play
     ```
 
 ## Licensing
@@ -81,3 +65,4 @@ The following projects and individuals have contributed significantly to the pro
 * **[GLFW for Go](https://github.com/go-gl/glfw)** for making it possible to use GLFW and OpenGL in Go.
 * **[Bo0mer](https://github.com/Bo0mer)** for the panoramic image that was used to generate the individual `city` skybox images.
 * **[Erin Catto](https://github.com/erincatto)** for all the presentations and articles that were used as reference.
+* **[TextureHeaven](https://texturehaven.com/)** for the free images.
diff --git a/bundle/Info.plist b/bundle/Info.plist
diff --git a/bundle/Resources/AppIcon.icns b/bundle/Resources/AppIcon.icns