Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
05af815
refactor: :construction: Split luminol into separate crates
melody-rs Sep 28, 2023
cfe52a3
refactor: :construction: Start working out dependencies
melody-rs Oct 2, 2023
131ae7e
Sorta figure out dependencies
melody-rs Oct 5, 2023
15205f2
Sorta start getting somewhere
melody-rs Oct 5, 2023
a2883df
Move Luminol into crates folder
melody-rs Oct 11, 2023
6681c89
Move the filesystem trait out of luminol-core
melody-rs Oct 14, 2023
b7a157d
refactor: :construction: refactor luminol-graphics and it's a mess
melody-rs Oct 17, 2023
4f64abc
refactor:
melody-rs Oct 17, 2023
03b88f3
refactor: add UpdateState to luminol-core and move various traits
melody-rs Oct 17, 2023
93add75
refactor(filesystem): :recycle: require FileSystem::File to be 'static
melody-rs Oct 18, 2023
94deff3
refactor: :recycle: don't take an &'static reference to graphics state
melody-rs Oct 18, 2023
658139a
refactor: :recycle: refactor modals
melody-rs Oct 18, 2023
0593a6d
refactor: :recycle: unify tabs and windows
melody-rs Oct 18, 2023
fb53043
refactor: :recycle: start to fix up windows
melody-rs Oct 18, 2023
9f78c0e
refactor: :recycle: hack together things so that they compile
melody-rs Oct 19, 2023
83af835
Merge branch 'dev' into split-crates
melody-rs Oct 19, 2023
9258308
refactor: :recycle: partially resolve async code issues
melody-rs Oct 19, 2023
ff46311
refactor: :recycle: it compiles (with a LOT of unfinished things)
melody-rs Oct 19, 2023
7d28c46
refactor: :recycle: NOW it compiles
melody-rs Oct 19, 2023
99fe08d
fix(graphics): :bug: fix sprite shader compilation
melody-rs Oct 19, 2023
15296e4
fix(data cache): :recycle: get data cache semi-working
melody-rs Oct 19, 2023
d3e1140
refactor(data cache): :recycle: actually load data cache
melody-rs Oct 19, 2023
f8ce75a
refactor(config): :recycle: store code theme in global state again
melody-rs Oct 19, 2023
74cc7c1
fix(ui): :bug: fix windows and tabs not being added
melody-rs Oct 20, 2023
f0e4619
refactor: :recycle: use workspace metadata for package metadata
melody-rs Oct 20, 2023
adf018f
refactor: :recycle: remove generic parameters on update state by usin…
melody-rs Oct 20, 2023
c919477
refactor(tabs): :recycle: pass update state when requesting tab name
melody-rs Oct 20, 2023
8b5411c
fix(tabs): :bug: fix tabs not adding properly
melody-rs Oct 21, 2023
3c6194e
Update window.rs
melody-rs Oct 21, 2023
d82a24d
fix: :bug: get top bar loading projects
melody-rs Oct 21, 2023
8c9df6f
fix: :bug: fix new project creation
melody-rs Oct 21, 2023
60be039
refactor: :construction: try splitting up the map tab
melody-rs Oct 23, 2023
cfddd5f
Merge remote-tracking branch 'upstream/dev' into split-crates
melody-rs Oct 23, 2023
992806b
Enable -Zthreads compiler flag
melody-rs Nov 14, 2023
abba61f
Update nightly in workflows
melody-rs Nov 19, 2023
63dd76e
revert: :rewind: Undo making cursor state an enum (will tackle this l…
melody-rs Nov 19, 2023
06763e7
Sorta resolve dependencies on wasm
melody-rs Nov 20, 2023
bb540bc
Fix backing web filesystem implementation
melody-rs Nov 20, 2023
f0412a1
Fix native build
melody-rs Nov 20, 2023
45b6897
Remove jobs flag
melody-rs Nov 20, 2023
19127dc
Fix audio on wasm
melody-rs Nov 20, 2023
c1355e6
Temporarily impl Send + Sync for wgpu callbacks
melody-rs Nov 20, 2023
4d71242
Fix winit not compiling in CI
melody-rs Nov 20, 2023
eebb2b8
Get wasm filesystem compiling
melody-rs Nov 20, 2023
10d1131
Get luminol compiling on wasm!
melody-rs Nov 20, 2023
a6f2a10
Fix missed rename
melody-rs Nov 20, 2023
e1cff87
Dumb typo
melody-rs Nov 20, 2023
0fc8ad5
Move luminol crate to be root package
melody-rs Nov 20, 2023
b4e4799
Run workspace tests
melody-rs Nov 20, 2023
8f4a8cd
fix(audio): :bug: Completely read audio file on wasm
melody-rs Nov 20, 2023
b121782
perf(wasm): :zap: Use oneshot crate for oneshot channels
melody-rs Nov 20, 2023
3b15546
fix(filesystem): :bug: Pass idb key instead of path to Filesystem::fr…
melody-rs Nov 20, 2023
799ef16
refactor(tilemap): :recycle: Use naga oil instead of const_format
melody-rs Nov 21, 2023
606a199
fix(ui): :bug: Fix top bar opening & closing projects
melody-rs Nov 21, 2023
b586066
Merge branch 'dev' into split-crates
melody-rs Nov 21, 2023
5856df2
Merge branch 'dev' into split-crates
melody-rs Nov 21, 2023
91d5082
Bump nightly in trunk build
melody-rs Nov 21, 2023
32622e0
Remove luminol- in folder prefixes
melody-rs Nov 22, 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
20 changes: 18 additions & 2 deletions .cargo/config.toml
Original file line number Diff line number Diff line change
@@ -1,8 +1,24 @@
# Possibly enable -Zshare-generics=y?

[target.x86_64-pc-windows-msvc]
linker = "rust-lld"
rustflags = ["-Z", "threads=8"]

[target.x86_64-unknown-linux-gnu]
rustflags = ["-C", "linker=clang", "-C", "link-arg=-fuse-ld=mold"]
rustflags = [
"-C",
"linker=clang",
"-C",
"link-arg=-fuse-ld=mold",
"-Z",
"threads=8",
]

[target.'cfg(target_arch = "wasm32")']
rustflags = ["--cfg=web_sys_unstable_apis", "-C", "target-feature=+atomics,+bulk-memory,+mutable-globals"]
rustflags = [
"--cfg=web_sys_unstable_apis",
"-C",
"target-feature=+atomics,+bulk-memory,+mutable-globals",
"-Z",
"threads=8",
]
12 changes: 6 additions & 6 deletions .github/workflows/build-steam.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ jobs:
sudo apt install libgtk-3-dev libatk1.0-dev libxcb-render0-dev libxcb-shape0-dev libxcb-xfixes0-dev libspeechd-dev libxkbcommon-dev libssl-dev libasound2-dev clang mold -y
- uses: dtolnay/rust-toolchain@nightly
with:
toolchain: nightly-2023-09-12
toolchain: nightly-2023-11-14
- name: Rust Cache
uses: Swatinem/rust-cache@v2
- name: Build luminol (Release)
run: cargo build --features steamworks --release --jobs 1
run: cargo build --features steamworks --release
- name: Setup artifact
run: |
mkdir -p ${{ github.workspace }}/artifact
Expand All @@ -48,11 +48,11 @@ jobs:
submodules: true
- uses: dtolnay/rust-toolchain@nightly
with:
toolchain: nightly-2023-09-12
toolchain: nightly-2023-11-14
- name: Rust Cache
uses: Swatinem/rust-cache@v2
- name: Build luminol (Release)
run: cargo build --features steamworks --release --jobs 1
run: cargo build --features steamworks --release
- name: Setup artifact
run: |
mkdir -p ${{ github.workspace }}/artifact
Expand All @@ -73,11 +73,11 @@ jobs:
submodules: true
- uses: dtolnay/rust-toolchain@nightly
with:
toolchain: nightly-2023-09-12
toolchain: nightly-2023-11-14
- name: Rust Cache
uses: Swatinem/rust-cache@v2
- name: Build luminol (Release)
run: cargo build --features steamworks --release --jobs 1
run: cargo build --features steamworks --release
- name: Setup artifact
run: |
mkdir -p ${{ github.workspace }}/artifact
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@ jobs:
sudo apt install libgtk-3-dev libatk1.0-dev libxcb-render0-dev libxcb-shape0-dev libxcb-xfixes0-dev libspeechd-dev libxkbcommon-dev libssl-dev libasound2-dev clang mold -y
- uses: dtolnay/rust-toolchain@nightly
with:
toolchain: nightly-2023-09-12
toolchain: nightly-2023-11-14
- name: Rust Cache
uses: Swatinem/rust-cache@v2
- name: Build luminol (Release)
run: cargo build --release --jobs 1
run: cargo build --release
- name: Setup artifact
run: |
mkdir -p ${{ github.workspace }}/artifact
Expand All @@ -46,11 +46,11 @@ jobs:
submodules: true
- uses: dtolnay/rust-toolchain@nightly
with:
toolchain: nightly-2023-09-12
toolchain: nightly-2023-11-14
- name: Rust Cache
uses: Swatinem/rust-cache@v2
- name: Build luminol (Release)
run: cargo build --release --jobs 1
run: cargo build --release
- name: Setup artifact
run: |
mkdir -p ${{ github.workspace }}/artifact
Expand All @@ -70,11 +70,11 @@ jobs:
submodules: true
- uses: dtolnay/rust-toolchain@nightly
with:
toolchain: nightly-2023-09-12
toolchain: nightly-2023-11-14
- name: Rust Cache
uses: Swatinem/rust-cache@v2
- name: Build luminol (Release)
run: cargo build --release --jobs 1
run: cargo build --release
- name: Setup artifact
run: |
mkdir -p ${{ github.workspace }}/artifact
Expand All @@ -98,7 +98,7 @@ jobs:
sudo apt install libgtk-3-dev libatk1.0-dev libxcb-render0-dev libxcb-shape0-dev libxcb-xfixes0-dev libspeechd-dev libxkbcommon-dev libssl-dev libasound2-dev clang mold -y
- uses: dtolnay/rust-toolchain@nightly
with:
toolchain: nightly-2023-09-12
toolchain: nightly-2023-11-14
targets: wasm32-unknown-unknown
components: rust-src
- name: Download and install Trunk binary
Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ jobs:
sudo apt install libgtk-3-dev libatk1.0-dev libxcb-render0-dev libxcb-shape0-dev libxcb-xfixes0-dev libspeechd-dev libxkbcommon-dev libssl-dev libasound2-dev clang mold -y
- uses: dtolnay/rust-toolchain@nightly
with:
toolchain: nightly-2023-09-12
toolchain: nightly-2023-11-14
- name: Rust Cache
uses: Swatinem/rust-cache@v2
- run: cargo check --all-features --jobs 1
- run: cargo check --all-features

check-wasm32:
name: Check wasm32
Expand All @@ -41,12 +41,12 @@ jobs:
sudo apt install libgtk-3-dev libatk1.0-dev libxcb-render0-dev libxcb-shape0-dev libxcb-xfixes0-dev libspeechd-dev libxkbcommon-dev libssl-dev libasound2-dev clang mold -y
- uses: dtolnay/rust-toolchain@nightly
with:
toolchain: nightly-2023-09-12
toolchain: nightly-2023-11-14
targets: wasm32-unknown-unknown
components: rust-src
- name: Rust Cache
uses: Swatinem/rust-cache@v2
- run: cargo check --jobs 1 --target wasm32-unknown-unknown -Z build-std=std,panic_abort
- run: cargo check --target wasm32-unknown-unknown -Z build-std=std,panic_abort

test:
name: Test Suite
Expand All @@ -60,10 +60,10 @@ jobs:
sudo apt install libgtk-3-dev libatk1.0-dev libxcb-render0-dev libxcb-shape0-dev libxcb-xfixes0-dev libspeechd-dev libxkbcommon-dev libssl-dev libasound2-dev clang mold -y
- uses: dtolnay/rust-toolchain@nightly
with:
toolchain: nightly-2023-09-12
toolchain: nightly-2023-11-14
- name: Rust Cache
uses: Swatinem/rust-cache@v2
- run: cargo test --lib --jobs 1
- run: cargo test --workspace

fmt:
name: Rustfmt
Expand All @@ -78,7 +78,7 @@ jobs:
sudo apt install libgtk-3-dev libatk1.0-dev libxcb-render0-dev libxcb-shape0-dev libxcb-xfixes0-dev libspeechd-dev libxkbcommon-dev libssl-dev libasound2-dev clang mold -y
- uses: dtolnay/rust-toolchain@nightly
with:
toolchain: nightly-2023-09-12
toolchain: nightly-2023-11-14
components: rustfmt
- name: Rust Cache
uses: Swatinem/rust-cache@v2
Expand All @@ -97,8 +97,8 @@ jobs:
sudo apt install libgtk-3-dev libatk1.0-dev libxcb-render0-dev libxcb-shape0-dev libxcb-xfixes0-dev libspeechd-dev libxkbcommon-dev libssl-dev libasound2-dev clang mold -y
- uses: dtolnay/rust-toolchain@nightly
with:
toolchain: nightly-2023-09-12
toolchain: nightly-2023-11-14
components: clippy
- name: Rust Cache
uses: Swatinem/rust-cache@v2
- run: cargo clippy --jobs 1 -- # -D warnings
- run: cargo clippy -- # -D warnings
5 changes: 3 additions & 2 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"licenser.customHeaderFile": "${workspaceFolder}/.vscode/header.txt",
"licenser.disableAutoHeaderInsertion": false,
"rust-analyzer.cargo.features": [
"steamworks"
// "steamworks"
],
"editor.formatOnSave": true,
"rust-analyzer.check.command": "clippy",
Expand All @@ -22,7 +22,8 @@
"image cache",
"tilemap",
"config",
"audio"
"audio",
"graphics"
],
"rust-analyzer.showUnlinkedFileNotification": false,
"rust-analyzer.cargo.extraEnv": {
Expand Down
1 change: 1 addition & 0 deletions .wakatime-project
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Luminol
Loading