diff --git a/assets/prelude.ld b/assets/prelude.ld index 03ce4ae..8907b62 100644 --- a/assets/prelude.ld +++ b/assets/prelude.ld @@ -1434,9 +1434,7 @@ fn apply_command { (:home) -> do state > assoc (_, :position, (0, 0)) > assoc (_, :heading, 0) - & (:clear) -> do state > - & assoc (state, :position, (0, 0)) > - & assoc (_, :heading, 0) + (:clear) -> state (:right, turns) -> update (state, :heading, add (_, turns)) (:left, turns) -> update (state, :heading, sub (_, turns)) (:forward, steps) -> { diff --git a/justfile b/justfile index 22719fa..c2677b0 100644 --- a/justfile +++ b/justfile @@ -29,7 +29,7 @@ release: echo {{ if git_status == "" {"git status ok"} else {error("please commit changes first")} }} just build -git commit -am "built for release" - git checkout release + git checkout release -m "merging for release" git merge main git push git checkout main diff --git a/pkg/p5.js b/pkg/p5.js index 0b468c6..e5eb4dd 100644 --- a/pkg/p5.js +++ b/pkg/p5.js @@ -1,11 +1,9 @@ import {eq_vect, eq_color, resolve_color, get_turtle_color, set_turtle_color, turtle_radius, turtle_angle, turn_to_rad, turtle_init, command_to_state, background_color, rotate, last} from "./turtle_geometry.js" function states_to_call (prev, curr) { - const calls = [] - // whose state should we use? - // pen states will only differ on more than one property - // if we use `loadstate` - // my sense is `prev`, but that may change + // console.log(prev) + // console.log(curr) + let calls = [] if (prev.pendown && !eq_vect(prev.position, curr.position)) { calls.push(["line", prev.position[0], prev.position[1], curr.position[0], curr.position[1]]) } @@ -15,6 +13,9 @@ function states_to_call (prev, curr) { if (curr.penwidth !== prev.penwidth) { calls.push(["strokeWeight", curr.penwidth]) } + if (curr.clear) { + calls.push("clear") + } return calls } @@ -67,25 +68,36 @@ export function p5 (commands) { let prev_state = last(all_states[turtle_id]) const new_state = command_to_state(prev_state, this_command) all_states[turtle_id].push(new_state) + } // console.log(all_states) const [r, g, b, _] = resolve_color(background_color) if ((r + g + b)/3 > 128) set_turtle_color([0, 0, 0, 150]) const p5_calls = [...p5_call_root()] for (const states of Object.values(all_states)) { - p5_calls.push(["strokeWeight", 1]) - p5_calls.push(["stroke", 255]) + // console.log(states) + let my_calls = [] for (let i = 1; i < states.length; ++i) { const prev = states[i - 1] const curr = states[i] const calls = states_to_call(prev, curr) for (const call of calls) { - p5_calls.push(call) + // console.log(call) + if (call === "clear") { + my_calls = [] + } else { + my_calls.push(call) + } } } - p5_calls[0] = ["background", ...resolve_color(background_color)] - p5_render_turtle(states[states.length - 1], p5_calls) + p5_calls.push(["strokeWeight", 1]) + p5_calls.push(["stroke", 255]) + for (const call of my_calls) { + p5_calls.push(call) + } + p5_render_turtle(last(states), p5_calls) } + p5_calls[0] = ["background", ...resolve_color(background_color)] p5_calls.push(["pop"]) return p5_calls } diff --git a/pkg/rudus.d.ts b/pkg/rudus.d.ts index 347c39d..07cf4f6 100644 --- a/pkg/rudus.d.ts +++ b/pkg/rudus.d.ts @@ -11,11 +11,11 @@ export interface InitOutput { readonly __externref_table_alloc: () => number; readonly __wbindgen_export_2: WebAssembly.Table; readonly __wbindgen_free: (a: number, b: number, c: number) => void; - readonly __wbindgen_export_4: WebAssembly.Table; readonly __wbindgen_malloc: (a: number, b: number) => number; readonly __wbindgen_realloc: (a: number, b: number, c: number, d: number) => number; - readonly closure334_externref_shim: (a: number, b: number, c: any) => void; - readonly closure356_externref_shim: (a: number, b: number, c: any, d: any) => void; + readonly __wbindgen_export_6: WebAssembly.Table; + readonly closure354_externref_shim: (a: number, b: number, c: any) => void; + readonly closure367_externref_shim: (a: number, b: number, c: any, d: any) => void; readonly __wbindgen_start: () => void; } diff --git a/pkg/rudus.js b/pkg/rudus.js index 28bb78e..d947aca 100644 --- a/pkg/rudus.js +++ b/pkg/rudus.js @@ -35,41 +35,6 @@ function getStringFromWasm0(ptr, len) { return cachedTextDecoder.decode(getUint8ArrayMemory0().subarray(ptr, ptr + len)); } -function isLikeNone(x) { - return x === undefined || x === null; -} - -const CLOSURE_DTORS = (typeof FinalizationRegistry === 'undefined') - ? { register: () => {}, unregister: () => {} } - : new FinalizationRegistry(state => { - wasm.__wbindgen_export_4.get(state.dtor)(state.a, state.b) -}); - -function makeMutClosure(arg0, arg1, dtor, f) { - const state = { a: arg0, b: arg1, cnt: 1, dtor }; - const real = (...args) => { - // First up with a closure we increment the internal reference - // count. This ensures that the Rust closure environment won't - // be deallocated while we're invoking it. - state.cnt++; - const a = state.a; - state.a = 0; - try { - return f(a, state.b, ...args); - } finally { - if (--state.cnt === 0) { - wasm.__wbindgen_export_4.get(state.dtor)(a, state.b); - CLOSURE_DTORS.unregister(state); - } else { - state.a = a; - } - } - }; - real.original = state; - CLOSURE_DTORS.register(real, state, state); - return real; -} - let WASM_VECTOR_LEN = 0; const cachedTextEncoder = (typeof TextEncoder !== 'undefined' ? new TextEncoder('utf-8') : { encode: () => { throw Error('TextEncoder not available') } } ); @@ -134,6 +99,41 @@ function getDataViewMemory0() { } return cachedDataViewMemory0; } + +function isLikeNone(x) { + return x === undefined || x === null; +} + +const CLOSURE_DTORS = (typeof FinalizationRegistry === 'undefined') + ? { register: () => {}, unregister: () => {} } + : new FinalizationRegistry(state => { + wasm.__wbindgen_export_6.get(state.dtor)(state.a, state.b) +}); + +function makeMutClosure(arg0, arg1, dtor, f) { + const state = { a: arg0, b: arg1, cnt: 1, dtor }; + const real = (...args) => { + // First up with a closure we increment the internal reference + // count. This ensures that the Rust closure environment won't + // be deallocated while we're invoking it. + state.cnt++; + const a = state.a; + state.a = 0; + try { + return f(a, state.b, ...args); + } finally { + if (--state.cnt === 0) { + wasm.__wbindgen_export_6.get(state.dtor)(a, state.b); + CLOSURE_DTORS.unregister(state); + } else { + state.a = a; + } + } + }; + real.original = state; + CLOSURE_DTORS.register(real, state, state); + return real; +} /** * @param {string} src * @returns {Promise} @@ -146,11 +146,11 @@ export function ludus(src) { } function __wbg_adapter_18(arg0, arg1, arg2) { - wasm.closure334_externref_shim(arg0, arg1, arg2); + wasm.closure354_externref_shim(arg0, arg1, arg2); } -function __wbg_adapter_38(arg0, arg1, arg2, arg3) { - wasm.closure356_externref_shim(arg0, arg1, arg2, arg3); +function __wbg_adapter_44(arg0, arg1, arg2, arg3) { + wasm.closure367_externref_shim(arg0, arg1, arg2, arg3); } async function __wbg_load(module, imports) { @@ -195,6 +195,17 @@ function __wbg_get_imports() { const ret = arg0.call(arg1, arg2); return ret; }, arguments) }; + imports.wbg.__wbg_error_7534b8e9a36f1ab4 = function(arg0, arg1) { + let deferred0_0; + let deferred0_1; + try { + deferred0_0 = arg0; + deferred0_1 = arg1; + console.error(getStringFromWasm0(arg0, arg1)); + } finally { + wasm.__wbindgen_free(deferred0_0, deferred0_1, 1); + } + }; imports.wbg.__wbg_io_5a3c8ea72d8c6ea3 = function() { return handleError(function (arg0, arg1) { let deferred0_0; let deferred0_1; @@ -217,7 +228,7 @@ function __wbg_get_imports() { const a = state0.a; state0.a = 0; try { - return __wbg_adapter_38(a, state0.b, arg0, arg1); + return __wbg_adapter_44(a, state0.b, arg0, arg1); } finally { state0.a = a; } @@ -228,6 +239,10 @@ function __wbg_get_imports() { state0.a = state0.b = 0; } }; + imports.wbg.__wbg_new_8a6f238a6ece86ea = function() { + const ret = new Error(); + return ret; + }; imports.wbg.__wbg_newnoargs_105ed471475aaf50 = function(arg0, arg1) { const ret = new Function(getStringFromWasm0(arg0, arg1)); return ret; @@ -251,6 +266,13 @@ function __wbg_get_imports() { const ret = Promise.resolve(arg0); return ret; }; + imports.wbg.__wbg_stack_0ed75d68575b0f3c = function(arg0, arg1) { + const ret = arg1.stack; + const ptr1 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc); + const len1 = WASM_VECTOR_LEN; + getDataViewMemory0().setInt32(arg0 + 4 * 1, len1, true); + getDataViewMemory0().setInt32(arg0 + 4 * 0, ptr1, true); + }; imports.wbg.__wbg_static_accessor_GLOBAL_88a902d13a557d07 = function() { const ret = typeof global === 'undefined' ? null : global; return isLikeNone(ret) ? 0 : addToExternrefTable0(ret); @@ -284,8 +306,8 @@ function __wbg_get_imports() { const ret = false; return ret; }; - imports.wbg.__wbindgen_closure_wrapper1023 = function(arg0, arg1, arg2) { - const ret = makeMutClosure(arg0, arg1, 335, __wbg_adapter_18); + imports.wbg.__wbindgen_closure_wrapper1077 = function(arg0, arg1, arg2) { + const ret = makeMutClosure(arg0, arg1, 355, __wbg_adapter_18); return ret; }; imports.wbg.__wbindgen_init_externref_table = function() { diff --git a/pkg/rudus_bg.wasm b/pkg/rudus_bg.wasm index bfa5f83..a2903d4 100644 --- a/pkg/rudus_bg.wasm +++ b/pkg/rudus_bg.wasm @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:65b3a2ee31bae0f5875d13f74267ba2d68c8400f973aa205c08b3da1731ff8a3 -size 2611314 +oid sha256:91cad66537b01609a16b8400bc25ea03b50714f5698db0277c30038418250d7e +size 2700230 diff --git a/pkg/rudus_bg.wasm.d.ts b/pkg/rudus_bg.wasm.d.ts index 45d3092..5c5f02c 100644 --- a/pkg/rudus_bg.wasm.d.ts +++ b/pkg/rudus_bg.wasm.d.ts @@ -6,9 +6,9 @@ export const __wbindgen_exn_store: (a: number) => void; export const __externref_table_alloc: () => number; export const __wbindgen_export_2: WebAssembly.Table; export const __wbindgen_free: (a: number, b: number, c: number) => void; -export const __wbindgen_export_4: WebAssembly.Table; export const __wbindgen_malloc: (a: number, b: number) => number; export const __wbindgen_realloc: (a: number, b: number, c: number, d: number) => number; -export const closure334_externref_shim: (a: number, b: number, c: any) => void; -export const closure356_externref_shim: (a: number, b: number, c: any, d: any) => void; +export const __wbindgen_export_6: WebAssembly.Table; +export const closure354_externref_shim: (a: number, b: number, c: any) => void; +export const closure367_externref_shim: (a: number, b: number, c: any, d: any) => void; export const __wbindgen_start: () => void; diff --git a/pkg/turtle_geometry.js b/pkg/turtle_geometry.js index 120bbd3..0140f77 100644 --- a/pkg/turtle_geometry.js +++ b/pkg/turtle_geometry.js @@ -71,53 +71,53 @@ export function command_to_state (prev_state, curr_command) { const [verb] = curr_command switch (verb) { case "goto": { - const [_, x, y] = curr_command - return {...prev_state, position: [x, y]} + const [_, [x, y]] = curr_command + return {...prev_state, position: [x, y], clear: false} } case "home": { - return {...prev_state, position: [0, 0], heading: 0} + return {...prev_state, position: [0, 0], heading: 0, clear: false} } case "right": { const [_, angle] = curr_command const {heading} = prev_state - return {...prev_state, heading: heading + angle} + return {...prev_state, heading: heading + angle, clear: false} } case "left": { const [_, angle] = curr_command const {heading} = prev_state - return {...prev_state, heading: heading - angle} + return {...prev_state, heading: heading - angle, clear: false} } case "forward": { const [_, steps] = curr_command const {heading, position} = prev_state const unit = unit_of(heading) const move = mult(unit, steps) - return {...prev_state, position: add(position, move)} + return {...prev_state, position: add(position, move), clear: false} } case "back": { const [_, steps] = curr_command const {heading, position} = prev_state const unit = unit_of(heading) const move = mult(unit, -steps) - return {...prev_state, position: add(position, move)} + return {...prev_state, position: add(position, move), clear: false} } case "penup": { - return {...prev_state, pendown: false} + return {...prev_state, pendown: false, clear: false} } case "pendown": { - return {...prev_state, pendown: true} + return {...prev_state, pendown: true, clear: false} } case "penwidth": { const [_, width] = curr_command - return {...prev_state, penwidth: width} + return {...prev_state, penwidth: width, clear: false} } case "pencolor": { const [_, color] = curr_command - return {...prev_state, pencolor: color} + return {...prev_state, pencolor: color, clear: false} } case "setheading": { const [_, heading] = curr_command - return {...prev_state, heading: heading} + return {...prev_state, heading: heading, clear: false} } case "loadstate": { // console.log("LOADSTATE: ", curr_command) @@ -125,15 +125,18 @@ export function command_to_state (prev_state, curr_command) { return {position: [x, y], heading, visible, pendown, penwidth, pencolor} } case "show": { - return {...prev_state, visible: true} + return {...prev_state, visible: true, clear: false} } case "hide": { - return {...prev_state, visible: false} + return {...prev_state, visible: false, clear: false} } case "background": { background_color = curr_command[1] return prev_state } + case "clear": { + return {...prev_state, clear: true} + } } } diff --git a/src/lib.rs b/src/lib.rs index c9955b7..0605ed6 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -111,7 +111,7 @@ fn prelude() -> HashMap { #[wasm_bindgen] pub async fn ludus(src: String) { // instrument wasm to report rust panics - // console_error_panic_hook::set_once(); + console_error_panic_hook::set_once(); // leak the source so it lives FOREVER let src = src.to_string().leak();