Skip to content

move livecode macros folder #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jessstringham merged 1 commit into from
Feb 6, 2026
Merged

move livecode macros folder #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@ members = [
"murrelet_draw",
"murrelet_gpu",
"murrelet_livecode",
"murrelet_livecode_macros",
"murrelet_livecode_macros/murrelet_livecode_derive",
"murrelet_livecode_derive",
"murrelet_perform",
"murrelet_src_audio",
"murrelet_src_midi",
Expand All @@ -29,8 +28,7 @@ murrelet_common = { path = "murrelet_common", version = "0.1.2" }
murrelet_draw = { path = "murrelet_draw", version = "0.1.2", default-features = false }
murrelet_gpu = { path = "murrelet_gpu", version = "0.1.2" }
murrelet_livecode = { path = "murrelet_livecode", version = "0.1.2", default-features = false }
murrelet_livecode_macros = { path = "murrelet_livecode_macros", version = "0.1.2", default-features = false }
murrelet_livecode_derive = { path = "murrelet_livecode_macros/murrelet_livecode_derive", version = "0.1.2", default-features = false }
murrelet_livecode_derive = { path = "murrelet_livecode_derive", version = "0.1.2", default-features = false }
murrelet_perform = { path = "murrelet_perform", version = "0.1.2", default-features = false }
murrelet_src_audio = { path = "murrelet_src_audio", version = "0.1.2" }
murrelet_src_midi = { path = "murrelet_src_midi", version = "0.1.2" }
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ I wanted to open source my code so I could share some ideas of how I've been imp
This repo can be broken down into a few parts:

- livecode macros and code: how I turn Rust sketches into YAML-controlled live performance.
- general code for parsing and evaluating livecode expressions: *murrelet_livecode, murrelet_livecode_macros*
- general code for parsing and evaluating livecode expressions: *murrelet_livecode, murrelet_livecode_derive*
- specific code for livecoding (hot-swapping configs, some generic parameters): *murrelet_perform*
- platform-specific packages for adding more sources: *murrelet_src_audio, murrelet_src_audio*
- *murrelet_gpu*: some cute little macros for managing and chaining shaders. (this is _not_ live at the moment)
Expand Down
3 changes: 0 additions & 3 deletions murrelet/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,12 @@ description = "Murrelet the live coding framework for visuals"
schemars = [
"murrelet_draw/schemars",
"murrelet_livecode/schemars",
"murrelet_livecode_macros/schemars",
"murrelet_livecode_derive/schemars",
"murrelet_perform/schemars",
]
# murrelet_gui = [
# "murrelet_draw/murrelet_gui",
# "murrelet_livecode/murrelet_gui",
# "murrelet_livecode_macros/murrelet_gui",
# "murrelet_livecode_derive/murrelet_gui",
# "murrelet_perform/murrelet_gui",
# ]
Expand All @@ -35,6 +33,5 @@ serde_yaml = "0.9.17"
murrelet_common = { workspace = true }
murrelet_draw = { workspace = true, default-features = false }
murrelet_livecode = { workspace = true, default-features = false }
murrelet_livecode_macros = { workspace = true, default-features = false }
murrelet_livecode_derive = { workspace = true, default-features = false }
murrelet_perform = { workspace = true, default-features = false }
2 changes: 0 additions & 2 deletions murrelet_draw/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ license = "AGPL-3.0-or-later"
schemars = [
"dep:schemars",
"murrelet_livecode/schemars",
"murrelet_livecode_macros/schemars",
"murrelet_livecode_derive/schemars",
]

Expand All @@ -20,7 +19,6 @@ schemars = [
murrelet_common = { workspace = true }

murrelet_livecode = { workspace = true, default-features = false }
murrelet_livecode_macros = { workspace = true, default-features = false }
murrelet_livecode_derive = { workspace = true, default-features = false }

lerpable = { version = "0.0.3", features = ["glam"] }
Expand Down
1 change: 0 additions & 1 deletion murrelet_gpu/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ naga = { version = "0.20.0", features = ["wgsl-in"] }
murrelet_common = { workspace = true }
murrelet_livecode = { workspace = true, default-features = false }
murrelet_draw = { workspace = true, default-features = false }
murrelet_livecode_macros = { workspace = true }
murrelet_livecode_derive = { workspace = true }
murrelet_perform = { workspace = true, default-features = false }

Expand Down
0 ...acros/murrelet_livecode_derive/Cargo.toml → murrelet_livecode_derive/Cargo.toml
View file
Open in desktop
File renamed without changes.
0 ...urrelet_livecode_derive/examples/tests.rs → murrelet_livecode_derive/examples/tests.rs
View file
Open in desktop
File renamed without changes.
0 ...elet_livecode_derive/src/derive_cached.rs → ...elet_livecode_derive/src/derive_cached.rs
View file
Open in desktop
File renamed without changes.
0 ...ecode_derive/src/derive_graphics_trait.rs → ...ecode_derive/src/derive_graphics_trait.rs
View file
Open in desktop
File renamed without changes.
0 ...rrelet_livecode_derive/src/derive_lazy.rs → murrelet_livecode_derive/src/derive_lazy.rs
View file
Open in desktop
File renamed without changes.
0 ...et_livecode_derive/src/derive_livecode.rs → ...et_livecode_derive/src/derive_livecode.rs
View file
Open in desktop
File renamed without changes.
0 ...et_livecode_derive/src/derive_nestedit.rs → ...et_livecode_derive/src/derive_nestedit.rs
View file
Open in desktop
File renamed without changes.
0 ...acros/murrelet_livecode_derive/src/lib.rs → murrelet_livecode_derive/src/lib.rs
View file
Open in desktop
File renamed without changes.
0 ...os/murrelet_livecode_derive/src/parser.rs → murrelet_livecode_derive/src/parser.rs
View file
Open in desktop
File renamed without changes.
0 .../murrelet_livecode_derive/src/toplevel.rs → murrelet_livecode_derive/src/toplevel.rs
View file
Open in desktop
File renamed without changes.
17 changes: 0 additions & 17 deletions murrelet_livecode_macros/Cargo.toml
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion murrelet_livecode_macros/src/lib.rs
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions murrelet_perform/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,13 @@ schemars = [
"dep:schemars",
"murrelet_livecode/schemars",
"murrelet_draw/schemars",
"murrelet_livecode_macros/schemars",
"murrelet_livecode_derive/schemars",
]

[dependencies]
murrelet_common = { workspace = true }
murrelet_livecode = { workspace = true, default-features = false }
murrelet_draw = { workspace = true, default-features = false }
murrelet_livecode_macros = { workspace = true, default-features = false }
murrelet_livecode_derive = { workspace = true, default-features = false }
lerpable = { version = "0.0.3" }
serde = { version = "1.0.104", features = ["derive"] }
Expand Down