Skip to content

Procjam 2025 #127

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
EliCDavis merged 4 commits into from
Nov 29, 2025
Merged

Procjam 2025 #127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
864b14f
Procjam 2025
EliCDavis Nov 22, 2025
62dd8b7
Torus bug fix
EliCDavis Nov 23, 2025
ee85293
Snow globe
EliCDavis Nov 28, 2025
872ed02
lil fixes
EliCDavis Nov 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions drawing/texturing/noise.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ func texture(
Seed nodes.Output[float64],
Polar nodes.Output[bool],
) {
width := nodes.TryGetOutputValue(out, Width, 1)
height := nodes.TryGetOutputValue(out, Height, 1)
width := nodes.TryGetOutputValue(out, Width, 64)
height := nodes.TryGetOutputValue(out, Height, 64)

if width <= 0 {
out.CaptureError(fmt.Errorf("invalid width dimension: %d", width))
Expand Down
3 changes: 1 addition & 2 deletions examples/chill/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package main
import (
"encoding/json"
"fmt"
"io/ioutil"
"log"
"math"
"math/rand"
Expand Down Expand Up @@ -425,7 +424,7 @@ func main() {

if ctx.IsSet("trail") {

trailFileData, err := ioutil.ReadFile(ctx.String("trail"))
trailFileData, err := os.ReadFile(ctx.String("trail"))
if err != nil {
return err
}
Expand Down
1 change: 1 addition & 0 deletions generator/edit/examples/snowglobe.json
View file
Open in desktop

Large diffs are not rendered by default.

9 changes: 5 additions & 4 deletions modeling/marching/canvas.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,14 @@ func interpolateVerts(v1, v2 vector3.Float64, v1v, v2v, cutoff float64) vector3.

func lookupOrAdd(data *workingData, vert vector3.Float64) int {
distritized := modeling.Vector3ToInt(vert, 4)
key := vector3.New(int32(distritized.X()), int32(distritized.Y()), int32(distritized.Z()))

if foundIndex, ok := data.vertLookup[distritized]; ok {
if foundIndex, ok := data.vertLookup[key]; ok {
return foundIndex
}

index := len(data.verts)
data.vertLookup[distritized] = index
data.vertLookup[key] = index
data.verts = append(data.verts, vert)
return index
}
Expand Down Expand Up @@ -430,7 +431,7 @@ func (d *MarchingCanvas) AddFieldParallel2(field Field) {
type workingData struct {
tris []int
verts []vector3.Float64
vertLookup map[vector3.Int]int
vertLookup map[vector3.Int32]int
}

func (d *MarchingCanvas) marchFloat1BlockPosition(
Expand Down Expand Up @@ -464,7 +465,7 @@ func (d *MarchingCanvas) marchFloat1BlockPosition(
marchingWorkingData := &workingData{
tris: make([]int, 0),
verts: make([]vector3.Float64, 0),
vertLookup: make(map[vector3.Int]int),
vertLookup: make(map[vector3.Int32]int),
}
blockIndex := section.positions[blockPosition]

Expand Down
Loading
Loading