Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
120 commits
Select commit Hold shift + click to select a range
fb353d7
Move conversion to png in a separate file
berkus Jan 28, 2024
14fe106
Add bevy dependency
berkus Jan 28, 2024
bdefdb1
Convert parsing to remove unwraps() whenever possible
berkus Jan 28, 2024
2aa7fdb
Start of bevy loader for assets
berkus Aug 27, 2020
0a51f5e
Add todo
berkus Aug 27, 2020
562bb13
Drop old unused code
berkus Aug 27, 2020
e247275
Refactor path representation to use AsRef<Path> bound
berkus Jan 28, 2024
e4ffdce
[wip] Load Cars via an AssetLoader
berkus Aug 31, 2020
599dec9
[wip] cleanup loading code
berkus Jan 28, 2024
fbdc31b
wip: add separate bevy scene setup
berkus Jan 28, 2024
a9f94d6
wip: impl Iterator
berkus Feb 5, 2023
56d0e88
wip: asset loader
berkus Jan 28, 2024
dd6072c
wip: update deps
berkus Jan 28, 2024
2137e69
wip: update years and todos
berkus Jan 28, 2024
be438db
wip: extract files visitor
berkus Jan 28, 2024
b46ce04
wip: extract logger setup
berkus Jan 28, 2024
d26a76e
fix: 🐛 deps versions
berkus Jan 28, 2024
3410df7
wip: fix compilation
berkus Jan 28, 2024
30a3efe
wip: AssetLoader
berkus Jan 28, 2024
b7bc648
wip: clippy opts
berkus Jan 28, 2024
7082aeb
wip: vscode config
berkus Jan 29, 2024
77abdce
wip: update todos
berkus Jan 29, 2024
63d3a71
wip: colorful bevy shapes
berkus Jan 29, 2024
1cb3dd9
wip: update todos with highlights
berkus Jan 29, 2024
31cc1c8
wip: copy readme image to repo
berkus Jan 29, 2024
6fcaeec
wip: move files out of the way
berkus Jan 29, 2024
d1979b7
wip: move converter app
berkus Jan 29, 2024
78a8393
wip: drop old cpp code
berkus Jan 29, 2024
3d4d187
wip: make demo meshes compile (bevy test)
berkus Jan 29, 2024
2e2719a
wip: fix imports
berkus Jan 29, 2024
c0680ae
wip: drop camera
berkus Jan 29, 2024
b165f1f
wip: optimize normals calculation
berkus Jan 29, 2024
8097898
wip: make Car a component
berkus Jan 29, 2024
892bbf4
wip: add AsRef<Path> to visit_files
berkus Jan 29, 2024
4ae2b8a
sq: todo highlights
berkus Jan 29, 2024
5f88008
sq: todos and fixmes
berkus Jan 29, 2024
84cc6dc
wip: use bevy logger instead of log crate
berkus Jan 29, 2024
4257460
wip: add fehler::throws
berkus Jan 29, 2024
df47a28
wip: remove as_ref() call
berkus Jan 29, 2024
a724aae
wip: fix comment
berkus Jan 29, 2024
8e1897c
wip: re-enable camera mod for now
berkus Jan 29, 2024
7868c51
sq: vscode settings
berkus Jan 30, 2024
94230b0
wip: commit cargo lock file
berkus Jan 30, 2024
ead4b6a
wip: add todo
berkus Jan 30, 2024
7ef4549
sq(beginning): stop ignoring idea files
berkus Jan 30, 2024
0ac5365
wip: bevy fast compiles
berkus Jan 30, 2024
9b8ef02
wip: systems
berkus Feb 3, 2024
f90659e
wip: drop old stuff
berkus Feb 4, 2024
081f99b
wip: add world inspector
berkus Feb 4, 2024
d11dcb8
wip: make compile
berkus Feb 4, 2024
b9cdf54
wip: move data to assets/ directory
berkus Feb 4, 2024
9977d38
wip: fix ksy syntax for new kaitai version
berkus Feb 4, 2024
8de065d
wip: update ksy based on brender src
berkus Feb 5, 2024
67843ec
wip: support reading brender chunks
berkus Feb 23, 2024
066f2b0
wip: temp ignore imports
berkus Feb 25, 2024
fa41e69
wip: temp unused code
berkus Feb 25, 2024
75b2187
wip: make chunks more public
berkus Feb 25, 2024
924da1c
wip: handle png write errors
berkus Feb 25, 2024
a7fbcc6
chore: ♻️ Fix clippy warnings
berkus Feb 25, 2024
eee878a
wip: tune build configuration for tests
berkus Feb 25, 2024
1ce68bf
wip: docs
berkus Mar 2, 2024
04acf21
wip: todo
berkus Mar 2, 2024
550e3a4
wip: splitting up resource loaders
berkus Mar 3, 2024
199c80e
wip: move mesh and texture to bevy level
berkus Mar 4, 2024
6bc7672
wip: move and edit stuff
berkus Mar 10, 2024
486605c
wip: just move stuff around
berkus Mar 10, 2024
dbe979b
wip: revert me
berkus Mar 10, 2024
55b30c0
Revert "wip: revert me"
berkus Mar 10, 2024
6d49032
Revert "wip: just move stuff around"
berkus Mar 10, 2024
5e38cdf
Revert "wip: move and edit stuff"
berkus Mar 10, 2024
a247964
wip: add proc-macro
berkus Mar 10, 2024
7af66e3
wip: edit stuff back
berkus Mar 10, 2024
238bd58
wip: move derive macro to a local cargo package
berkus Mar 17, 2024
46095ff
wip: convert to bevy entities
berkus Mar 17, 2024
982a67f
wip: pop() works better but not top()
berkus Mar 18, 2024
6759c45
wip: passes tests
berkus Mar 18, 2024
dfdace2
wip: loading the whole race level now works
berkus Mar 29, 2024
84f03f7
wip: now need to read and instantiate materials
berkus Mar 29, 2024
1f6c434
wip: implement material loading
berkus Mar 30, 2024
1a1e387
wip: model loading
berkus Mar 30, 2024
56b20ba
wip: completely invalid mat file
berkus Mar 31, 2024
032b336
wip: fix assets path for convert_to_png
berkus Mar 31, 2024
be3bca7
wip: change debug levels, add chunk type debug text
berkus Mar 31, 2024
3a12820
wip: load materials
berkus Mar 31, 2024
2b91578
wip: add LoadMany trait and impls
berkus Mar 31, 2024
745e2ba
wip: load pixmaps
berkus Mar 31, 2024
d1f77f0
fix: 🐛 Fix face_materials chunk loading
berkus Mar 31, 2024
9dd3a90
wip: load all models
berkus Mar 31, 2024
54957d5
wip: split model into per-material meshes
berkus Mar 31, 2024
c76a9e8
wip: drop unused trait
berkus Mar 31, 2024
42bc58d
wip: rename name to identifier
berkus Apr 2, 2024
8c56698
wip: fix actor loading
berkus Apr 2, 2024
3d064cd
wip: change LoadMany signature
berkus Apr 2, 2024
4eefeb0
wip: catch unimplemented code
berkus Apr 2, 2024
3d574ac
wip: prototype material/texture loading
berkus Apr 2, 2024
ea58494
wip: add load_bunch to fetch resources from multiple locations
berkus Apr 2, 2024
16d8969
wip: constrain by named resources trait
berkus Apr 2, 2024
07806cc
wip: simplify load_bunch requirements
berkus Apr 2, 2024
1b60015
wip: make load_bunch compile
berkus Apr 2, 2024
fec2cb4
sq: name->identifier rename
berkus Apr 2, 2024
36f3e70
wip: cleanup unused imports
berkus Apr 2, 2024
54bca80
wip: parse load_bunch errors
berkus Apr 2, 2024
96b7e2c
fix: 🐛 Restore expected resource type in error message
berkus Apr 7, 2024
72ae9f4
wip: Replace mut assignment with proper init
berkus Apr 7, 2024
ea175d0
chore(temp): ♻️ Rollback resource type error for now
berkus Apr 10, 2024
51c0b35
chore: ♻️ Unify throws specifications
berkus Apr 10, 2024
379f557
chore(wip): ♻️ Drop unused texture type
berkus Apr 10, 2024
be015e2
chore(wip): ♻️ Add pixelmap parsing and remapping
berkus Apr 10, 2024
8f13939
chore(wip): ♻️ Material loading
berkus Apr 10, 2024
aecde4b
chore(sq): ♻️ Add two deps to help parsing pixmaps
berkus Apr 10, 2024
e2d4240
build: 🛠 Add justfile
berkus Apr 13, 2024
175c065
fix: 🐛 Simplify actor stack loading
berkus Apr 13, 2024
eb64df9
fix: 🐛 Add separate error for invalid file type
berkus Apr 13, 2024
e75ff70
wip: Load actor bits
berkus Apr 13, 2024
4f9de2b
wip: ⛔️ Update to bevy 0.13
berkus Feb 3, 2025
8f8b051
wip: ⛔️ linking
berkus Feb 3, 2025
bc83bc5
wip: ⛔️ drop vscode
berkus Feb 3, 2025
25052b7
wip: ⛔️ rename crates and update to edition 2024
berkus Feb 3, 2025
4a49bf7
wip: ⛔️ add ksy file from blender plugin
berkus Feb 3, 2025
98819ee
wip: ⛔️ trying to make compile in bevy
berkus Feb 3, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 4 additions & 0 deletions .cargo/config.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# From https://github.com/bevyengine/bevy/blob/main/.cargo/config_fast_builds.toml
# Linker is used from the system, with -ld_new option to run the apple optimized linker.
[target.aarch64-apple-darwin]
rustflags = ["-Zshare-generics=y", "-Zthreads=0"]
6 changes: 6 additions & 0 deletions .github/workflows/check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@ jobs:
name: Check
runs-on: ubuntu-latest
steps:
- name: Install required packages
run: |
sudo apt-get install libasound2-dev libudev-dev
- uses: actions/checkout@v2
- uses: actions-rs/toolchain@v1
with:
Expand Down Expand Up @@ -44,6 +47,9 @@ jobs:
name: Clippy
runs-on: ubuntu-latest
steps:
- name: Install required packages
run: |
sudo apt-get install libasound2-dev libudev-dev
- uses: actions/checkout@v2
- uses: actions-rs/toolchain@v1
with:
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/codecov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ jobs:
RUSTDOCFLAGS: -Cpanic=abort
runs-on: ubuntu-latest
steps:
- name: Install required packages
run: |
sudo apt-get install libasound2-dev libudev-dev
- uses: actions/checkout@v3
- uses: actions-rs/toolchain@v1
with:
Expand All @@ -38,7 +41,7 @@ jobs:
- name: Generate test result and coverage report
run: |
cargo install cargo2junit grcov;
cargo test $CARGO_OPTIONS -- -Z unstable-options --format json | cargo2junit > results.xml;
cargo test --no-default-features $CARGO_OPTIONS -- -Z unstable-options --format json | cargo2junit > results.xml;
zip -0 ccov.zip `find . \( -name "$PROJECT_NAME_UNDERSCORE*.gc*" \) -print`;
grcov ccov.zip -s . -t lcov --llvm --ignore-not-existing --ignore "/*" --ignore "tests/*" -o lcov.info;
- name: Upload test results
Expand Down
3 changes: 0 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
target/
Cargo.lock
**/*.rs.bk
.idea/workspace.xml
.idea/dbnavigator.xml
*.log
12 changes: 0 additions & 12 deletions .idea/carma.iml

This file was deleted.

4 changes: 0 additions & 4 deletions .idea/encodings.xml

This file was deleted.

8 changes: 0 additions & 8 deletions .idea/modules.xml

This file was deleted.

6 changes: 0 additions & 6 deletions .idea/vcs.xml

This file was deleted.

27 changes: 27 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"type": "lldb",
"request": "launch",
"name": "Debug unit tests in carma",
"cargo": {
"args": [
"test",
"--no-run",
"--lib",
"--package=carma"
],
"filter": {
"name": "carma",
"kind": "lib"
}
},
"args": [],
"cwd": "${workspaceFolder}"
},
]
}
33 changes: 33 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
{
"cmake.configureOnOpen": false,
"rust-analyzer.linkedProjects": [
"./Cargo.toml"
],
"todohighlight.include": [
"**/*.txt",
"**/*.md",
"**/*.rs",
"**/TODO",
],
"todohighlight.keywords": [
{
"text": "@done",
"color": "#fff",
"isWholeLine": true,
"backgroundColor": "green",
"overviewRulerColor": "rgba(0,189,0,0.8)"
},
{
"text": "@todo",
"color": "#fff",
"backgroundColor": "#ffbd2a",
"overviewRulerColor": "rgba(255,189,42,0.8)"
},
{
"text": "@fixme",
"color": "#fff",
"backgroundColor": "#f06292",
"overviewRulerColor": "rgba(240,98,146,0.8)"
},
],
}
118 changes: 118 additions & 0 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,118 @@
{
// See https://go.microsoft.com/fwlink/?LinkId=733558
// for the documentation about the tasks.json format
"version": "2.0.0",
"tasks": [
{
"label": "Build",
"type": "cargo",
"command": "build",
"problemMatcher": [
"$rustc"
],
"group": {
"kind": "build",
"isDefault": true
}
},
{
"label": "Check",
"detail": "Run a compile check",
"type": "cargo",
"command": "check",
"args": [
"--all-features",
"--all-targets"
],
"problemMatcher": [
"$rustc"
],
"presentation": {
"echo": true,
"reveal": "always",
"panel": "shared",
"showReuseMessage": true,
"clear": true
},
"group": "build"
},
{
"label": "Run",
"type": "cargo",
"command": "run",
"problemMatcher": [
"$rustc"
]
},
{
"label": "Test",
"detail": "Runs all tests",
"type": "cargo",
"command": "test",
"args": [
"--workspace",
"--all-features",
"--no-fail-fast",
"--",
"--nocapture"
],
"options": {
"env": {
"RUST_LOG": "warn,{{crate_name}}=trace"
}
},
"problemMatcher": [
"$rustc"
],
"group": "build",
"presentation": {
"echo": true,
"reveal": "always",
"panel": "shared",
"showReuseMessage": true,
"clear": true
}
},
{
"label": "Clippy",
"detail": "Look for Clippy errors",
"type": "cargo",
"command": "clippy",
"args": [
"--all-features",
"--all-targets",
"--",
"-D clippy::all",
"-W clippy::pedantic",
"-W clippy::nursery"
],
"problemMatcher": [],
"group": "build",
"presentation": {
"echo": true,
"reveal": "always",
"panel": "shared",
"showReuseMessage": true,
"clear": true
}
},
{
"label": "Format",
"detail": "Format all source",
"type": "cargo",
"command": "fmt",
"args": [
"--all",
"--quiet"
],
"problemMatcher": [],
"group": "build",
"presentation": {
"echo": false,
"reveal": "never",
"panel": "shared",
"showReuseMessage": false
}
}
]
}
Loading