Merge branch 'main' into release

This commit is contained in:
Scott Richmond 2025-07-09 18:07:36 -04:00
commit 547599e44a
9 changed files with 113 additions and 78 deletions

View File

@ -1434,9 +1434,7 @@ fn apply_command {
(:home) -> do state > (:home) -> do state >
assoc (_, :position, (0, 0)) > assoc (_, :position, (0, 0)) >
assoc (_, :heading, 0) assoc (_, :heading, 0)
& (:clear) -> do state > (:clear) -> state
& assoc (state, :position, (0, 0)) >
& assoc (_, :heading, 0)
(:right, turns) -> update (state, :heading, add (_, turns)) (:right, turns) -> update (state, :heading, add (_, turns))
(:left, turns) -> update (state, :heading, sub (_, turns)) (:left, turns) -> update (state, :heading, sub (_, turns))
(:forward, steps) -> { (:forward, steps) -> {

View File

@ -29,7 +29,7 @@ release:
echo {{ if git_status == "" {"git status ok"} else {error("please commit changes first")} }} echo {{ if git_status == "" {"git status ok"} else {error("please commit changes first")} }}
just build just build
-git commit -am "built for release" -git commit -am "built for release"
git checkout release git checkout release -m "merging for release"
git merge main git merge main
git push git push
git checkout main git checkout main

View File

@ -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" 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) { function states_to_call (prev, curr) {
const calls = [] // console.log(prev)
// whose state should we use? // console.log(curr)
// pen states will only differ on more than one property let calls = []
// if we use `loadstate`
// my sense is `prev`, but that may change
if (prev.pendown && !eq_vect(prev.position, curr.position)) { if (prev.pendown && !eq_vect(prev.position, curr.position)) {
calls.push(["line", prev.position[0], prev.position[1], curr.position[0], curr.position[1]]) 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) { if (curr.penwidth !== prev.penwidth) {
calls.push(["strokeWeight", curr.penwidth]) calls.push(["strokeWeight", curr.penwidth])
} }
if (curr.clear) {
calls.push("clear")
}
return calls return calls
} }
@ -67,25 +68,36 @@ export function p5 (commands) {
let prev_state = last(all_states[turtle_id]) let prev_state = last(all_states[turtle_id])
const new_state = command_to_state(prev_state, this_command) const new_state = command_to_state(prev_state, this_command)
all_states[turtle_id].push(new_state) all_states[turtle_id].push(new_state)
} }
// console.log(all_states) // console.log(all_states)
const [r, g, b, _] = resolve_color(background_color) const [r, g, b, _] = resolve_color(background_color)
if ((r + g + b)/3 > 128) set_turtle_color([0, 0, 0, 150]) if ((r + g + b)/3 > 128) set_turtle_color([0, 0, 0, 150])
const p5_calls = [...p5_call_root()] const p5_calls = [...p5_call_root()]
for (const states of Object.values(all_states)) { for (const states of Object.values(all_states)) {
p5_calls.push(["strokeWeight", 1]) // console.log(states)
p5_calls.push(["stroke", 255]) let my_calls = []
for (let i = 1; i < states.length; ++i) { for (let i = 1; i < states.length; ++i) {
const prev = states[i - 1] const prev = states[i - 1]
const curr = states[i] const curr = states[i]
const calls = states_to_call(prev, curr) const calls = states_to_call(prev, curr)
for (const call of calls) { 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_calls.push(["strokeWeight", 1])
p5_render_turtle(states[states.length - 1], p5_calls) 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"]) p5_calls.push(["pop"])
return p5_calls return p5_calls
} }

6
pkg/rudus.d.ts vendored
View File

@ -11,11 +11,11 @@ export interface InitOutput {
readonly __externref_table_alloc: () => number; readonly __externref_table_alloc: () => number;
readonly __wbindgen_export_2: WebAssembly.Table; readonly __wbindgen_export_2: WebAssembly.Table;
readonly __wbindgen_free: (a: number, b: number, c: number) => void; 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_malloc: (a: number, b: number) => number;
readonly __wbindgen_realloc: (a: number, b: number, c: number, d: 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 __wbindgen_export_6: WebAssembly.Table;
readonly closure356_externref_shim: (a: number, b: number, c: any, d: any) => void; 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; readonly __wbindgen_start: () => void;
} }

View File

@ -35,41 +35,6 @@ function getStringFromWasm0(ptr, len) {
return cachedTextDecoder.decode(getUint8ArrayMemory0().subarray(ptr, 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; let WASM_VECTOR_LEN = 0;
const cachedTextEncoder = (typeof TextEncoder !== 'undefined' ? new TextEncoder('utf-8') : { encode: () => { throw Error('TextEncoder not available') } } ); const cachedTextEncoder = (typeof TextEncoder !== 'undefined' ? new TextEncoder('utf-8') : { encode: () => { throw Error('TextEncoder not available') } } );
@ -134,6 +99,41 @@ function getDataViewMemory0() {
} }
return cachedDataViewMemory0; 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 * @param {string} src
* @returns {Promise<void>} * @returns {Promise<void>}
@ -146,11 +146,11 @@ export function ludus(src) {
} }
function __wbg_adapter_18(arg0, arg1, arg2) { 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) { function __wbg_adapter_44(arg0, arg1, arg2, arg3) {
wasm.closure356_externref_shim(arg0, arg1, arg2, arg3); wasm.closure367_externref_shim(arg0, arg1, arg2, arg3);
} }
async function __wbg_load(module, imports) { async function __wbg_load(module, imports) {
@ -195,6 +195,17 @@ function __wbg_get_imports() {
const ret = arg0.call(arg1, arg2); const ret = arg0.call(arg1, arg2);
return ret; return ret;
}, arguments) }; }, 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) { imports.wbg.__wbg_io_5a3c8ea72d8c6ea3 = function() { return handleError(function (arg0, arg1) {
let deferred0_0; let deferred0_0;
let deferred0_1; let deferred0_1;
@ -217,7 +228,7 @@ function __wbg_get_imports() {
const a = state0.a; const a = state0.a;
state0.a = 0; state0.a = 0;
try { try {
return __wbg_adapter_38(a, state0.b, arg0, arg1); return __wbg_adapter_44(a, state0.b, arg0, arg1);
} finally { } finally {
state0.a = a; state0.a = a;
} }
@ -228,6 +239,10 @@ function __wbg_get_imports() {
state0.a = state0.b = 0; 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) { imports.wbg.__wbg_newnoargs_105ed471475aaf50 = function(arg0, arg1) {
const ret = new Function(getStringFromWasm0(arg0, arg1)); const ret = new Function(getStringFromWasm0(arg0, arg1));
return ret; return ret;
@ -251,6 +266,13 @@ function __wbg_get_imports() {
const ret = Promise.resolve(arg0); const ret = Promise.resolve(arg0);
return ret; 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() { imports.wbg.__wbg_static_accessor_GLOBAL_88a902d13a557d07 = function() {
const ret = typeof global === 'undefined' ? null : global; const ret = typeof global === 'undefined' ? null : global;
return isLikeNone(ret) ? 0 : addToExternrefTable0(ret); return isLikeNone(ret) ? 0 : addToExternrefTable0(ret);
@ -284,8 +306,8 @@ function __wbg_get_imports() {
const ret = false; const ret = false;
return ret; return ret;
}; };
imports.wbg.__wbindgen_closure_wrapper1023 = function(arg0, arg1, arg2) { imports.wbg.__wbindgen_closure_wrapper1077 = function(arg0, arg1, arg2) {
const ret = makeMutClosure(arg0, arg1, 335, __wbg_adapter_18); const ret = makeMutClosure(arg0, arg1, 355, __wbg_adapter_18);
return ret; return ret;
}; };
imports.wbg.__wbindgen_init_externref_table = function() { imports.wbg.__wbindgen_init_externref_table = function() {

BIN
pkg/rudus_bg.wasm (Stored with Git LFS)

Binary file not shown.

View File

@ -6,9 +6,9 @@ export const __wbindgen_exn_store: (a: number) => void;
export const __externref_table_alloc: () => number; export const __externref_table_alloc: () => number;
export const __wbindgen_export_2: WebAssembly.Table; export const __wbindgen_export_2: WebAssembly.Table;
export const __wbindgen_free: (a: number, b: number, c: number) => void; 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_malloc: (a: number, b: number) => number;
export const __wbindgen_realloc: (a: number, b: number, c: number, d: 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 __wbindgen_export_6: WebAssembly.Table;
export const closure356_externref_shim: (a: number, b: number, c: any, d: any) => void; 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; export const __wbindgen_start: () => void;

View File

@ -71,53 +71,53 @@ export function command_to_state (prev_state, curr_command) {
const [verb] = curr_command const [verb] = curr_command
switch (verb) { switch (verb) {
case "goto": { case "goto": {
const [_, x, y] = curr_command const [_, [x, y]] = curr_command
return {...prev_state, position: [x, y]} return {...prev_state, position: [x, y], clear: false}
} }
case "home": { case "home": {
return {...prev_state, position: [0, 0], heading: 0} return {...prev_state, position: [0, 0], heading: 0, clear: false}
} }
case "right": { case "right": {
const [_, angle] = curr_command const [_, angle] = curr_command
const {heading} = prev_state const {heading} = prev_state
return {...prev_state, heading: heading + angle} return {...prev_state, heading: heading + angle, clear: false}
} }
case "left": { case "left": {
const [_, angle] = curr_command const [_, angle] = curr_command
const {heading} = prev_state const {heading} = prev_state
return {...prev_state, heading: heading - angle} return {...prev_state, heading: heading - angle, clear: false}
} }
case "forward": { case "forward": {
const [_, steps] = curr_command const [_, steps] = curr_command
const {heading, position} = prev_state const {heading, position} = prev_state
const unit = unit_of(heading) const unit = unit_of(heading)
const move = mult(unit, steps) const move = mult(unit, steps)
return {...prev_state, position: add(position, move)} return {...prev_state, position: add(position, move), clear: false}
} }
case "back": { case "back": {
const [_, steps] = curr_command const [_, steps] = curr_command
const {heading, position} = prev_state const {heading, position} = prev_state
const unit = unit_of(heading) const unit = unit_of(heading)
const move = mult(unit, -steps) const move = mult(unit, -steps)
return {...prev_state, position: add(position, move)} return {...prev_state, position: add(position, move), clear: false}
} }
case "penup": { case "penup": {
return {...prev_state, pendown: false} return {...prev_state, pendown: false, clear: false}
} }
case "pendown": { case "pendown": {
return {...prev_state, pendown: true} return {...prev_state, pendown: true, clear: false}
} }
case "penwidth": { case "penwidth": {
const [_, width] = curr_command const [_, width] = curr_command
return {...prev_state, penwidth: width} return {...prev_state, penwidth: width, clear: false}
} }
case "pencolor": { case "pencolor": {
const [_, color] = curr_command const [_, color] = curr_command
return {...prev_state, pencolor: color} return {...prev_state, pencolor: color, clear: false}
} }
case "setheading": { case "setheading": {
const [_, heading] = curr_command const [_, heading] = curr_command
return {...prev_state, heading: heading} return {...prev_state, heading: heading, clear: false}
} }
case "loadstate": { case "loadstate": {
// console.log("LOADSTATE: ", curr_command) // 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} return {position: [x, y], heading, visible, pendown, penwidth, pencolor}
} }
case "show": { case "show": {
return {...prev_state, visible: true} return {...prev_state, visible: true, clear: false}
} }
case "hide": { case "hide": {
return {...prev_state, visible: false} return {...prev_state, visible: false, clear: false}
} }
case "background": { case "background": {
background_color = curr_command[1] background_color = curr_command[1]
return prev_state return prev_state
} }
case "clear": {
return {...prev_state, clear: true}
}
} }
} }

View File

@ -111,7 +111,7 @@ fn prelude() -> HashMap<Key, Value> {
#[wasm_bindgen] #[wasm_bindgen]
pub async fn ludus(src: String) { pub async fn ludus(src: String) {
// instrument wasm to report rust panics // 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 // leak the source so it lives FOREVER
let src = src.to_string().leak(); let src = src.to_string().leak();