diff options
| author | s-ol <s-ol@users.noreply.github.com> | 2020-07-11 17:25:50 +0000 |
|---|---|---|
| committer | s-ol <s-ol@users.noreply.github.com> | 2020-07-11 17:37:04 +0000 |
| commit | c6fa7aa7657647fffbbe8a0507e29bcd9a980dba (patch) | |
| tree | 9b58942e0d5c2ad4be70fd7f628893e7f984dfc7 /alv | |
| parent | rename time/sequence to time/val-seq and add time/bang-seq (diff) | |
| download | alive-c6fa7aa7657647fffbbe8a0507e29bcd9a980dba.tar.gz alive-c6fa7aa7657647fffbbe8a0507e29bcd9a980dba.zip | |
add vis field to Ops
Diffstat (limited to 'alv')
| -rw-r--r-- | alv/base/op.moon | 16 | ||||
| -rw-r--r-- | alv/builtins.moon | 1 | ||||
| -rw-r--r-- | alv/copilot/udp.moon | 13 |
3 files changed, 17 insertions, 13 deletions
diff --git a/alv/base/op.moon b/alv/base/op.moon index b152543..625e1a8 100644 --- a/alv/base/op.moon +++ b/alv/base/op.moon @@ -22,7 +22,8 @@ class Op fork: => out = if @out then @out\fork! state = if @state then deep_copy @state - @@ out, state + vis = if @vis then deep_copy @vis + @@ out, state, vis --- internal state of this Op. -- @@ -31,6 +32,16 @@ class Op -- -- @tfield table state + --- visualisation data of this Op. + -- + -- This may be any simple Lua value, including Lua tables, as long as it has + -- no metatables, multiple references/loops, userdata etc. + -- + -- This value is exposed to alv editors in order to render realtime + -- visualisations overlaid onto the program text. + -- + -- @tfield table vis + --- `Result` instance representing this Op's computed output value. -- -- Must be set to a `Result` instance once `setup` finishes. Must not change @@ -107,7 +118,8 @@ class Op -- @classmethod -- @tparam ?Result out `out` -- @tparam ?table state `state` - new: (@out, @state) => + -- @tparam ?table vis `vis` + new: (@out, @state, @vis={}) => do_setup = (old, cur) -> for k, cur_val in pairs cur diff --git a/alv/builtins.moon b/alv/builtins.moon index 9fffabc..12e78ba 100644 --- a/alv/builtins.moon +++ b/alv/builtins.moon @@ -331,6 +331,7 @@ switch_ = Constant.meta when false then 1 else (math.floor i!) % #values + @vis.step = ii @out\set if v = values[ii + 1] then v! trace_ = Constant.meta diff --git a/alv/copilot/udp.moon b/alv/copilot/udp.moon index c0ea86e..5bf2ad4 100644 --- a/alv/copilot/udp.moon +++ b/alv/copilot/udp.moon @@ -2,7 +2,7 @@ import udp from require 'socket' import encode, decode from require 'dkjson' import fn_invoke, op_invoke from require 'alv.invoke' -encode_res = (copilot) => +encode_res = => return unless @ { @@ -45,22 +45,13 @@ class UDPServer if builtin and builtin.__class.__name ~= 'DummyReg' res.head_meta = builtin.head.meta res.result = encode_res builtin.node.result + res.vis = if builtin.op then builtin.op.vis res.kind = switch builtin.__class when op_invoke then 'op' when fn_invoke then 'fn' else 'builtin' else res.error = 'not_registered' - when 'state' - res.tag = msg.tag - res.module = msg.module or '__root' - mod = @copilot.last_modules[res.module] - builtin = mod.registry\last msg.tag - if builtin and builtin.__class.__name ~= 'DummyReg' - res.value = encode_res builtin.node.result, @copilot - res.state = if builtin.op then builtin.op.state - else - res.error = 'not_registered' else res.error = 'unknown_type' return res |