From 0dae7447a548f2b13246c2c002376d9761cd60d5 Mon Sep 17 00:00:00 2001 From: Martyn Date: Sun, 3 Jan 2021 11:19:15 +0100 Subject: [PATCH 1/4] single-colour plasma, I hope --- internal/patterns/plasma.go | 43 +++++++++++++++++++++++++++++++++ internal/webserver/webserver.go | 21 +++++++++++++--- 2 files changed, 61 insertions(+), 3 deletions(-) diff --git a/internal/patterns/plasma.go b/internal/patterns/plasma.go index 4684d97..3005ec5 100755 --- a/internal/patterns/plasma.go +++ b/internal/patterns/plasma.go @@ -112,3 +112,46 @@ func PlasmaPanel(w int, h int, speed uint16) [][]RGBcolor { } return grid } + +func singleColorPlasmaFromFloatVal(val float64, baseColor RGBcolor) (byte, byte, byte) { + var r byte + var g byte + var b byte + val = positiveModF(val) + r = baseColor[0] * val + g = baseColor[1] * val + b = baseColor[2] * val + return r, g, b +} + +func PlasmaPanelSingleColor(w int, h int, speed uint16, baseColor RGBcolor) [][]RGBcolor { + grid := make([][]RGBcolor, w) + for i := 0; i < w; i++ { + grid[i] = make([]RGBcolor, h) + } + + palletteOffset -= 0.05 / 1.0 + if palletteOffset < 0 { + palletteOffset += 1.0 + } + + offset := 0.5 // center offset + scaleW := math.Pi * 2.0 / float64(w) + scaleH := math.Pi * 2.0 / float64(h) + + for y := 0; y < h; y++ { + for x := 0; x < w; x++ { + u := math.Cos((float64(x) + offset) * scaleW) + v := math.Cos((float64(y) + offset) * scaleH) + j := math.Cos(offset * scaleW) // 2D - No Z + e := (u + v + j + 3.0) / 6.0 + r, g, b := singleColorPlasmaFromFloatVal(palletteOffset+e, baseColor) + var rgb [3]byte + rgb[0] = r + rgb[1] = g + rgb[2] = b + grid[x][y] = rgb + } + } + return grid +} diff --git a/internal/webserver/webserver.go b/internal/webserver/webserver.go index 84d664c..7a29c1c 100755 --- a/internal/webserver/webserver.go +++ b/internal/webserver/webserver.go @@ -55,6 +55,17 @@ func PatternHandler(response http.ResponseWriter, request *http.Request) { } else { e.Speed = 40 } + if vars["color"] != "" { + var c queue.RGBcolor + for cn, cv := range colornames.Map { + if cn == strings.ToLower(vars["name"]) { + c[0] = cv.R + c[1] = cv.G + c[2] = cv.B + } + } + e.SeedColour = c + } if vars["override"] == "true" { overrideFlag <- e } else { @@ -159,9 +170,13 @@ func HandleHTTP(queueChannel chan queue.QueueItem, Port int, overrideChannel cha r.HandleFunc("/pattern/{pattern}/", PatternHandler) r.HandleFunc("/pattern/{pattern}/{duration}", PatternHandler) r.HandleFunc("/pattern/{pattern}/{duration}/{speed}", PatternHandler) - r.HandleFunc("/colour/{name}", ColourHandler) - r.HandleFunc("/colour/{name}/override={override}", ColourHandler) - r.HandleFunc("/colour/{name}/{duration}", ColourHandler) + r.HandleFunc("/colorpattern/{color}/{pattern}/override={override}", PatternHandler) + r.HandleFunc("/colorpattern/{color}/{pattern}/", PatternHandler) + r.HandleFunc("/colorpattern/{color}/{pattern}/{duration}", PatternHandler) + r.HandleFunc("/colorpattern/{color}/{pattern}/{duration}/{speed}", PatternHandler) + r.HandleFunc("/bloop/{name}", ColourHandler) + r.HandleFunc("/bloop/{name}/override={override}", ColourHandler) + r.HandleFunc("/bloop/{name}/{duration}", ColourHandler) r.HandleFunc("/color/{name}", ColourHandler) r.HandleFunc("/color/{name}/override={override}", ColourHandler) r.HandleFunc("/color/{name}/{duration}", ColourHandler) -- 2.40.1 From a915977cea27a2a07fe31598c89646df02fbb180 Mon Sep 17 00:00:00 2001 From: Martyn Date: Sun, 3 Jan 2021 11:24:45 +0100 Subject: [PATCH 2/4] types.... yeah... I know about them. --- internal/patterns/plasma.go | 6 +++--- internal/webserver/webserver.go | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/patterns/plasma.go b/internal/patterns/plasma.go index 3005ec5..01d5896 100755 --- a/internal/patterns/plasma.go +++ b/internal/patterns/plasma.go @@ -118,9 +118,9 @@ func singleColorPlasmaFromFloatVal(val float64, baseColor RGBcolor) (byte, byte, var g byte var b byte val = positiveModF(val) - r = baseColor[0] * val - g = baseColor[1] * val - b = baseColor[2] * val + r = byte(math.Trunc(float64(baseColor[0]) * val)) + g = byte(math.Trunc(float64(baseColor[1]) * val)) + b = byte(math.Trunc(float64(baseColor[2]) * val)) return r, g, b } diff --git a/internal/webserver/webserver.go b/internal/webserver/webserver.go index 7a29c1c..901918f 100755 --- a/internal/webserver/webserver.go +++ b/internal/webserver/webserver.go @@ -174,9 +174,9 @@ func HandleHTTP(queueChannel chan queue.QueueItem, Port int, overrideChannel cha r.HandleFunc("/colorpattern/{color}/{pattern}/", PatternHandler) r.HandleFunc("/colorpattern/{color}/{pattern}/{duration}", PatternHandler) r.HandleFunc("/colorpattern/{color}/{pattern}/{duration}/{speed}", PatternHandler) - r.HandleFunc("/bloop/{name}", ColourHandler) - r.HandleFunc("/bloop/{name}/override={override}", ColourHandler) - r.HandleFunc("/bloop/{name}/{duration}", ColourHandler) + r.HandleFunc("/colour/{name}", ColourHandler) + r.HandleFunc("/colour/{name}/override={override}", ColourHandler) + r.HandleFunc("/colour/{name}/{duration}", ColourHandler) r.HandleFunc("/color/{name}", ColourHandler) r.HandleFunc("/color/{name}/override={override}", ColourHandler) r.HandleFunc("/color/{name}/{duration}", ColourHandler) -- 2.40.1 From 0a28f0b93c51577544a781f4bf4f0cba57fe1c73 Mon Sep 17 00:00:00 2001 From: Martyn Date: Sun, 3 Jan 2021 11:33:41 +0100 Subject: [PATCH 3/4] Allow color setting --- cmd/ledcontroller-server/main.go | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/cmd/ledcontroller-server/main.go b/cmd/ledcontroller-server/main.go index a6fe692..284af68 100755 --- a/cmd/ledcontroller-server/main.go +++ b/cmd/ledcontroller-server/main.go @@ -32,6 +32,11 @@ var previousEffect queue.QueueItem var msDelay = 0 +func isColorSet(c RGBcolor) bool { + // Any color so long as it's NOT black! + return c[0] != 0 || c[1] != 0 || c[2] != 0 +} + func foreverLoop() { for /*ever*/ { time.Sleep(time.Duration(msDelay) * time.Millisecond) //25fps @@ -169,7 +174,11 @@ func main() { case "line": rearranged = remapping.SliceRearrange(PanelWidth, PanelHeight, true, remapping.XYGridToLinear(PanelWidth, PanelHeight, patterns.ZigZag(PanelWidth, PanelHeight))) case "plasma": - rearranged = remapping.SliceRearrange(PanelWidth, PanelHeight, true, remapping.XYGridToLinear(PanelWidth, PanelHeight, patterns.PlasmaPanel(PanelWidth, PanelHeight, currentEffect.Speed))) + if isColorSet(currentEffect.SeedColour) { + rearranged = remapping.SliceRearrange(PanelWidth, PanelHeight, true, remapping.XYGridToLinear(PanelWidth, PanelHeight, patterns.PlasmaPanelSingleColor(PanelWidth, PanelHeight, currentEffect.Speed, currentEffect.SeedColour))) + } else { + rearranged = remapping.SliceRearrange(PanelWidth, PanelHeight, true, remapping.XYGridToLinear(PanelWidth, PanelHeight, patterns.PlasmaPanel(PanelWidth, PanelHeight, currentEffect.Speed))) + } case "red": rearranged = remapping.SliceRearrange(PanelWidth, PanelHeight, false, remapping.XYGridToLinear(PanelWidth, PanelHeight, patterns.RedPanel(PanelWidth, PanelHeight))) case "random": -- 2.40.1 From f15419eab975f4c1125f2bc095f459aaa26159a0 Mon Sep 17 00:00:00 2001 From: Martyn Date: Sun, 3 Jan 2021 11:43:18 +0100 Subject: [PATCH 4/4] Make the comparison work --- internal/webserver/webserver.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/webserver/webserver.go b/internal/webserver/webserver.go index 901918f..6759639 100755 --- a/internal/webserver/webserver.go +++ b/internal/webserver/webserver.go @@ -58,7 +58,7 @@ func PatternHandler(response http.ResponseWriter, request *http.Request) { if vars["color"] != "" { var c queue.RGBcolor for cn, cv := range colornames.Map { - if cn == strings.ToLower(vars["name"]) { + if cn == strings.ToLower(vars["color"]) { c[0] = cv.R c[1] = cv.G c[2] = cv.B -- 2.40.1