Skip to content
This repository has been archived by the owner on Oct 24, 2024. It is now read-only.

Commit

Permalink
Scenes refactor pt. 5: Merge scene packages (#224)
Browse files Browse the repository at this point in the history
* Remove TopDownScene trait

* Removing unused dependencies

* Moving clinic, building1_basement1, building1_basement2, building1_player_floor, plant shop, compound, clinic ward, sewers, mall, downtown, compound tower and twinpeaks apartment scenes into a shared package
  • Loading branch information
porkbrain authored Jul 20, 2024
1 parent d51a5ae commit d29ad81
Show file tree
Hide file tree
Showing 83 changed files with 823 additions and 2,784 deletions.
266 changes: 2 additions & 264 deletions Cargo.lock

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

26 changes: 2 additions & 24 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,8 @@ members = [
"common/visuals",
"main_game_lib",
"main_game",
"scenes/building1_basement1",
"scenes/building1_basement2",
"scenes/building1_player_floor",
"scenes/clinic_ward",
"scenes/clinic",
"scenes/compound_tower",
"scenes/compound",
"scenes/downtown",
"scenes/mall",
"scenes/meditation",
"scenes/plant_shop",
"scenes/sewers",
"scenes/twinpeaks_apartment",
"scenes/top_down",
]


Expand Down Expand Up @@ -61,19 +50,8 @@ bevy-inspector-egui = { version = "0.25", default-features = false, features = [
leafwing-input-manager = "0.14"
bevy_egui = "0.28"

scene_building1_basement1 = { path = "scenes/building1_basement1" }
scene_building1_basement2 = { path = "scenes/building1_basement2" }
scene_building1_player_floor = { path = "scenes/building1_player_floor" }
scene_clinic = { path = "scenes/clinic" }
scene_clinic_ward = { path = "scenes/clinic_ward" }
scene_compound = { path = "scenes/compound" }
scene_compound_tower = { path = "scenes/compound_tower" }
scene_downtown = { path = "scenes/downtown" }
scene_mall = { path = "scenes/mall" }
scene_top_down = { path = "scenes/top_down" }
scene_meditation = { path = "scenes/meditation" }
scene_plant_shop = { path = "scenes/plant_shop" }
scene_sewers = { path = "scenes/sewers" }
scene_twinpeaks_apartment = { path = "scenes/twinpeaks_apartment" }

bevy_grid_squared = { path = "bevy_grid_squared", features = ["serde"] }
common_action = { path = "common/action" }
Expand Down
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ With every extra dependency that also depends on Bevy it potentially takes longe
- [`bevy_webp_anim`][bevy_webp_anim] is a crate we maintain so not a problem
- [`bevy-inspector-egui`][bevy-inspector-egui]
- [`leafwing-input-manager`][leafwing-input-manager] is maintained by a core Bevy contributor
- [`bevy_magic_light`](bevy_magic_light/) is a fork of [this][original-bevy_magic_light] we maintain but ideally we'd like to remove it in favor of Bevy's official 2D lighting solution
- [`bevy_egui`][bevy_egui]

[bevy_pixel_camera]: https://github.com/drakmaniso/bevy_pixel_camera
Expand Down
1 change: 0 additions & 1 deletion common/loading_screen/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,3 @@ bevy.workspace = true
common_assets.workspace = true
common_visuals.workspace = true
rand.workspace = true
strum.workspace = true
1 change: 0 additions & 1 deletion common/store/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,3 @@ rusqlite_migration.workspace = true
rusqlite.workspace = true
serde_json.workspace = true
serde.workspace = true
strum.workspace = true
1 change: 1 addition & 0 deletions common/store/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
//! A way to communicate between scenes and across time (save/load).
#![deny(missing_docs)]

use std::{
Expand Down
3 changes: 0 additions & 3 deletions common/story/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,7 @@ devtools = ["bevy-inspector-egui"]
bevy_grid_squared.workspace = true
bevy-inspector-egui = { workspace = true, optional = true }
bevy.workspace = true
common_action.workspace = true
common_assets.workspace = true
common_store.workspace = true
common_visuals.workspace = true
serde = { workspace = true, features = ["derive"] }
serde_with.workspace = true
strum.workspace = true
Loading

0 comments on commit d29ad81

Please sign in to comment.