Skip to content
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.

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

UI rewrite #6

Merged
merged 80 commits into from
Dec 11, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
80 commits
Select commit Hold shift + click to select a range
b15f418
Ui stuff
Nov 27, 2023
ecc3044
Better layouting
Nov 27, 2023
0bbe4c7
Widget snapping
Nov 27, 2023
fbe0ac0
Widget work ahead? I sure hope it does!
Nov 28, 2023
0c2c678
New knob rendering
Nov 29, 2023
209920c
Knobwork
Nov 29, 2023
e6add4f
Added position drag value
Nov 29, 2023
e5fc545
Widget editor in module designer
Nov 29, 2023
b243d44
Module internal devices
Nov 29, 2023
75745a2
Add devices to modules
Nov 29, 2023
383bed9
Connect graph to stack
Nov 29, 2023
bfa3341
move module to own module
Nov 29, 2023
84956f0
upgrade egui
Nov 29, 2023
74e25b4
Work on visuals
Nov 30, 2023
b8bd011
Render widgets in style
Nov 30, 2023
952fddc
Start displaying wires
Nov 30, 2023
eaf4ac8
Wires: handled
Nov 30, 2023
90f7283
Factor out some repetition
Nov 30, 2023
2ad13a5
Connect grapg to synth
Nov 30, 2023
82ab257
Add device selector to module designer
Dec 1, 2023
cd61352
Add "add widget" button to module designer
Dec 1, 2023
5d44713
Refactor adder adding
Dec 1, 2023
7a56c10
Fix prefabs and serializer
Dec 1, 2023
9ee47d0
Wire up knob response
Dec 1, 2023
27f2d59
Fix bug in update_param
Dec 1, 2023
d13b0a7
Add period parameter to samplequeue
Dec 1, 2023
47225e5
Update readme
Dec 1, 2023
414d0c2
Start fixing graph
Dec 2, 2023
7dcb619
Rewrote graph
Dec 2, 2023
4614a6c
Start work on editor rewrite
Dec 3, 2023
056573b
Editor bruh
Dec 3, 2023
0c2c907
Fix graph and compiler
Dec 3, 2023
f58b19e
Fix widget rendering
Dec 3, 2023
19cd776
Add knob parameters
Dec 3, 2023
d34c025
Remove old module editor
Dec 3, 2023
11ecccb
Wire beautification project
Dec 3, 2023
819d9ef
Add more devices
Dec 3, 2023
827ef4d
Fix wasm a lil
Dec 3, 2023
4888e4a
Add back scope
Dec 3, 2023
9ccfa9b
rewrite graph walking
Dec 4, 2023
12428d2
Start new widget editor
Dec 4, 2023
b8fc26f
use rfd
Dec 5, 2023
6c926a5
trunkify designer
Dec 5, 2023
317535a
Add logging
Dec 5, 2023
c11fc40
Small fixes
Dec 5, 2023
278710c
Support file loading on wasm
Dec 5, 2023
9d07f22
Change page title for wasm build of the editor
Dec 5, 2023
9febafa
Actually fix graph building and add midis
Dec 6, 2023
512b164
Send knobs on rebuild
Dec 6, 2023
fcce212
Check that param exists before updateing
Dec 6, 2023
7783b72
Correctly offset points from center
Dec 6, 2023
0753051
Add circle shape
Dec 6, 2023
4cd305f
Fix #5
Dec 6, 2023
c21d93c
nuke old prototypes
Dec 6, 2023
0c75f96
Add text visual
Dec 6, 2023
eaa11b8
Transition to using templates instead of descs pt1
Dec 6, 2023
1aaf0ac
Fix rotation
Dec 7, 2023
97744bd
Asset loading
Dec 9, 2023
b382429
Add back to menue option
Dec 9, 2023
100930e
Move saveloaders to separate crate
Dec 9, 2023
72abc60
Fix grid and snapping
Dec 9, 2023
06cf2f9
Hack in a loader into pcmg
Dec 9, 2023
26c41c2
Framelimit the oscilloscope
Dec 10, 2023
60b5cc5
SlotWIdget to enum
Dec 10, 2023
90f4855
Add tooltips to widgets
Dec 10, 2023
91e9922
Theming
Dec 10, 2023
25ad4e3
icons and remove debug rects from pcmg
Dec 10, 2023
604abc7
Kinda sorta sequencer
Dec 10, 2023
88da742
Fix compilation
Dec 10, 2023
6532368
Fix adsr?
Dec 10, 2023
9789e35
Larger grid
Dec 10, 2023
e178f10
Rename file
Dec 10, 2023
317638b
Flipped connections in editor, added pre-start stage to pcmg
Dec 11, 2023
2f743a1
Fix farting on chrome-based browsers
Dec 11, 2023
52d7fd6
Merge branch 'master' into ui-rewrite
JohnDowson Dec 11, 2023
e537c53
Expand pipeline to trunk build rack-designer
Dec 11, 2023
67b700b
Merge remote-tracking branch 'origin/ui-rewrite' into ui-rewrite
Dec 11, 2023
4c87e74
fix workflow
Dec 11, 2023
6ae8a8d
Loading modules from files
Dec 11, 2023
d538ccf
Update prefabs
Dec 11, 2023
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
63 changes: 42 additions & 21 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ jobs:
name: Check
runs-on: ubuntu-latest
steps:
- run: sudo apt-get install -y libasound2 libasound2-dev
- uses: actions/checkout@v2
- uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: nightly
override: true
- run: sudo apt-get install -y libasound2 libasound2-dev libatk1.0-0 libgtk-3-dev
- uses: actions-rs/cargo@v1
with:
command: check
Expand All @@ -41,22 +41,23 @@ jobs:
command: check
args: --all-features --lib --target wasm32-unknown-unknown

