added noise functionality

aldernero · aldernero · commit dad88865cab4 · 2022-02-16T20:48:36.000-07:00
diff --git a/examples/lissajous/config.json b/examples/lissajous/config.json
diff --git a/examples/lissajous/main.go b/examples/lissajous/main.go
diff --git a/examples/noise/config.json b/examples/noise/config.json
@@ -0,0 +1,70 @@
+{
+    "SketchWidth": 1080,
+    "SketchHeight": 1080,
+    "ControlWidth": 240,
+    "Controls": [
+        {
+            "Name": "cellSize",
+            "MinVal": 1,
+            "MaxVal": 100,
+            "Val": 10,
+            "Incr": 1
+        },
+        {
+            "Name": "seed",
+            "MinVal": -10000,
+            "MaxVal": 10000,
+            "Val": 0,
+            "Incr": 1
+        },
+        {
+            "Name": "octaves",
+            "MinVal": 1,
+            "MaxVal": 10,
+            "Val": 1,
+            "Incr": 1
+        },
+        {
+            "Name": "persistence",
+            "MinVal": 0,
+            "MaxVal": 2,
+            "Val": 0.9,
+            "Incr": 0.01
+        },
+        {
+            "Name": "lacunarity",
+            "MinVal": 0,
+            "MaxVal": 10,
+            "Val": 2,
+            "Incr": 0.1
+        },
+        {
+            "Name": "xscale",
+            "MinVal": 0,
+            "MaxVal": 0.1,
+            "Val": 0.005,
+            "Incr": 0.001
+        },
+        {
+            "Name": "yscale",
+            "MinVal": 0,
+            "MaxVal": 0.1,
+            "Val": 0.005,
+            "Incr": 0.001
+        },
+        {
+            "Name": "xoffset",
+            "MinVal": -1000,
+            "MaxVal": 1000,
+            "Val": 0,
+            "Incr": 1
+        },
+        {
+            "Name": "yoffset",
+            "MinVal": -1000,
+            "MaxVal": 1000,
+            "Val": 0,
+            "Incr": 1
+        }
+    ]
+}
diff --git a/examples/noise/main.go b/examples/noise/main.go
@@ -0,0 +1,51 @@
+package main
+
+import (
+	"log"
+
+	"github.com/aldernero/sketchy"
+	"github.com/fogleman/gg"
+	"github.com/hajimehoshi/ebiten/v2"
+	"github.com/lucasb-eyer/go-colorful"
+)
+
+func update(s *sketchy.Sketch) {
+	s.Rand.SetSeed(int64(s.Var("seed")))
+	s.Rand.SetNoiseOctaves(int(s.Var("octaves")))
+	s.Rand.SetNoisePersistence(s.Var("persistence"))
+	s.Rand.SetNoiseLacunarity(s.Var("lacunarity"))
+	s.Rand.SetNoiseScaleX(s.Var("xscale"))
+	s.Rand.SetNoiseScaleY(s.Var("yscale"))
+	s.Rand.SetNoiseOffsetX(s.Var("xoffset"))
+	s.Rand.SetNoiseOffsetY(s.Var("yoffset"))
+}
+
+func draw(s *sketchy.Sketch, c *gg.Context) {
+	cellSize := s.Var("cellSize")
+	for x := 0.0; x < s.SketchWidth; x += cellSize {
+		for y := 0.0; y < s.SketchHeight; y += cellSize {
+			noise := s.Rand.Noise2D(x, y)
+			hue := sketchy.Map(0, 1, 0, 360, noise)
+			cellColor := colorful.Hsl(hue, 0.5, 0.5)
+			c.SetColor(cellColor)
+			c.DrawRectangle(x, y, cellSize, cellSize)
+			c.Fill()
+		}
+	}
+}
+
+func main() {
+	s, err := sketchy.NewSketchFromFile("config.json")
+	s.Updater = update
+	s.Drawer = draw
+	if err != nil {
+		log.Fatal(err)
+	}
+	s.Init()
+	ebiten.SetWindowSize(int(s.ControlWidth+s.SketchWidth), int(s.SketchHeight))
+	ebiten.SetWindowTitle("Sketchy Noise Example")
+	ebiten.SetWindowResizable(false)
+	if err := ebiten.RunGame(s); err != nil {
+		log.Fatal(err)
+	}
+}
diff --git a/examples/noise/test_20220216_204529.png b/examples/noise/test_20220216_204529.png
diff --git a/go.mod b/go.mod
@@ -6,6 +6,7 @@ require (
 	github.com/fogleman/gg v1.3.0
 	github.com/hajimehoshi/ebiten/v2 v2.2.4
 	github.com/lucasb-eyer/go-colorful v1.2.0
+	github.com/ojrac/opensimplex-go v1.0.2
 )
 
 require (
diff --git a/go.sum b/go.sum
@@ -19,6 +19,8 @@ github.com/jfreymuth/oggvorbis v1.0.3/go.mod h1:1U4pqWmghcoVsCJJ4fRBKv9peUJMBHix
 github.com/jfreymuth/vorbis v1.0.2/go.mod h1:DoftRo4AznKnShRl1GxiTFCseHr4zR9BN3TWXyuzrqQ=
 github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69Aj6K7nkY=
 github.com/lucasb-eyer/go-colorful v1.2.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
+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=
 github.com/pkg/browser v0.0.0-20180916011732-0a3d74bf9ce4/go.mod h1:4OwLy04Bl9Ef3GJJCoec+30X3LQs/0/m4HFRt/2LUSA=
 github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
 github.com/yuin/goldmark v1.4.0/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
diff --git a/random.go b/random.go
@@ -0,0 +1,113 @@
+package sketchy
+
+import (
+	"math/rand"
+
+	"github.com/ojrac/opensimplex-go"
+)
+
+const (
+	defaultScale       = 0.001
+	defaultOctaves     = 1
+	defaultPersistence = 0.9
+	defaultLacunarity  = 2.0
+)
+
+type Rng struct {
+	seed        int64
+	noise       opensimplex.Noise
+	octaves     int
+	persistence float64
+	lacunarity  float64
+	xscale      float64
+	yscale      float64
+	zscale      float64
+	xoffset     float64
+	yoffset     float64
+	zoffset     float64
+}
+
+func NewRng(i int64) Rng {
+	rand.Seed(i)
+	return Rng{
+		seed:        i,
+		noise:       opensimplex.New(i),
+		octaves:     defaultOctaves,
+		persistence: defaultPersistence,
+		lacunarity:  defaultLacunarity,
+		xscale:      defaultScale,
+		yscale:      defaultScale,
+		zscale:      defaultScale,
+		xoffset:     0,
+		yoffset:     0,
+		zoffset:     0,
+	}
+}
+
+func (r *Rng) SetSeed(i int64) {
+	rand.Seed(i)
+	r.seed = i
+	r.noise = opensimplex.New(i)
+}
+
+func (r *Rng) SetNoiseScaleX(scale float64) {
+	r.xscale = scale
+}
+
+func (r *Rng) SetNoiseScaleY(scale float64) {
+	r.yscale = scale
+}
+
+func (r *Rng) SetNoiseScaleZ(scale float64) {
+	r.zscale = scale
+}
+
+func (r *Rng) SetNoiseOffsetX(offset float64) {
+	r.xoffset = offset
+}
+
+func (r *Rng) SetNoiseOffsetY(offset float64) {
+	r.yoffset = offset
+}
+
+func (r *Rng) SetNoiseOffsetZ(offset float64) {
+	r.zoffset = offset
+}
+
+func (r *Rng) SetNoiseOctaves(i int) {
+	r.octaves = i
+}
+
+func (r *Rng) SetNoisePersistence(p float64) {
+	r.persistence = p
+}
+
+func (r *Rng) SetNoiseLacunarity(l float64) {
+	r.lacunarity = l
+}
+
+func (r *Rng) Noise2D(x float64, y float64) float64 {
+	return r.calcNoise(x, y, 0)
+}
+
+func (r *Rng) Noise3D(x float64, y float64, z float64) float64 {
+	return r.calcNoise(x, y, z)
+}
+
+func (r *Rng) calcNoise(x, y, z float64) float64 {
+	totalNoise := 0.0
+	totalAmp := 0.0
+	amp := 1.0
+	freq := 1.0
+	for i := 0; i < r.octaves; i++ {
+		totalNoise += r.noise.Eval3(
+			(x+r.xoffset)*r.xscale*freq,
+			(y+r.yoffset)*r.yscale*freq,
+			(z+r.zoffset)*r.zscale*freq,
+		)
+		totalAmp += amp
+		amp *= r.persistence
+		freq *= r.lacunarity
+	}
+	return totalNoise / totalAmp
+}
diff --git a/sketch.go b/sketch.go
@@ -2,12 +2,14 @@ package sketchy
 
 import (
 	"encoding/json"
+	"fmt"
 	"image/color"
 	"log"
 	"os"
 
 	"github.com/fogleman/gg"
 	"github.com/hajimehoshi/ebiten/v2"
+	"github.com/hajimehoshi/ebiten/v2/inpututil"
 	"github.com/lucasb-eyer/go-colorful"
 )
 
@@ -35,6 +37,8 @@ type Sketch struct {
 	Updater                SketchUpdater
 	Drawer                 SketchDrawer
 	controlMap             map[string]int
+	Rand                   Rng
+	isSavingPNG            bool
 }
 
 func NewSketchFromFile(fname string) (*Sketch, error) {
@@ -51,7 +55,8 @@ func NewSketchFromFile(fname string) (*Sketch, error) {
 }
 
 func (s *Sketch) Init() {
-	s.buildMap()
+	s.buildMaps()
+	s.Rand = NewRng(0)
 	ctx := gg.NewContext(int(s.ControlWidth), int(s.SketchHeight))
 	s.PlaceControls(s.ControlWidth, s.SketchHeight, ctx)
 	for i := range s.Controls {
@@ -123,6 +128,12 @@ func (s *Sketch) Var(name string) float64 {
 }
 
 func (s *Sketch) UpdateControls() {
+	if inpututil.IsKeyJustReleased(ebiten.KeyS) {
+		s.isSavingPNG = true
+	}
+	if inpututil.IsKeyJustReleased(ebiten.KeyC) {
+		s.saveConfig()
+	}
 	for i := range s.Controls {
 		s.Controls[i].CheckAndUpdate()
 	}
@@ -167,7 +178,6 @@ func (s *Sketch) Update() error {
 func (s *Sketch) Draw(screen *ebiten.Image) {
 	W := int(s.ControlWidth + s.SketchWidth)
 	H := int(s.SketchHeight)
-	//screen.Fill(color.White)
 	cc := gg.NewContext(W, H)
 	cc.DrawRectangle(0, 0, s.ControlWidth, s.SketchHeight)
 	cc.SetColor(color.White)
@@ -180,17 +190,28 @@ func (s *Sketch) Draw(screen *ebiten.Image) {
 	cc.DrawRectangle(s.ControlWidth+2.5, 2.5, s.SketchWidth-5, s.SketchHeight-5)
 	cc.Stroke()
 	screen.DrawImage(ebiten.NewImageFromImage(cc.Image()), nil)
-	ctx := gg.NewContext(W, H)
+	ctx := gg.NewContext(int(s.SketchWidth), H)
 	ctx.Push()
-	ctx.Translate(s.ControlWidth, 0)
 	s.Drawer(s, ctx)
 	ctx.Pop()
-	screen.DrawImage(ebiten.NewImageFromImage(ctx.Image()), nil)
+	if s.isSavingPNG {
+		fmt.Println("saving image")
+		fname := "test_" + GetTimestampString() + ".png"
+		ctx.SavePNG(fname)
+		s.isSavingPNG = false
+	}
+	op := &ebiten.DrawImageOptions{}
+	op.GeoM.Translate(s.ControlWidth, 0)
+	screen.DrawImage(ebiten.NewImageFromImage(ctx.Image()), op)
 }
 
-func (s *Sketch) buildMap() {
+func (s *Sketch) buildMaps() {
 	s.controlMap = make(map[string]int)
 	for i := range s.Controls {
 		s.controlMap[s.Controls[i].Name] = i
 	}
 }
+
+func (s *Sketch) saveConfig() {
+
+}
diff --git a/util.go b/util.go
@@ -1,6 +1,7 @@
 package sketchy
 
 import (
+	"fmt"
 	"math"
 	"math/rand"
 	"time"
@@ -85,3 +86,10 @@ func Shuffle(p *[]Point) {
 		(*p)[j], (*p)[k] = (*p)[k], (*p)[j]
 	}
 }
+
+func GetTimestampString() string {
+	now := time.Now()
+	return fmt.Sprintf("%d%02d%02d_%02d%02d%02d",
+		now.Year(), now.Month(), now.Day(), now.Hour(),
+		now.Minute(), now.Second())
+}

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@ require (`
`6`	`6`	`github.com/fogleman/gg v1.3.0`
`7`	`7`	`github.com/hajimehoshi/ebiten/v2 v2.2.4`
`8`	`8`	`github.com/lucasb-eyer/go-colorful v1.2.0`
	`9`	`+ github.com/ojrac/opensimplex-go v1.0.2`
`9`	`10`	`)`
`10`	`11`
`11`	`12`	`require (`