upgrade tb crate

This commit is contained in:
2025-03-16 13:47:37 +01:00
parent 8cadb670b7
commit b1622f383a
3 changed files with 15 additions and 11 deletions

12
Cargo.lock generated
View File

@@ -1007,9 +1007,9 @@ dependencies = [
[[package]] [[package]]
name = "bevy_materialize" name = "bevy_materialize"
version = "0.4.0" version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "911eaa27cd446a9e95f18c7c234b6a8c036ae47b4632e09bbdf5326c3f1f0bc5" checksum = "20040879c95d5f3210eafd7fc00d64e9e75b5cc7eddbedfc752bd9c73b8b12e2"
dependencies = [ dependencies = [
"bevy", "bevy",
"serde", "serde",
@@ -1384,9 +1384,9 @@ dependencies = [
[[package]] [[package]]
name = "bevy_trenchbroom" name = "bevy_trenchbroom"
version = "0.6.4" version = "0.6.5"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f34467f8088d997444e0cfdd7f17a3c929894eb3557b5ca62ddbbd86c7a97260" checksum = "00ed5bb471e9b65df4c4b6313de1578577f6bab75466e73af66e8d145d7bf49c"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"avian3d", "avian3d",
@@ -1413,9 +1413,9 @@ dependencies = [
[[package]] [[package]]
name = "bevy_trenchbroom_macros" name = "bevy_trenchbroom_macros"
version = "0.6.4" version = "0.6.5"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "025a890d6eaec92b4ee7105660a73319054b6fe97d5a925e3691cfebd800bd9f" checksum = "d705a6b59b24c75bb34f71b84249fb5625a53298e0737870613fa1a799e67993"
dependencies = [ dependencies = [
"heck", "heck",
"proc-macro2", "proc-macro2",

View File

@@ -9,7 +9,7 @@ opt-level = 3
[dependencies] [dependencies]
avian3d = "0.2" avian3d = "0.2"
bevy = "0.15.3" bevy = "0.15.3"
bevy_trenchbroom = { version = "0.6.4", features = ["auto_register", "avian"] } bevy_trenchbroom = { version = "0.6.5", features = ["auto_register", "avian"] }
nil = "0.14.0" nil = "0.14.0"
bevy-inspector-egui = "0.29.1" bevy-inspector-egui = "0.29.1"
bevy-tnua = "0.21.0" bevy-tnua = "0.21.0"

View File

@@ -23,6 +23,7 @@ use bevy::audio::Volume;
use bevy::core_pipeline::tonemapping::Tonemapping; use bevy::core_pipeline::tonemapping::Tonemapping;
use bevy::prelude::*; use bevy::prelude::*;
use bevy::render::view::ColorGrading; use bevy::render::view::ColorGrading;
use bevy::scene::SceneInstanceReady;
use bevy_dolly::prelude::*; use bevy_dolly::prelude::*;
use bevy_tnua::prelude::TnuaControllerPlugin; use bevy_tnua::prelude::TnuaControllerPlugin;
use bevy_tnua_avian3d::TnuaAvian3dPlugin; use bevy_tnua_avian3d::TnuaAvian3dPlugin;
@@ -54,9 +55,7 @@ fn main() {
cam_follow: true, cam_follow: true,
}); });
app.add_plugins(DefaultPlugins.set(ImagePlugin { app.add_plugins(DefaultPlugins);
default_sampler: repeating_image_sampler(false),
}));
// app.add_plugins(bevy::pbr::wireframe::WireframePlugin) // app.add_plugins(bevy::pbr::wireframe::WireframePlugin)
// .insert_resource(bevy::pbr::wireframe::WireframeConfig { // .insert_resource(bevy::pbr::wireframe::WireframeConfig {
@@ -119,7 +118,12 @@ fn setup_cam(mut commands: Commands) {
} }
fn setup_scene(mut commands: Commands, asset_server: Res<AssetServer>) { fn setup_scene(mut commands: Commands, asset_server: Res<AssetServer>) {
commands.spawn(SceneRoot(asset_server.load("maps/map1.map#Scene"))); commands
.spawn(SceneRoot(asset_server.load("maps/map1.map#Scene")))
.observe(|_t: Trigger<SceneInstanceReady>| {
//TODO: use for state driven map loading
info!("map loaded");
});
commands.spawn(( commands.spawn((
DirectionalLight { DirectionalLight {