Skip to content

Commit

Permalink
Merge pull request #295 from janhohenheim/blueprints
Browse files Browse the repository at this point in the history
  • Loading branch information
janhohenheim authored Feb 22, 2024
2 parents ac4f442 + 0d3344d commit 26f3ad1
Show file tree
Hide file tree
Showing 17 changed files with 13,576 additions and 91 deletions.
61 changes: 49 additions & 12 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

25 changes: 16 additions & 9 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,21 +22,23 @@ dev = ["dep:bevy_editor_pls"]
tracing = ["bevy/trace_chrome"]

[dependencies]
# keep the following in sync with Bevy's dependencies
# keep the following two in sync with Bevy's dependencies
## https://github.com/bevyengine/bevy/blob/v0.12.1/crates/bevy_winit/Cargo.toml#L31
winit = { version = "0.28.7", default-features = false }
## https://github.com/bevyengine/bevy/blob/v0.12.1/crates/bevy_render/Cargo.toml#L57
image = { version = "0.24", default-features = false }

# generic dependencies
serde = { version = "1", features = ["derive"] }
anyhow = "1"

# Bevy plugins
bevy_kira_audio = "0.18"
bevy_asset_loader = { version = "0.19", features = ["progress_tracking"] }
bevy_asset_loader = { version = "0.19", features = ["progress_tracking", "standard_dynamic_assets"] }
bevy_common_assets = { version = "0.9", features = ["ron", "toml"] }
bevy_egui = "0.24"
serde = { version = "1", features = ["derive"] }
oxidized_navigation = { version = "0.8", features = ["xpbd", "debug_draw"] }
iyes_progress = "0.10"
unicode-segmentation = "1"
anyhow = "1"
# Activate the egui feature when https://github.com/Leafwing-Studios/leafwing-input-manager/pull/442 lands
leafwing-input-manager = { version = "0.11", features = [] }
bevy_dolly = "0.0.2"
Expand All @@ -48,10 +50,11 @@ bevy_yarnspinner = "0.1"
bevy_yarnspinner_example_dialogue_view = "0.1"
bevy-tnua-xpbd3d = "0.1"
bevy_xpbd_3d = { version = "0.3", features = ["simd"] }
bevy-tnua = "0.14.1"
bevy_atmosphere = "0.8.1"
warbler_grass = "0.5.0"
bevy_gltf_components = {git = "https://github.com/kaosat-dev/Blender_bevy_components_workflow", rev = "de543727ed64e0d493b8eeb032bdd2e79c7ac6a1" }
bevy-tnua = "0.14"
bevy_atmosphere = "0.8"
warbler_grass = "0.5"
bevy_gltf_blueprints = "0.7"
bevy_registry_export = "0.1"

[dependencies.bevy]
version = "0.12.1"
Expand All @@ -64,3 +67,7 @@ features = [

[build-dependencies]
embed-resource = "2"

[patch.crates-io]
# Remove when https://github.com/kaosat-dev/Blender_bevy_components_workflow/pull/143 has been merged
bevy_gltf_components = { git = "https://github.com/janhohenheim/Blender_bevy_components_workflow", rev = "6313c2f695e9e64dbd797c45ef7d6402062094ca" }
10 changes: 10 additions & 0 deletions assets/main.assets.ron
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
({
"world":File (path: "scenes/World.glb"),
"library": Folder (
path: "scenes/library",
),
"audio_walking": File (path: "audio/walking.ogg"),
"texture_glowy_interior": File (path: "textures/stone_alley_2.jpg"),
"grass_density_map": File (path: "textures/grass_density_map.png"),
"game_config": File (path: "config/config.game.toml"),
})
Binary file renamed assets/scenes/level.glb → assets/scenes/World.glb
Binary file not shown.
Binary file modified assets/scenes/level.blend
Binary file not shown.
Binary file added assets/scenes/library/Fox.glb
Binary file not shown.
Binary file added assets/scenes/library/House.glb
Binary file not shown.
Binary file added assets/scenes/library/Orb.glb
Binary file not shown.
Loading

0 comments on commit 26f3ad1

Please sign in to comment.