test:
name: Test Suite
runs-on: ubuntu-latest
steps:
- run: sudo apt-get install -y libasound2 libasound2-dev
- uses: actions/checkout@v2
- uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: nightly
override: true
- run: sudo apt-get install libxcb-render0-dev libxcb-shape0-dev libxcb-xfixes0-dev libxkbcommon-dev libssl-dev
- uses: actions-rs/cargo@v1
with:
command: test
args: --lib
# Welp, i don't really have any tests for now
# test:
# name: Test Suite
# runs-on: ubuntu-latest
# steps:
# - uses: actions/checkout@v2
# - uses: actions-rs/toolchain@v1
# with:
# profile: minimal
# toolchain: nightly
# override: true
# - run: sudo apt-get install libxcb-render0-dev libxcb-shape0-dev libxcb-xfixes0-dev libxkbcommon-dev libssl-dev
# - run: sudo apt-get install -y libasound2 libasound2-dev libatk1.0-0 libgtk-3-dev
# - uses: actions-rs/cargo@v1
# with:
# command: test
# args: --lib

fmt:
name: Rustfmt
Expand All @@ -78,21 +79,21 @@ jobs:
name: Clippy
runs-on: ubuntu-latest
steps:
- run: sudo apt-get install -y libasound2 libasound2-dev
- uses: actions/checkout@v2
- uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: nightly
override: true
components: clippy
- run: sudo apt-get install -y libasound2 libasound2-dev libatk1.0-0 libgtk-3-dev
- uses: actions-rs/cargo@v1
with:
command: clippy
args: -- -D warnings

trunk:
name: trunk
trunk-pcmg:
name: trunk pcmg
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
Expand All @@ -104,5 +105,25 @@ jobs:
override: true
- name: Download and install Trunk binary
run: wget -qO- https://github.com/thedodd/trunk/releases/latest/download/trunk-x86_64-unknown-linux-gnu.tar.gz | tar -xzf-
- name: Build
- name: Create dist folder
run: mkdir ./dist
- name: Build PCMG
run: ./trunk build

trunk-rack-designer:
name: trunk rack-designer
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: nightly
target: wasm32-unknown-unknown
override: true
- name: Download and install Trunk binary
run: wget -qO- https://github.com/thedodd/trunk/releases/latest/download/trunk-x86_64-unknown-linux-gnu.tar.gz | tar -xzf-
- name: Create dist folder
run: mkdir ./dist
- name: Build rack-designer
run: cd ./rack-designer && ../trunk build
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/target
/dist
**/dist
ffplay.exe
/.vscode
play.sh
Expand All @@ -8,3 +8,5 @@ play.sh
/.sloc
TODO.md
*.log
/dist/pcmg
/dist/editor
2 changes: 2 additions & 0 deletions .rustfmt.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
imports_layout = "Vertical"
imports_granularity = "Crate"
Loading
Loading