mirror of
https://codeberg.org/scip/golsky.git
synced 2025-12-16 20:20:57 +01:00
Compare commits
6 Commits
no-pointer
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
|
fee8aaeed9 | ||
| a115db60f6 | |||
| 1250f1113e | |||
| 78aba6f005 | |||
| a680cca30c | |||
| 4074debdbf |
65
.goreleaser.yaml
Normal file
65
.goreleaser.yaml
Normal file
@@ -0,0 +1,65 @@
|
||||
# vim: set ts=2 sw=2 tw=0 fo=cnqoj
|
||||
|
||||
version: 2
|
||||
|
||||
before:
|
||||
hooks:
|
||||
- go mod tidy
|
||||
|
||||
gitea_urls:
|
||||
api: https://codeberg.org/api/v1
|
||||
download: https://codeberg.org
|
||||
|
||||
builds:
|
||||
- env:
|
||||
- CGO_ENABLED=0
|
||||
goos:
|
||||
- linux
|
||||
- freebsd
|
||||
|
||||
archives:
|
||||
- formats: [tar.gz]
|
||||
# this name template makes the OS and Arch compatible with the results of `uname`.
|
||||
name_template: >-
|
||||
{{ .ProjectName }}_
|
||||
{{- title .Os }}_
|
||||
{{- if eq .Arch "amd64" }}x86_64
|
||||
{{- else if eq .Arch "386" }}i386
|
||||
{{- else }}{{ .Arch }}{{ end }}
|
||||
{{- if .Arm }}v{{ .Arm }}{{ end }}_{{ .Tag }}
|
||||
# use zip for windows archives
|
||||
format_overrides:
|
||||
- goos: windows
|
||||
formats: [zip]
|
||||
- goos: linux
|
||||
formats: [tar.gz,binary]
|
||||
files:
|
||||
- src: "*.md"
|
||||
strip_parent: true
|
||||
- src: Makefile.dist
|
||||
dst: Makefile
|
||||
wrap_in_directory: true
|
||||
|
||||
changelog:
|
||||
sort: asc
|
||||
filters:
|
||||
exclude:
|
||||
- "^docs:"
|
||||
- "^test:"
|
||||
groups:
|
||||
- title: Improved
|
||||
regexp: '^.*?(feat|add|new)(\([[:word:]]+\))??!?:.+$'
|
||||
order: 0
|
||||
- title: Fixed
|
||||
regexp: '^.*?(bug|fix)(\([[:word:]]+\))??!?:.+$'
|
||||
order: 1
|
||||
- title: Changed
|
||||
order: 999
|
||||
|
||||
release:
|
||||
header: "# Release Notes"
|
||||
footer: >-
|
||||
|
||||
---
|
||||
|
||||
Full Changelog: [{{ .PreviousTag }}...{{ .Tag }}](https://codeberg.org/scip/golsky/compare/{{ .PreviousTag }}...{{ .Tag }})
|
||||
104
Makefile
104
Makefile
@@ -1,15 +1,101 @@
|
||||
.PHONY all:
|
||||
all: build
|
||||
# Copyright © 2024 Thomas von Dein
|
||||
|
||||
.PHONY: build
|
||||
build:
|
||||
make -C src
|
||||
mv src/golsky .
|
||||
# This program is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation, either version 3 of the License, or
|
||||
# (at your option) any later version.
|
||||
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
|
||||
#
|
||||
# no need to modify anything below
|
||||
tool = golsky
|
||||
VERSION = $(shell grep VERSION main.go | head -1 | cut -d '"' -f2)
|
||||
archs = darwin freebsd linux windows
|
||||
PREFIX = /usr/local
|
||||
UID = root
|
||||
GID = 0
|
||||
HAVE_POD := $(shell pod2text -h 2>/dev/null)
|
||||
#TAGS = -tags=ebitenginedebug
|
||||
|
||||
all: buildlocal
|
||||
|
||||
|
||||
buildlocal:
|
||||
go build $(TAGS) -o $(tool)
|
||||
|
||||
install: buildlocal
|
||||
install -d -o $(UID) -g $(GID) $(PREFIX)/bin
|
||||
install -d -o $(UID) -g $(GID) $(PREFIX)/man/man1
|
||||
install -o $(UID) -g $(GID) -m 555 $(tool) $(PREFIX)/sbin/
|
||||
install -o $(UID) -g $(GID) -m 444 $(tool).1 $(PREFIX)/man/man1/
|
||||
|
||||
.PHONY: clean
|
||||
clean:
|
||||
make -C src clean
|
||||
rm -f dump* rect*
|
||||
rm -rf $(tool) coverage.out testdata t/out
|
||||
|
||||
test: clean
|
||||
mkdir -p t/out
|
||||
go test ./... $(ARGS)
|
||||
|
||||
testlint: test lint
|
||||
|
||||
lint:
|
||||
golangci-lint run
|
||||
|
||||
lint-full:
|
||||
golangci-lint run --enable-all --exclude-use-default --disable exhaustivestruct,exhaustruct,depguard,interfacer,deadcode,golint,structcheck,scopelint,varcheck,ifshort,maligned,nosnakecase,godot,funlen,gofumpt,cyclop,noctx,gochecknoglobals,paralleltest
|
||||
|
||||
testfuzzy: clean
|
||||
go test -fuzz ./... $(ARGS)
|
||||
|
||||
singletest:
|
||||
@echo "Call like this: make singletest TEST=TestPrepareColumns ARGS=-v"
|
||||
go test -run $(TEST) $(ARGS)
|
||||
|
||||
cover-report:
|
||||
go test ./... -cover -coverprofile=coverage.out
|
||||
go tool cover -html=coverage.out
|
||||
|
||||
goupdate:
|
||||
go get -t -u=patch ./...
|
||||
|
||||
buildall:
|
||||
./mkrel.sh $(tool) $(VERSION)
|
||||
|
||||
release: buildall
|
||||
gh release create $(VERSION) --generate-notes releases/*
|
||||
|
||||
show-versions: buildlocal
|
||||
@echo "### golsky version:"
|
||||
@./golsky -V
|
||||
|
||||
@echo
|
||||
@echo "### go module versions:"
|
||||
@go list -m all
|
||||
|
||||
@echo
|
||||
@echo "### go version used for building:"
|
||||
@grep -m 1 go go.mod
|
||||
|
||||
# lint:
|
||||
# golangci-lint run -p bugs -p unused
|
||||
|
||||
buildwasm:
|
||||
env GOOS=js GOARCH=wasm go build -o $(tool).wasm $(LDFLAGS) .
|
||||
|
||||
zipwasm:
|
||||
zip -r openquell-$(SHORTVERSION).zip index.html $(tool).wasm wasm_exec.js
|
||||
|
||||
wasm: buildwasm zipwasm
|
||||
@ls -l $(tool)-$(SHORTVERSION).zip
|
||||
|
||||
|
||||
.PHONY: profile
|
||||
profile: build
|
||||
|
||||
18
Makefile.dist
Normal file
18
Makefile.dist
Normal file
@@ -0,0 +1,18 @@
|
||||
# -*-make-*-
|
||||
|
||||
.PHONY: install all
|
||||
|
||||
tool = rpn
|
||||
PREFIX = /usr/local
|
||||
UID = root
|
||||
GID = 0
|
||||
|
||||
all:
|
||||
@echo "Type 'sudo make install' to install the tool."
|
||||
@echo "To change prefix, type 'sudo make install PREFIX=/opt'"
|
||||
|
||||
install:
|
||||
install -d -o $(UID) -g $(GID) $(PREFIX)/bin
|
||||
install -d -o $(UID) -g $(GID) $(PREFIX)/share/doc
|
||||
install -o $(UID) -g $(GID) -m 555 $(tool) $(PREFIX)/sbin/
|
||||
install -o $(UID) -g $(GID) -m 444 *.md $(PREFIX)/share/doc/
|
||||
26
README.md
26
README.md
@@ -1,9 +1,9 @@
|
||||
# golsky - Conway's game of life written in GO
|
||||
|
||||
|
||||
|
||||
|
||||
[](https://github.com/tlinden/golsky/blob/master/LICENSE)
|
||||
[](https://goreportcard.com/report/github.com/tlinden/golsky)
|
||||
[](https://codeberg.org/scip/golsky/blob/master/LICENSE)
|
||||
[](https://goreportcard.com/report/codeberg.org/scip/golsky)
|
||||
|
||||
I wanted to play around a little bit with [**Conways Game of Life**](https://conwaylife.com/)
|
||||
in golang and here's the result. It's a simple game using
|
||||
@@ -14,15 +14,15 @@ John Conway himself: https://youtu.be/R9Plq-D1gEk?si=yYxs77e9yXxeSNbL
|
||||
Based on: https://youtu.be/FWSR_7kZuYg?si=ix1dmo76D8AmF25F
|
||||
|
||||
# Screenshots
|
||||
[](https://github.com/TLINDEN/golsky/blob/main/.github/assets/screenshots/golsky-mainmenu.png)
|
||||
[](https://github.com/TLINDEN/golsky/blob/main/.github/assets/screenshots/golsky-options.png)
|
||||
[](https://github.com/TLINDEN/golsky/blob/main/.github/assets/screenshots/golsky-bindings.png)
|
||||
[](https://github.com/TLINDEN/golsky/blob/main/.github/assets/screenshots/golsky-evolution-trace.png)
|
||||
[](https://github.com/TLINDEN/golsky/blob/main/.github/assets/screenshots/golsky-zoom.png)
|
||||
[](https://github.com/TLINDEN/golsky/blob/main/.github/assets/screenshots/golsky-debug.png)
|
||||
[](https://github.com/TLINDEN/golsky/blob/main/.github/assets/screenshots/golsky-capture.png)
|
||||
[](https://github.com/TLINDEN/golsky/blob/main/.github/assets/screenshots/golsky-captured.png)
|
||||
[](https://github.com/TLINDEN/golsky/blob/main/.github/assets/screenshots/golsky-dark-theme.png)
|
||||
[](https://codeberg.org/scip/golsky/raw/branch/main/.github/assets/screenshots/golsky-mainmenu.png)
|
||||
[](https://codeberg.org/scip/golsky/raw/branch/main/.github/assets/screenshots/golsky-options.png)
|
||||
[](https://codeberg.org/scip/golsky/raw/branch/main/.github/assets/screenshots/golsky-bindings.png)
|
||||
[](https://codeberg.org/scip/golsky/raw/branch/main/.github/assets/screenshots/golsky-evolution-trace.png)
|
||||
[](https://codeberg.org/scip/golsky/raw/branch/main/.github/assets/screenshots/golsky-zoom.png)
|
||||
[](https://codeberg.org/scip/golsky/raw/branch/main/.github/assets/screenshots/golsky-debug.png)
|
||||
[](https://codeberg.org/scip/golsky/raw/branch/main/.github/assets/screenshots/golsky-capture.png)
|
||||
[](https://codeberg.org/scip/golsky/raw/branch/main/.github/assets/screenshots/golsky-captured.png)
|
||||
[](https://codeberg.org/scip/golsky/raw/branch/main/.github/assets/screenshots/golsky-dark-theme.png)
|
||||
|
||||
|
||||
[Youtube video game preview](https://www.youtube.com/watch?v=xEto6Oew16I)
|
||||
@@ -102,7 +102,7 @@ While it runs, there are a couple of commands you can use:
|
||||
|
||||
# Report bugs
|
||||
|
||||
[Please open an issue](https://github.com/TLINDEN/golsky/issues). Thanks!
|
||||
[Please open an issue](https://codeberg.org/scip/golsky/issues). Thanks!
|
||||
|
||||
# License
|
||||
|
||||
|
||||
4
TODO.md
4
TODO.md
@@ -11,8 +11,8 @@
|
||||
- try arche ecs variant with either a component of the cells neighbors or using relations.
|
||||
- https://mattnakama.com/blog/go-branchless-coding/
|
||||
- add performance measurements, see:
|
||||
DrawTriangles: https://github.com/TLINDEN/testgol
|
||||
WritePixels: https://github.com/TLINDEN/testgol/tree/wrpixels
|
||||
DrawTriangles: https://codeberg.org/scip/testgol
|
||||
WritePixels: https://codeberg.org/scip/testgol/tree/wrpixels
|
||||
https://www.tasnimzotder.com/blog/optimizing-game-of-life-algorithm
|
||||
- pre-draw the grid separately to a cache grid image, then during
|
||||
rendering, first draw the dead background, then the life cells, and
|
||||
|
||||
|
Before Width: | Height: | Size: 269 B After Width: | Height: | Size: 269 B |
|
Before Width: | Height: | Size: 263 B After Width: | Height: | Size: 263 B |
|
Before Width: | Height: | Size: 269 B After Width: | Height: | Size: 269 B |
|
Before Width: | Height: | Size: 289 B After Width: | Height: | Size: 289 B |
|
Before Width: | Height: | Size: 271 B After Width: | Height: | Size: 271 B |
@@ -1,6 +1,6 @@
|
||||
// this comes from the camera example but I enhanced it a little bit
|
||||
|
||||
package main
|
||||
package cmd
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
@@ -1,4 +1,4 @@
|
||||
package main
|
||||
package cmd
|
||||
|
||||
import (
|
||||
"errors"
|
||||
@@ -10,7 +10,7 @@ import (
|
||||
"strings"
|
||||
|
||||
"github.com/spf13/pflag"
|
||||
"github.com/tlinden/golsky/rle"
|
||||
"codeberg.org/scip/golsky/rle"
|
||||
)
|
||||
|
||||
// all the settings comming from commandline, but maybe tweaked later from the UI
|
||||
@@ -1,4 +1,4 @@
|
||||
package main
|
||||
package cmd
|
||||
|
||||
import (
|
||||
"github.com/hajimehoshi/ebiten/v2"
|
||||
@@ -1,4 +1,4 @@
|
||||
package main
|
||||
package cmd
|
||||
|
||||
// find an item in a list, generic variant
|
||||
func Contains[E comparable](s []E, v E) bool {
|
||||
@@ -1,4 +1,4 @@
|
||||
package main
|
||||
package cmd
|
||||
|
||||
import (
|
||||
"bufio"
|
||||
@@ -9,49 +9,46 @@ import (
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"github.com/tlinden/golsky/rle"
|
||||
"codeberg.org/scip/golsky/rle"
|
||||
)
|
||||
|
||||
// func (cell *Cell) Count() uint8 {
|
||||
// var count uint8
|
||||
|
||||
// for idx := 0; idx < cell.NeighborCount; idx++ {
|
||||
// count += cell.Neighbors[idx].State
|
||||
// }
|
||||
|
||||
// return count
|
||||
// }
|
||||
// equals grid height, is being used to access grid elements and must be global
|
||||
var STRIDE int
|
||||
|
||||
type Neighbor struct {
|
||||
X, Y int
|
||||
}
|
||||
|
||||
type Grid struct {
|
||||
Data [][]uint8
|
||||
NeighborCount [][]int
|
||||
Neighbors [][][]Neighbor
|
||||
Data []uint8
|
||||
NeighborCount []int
|
||||
Neighbors [][]Neighbor
|
||||
Empty bool
|
||||
Config *Config
|
||||
Counter func(x, y int) uint8
|
||||
}
|
||||
|
||||
// Create new empty grid and allocate Data according to provided dimensions
|
||||
func NewGrid(config *Config) *Grid {
|
||||
STRIDE = config.Height
|
||||
if config.Width > config.Height {
|
||||
STRIDE = config.Width
|
||||
}
|
||||
|
||||
size := STRIDE * STRIDE
|
||||
|
||||
grid := &Grid{
|
||||
Data: make([][]uint8, config.Height),
|
||||
NeighborCount: make([][]int, config.Height),
|
||||
Neighbors: make([][][]Neighbor, config.Height),
|
||||
Data: make([]uint8, size),
|
||||
NeighborCount: make([]int, size),
|
||||
Neighbors: make([][]Neighbor, size),
|
||||
Empty: config.Empty,
|
||||
Config: config,
|
||||
}
|
||||
|
||||
// first setup the cells
|
||||
for y := 0; y < config.Height; y++ {
|
||||
grid.Data[y] = make([]uint8, config.Width)
|
||||
grid.Neighbors[y] = make([][]Neighbor, config.Width)
|
||||
grid.NeighborCount[y] = make([]int, config.Width)
|
||||
|
||||
for x := 0; x < config.Width; x++ {
|
||||
grid.Data[y][x] = 0
|
||||
grid.Data[y+STRIDE*x] = 0
|
||||
}
|
||||
}
|
||||
|
||||
@@ -62,6 +59,12 @@ func NewGrid(config *Config) *Grid {
|
||||
}
|
||||
}
|
||||
|
||||
if grid.Config.Wrap {
|
||||
grid.Counter = grid.CountNeighborsWrap
|
||||
} else {
|
||||
grid.Counter = grid.CountNeighbors
|
||||
}
|
||||
|
||||
return grid
|
||||
}
|
||||
|
||||
@@ -97,20 +100,79 @@ func (grid *Grid) SetupNeighbors(x, y int) {
|
||||
}
|
||||
|
||||
neighbors = append(neighbors, Neighbor{X: col, Y: row})
|
||||
grid.NeighborCount[y][x]++
|
||||
grid.NeighborCount[y+STRIDE*x]++
|
||||
idx++
|
||||
}
|
||||
}
|
||||
|
||||
grid.Neighbors[y][x] = neighbors
|
||||
grid.Neighbors[y+STRIDE*x] = neighbors
|
||||
}
|
||||
|
||||
func (grid *Grid) CountNeighborsWrap(x, y int) uint8 {
|
||||
var sum uint8
|
||||
|
||||
for nbgX := -1; nbgX < 2; nbgX++ {
|
||||
for nbgY := -1; nbgY < 2; nbgY++ {
|
||||
var col, row int
|
||||
|
||||
// In wrap mode we look at all the 8 neighbors surrounding us.
|
||||
// In case we are on an edge we'll look at the neighbor on the
|
||||
// other side of the grid, thus wrapping lookahead around
|
||||
// using the mod() function.
|
||||
col = (x + nbgX + grid.Config.Width) % grid.Config.Width
|
||||
row = (y + nbgY + grid.Config.Height) % grid.Config.Height
|
||||
|
||||
sum += grid.Data[row+STRIDE*col]
|
||||
}
|
||||
}
|
||||
|
||||
// don't count ourselfes though
|
||||
sum -= grid.Data[y+STRIDE*x]
|
||||
|
||||
return sum
|
||||
}
|
||||
|
||||
func (grid *Grid) CountNeighbors(x, y int) uint8 {
|
||||
var sum uint8
|
||||
|
||||
width := grid.Config.Width
|
||||
height := grid.Config.Height
|
||||
|
||||
for nbgX := -1; nbgX < 2; nbgX++ {
|
||||
for nbgY := -1; nbgY < 2; nbgY++ {
|
||||
var col, row int
|
||||
|
||||
xnbgX := x + nbgX
|
||||
ynbgY := y + nbgY
|
||||
|
||||
// In traditional grid mode the edges are deadly
|
||||
if xnbgX < 0 || xnbgX >= width || ynbgY < 0 || ynbgY >= height {
|
||||
continue
|
||||
}
|
||||
col = xnbgX
|
||||
row = ynbgY
|
||||
|
||||
sum += grid.Data[row+STRIDE*col]
|
||||
}
|
||||
}
|
||||
|
||||
// don't count ourselfes though
|
||||
sum -= grid.Data[y+STRIDE*x]
|
||||
|
||||
return sum
|
||||
}
|
||||
|
||||
// count the living neighbors of a cell
|
||||
func (grid *Grid) CountNeighbors(x, y int) uint8 {
|
||||
func (grid *Grid) _CountNeighbors(x, y int) uint8 {
|
||||
var count uint8
|
||||
|
||||
for idx := 0; idx < grid.NeighborCount[y][x]; idx++ {
|
||||
count += grid.Data[grid.Neighbors[y][x][idx].Y][grid.Neighbors[y][x][idx].X]
|
||||
pos := y + STRIDE*x
|
||||
neighbors := grid.Neighbors[pos]
|
||||
neighborCount := grid.NeighborCount[pos]
|
||||
|
||||
for idx := 0; idx < neighborCount; idx++ {
|
||||
neighbor := neighbors[idx]
|
||||
count += grid.Data[neighbor.Y+STRIDE*neighbor.X]
|
||||
}
|
||||
|
||||
return count
|
||||
@@ -127,30 +189,30 @@ func (grid *Grid) Clone() *Grid {
|
||||
}
|
||||
|
||||
// copy data
|
||||
func (grid *Grid) Copy(other *Grid) {
|
||||
for y := range grid.Data {
|
||||
for x := range grid.Data[y] {
|
||||
other.Data[y][x] = grid.Data[y][x]
|
||||
}
|
||||
}
|
||||
}
|
||||
// func (grid *Grid) Copy(other *Grid) {
|
||||
// for y := range grid.Data {
|
||||
// for x := range grid.Data[y] {
|
||||
// other.Data[y+STRIDE*x] = grid.Data[y+STRIDE*x]
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
|
||||
// delete all contents
|
||||
func (grid *Grid) Clear() {
|
||||
for y := range grid.Data {
|
||||
for x := range grid.Data[y] {
|
||||
grid.Data[y][x] = 0
|
||||
}
|
||||
}
|
||||
}
|
||||
// func (grid *Grid) Clear() {
|
||||
// for y := range grid.Data {
|
||||
// for x := range grid.Data[y] {
|
||||
// grid.Data[y+STRIDE*x] = 0
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
|
||||
// initialize with random life cells using the given density
|
||||
func (grid *Grid) FillRandom() {
|
||||
if !grid.Empty {
|
||||
for y := range grid.Data {
|
||||
for x := range grid.Data[y] {
|
||||
for y := 0; y < grid.Config.Height; y++ {
|
||||
for x := 0; x < grid.Config.Width; x++ {
|
||||
if rand.Intn(grid.Config.Density) == 1 {
|
||||
grid.Data[y][x] = 1
|
||||
grid.Data[y+STRIDE*x] = 1
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -160,7 +222,7 @@ func (grid *Grid) FillRandom() {
|
||||
func (grid *Grid) Dump() {
|
||||
for y := 0; y < grid.Config.Height; y++ {
|
||||
for x := 0; x < grid.Config.Width; x++ {
|
||||
if grid.Data[y][x] == 1 {
|
||||
if grid.Data[y+STRIDE*x] == 1 {
|
||||
fmt.Print("XX")
|
||||
} else {
|
||||
fmt.Print(" ")
|
||||
@@ -183,7 +245,7 @@ func (grid *Grid) LoadRLE(pattern *rle.RLE) {
|
||||
x = colIndex + startX
|
||||
y = rowIndex + startY
|
||||
|
||||
grid.Data[y][x] = 1
|
||||
grid.Data[y+STRIDE*x] = 1
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -291,10 +353,10 @@ func (grid *Grid) SaveState(filename, rule string) error {
|
||||
|
||||
fmt.Fprintf(file, "#Life 1.05\n#R %s\n#D golsky state file\n#P -1 -1\n", rule)
|
||||
|
||||
for y := range grid.Data {
|
||||
for _, cell := range grid.Data[y] {
|
||||
for y := 0; y < grid.Config.Height; y++ {
|
||||
for x := 0; x < grid.Config.Width; x++ {
|
||||
row := "."
|
||||
if cell == 1 {
|
||||
if grid.Data[y+STRIDE*x] == 1 {
|
||||
row = "o"
|
||||
}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package main
|
||||
package cmd
|
||||
|
||||
import (
|
||||
"image/color"
|
||||
@@ -1,4 +1,4 @@
|
||||
package main
|
||||
package cmd
|
||||
|
||||
import (
|
||||
"log"
|
||||
@@ -1,4 +1,4 @@
|
||||
package main
|
||||
package cmd
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
@@ -1,4 +1,4 @@
|
||||
package main
|
||||
package cmd
|
||||
|
||||
import (
|
||||
"embed"
|
||||
@@ -1,4 +1,4 @@
|
||||
package main
|
||||
package cmd
|
||||
|
||||
import (
|
||||
"image/color"
|
||||
@@ -1,4 +1,4 @@
|
||||
package main
|
||||
package cmd
|
||||
|
||||
import (
|
||||
"image/color"
|
||||
@@ -1,4 +1,4 @@
|
||||
package main
|
||||
package cmd
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
@@ -10,7 +10,7 @@ import (
|
||||
"github.com/hajimehoshi/ebiten/v2"
|
||||
"github.com/hajimehoshi/ebiten/v2/inpututil"
|
||||
"github.com/hajimehoshi/ebiten/v2/vector"
|
||||
"github.com/tlinden/golsky/rle"
|
||||
"codeberg.org/scip/golsky/rle"
|
||||
"golang.org/x/image/math/f64"
|
||||
)
|
||||
|
||||
@@ -156,21 +156,24 @@ func (scene *ScenePlay) UpdateCells() {
|
||||
var wg sync.WaitGroup
|
||||
wg.Add(scene.Config.Height)
|
||||
|
||||
width := scene.Config.Width
|
||||
height := scene.Config.Height
|
||||
|
||||
// compute life status of cells
|
||||
for y := 0; y < scene.Config.Height; y++ {
|
||||
for y := 0; y < height; y++ {
|
||||
|
||||
go func() {
|
||||
defer wg.Done()
|
||||
|
||||
for x := 0; x < scene.Config.Width; x++ {
|
||||
state := scene.Grids[scene.Index].Data[y][x] // 0|1 == dead or alive
|
||||
neighbors := scene.Grids[scene.Index].CountNeighbors(x, y)
|
||||
for x := 0; x < width; x++ {
|
||||
state := scene.Grids[scene.Index].Data[y+STRIDE*x] // 0|1 == dead or alive
|
||||
neighbors := scene.Grids[scene.Index].Counter(x, y)
|
||||
|
||||
// actually apply the current rules
|
||||
nextstate := scene.RuleCheckFunc(state, neighbors)
|
||||
|
||||
// change state of current cell in next grid
|
||||
scene.Grids[next].Data[y][x] = nextstate
|
||||
scene.Grids[next].Data[y+STRIDE*x] = nextstate
|
||||
|
||||
if scene.Config.ShowEvolution {
|
||||
// set history to current generation so we can infer the
|
||||
@@ -418,7 +421,7 @@ func (scene *ScenePlay) SaveRectRLE() {
|
||||
grid[y] = make([]uint8, width)
|
||||
|
||||
for x := 0; x < width; x++ {
|
||||
grid[y][x] = scene.Grids[scene.Index].Data[y+starty][x+startx]
|
||||
grid[y][x] = scene.Grids[scene.Index].Data[(y+starty)+STRIDE*(x+startx)]
|
||||
}
|
||||
}
|
||||
|
||||
@@ -471,7 +474,7 @@ func (scene *ScenePlay) ToggleCellOnCursorPos() {
|
||||
y := int(worldY) / scene.Config.Cellsize
|
||||
|
||||
if x > -1 && y > -1 && x < scene.Config.Width && y < scene.Config.Height {
|
||||
scene.Grids[scene.Index].Data[y][x] ^= 1
|
||||
scene.Grids[scene.Index].Data[y+STRIDE*x] ^= 1
|
||||
scene.History.Age[y][x] = 1
|
||||
}
|
||||
}
|
||||
@@ -497,7 +500,7 @@ func (scene *ScenePlay) Draw(screen *ebiten.Image) {
|
||||
if scene.Config.ShowEvolution {
|
||||
scene.DrawEvolution(screen, x, y, op)
|
||||
} else {
|
||||
if scene.Grids[scene.Index].Data[y][x] == 1 {
|
||||
if scene.Grids[scene.Index].Data[y+STRIDE*x] == 1 {
|
||||
scene.World.DrawImage(scene.Theme.Tile(ColLife), op)
|
||||
}
|
||||
}
|
||||
@@ -514,7 +517,7 @@ func (scene *ScenePlay) Draw(screen *ebiten.Image) {
|
||||
func (scene *ScenePlay) DrawEvolution(screen *ebiten.Image, x, y int, op *ebiten.DrawImageOptions) {
|
||||
age := scene.Generations - scene.History.Age[y][x]
|
||||
|
||||
switch scene.Grids[scene.Index].Data[y][x] {
|
||||
switch scene.Grids[scene.Index].Data[y+STRIDE*x] {
|
||||
case Alive:
|
||||
if age > 50 && scene.Config.ShowEvolution {
|
||||
scene.World.DrawImage(scene.Theme.Tile(ColOld), op)
|
||||
@@ -1,4 +1,4 @@
|
||||
package main
|
||||
package cmd
|
||||
|
||||
import (
|
||||
"log"
|
||||
@@ -1,4 +1,4 @@
|
||||
package main
|
||||
package cmd
|
||||
|
||||
import "github.com/hajimehoshi/ebiten/v2"
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package main
|
||||
package cmd
|
||||
|
||||
import "runtime"
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package main
|
||||
package cmd
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
@@ -42,10 +42,10 @@ var THEMES = map[string]ThemeDef{
|
||||
dead: "5a5a5a",
|
||||
old: "ff1e1e",
|
||||
grid: "808080",
|
||||
age1: "735f52",
|
||||
age2: "6c6059",
|
||||
age3: "635d59",
|
||||
age4: "7b5e4b",
|
||||
age3: "6c6059",
|
||||
age2: "735f52",
|
||||
age1: "7b5e4b",
|
||||
age4: "635d59",
|
||||
},
|
||||
"dark": {
|
||||
life: "c8c8c8",
|
||||
@@ -1,4 +1,4 @@
|
||||
package main
|
||||
package cmd
|
||||
|
||||
import (
|
||||
"image/color"
|
||||
2
go.mod
2
go.mod
@@ -1,4 +1,4 @@
|
||||
module github.com/tlinden/golsky
|
||||
module codeberg.org/scip/golsky
|
||||
|
||||
go 1.22
|
||||
|
||||
|
||||
@@ -8,6 +8,7 @@ import (
|
||||
|
||||
_ "net/http/pprof"
|
||||
|
||||
"codeberg.org/scip/golsky/cmd"
|
||||
"github.com/hajimehoshi/ebiten/v2"
|
||||
)
|
||||
|
||||
@@ -18,22 +19,22 @@ func main() {
|
||||
directstart = true
|
||||
}
|
||||
|
||||
config, err := ParseCommandline()
|
||||
config, err := cmd.ParseCommandline()
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
|
||||
if config.ShowVersion {
|
||||
fmt.Printf("This is golsky version %s\n", VERSION)
|
||||
fmt.Printf("This is golsky version %s\n", cmd.VERSION)
|
||||
os.Exit(0)
|
||||
}
|
||||
|
||||
start := Play
|
||||
start := cmd.Play
|
||||
if !directstart {
|
||||
start = Menu
|
||||
start = cmd.Menu
|
||||
config.DelayedStart = true
|
||||
}
|
||||
game := NewGame(config, SceneName(start))
|
||||
game := cmd.NewGame(config, cmd.SceneName(start))
|
||||
|
||||
if config.ProfileFile != "" {
|
||||
// enable cpu profiling. Do NOT use q to stop the game but
|
||||
97
src/Makefile
97
src/Makefile
@@ -1,97 +0,0 @@
|
||||
# Copyright © 2024 Thomas von Dein
|
||||
|
||||
# This program is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation, either version 3 of the License, or
|
||||
# (at your option) any later version.
|
||||
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
|
||||
#
|
||||
# no need to modify anything below
|
||||
tool = golsky
|
||||
VERSION = $(shell grep VERSION main.go | head -1 | cut -d '"' -f2)
|
||||
archs = darwin freebsd linux windows
|
||||
PREFIX = /usr/local
|
||||
UID = root
|
||||
GID = 0
|
||||
HAVE_POD := $(shell pod2text -h 2>/dev/null)
|
||||
#TAGS = -tags=ebitenginedebug
|
||||
|
||||
all: buildlocal
|
||||
|
||||
|
||||
buildlocal:
|
||||
go build $(TAGS) -o $(tool)
|
||||
|
||||
install: buildlocal
|
||||
install -d -o $(UID) -g $(GID) $(PREFIX)/bin
|
||||
install -d -o $(UID) -g $(GID) $(PREFIX)/man/man1
|
||||
install -o $(UID) -g $(GID) -m 555 $(tool) $(PREFIX)/sbin/
|
||||
install -o $(UID) -g $(GID) -m 444 $(tool).1 $(PREFIX)/man/man1/
|
||||
|
||||
clean:
|
||||
rm -rf $(tool) coverage.out testdata t/out
|
||||
|
||||
test: clean
|
||||
mkdir -p t/out
|
||||
go test ./... $(ARGS)
|
||||
|
||||
testlint: test lint
|
||||
|
||||
lint:
|
||||
golangci-lint run
|
||||
|
||||
lint-full:
|
||||
golangci-lint run --enable-all --exclude-use-default --disable exhaustivestruct,exhaustruct,depguard,interfacer,deadcode,golint,structcheck,scopelint,varcheck,ifshort,maligned,nosnakecase,godot,funlen,gofumpt,cyclop,noctx,gochecknoglobals,paralleltest
|
||||
|
||||
testfuzzy: clean
|
||||
go test -fuzz ./... $(ARGS)
|
||||
|
||||
singletest:
|
||||
@echo "Call like this: make singletest TEST=TestPrepareColumns ARGS=-v"
|
||||
go test -run $(TEST) $(ARGS)
|
||||
|
||||
cover-report:
|
||||
go test ./... -cover -coverprofile=coverage.out
|
||||
go tool cover -html=coverage.out
|
||||
|
||||
goupdate:
|
||||
go get -t -u=patch ./...
|
||||
|
||||
buildall:
|
||||
./mkrel.sh $(tool) $(VERSION)
|
||||
|
||||
release: buildall
|
||||
gh release create $(VERSION) --generate-notes releases/*
|
||||
|
||||
show-versions: buildlocal
|
||||
@echo "### golsky version:"
|
||||
@./golsky -V
|
||||
|
||||
@echo
|
||||
@echo "### go module versions:"
|
||||
@go list -m all
|
||||
|
||||
@echo
|
||||
@echo "### go version used for building:"
|
||||
@grep -m 1 go go.mod
|
||||
|
||||
# lint:
|
||||
# golangci-lint run -p bugs -p unused
|
||||
|
||||
buildwasm:
|
||||
env GOOS=js GOARCH=wasm go build -o $(tool).wasm $(LDFLAGS) .
|
||||
|
||||
zipwasm:
|
||||
zip -r openquell-$(SHORTVERSION).zip index.html $(tool).wasm wasm_exec.js
|
||||
|
||||
wasm: buildwasm zipwasm
|
||||
@ls -l $(tool)-$(SHORTVERSION).zip
|
||||
@@ -87,6 +87,17 @@ func Loop(grid []bool) {
|
||||
}
|
||||
|
||||
func main() {
|
||||
grid := make([]int, 50*50)
|
||||
|
||||
for y := 0; y < 50; y++ {
|
||||
for x := 0; x < 50; x++ {
|
||||
grid[y+50*x] = 1
|
||||
fmt.Printf("%d,%d => %d\n", x, y, x+50*y)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func xmain() {
|
||||
// enable cpu profiling. Do NOT use q to stop the game but
|
||||
// close the window to get a profile
|
||||
fd, err := os.Create("cpu.profile")
|
||||
|
||||
Reference in New Issue
Block a user