diff --git a/.gitignore b/.gitignore index 48b8bf9..b8a949a 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ vendor/ +result +snapshot.png diff --git a/flake.nix b/flake.nix index b30842d..505c37c 100644 --- a/flake.nix +++ b/flake.nix @@ -49,34 +49,31 @@ ]; in { - packages.default = pkgs.buildGoModule { - inherit pname version; - src = self; + packages.default = pkgs.buildGoModule { + pname = "sumi"; + version = "0.1.0"; - # raylib-go uses CGO to link against libraylib - env.CGO_ENABLED = 1; + src = pkgs.lib.cleanSourceWith { + src = ./.; + filter = path: type: + let base = builtins.baseNameOf path; + in base != "vendor" && base != ".git"; + }; - # GOFLAGS = [ "-mod=mod" ]; - # proxyVendor = true; + env.CGO_ENABLED = 1; - nativeBuildInputs = nativeDeps; - buildInputs = raylibDeps; + nativeBuildInputs = nativeDeps; + buildInputs = raylibDeps; - # If your main package isn’t at repo root, set this (examples): - # subPackages = [ "./cmd/sketch" ]; + vendorHash = "sha256-teooSdWKQ08cYn/yWMZ8JKuo4rGnV5QOt2Zxzp34Q+I="; - # First build will fail with a message containing the correct hash. - vendorHash = "sha256-pcNGzxHripkn9lX2R9O29nYvR+hWLxIev4KJmEhQwC8="; + # use this every time there's vendor changeO + # vendorHash = pkgs.lib.fakeHash; - # Optional: strip for smaller binaries - ldflags = [ - "-s" - "-w" - ]; - - doCheck = false; - }; + ldflags = [ "-s" "-w" ]; + doCheck = false; + }; devShells.default = pkgs.mkShell { # Tools you want while hacking diff --git a/go.mod b/go.mod index 39f4da8..be30ba1 100644 --- a/go.mod +++ b/go.mod @@ -1,14 +1,31 @@ module github.com/d2fn/sumi -go 1.22 +go 1.24.0 + +toolchain go1.24.10 require ( github.com/gen2brain/raylib-go/raylib v0.55.1 + github.com/go-git/go-git/v6 v6.0.0-20251212081956-e83cbb9651e8 github.com/ojrac/opensimplex-go v1.0.2 ) require ( + github.com/Microsoft/go-winio v0.6.2 // indirect + github.com/ProtonMail/go-crypto v1.3.0 // indirect + github.com/cloudflare/circl v1.6.1 // indirect + github.com/cyphar/filepath-securejoin v0.6.1 // indirect github.com/ebitengine/purego v0.7.1 // indirect - golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect - golang.org/x/sys v0.20.0 // indirect + github.com/emirpasic/gods v1.18.1 // indirect + github.com/go-git/gcfg/v2 v2.0.2 // indirect + github.com/go-git/go-billy/v6 v6.0.0-20251126203821-7f9c95185ee0 // indirect + github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect + github.com/kevinburke/ssh_config v1.4.0 // indirect + github.com/klauspost/cpuid/v2 v2.3.0 // indirect + github.com/pjbgf/sha1cd v0.5.0 // indirect + github.com/sergi/go-diff v1.4.0 // indirect + golang.org/x/crypto v0.46.0 // indirect + golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect + golang.org/x/net v0.48.0 // indirect + golang.org/x/sys v0.39.0 // indirect ) diff --git a/go.sum b/go.sum index b1ddf72..3dd961b 100644 --- a/go.sum +++ b/go.sum @@ -1,10 +1,72 @@ +github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY= +github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU= +github.com/ProtonMail/go-crypto v1.3.0 h1:ILq8+Sf5If5DCpHQp4PbZdS1J7HDFRXz/+xKBiRGFrw= +github.com/ProtonMail/go-crypto v1.3.0/go.mod h1:9whxjD8Rbs29b4XWbB8irEcE8KHMqaR2e7GWU1R+/PE= +github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be h1:9AeTilPcZAjCFIImctFaOjnTIavg87rW78vTPkQqLI8= +github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be/go.mod h1:ySMOLuWl6zY27l47sB3qLNK6tF2fkHG55UZxx8oIVo4= +github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio= +github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= +github.com/cloudflare/circl v1.6.1 h1:zqIqSPIndyBh1bjLVVDHMPpVKqp8Su/V+6MeDzzQBQ0= +github.com/cloudflare/circl v1.6.1/go.mod h1:uddAzsPgqdMAYatqJ0lsjX1oECcQLIlRpzZh3pJrofs= +github.com/cyphar/filepath-securejoin v0.6.1 h1:5CeZ1jPXEiYt3+Z6zqprSAgSWiggmpVyciv8syjIpVE= +github.com/cyphar/filepath-securejoin v0.6.1/go.mod h1:A8hd4EnAeyujCJRrICiOWqjS1AX0a9kM5XL+NwKoYSc= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/ebitengine/purego v0.7.1 h1:6/55d26lG3o9VCZX8lping+bZcmShseiqlh2bnUDiPA= github.com/ebitengine/purego v0.7.1/go.mod h1:ah1In8AOtksoNK6yk5z1HTJeUkC1Ez4Wk2idgGslMwQ= +github.com/elazarl/goproxy v1.7.2 h1:Y2o6urb7Eule09PjlhQRGNsqRfPmYI3KKQLFpCAV3+o= +github.com/elazarl/goproxy v1.7.2/go.mod h1:82vkLNir0ALaW14Rc399OTTjyNREgmdL2cVoIbS6XaE= +github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc= +github.com/emirpasic/gods v1.18.1/go.mod h1:8tpGGwCnJ5H4r6BWwaV6OrWmMoPhUl5jm/FMNAnJvWQ= github.com/gen2brain/raylib-go/raylib v0.55.1 h1:1rdc10WvvYjtj7qijHnV9T38/WuvlT6IIL+PaZ6cNA8= github.com/gen2brain/raylib-go/raylib v0.55.1/go.mod h1:BaY76bZk7nw1/kVOSQObPY1v1iwVE1KHAGMfvI6oK1Q= +github.com/gliderlabs/ssh v0.3.8 h1:a4YXD1V7xMF9g5nTkdfnja3Sxy1PVDCj1Zg4Wb8vY6c= +github.com/gliderlabs/ssh v0.3.8/go.mod h1:xYoytBv1sV0aL3CavoDuJIQNURXkkfPA/wxQ1pL1fAU= +github.com/go-git/gcfg/v2 v2.0.2 h1:MY5SIIfTGGEMhdA7d7JePuVVxtKL7Hp+ApGDJAJ7dpo= +github.com/go-git/gcfg/v2 v2.0.2/go.mod h1:/lv2NsxvhepuMrldsFilrgct6pxzpGdSRC13ydTLSLs= +github.com/go-git/go-billy/v6 v6.0.0-20251126203821-7f9c95185ee0 h1:eY5aB2GXiVdgTueBcqsBt53WuJTRZAuCdIS/86Pcq5c= +github.com/go-git/go-billy/v6 v6.0.0-20251126203821-7f9c95185ee0/go.mod h1:0NjwVNrwtVFZBReAp5OoGklGJIgJFEbVyHneAr4lc8k= +github.com/go-git/go-git-fixtures/v5 v5.1.2-0.20251205091929-ed656e84d025 h1:24Uc4y1yxMe8V30NhshaDdCaTOw97BWVhVGH/m1+udM= +github.com/go-git/go-git-fixtures/v5 v5.1.2-0.20251205091929-ed656e84d025/go.mod h1:T6lRF5ejdxaYZLVaCTuTG1+ZSvwI/c2oeiTgBWORJ8Q= +github.com/go-git/go-git/v6 v6.0.0-20251212081956-e83cbb9651e8 h1:9PLPn/icZJaDXE8KeI47CDFQe9EaOht+89NrNn2+VPg= +github.com/go-git/go-git/v6 v6.0.0-20251212081956-e83cbb9651e8/go.mod h1:XY/p4VJq0DwOVAAs+58NpHcQrqwHDEzMv4g8MBK7ZVA= +github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 h1:f+oWsMOmNPc8JmEHVZIycC7hBoQxHH9pNKQORJNozsQ= +github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8/go.mod h1:wcDNUvekVysuuOpQKo3191zZyTpiI6se1N1ULghS0sw= +github.com/kevinburke/ssh_config v1.4.0 h1:6xxtP5bZ2E4NF5tuQulISpTO2z8XbtH8cg1PWkxoFkQ= +github.com/kevinburke/ssh_config v1.4.0/go.mod h1:q2RIzfka+BXARoNexmF9gkxEX7DmvbW9P4hIVx2Kg4M= +github.com/klauspost/cpuid/v2 v2.3.0 h1:S4CRMLnYUhGeDFDqkGriYKdfoFlDnMtqTiI/sFzhA9Y= +github.com/klauspost/cpuid/v2 v2.3.0/go.mod h1:hqwkgyIinND0mEev00jJYCxPNVRVXFQeu1XKlok6oO0= +github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/ojrac/opensimplex-go v1.0.2 h1:l4vs0D+JCakcu5OV0kJ99oEaWJfggSc9jiLpxaWvSzs= github.com/ojrac/opensimplex-go v1.0.2/go.mod h1:NwbXFFbXcdGgIFdiA7/REME+7n/lOf1TuEbLiZYOWnM= -golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 h1:vr/HnozRka3pE4EsMEg1lgkXJkTFJCVUX+S/ZT6wYzM= -golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842/go.mod h1:XtvwrStGgqGPLc4cjQfWqZHG1YFdYs6swckp8vpsjnc= -golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y= -golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +github.com/pjbgf/sha1cd v0.5.0 h1:a+UkboSi1znleCDUNT3M5YxjOnN1fz2FhN48FlwCxs0= +github.com/pjbgf/sha1cd v0.5.0/go.mod h1:lhpGlyHLpQZoxMv8HcgXvZEhcGs0PG/vsZnEJ7H0iCM= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/sergi/go-diff v1.4.0 h1:n/SP9D5ad1fORl+llWyN+D6qoUETXNZARKjyY2/KVCw= +github.com/sergi/go-diff v1.4.0/go.mod h1:A0bzQcvG0E7Rwjx0REVgAGH58e96+X0MeOfepqsbeW4= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= +github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U= +github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U= +golang.org/x/crypto v0.46.0 h1:cKRW/pmt1pKAfetfu+RCEvjvZkA9RimPbh7bhFjGVBU= +golang.org/x/crypto v0.46.0/go.mod h1:Evb/oLKmMraqjZ2iQTwDwvCtJkczlDuTmdJXoZVzqU0= +golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 h1:2dVuKD2vS7b0QIHQbpyTISPd0LeHDbnYEryqj5Q1ug8= +golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56/go.mod h1:M4RDyNAINzryxdtnbRXRL/OHtkFuWGRjvuhBJpk2IlY= +golang.org/x/net v0.48.0 h1:zyQRTTrjc33Lhh0fBgT/H3oZq9WuvRR5gPC70xpDiQU= +golang.org/x/net v0.48.0/go.mod h1:+ndRgGjkh8FGtu1w1FGbEC31if4VrNVMuKTgcAAnQRY= +golang.org/x/sys v0.39.0 h1:CvCKL8MeisomCi6qNZ+wbb0DN9E5AATixKsvNtMoMFk= +golang.org/x/sys v0.39.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= +golang.org/x/term v0.38.0 h1:PQ5pkm/rLO6HnxFR7N2lJHOZX6Kez5Y1gDSJla6jo7Q= +golang.org/x/term v0.38.0/go.mod h1:bSEAKrOT1W+VSu9TSCMtoGEOUcKxOKgl3LE5QEF/xVg= +golang.org/x/text v0.32.0 h1:ZD01bjUt1FQ9WJ0ClOL5vxgxOI/sVCNgX1YtKwcY0mU= +golang.org/x/text v0.32.0/go.mod h1:o/rUWzghvpD5TXrTIBuJU77MTaN0ljMWE47kxGJQ7jY= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/main.go b/main.go index a512140..04c2941 100644 --- a/main.go +++ b/main.go @@ -2,28 +2,108 @@ package main import ( "fmt" + "math" "github.com/gen2brain/raylib-go/raylib" "github.com/ojrac/opensimplex-go" + "github.com/go-git/go-git/v6" ) +func HeadHash(repoPath string) (string, error) { + r, err := git.PlainOpen(repoPath) + if err != nil { + return "", err + } + + ref, err := r.Head() + if err != nil { + return "", err + } + + return ref.Hash().String(), nil +} + +func IsDirty(repoPath string) (bool, error) { + r, err := git.PlainOpen(repoPath) + if err != nil { + return false, err + } + + wt, err := r.Worktree() + if err != nil { + return false, err + } + + status, err := wt.Status() + if err != nil { + return false, err + } + + return !status.IsClean(), nil +} + +func clamp01(v float64) float64 { + if v < 0 { + return 0 + } + if v > 1 { + return 1 + } + return v +} + +func GrayCurve(v, k float64) rl.Color { + v = math.Pow(clamp01(v), k) // k < 1 boosts highlights, k > 1 boosts shadows + c := uint8(v * 255) + return rl.Color{R: c, G: c, B: c, A: 255} +} + +func sierpinskiArrow(order int, length float64) { + rl.Scalef(1, -1, 1) + //rl.Rotatef(180, 0, 0, 1) + if order == 0 { + curve(order, length, 60) + } else { + rl.Rotatef(60, 0, 0, 1) + curve(order, length, -60) + } +} + +func curve(order int, length float64, angle float64) { + if order == 0 { + len := int32(length) + rl.DrawLine(0, 0, len, 0, rl.Black) + rl.Translatef(float32(len), 0, 0) + } else { + curve(order - 1, length/2, -angle) + rl.Rotatef(float32(angle), 0, 0, 1) + curve(order - 1, length/2, angle) + rl.Rotatef(float32(angle), 0, 0, 1) + curve(order - 1, length/2, -angle) + } +} + func main() { const ( - screenWidth = 2200 - screenHeight = 1200 + screenWidth = 1200 + screenHeight = 700 ) rl.InitWindow(screenWidth, screenHeight, "sumi sierpinski arrow") - var camera rl.Camera2D - camera.Zoom = 1.0 + var camera = rl.Camera2D { + Target: rl.Vector2{X: 0, Y: 0}, + Offset: rl.Vector2{X: float32(screenWidth) / 2, Y: float32(screenHeight) / 2}, + Rotation: 0, + Zoom: 1.0, + } rl.SetTargetFPS(60) angles := make([]float32, 1000) noise := opensimplex.NewNormalized(0) for i := range len(angles) { - angles[i] = float32(noise.Eval2(float64(i)*0.0001, 0.00)) * 2 - 1 + angles[i] = float32(noise.Eval2(float64(i)*0.05, 0.00)) * 0.1 - 0.05 fmt.Printf("angles[%d] = %.2f\n", i, angles[i]) } @@ -67,7 +147,17 @@ func main() { rl.BeginMode2D(camera) rl.PushMatrix() - rl.Translatef(screenWidth/2, screenHeight/2, 0); + + /** + for x := range screenWidth { + for y := range screenHeight { + sp := rl.Vector2 { X: float32(x), Y: float32(y) }; + wp := rl.GetScreenToWorld2D(sp, camera); + normVal := noise.Eval2(float64(wp.X), float64(wp.Y)) + rl.DrawPixelV(wp, GrayCurve(normVal, 0.8)); + } + } + **/ // initial transform by halfway again through angle array @@ -75,12 +165,13 @@ func main() { angle := angles[angleIndex] initAngle := angles[(angleIndex + len(angles)/2)%len(angles)] - rl.Rotatef(250*initAngle, 0, 0, 1) + rl.Rotatef(2500*initAngle, 0, 0, 1) rl.Translatef(100*initAngle, 100*initAngle, 0) + stepSize := int32(1) for range 1000 { - rl.DrawLine(0, 0, 10, 0, rl.Black) - rl.Translatef(10, 0, 0) + rl.DrawLine(0, 0, stepSize, 0, rl.Black) + rl.Translatef(float32(stepSize), 0, 0) rl.Rotatef(angle, 0, 0, 1) angleIndex++ angleIndex = angleIndex%len(angles) @@ -88,6 +179,15 @@ func main() { } rl.PopMatrix() + + rl.PushMatrix() + + //rl.Translatef(-screenWidth/2, screenHeight/2, 0) + + sierpinskiArrow(9,800) + + rl.PopMatrix() + /* rl.PushMatrix() rl.Translatef(0, 25*50, 0) @@ -98,6 +198,29 @@ func main() { rl.EndMode2D() + if rl.IsKeyDown(rl.KeySpace) { + //rl.TakeScreenshot("snapshot.png") + img := rl.LoadImageFromScreen() + defer rl.UnloadImage(img) + rl.ExportImage(*img, "shot.png") + + dflag, err := IsDirty(".") + + if err == nil { + + if dflag { + fmt.Printf("working tree is dirty\n") + } else { + fmt.Printf("working tree is clean\n") + } + + hash, err := HeadHash(".") + if err == nil { + fmt.Printf("HEAD -> %s\n", hash) + } + } + } + rl.DrawText("Mouse right button drag to move, mouse wheel to zoom", 10, 10, 20, rl.White) rl.EndDrawing()