Skip to content

Commit

Permalink
Asset system rework and GLTF scene loading (#693)
Browse files Browse the repository at this point in the history
  • Loading branch information
cart authored Oct 18, 2020
1 parent a602f50 commit c32e637
Show file tree
Hide file tree
Showing 150 changed files with 3,607 additions and 1,976 deletions.
8 changes: 4 additions & 4 deletions Cargo.toml
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
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

This file was deleted.

3 changes: 0 additions & 3 deletions assets/data/test_data.data2

This file was deleted.

Binary file added assets/models/FlightHelmet/FlightHelmet.bin
Binary file not shown.
Loading

0 comments on commit c32e637

Please sign in to comment.