vivlim
/
voxel-zone
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update bevy again

This commit is contained in:
Viv Lim 2023-12-20 22:45:47 -08:00
parent d45f7d972f
commit 6dd93ca2cf
4 changed files with 870 additions and 562 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1390
Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

12
app/Cargo.toml
View File

@ -8,14 +8,14 @@ resolver = "2"
[dependencies] [dependencies]
common = { path = "../common", features = [ "two_dimensional", "three_dimensional", "serde", "bevy", "import_dot_vox" ] } common = { path = "../common", features = [ "two_dimensional", "three_dimensional", "serde", "bevy", "import_dot_vox" ] }
bevy = { version = "0.11", default-features = true, features = ["bevy_winit", "bevy_render", "bevy_pbr", "bevy_scene", "png", "x11"] } bevy = { version = "0.12", default-features = true, features = ["bevy_winit", "bevy_render", "bevy_pbr", "bevy_scene", "png", "x11"] }
serde = { version = "1", features = ["derive"] } serde = { version = "1", features = ["derive"] }
block-mesh = "0.2.0" block-mesh = "0.2.0"
bevy_egui = "0.21.0" bevy_egui = "0.24.0"
egui = "0.22" egui = "0.24"
egui_extras = "0.22" egui_extras = "0.24"
smooth-bevy-cameras = "0.9.0" smooth-bevy-cameras = "0.10.0"
itertools = "0.10" itertools = "0.10"
rfd = "0.8" rfd = "0.8"
async-channel = "1.6.1" async-channel = "1.6.1"
enum-map = "2.4" # syntax_highlighting dep, possibly redundant with strum? enum-map = "2.4" # syntax_highlighting dep, possibly redundant with strum?

26
app/src/main.rs
View File

@ -50,29 +50,33 @@ fn main() {
.add_plugins(OrbitCameraPlugin { .add_plugins(OrbitCameraPlugin {
override_input_system: false, override_input_system: false,
}) })
.add_system(systems::ui::layers::layer_ui) // https://bevyengine.org/learn/migration-guides/0.10-0.11/#schedule-first-the-new-and-improved-add-systems
.add_system(systems::ui::properties::properties_ui) .add_systems(Update, systems::ui::layers::layer_ui)
.add_system(systems::ui::properties::clean_up_closed_panes) .add_systems(Update, systems::ui::properties::properties_ui)
.add_system( .add_systems(Update, systems::ui::properties::clean_up_closed_panes)
.add_systems(
Update,
systems::mutable_mesh_refresher::mutable_mesh_refresher::< systems::mutable_mesh_refresher::mutable_mesh_refresher::<
VoxelHashMapLayer<LevelTile>, VoxelHashMapLayer<LevelTile>,
LevelTile, LevelTile,
>, >,
) )
.add_system( .add_systems(
Update,
systems::mutable_mesh_refresher::mutable_mesh_refresher::< systems::mutable_mesh_refresher::mutable_mesh_refresher::<
DepthTileContainer<LevelTile>, DepthTileContainer<LevelTile>,
LevelTile, LevelTile,
>, >,
) )
.add_system( .add_systems(
Update,
systems::mutable_mesh_refresher::mutable_mesh_refresher::<VoxelCursorLayer, BoolVoxel>, systems::mutable_mesh_refresher::mutable_mesh_refresher::<VoxelCursorLayer, BoolVoxel>,
) )
.add_system(move_camera_system) .add_systems(Update, move_camera_system)
.add_system(look_at_cursor_system) .add_systems(Update, look_at_cursor_system)
.add_system(systems::layer_spawner::layer_spawner) .add_systems(Update, systems::layer_spawner::layer_spawner)
.add_system(systems::ui::ui_spawner::ui_spawner) .add_systems(Update, systems::ui::ui_spawner::ui_spawner)
.add_startup_system(setup) .add_systems(Startup, setup)
.run(); .run();
} }

4
common/Cargo.toml
View File

@ -11,7 +11,7 @@ ron = { version = "0.8", optional = true }
serde = { version = "1.0", optional = true } serde = { version = "1.0", optional = true }
strum = { version = "0.24", optional = true } strum = { version = "0.24", optional = true }
strum_macros = { version = "0.24", optional = true } strum_macros = { version = "0.24", optional = true }
bevy = { version = "0.11", default-features = false, optional = true } bevy = { version = "0.12", default-features = false, optional = true }
dot_vox = { version = "4.1.0", optional = true } dot_vox = { version = "4.1.0", optional = true }
thiserror = { version = "1.0", optional = true } thiserror = { version = "1.0", optional = true }
@ -25,4 +25,4 @@ bevy = ["dep:bevy"]
import_dot_vox = ["dep:dot_vox"] import_dot_vox = ["dep:dot_vox"]
block-mesh = ["dep:block-mesh"] block-mesh = ["dep:block-mesh"]
std = ["dep:strum", "dep:strum_macros", "dep:thiserror"] std = ["dep:strum", "dep:strum_macros", "dep:thiserror"]
fixed_arrays_instead_of_vecs = [] fixed_arrays_instead_of_vecs = []