aiz/state: add series

aiz/aiz.go

@@ -17,18 +17,20 @@ type Cue struct {
 }
 
 type SG struct {
-	State    State    `json:"state"`
-	Gradient Gradient `json:"gradient"`
+	Series   SeriesName `json:"seriesName"`
+	State    State      `json:"state"`
+	Gradient Gradient   `json:"gradient"`
 }
 
 func (sg *SG) Clone() *SG {
-	return &SG{sg.State.Clone(), sg.Gradient.Clone()}
+	return &SG{sg.Series, sg.State.Clone(), sg.Gradient.Clone()}
 }
 
 var StateTypes = map[string]func() State{}
 var GradientTypes = map[string]func() Gradient{}
 
 type sgJSON struct {
+	Series       string
 	StateType    string
 	State        json.RawMessage
 	GradientType string
@@ -38,6 +40,7 @@ type sgJSON struct {
 func (sg *SG) MarshalJSON() ([]byte, error) {
 	var j sgJSON
 	var err error
+	j.Series = sg.Series
 	if sg.State != nil {
 		j.State, err = json.Marshal(sg.State)
 		if err != nil {
@@ -81,6 +84,7 @@ func (sg *SG) UnmarshalJSON(data []byte) error {
 	}
 	sg.State = s
 	sg.Gradient = g
+	sg.Series = j.Series
 	return nil
 }
 

aiz/runner.go

@@ -6,9 +6,11 @@ import (
 	"nyiyui.ca/halation/notify"
 )
 
+type SeriesName = string
+
 type Runner struct {
 	Specific      map[string]interface{}
-	CurrentStates map[string]State
+	CurrentStates map[SeriesName]map[string]State
 
 	sgAppliedMuxS *notify.MultiplexerSender[*SG]
 	SGAppliedMux  *notify.Multiplexer[*SG]
@@ -17,7 +19,7 @@ type Runner struct {
 func NewRunner() *Runner {
 	r := new(Runner)
 	r.Specific = map[string]interface{}{}
-	r.CurrentStates = map[string]State{}
+	r.CurrentStates = map[SeriesName]map[string]State{}
 	r.sgAppliedMuxS, r.SGAppliedMux = notify.NewMultiplexerSender[*SG]("Runner.sgAppliedMuxS")
 	return r
 }
@@ -26,9 +28,13 @@ func NewRunner() *Runner {
 // sg must not be mutated once this function is called.
 func (r *Runner) ApplySG(sg *SG, ctx context.Context) error {
 	r.sgAppliedMuxS.Send(sg)
-	prev := r.CurrentStates[sg.State.TypeName()]
+	_, ok := r.CurrentStates[sg.Series]
+	if !ok {
+		r.CurrentStates[sg.Series] = map[string]State{}
+	}
+	prev := r.CurrentStates[sg.Series][sg.State.TypeName()]
 	defer func() {
-		r.CurrentStates[sg.State.TypeName()] = sg.State
+		r.CurrentStates[sg.Series][sg.State.TypeName()] = sg.State
 	}()
 	return sg.State.Reify(r, sg.Gradient, prev)
 }

cmd/web/main.go

@@ -9,6 +9,7 @@ import (
 
 	"nyiyui.ca/halation/aiz"
 	"nyiyui.ca/halation/node"
+	"nyiyui.ca/halation/osc"
 	"nyiyui.ca/halation/web"
 )
 
@@ -41,15 +42,13 @@ func initShow() (*aiz.Runner, *node.NodeRunner, *node.Cuelist) {
 	runner := aiz.NewRunner()
 	var err error
 	_ = err
-	/*
-		c := osc.NewDefaultClient()
-		c.Register(runner)
-		err = c.Blackout()
-		if err != nil {
-			panic(err)
-		}
-		log.Printf("osc setup ok")
-	*/
+	c := osc.NewDefaultClient()
+	c.Register(runner)
+	err = c.Blackout()
+	if err != nil {
+		panic(err)
+	}
+	log.Printf("osc setup ok")
 	//mpvClient, err := mpv.NewClientUsingSubprocess()
 	//if err != nil {
 	//	panic(err)

node/state.go

@@ -9,7 +9,8 @@ import (
 
 type SetState struct {
 	*BaseNode
-	SG *aiz.SG `halation:""`
+	SG     *aiz.SG `halation:""`
+	Series string  `halation:""`
 }
 
 func newSetStateBlank() *SetState {

test/aiz_test.go

@@ -2,25 +2,26 @@ package test
 
 import (
 	"encoding/json"
+	"testing"
+
 	"github.com/google/go-cmp/cmp"
 	. "nyiyui.ca/halation/aiz"
 	"nyiyui.ca/halation/gradient"
 	"nyiyui.ca/halation/osc"
-	"testing"
 )
 
 func TestJSON(t *testing.T) {
 	s := &Show{
 		Cues: []Cue{
 			{
 				SGs: []SG{
-					{&osc.State{
+					{"a", &osc.State{
 						Blackout: true,
 					}, &gradient.LinearGradient{
 						Duration_:            1000,
 						PreferredResolution_: 100,
 					}},
-					{&osc.State{
+					{"b", &osc.State{
 						Channels: []osc.Channel{
 							{1, 100, 0, 0},
 						},

tsapi/tsapi.go

@@ -27,7 +27,7 @@ func main() {
 	}
 	defer f.Close()
 	fmt.Fprint(f, `
-type SG = { State: State, StateType: string, Gradient: Gradient, GradientType: string }
+type SG = { Series: string, State: State, StateType: string, Gradient: Gradient, GradientType: string }
 type Channel = {
   ChannelID: number,
 	Level: number,

yukiakari/src/lib/NodeEdit.svelte

@@ -26,6 +26,7 @@
     if (node.NodeType == "nyiyui.ca/halation/node.SetState") {
       if (!node.Node.SG) {
         node.Node.SG = {
+          Series: "",
           StateType: "",
           State: {},
           GradientType: "",
@@ -62,21 +63,12 @@
     }
   }
 
-  function updateColour(i) {
-    return (e) => {
-      console.log(i, e.detail.hsv);
-      // node.Node.SG.State.channels[i].hue = e.detail.hsv.h;
-      // node.Node.SG.State.channels[i].saturation = e.detail.hsv.s;
-      // node.Node.SG.State.channels[i].level = e.detail.hsv.v;
-    }
-  }
-
   let channelProps = {
     0: {name: "invalid"},
-    1: {name: "left small"},
-    2: {name: "left podium", colour: false},
+    1: {name: "left flood", colour: false},
+    2: {name: "left podium"},
     3: {name: "left front"},
-    4: {name: "left side"},
+    4: {name: "left podium-right"},
     5: {name: "left flood (LED)", colour: true},
     6: {name: "left ground"},
     7: {name: "left centre wall"},
@@ -187,6 +179,10 @@
       <input bind:value={node.Node.delay} />
     </label>
   {:else if node.NodeType == "nyiyui.ca/halation/node.SetState" && node.Node.SG}
+    <label>
+      Series
+      <input type=text bind:value={node.Node.SG.Series} />
+    </label>
     <fieldset>
       <legend>State</legend>
       <label>