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.

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

Asset system rework and GLTF scene loading #693

Merged
merged 1 commit into from
Oct 18, 2020
Merged

Asset system rework and GLTF scene loading #693

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
8 changes: 4 additions & 4 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,8 @@ name = "texture_atlas"
path = "examples/2d/texture_atlas.rs"

[[example]]
name = "load_model"
path = "examples/3d/load_model.rs"
name = "load_gltf"
path = "examples/3d/load_gltf.rs"

[[example]]
name = "msaa"
Expand Down Expand Up @@ -171,8 +171,8 @@ name = "asset_loading"
path = "examples/asset/asset_loading.rs"

[[example]]
name = "custom_loader"
path = "examples/asset/custom_asset_loading.rs"
name = "custom_asset"
path = "examples/asset/custom_asset.rs"

[[example]]
name = "audio"
Expand Down
3 changes: 3 additions & 0 deletions assets/data/asset.custom
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
CustomAsset (
value: 42
)
3 changes: 0 additions & 3 deletions assets/data/test_data.data1
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions assets/data/test_data.data2
View file
Open in desktop

This file was deleted.

Binary file added assets/models/FlightHelmet/FlightHelmet.bin
View file
Open in desktop
Binary file not shown.
Loading